Re: [patch 08/13] Use menuconfig objects II - netdev (general+100mbit)

[Andrew Morton <akpm@linux-foundation.org>]

On Fri, 11 May 2007 23:32:08 +0200 (MEST)
Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:

> 
> On May 11 2007 16:57, Jeff Garzik wrote:
> >> 
> >> CONFIG_NETDEVICES, CONFIG_NET_ETHERNET:
> >> Change Kconfig objects from "menu, config" into "menuconfig" so
> >> that the user can disable the whole feature without having to
> >> enter the menu first.
> >> 
> >> CONFIG_SMC9194:
> >> Move it so that it appears correctly in menuconfig.
> >> 
> >> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
> >> Cc: Jeff Garzik <jeff@garzik.org>
> >> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> >> ---
> >> 
> >> drivers/net/Kconfig         |  167 ++++++++++++++++------------------
> >> drivers/net/arm/Kconfig     |   12 +-
> >> drivers/net/fec_8xx/Kconfig |    2 drivers/net/fs_enet/Kconfig |    2
> >> drivers/net/tulip/Kconfig   |   27 ++---
> >> 5 files changed, 102 insertions(+), 108 deletions(-)
> >
> > ACK, but failed to apply
> >
> Name the tree that I should rebase it on. (Did not seem like basing
> everything on -mm always works out.)
> 

Is OK.  It applies OK here, but is obviously geting rejects due to all the
other maintainers who have their sticky paws on Jeff's stuff.

akpm:/usr/src/25> for i in drivers/net/Kconfig drivers/net/arm/Kconfig drivers/net/fec_8xx/Kconfig drivers/net/tulip/Kconfig
for> do
for> grep -l $i pc/git-*.pc
for> done | sort | uniq
pc/git-infiniband.pc
pc/git-qla3xxx.pc
pc/git-wireless.pc

I'll just continue to maintain the patch and one day the conflicting
changes will make it into mainline and the patch will then apply on Jeff's
tree.  Ho hum.