[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <1352845961.17444.13.camel@joe-AO722>
Date: Tue, 13 Nov 2012 14:32:41 -0800
From: Joe Perches <joe@...ches.com>
To: David Miller <davem@...emloft.net>
Cc: rob@...dley.net, harryxiyou@...il.com, jdike@...toit.com,
richard@....at, linux@....linux.org.uk, ralf@...ux-mips.org,
benh@...nel.crashing.org, paulus@...ba.org, chris@...kel.net,
jcmvbkbc@...il.com, isdn@...ux-pingi.de, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org,
xiyoulinuxkernelgroup@...glegroups.com, linux-kernel@...kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-mips@...ux-mips.org,
linuxppc-dev@...ts.ozlabs.org,
user-mode-linux-devel@...ts.sourceforge.net,
user-mode-linux-user@...ts.sourceforge.net,
linux-xtensa@...ux-xtensa.org, netdev@...r.kernel.org
Subject: Re: [PATCH V2] wanrouter: Remove it and the drivers that depend on
it
On Tue, 2012-11-13 at 17:17 -0500, David Miller wrote:
> From: Joe Perches <joe@...ches.com>
> Date: Tue, 13 Nov 2012 12:17:25 -0800
>
> > That seems an odd workflow as it leaves dangling CONFIG_<foo>
> > options set, but I guess it doesn't hurt so here it is.
>
> As you said it's harmless, and more importantly it avoids
> unnecessary conflicts.
>
> > I just removed the modified arch/.../<foo>defconfig files.
>
> Something is not right here:
> [davem@drr net-next]$ git am --signoff V2-wanrouter-Remove-it-and-the-drivers-that-depend-on-it.patch
> Applying: wanrouter: Remove it and the drivers that depend on it
> error: removal patch leaves file contents
> error: net/wanrouter/Kconfig: patch does not apply
> error: removal patch leaves file contents
> error: net/wanrouter/Makefile: patch does not apply
> error: removal patch leaves file contents
> error: net/wanrouter/patchlevel: patch does not apply
> error: removal patch leaves file contents
> error: net/wanrouter/wanmain.c: patch does not apply
> error: removal patch leaves file contents
> error: net/wanrouter/wanproc.c: patch does not apply
> error: removal patch leaves file contents
> error: drivers/net/wan/cycx_drv.c: patch does not apply
> error: removal patch leaves file contents
> error: drivers/net/wan/cycx_main.c: patch does not apply
> error: removal patch leaves file contents
> error: drivers/net/wan/cycx_x25.c: patch does not apply
> error: removal patch leaves file contents
> error: include/linux/cyclomx.h: patch does not apply
> error: removal patch leaves file contents
> error: include/linux/cycx_drv.h: patch does not apply
> error: removal patch leaves file contents
> error: include/linux/wanrouter.h: patch does not apply
> error: removal patch leaves file contents
> error: include/uapi/linux/wanrouter.h: patch does not apply
Right, that is unexpected/odd/interesting.
I was trying to save mailing list bandwidth by reducing
the patch size.
I generated this with
$ git format-patch -M -D
but it doesn't apply here either. :(
Using
$ git format-patch -M
does apply correctly.
It's quite a bit larger though. (120KB vs 14)
I'll send the large patch just to netdev.
Joe
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists