On Wed 10 Jan, 2018, 1:33 AM Greg Kroah-Hartman, wrote: > On Tue, Jan 09, 2018 at 07:45:33PM +0000, Harsh Shandilya wrote: > > On Tue 9 Jan, 2018, 10:32 PM Greg Kroah-Hartman, < > gregkh@linuxfoundation.org> > > wrote: > > > > > On Fri, Dec 22, 2017 at 07:37:03PM +0530, Harsh Shandilya wrote: > > > > From: Harsh Shandilya > > > > > > > > Several methods in the driver were hardcoding > > > > the function name in their logging calls which > > > > is a checkpatch violation. Utilise the __func__ > > > > macro to avoid needing to add the function name > > > > as is to the string. > > > > > > > > Test: logtags in dmesg remain unaffected before > > > > and after the patch. > > > > > > > > Signed-off-by: Harsh Shandilya > > > > > > > > Cc: Greg Kroah-Hartman > > > > Cc: "Arve Hjønnevåg" > > > > Cc: Todd Kjos > > > > Cc: Martijn Coenen > > > > Cc: devel@driverdev.osuosl.org > > > > Cc: linux-kernel@vger.kernel.org > > > > --- > > > > drivers/android/binder.c | 13 +++++++------ > > > > 1 file changed, 7 insertions(+), 6 deletions(-) > > > > > > Patch does not apply to my tree :( > > > > > > > If you drop > > > https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/commit/?h=char-misc-next&id=00c41cddebde8d1a635bf81a7b255b7e56fd0d15 > > then the patch should go in cleanly. My patch includes the changes from > > Elad's already. > > That patch came first in my inbox, I'm not going to revert it from the > tree now, sorry. > > Just rebase and resend if your patch did "more". > > thanks, > > greg k-h > Comparing both patches again I think Elad's is the better one to keep since the only difference between his and mine is that I also fixed up a commented out pr_info call. You can ignore my patch, sorry for the noise. >