Messages in this thread | | | Date | Thu, 30 Dec 2021 15:14:26 +0100 (CET) | From | Jan Engelhardt <> | Subject | Re: [PATCH] android: use "menuconfig" menu entry type for CONFIG_ANDROID |
| |
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.
(which of course breaks part of my workflow just like xkcd.com/1172 predicts, but alas... -- I've already conveyed to the git list it's suboptimal for me, https://lore.kernel.org/all/xmqqr1auvs7m.fsf@gitster.g/ )
| |