From mboxrd@z Thu Jan  1 00:00:00 1970
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S965067AbeAIUDt (ORCPT <rfc822;ralf@linux-mips.org> + 1 other);
        Tue, 9 Jan 2018 15:03:49 -0500
Received: from mail.linuxfoundation.org ([140.211.169.12]:55578 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S965055AbeAIUDq (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 9 Jan 2018 15:03:46 -0500
Date: Tue, 9 Jan 2018 21:03:48 +0100
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Harsh Shandilya <harsh@prjkt.io>
Cc: Arve =?iso-8859-1?B?SGr4bm5lduVn?= <arve@android.com>,
        Harsh Shandilya <msfjarvis@gmail.com>,
        Martijn Coenen <maco@android.com>,
        Todd Kjos <tkjos@android.com>, devel@driverdev.osuosl.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] drivers: android: Fix logtags in methods
Message-ID: <20180109200348.GA28275@kroah.com>
References: <20171222140703.21235-1-msfjarvis@gmail.com>
 <20171222140703.21235-2-msfjarvis@gmail.com>
 <20180109170214.GA16149@kroah.com>
 <CAGr0tMvbi-uM4GAcHR+NdWYGX1XBewc_okQAKoWGxEf1rLpr8Q@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAGr0tMvbi-uM4GAcHR+NdWYGX1XBewc_okQAKoWGxEf1rLpr8Q@mail.gmail.com>
User-Agent: Mutt/1.9.2 (2017-12-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>

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 <harsh@prjkt.io>
> > >
> > > 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 <harsh@prjkt.io>
> > >
> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > Cc: "Arve Hjønnevåg" <arve@android.com>
> > > Cc: Todd Kjos <tkjos@android.com>
> > > Cc: Martijn Coenen <maco@android.com>
> > > 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