public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Jan Engelhardt <jengelh@inai.de>
Cc: tkjos@android.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] android: use "menuconfig" menu entry type for CONFIG_ANDROID
Date: Thu, 30 Dec 2021 15:29:49 +0100	[thread overview]
Message-ID: <Yc3CXep5zS0u96m9@kroah.com> (raw)
In-Reply-To: <5po21q10-20p8-5593-2npn-7n5718qsnq73@vanv.qr>

On Thu, Dec 30, 2021 at 03:14:26PM +0100, Jan Engelhardt wrote:
> 
> On Thursday 2021-12-30 14:14, Greg KH wrote:
> >On Tue, Dec 28, 2021 at 09:06:34PM +0100, Jan Engelhardt wrote:
> >> Allow disabling the Android driver section from within the Device
> >> Drivers submenu, without having to descend into the Android drivers
> >> submenu first.
> >> 
> >> Signed-off-by: Jan Engelhardt <jengelh@inai.de>
> >> ---
> >>  drivers/android/Kconfig | 6 +-----
> >>  1 file changed, 1 insertion(+), 5 deletions(-)
> >> 
> >> diff --git drivers/android/Kconfig drivers/android/Kconfig
> >> index 53b22e26266c..dc0a373ab879 100644
> >> --- drivers/android/Kconfig
> >> +++ drivers/android/Kconfig
> >
> >You made this patch at one level too deep, it should look like:
> >
> >--- a/drivers/android/Kconfig
> >+++ b/drivers/android/Kconfig
> >
> >As-is, this will not apply.
> >
> >A normal git diff will output the correct patch file, as will 'git
> >format-patch', how did you create this?
> 
> Uh, I once again ran afoul of my default "diff.noprefix=true" in 
> ~/.gitconfig. Unless there is a magical barrier, `git am -p0`
> should momentarily work for you as I edit my ~/linux/.git/config to 
> set diff.noprefix=false.

I use the tool 'b4' to apply patches, which sucks it out of the public
archive and then uses 'git am' to apply the patch.  So I can't apply
your patch as-is, sorry.

Please resend.

thanks,

greg k-h

  reply	other threads:[~2021-12-30 14:29 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-28 20:06 [PATCH] android: use "menuconfig" menu entry type for CONFIG_ANDROID Jan Engelhardt
2021-12-30 13:14 ` Greg KH
2021-12-30 14:14   ` Jan Engelhardt
2021-12-30 14:29     ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-30 14:50 Jan Engelhardt
2021-12-30 16:58 ` Greg KH
2021-12-30 17:36   ` Jan Engelhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Yc3CXep5zS0u96m9@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=jengelh@inai.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tkjos@android.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox