On Tue, Dec 13, 2016 at 04:16:56AM -0800, Greg Kroah-Hartman wrote: > On Mon, Dec 12, 2016 at 07:32:07PM -0800, Guenter Roeck wrote: > > There is now a different driver for the slicoss devices in > > drivers/net/ethernet/alacritech/. That driver supports the same PCI > > device IDs as the driver in staging. Both drivers use the same > > configuration symbol (CONFIG_SLICOSS), which causes build failures > > for the staging driver. Presumably the driver in staging is obsolete > > and can be removed. > > > > Cc: Tobias Klauser <tklauser@xxxxxxxxxx> > > Cc: David S. Miller <davem@xxxxxxxxxxxxx> > > Cc: Lino Sanfilippo <LinoSanfilippo@xxxxxx> > > Cc: Lior Dotan <liodot@xxxxxxxxx> > > Cc: Christopher Harrer <charrer@xxxxxxxxxxxxxx> > > Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx> > > --- > > MAINTAINERS | 6 - > > drivers/staging/Kconfig | 2 - > > drivers/staging/Makefile | 1 - > > drivers/staging/slicoss/Kconfig | 14 - > > drivers/staging/slicoss/Makefile | 1 - > > drivers/staging/slicoss/README | 7 - > > drivers/staging/slicoss/TODO | 36 - > > drivers/staging/slicoss/slic.h | 573 ------- > > drivers/staging/slicoss/slichw.h | 652 -------- > > drivers/staging/slicoss/slicoss.c | 3131 ------------------------------------- > > 10 files changed, 4423 deletions(-) > > delete mode 100644 drivers/staging/slicoss/Kconfig > > delete mode 100644 drivers/staging/slicoss/Makefile > > delete mode 100644 drivers/staging/slicoss/README > > delete mode 100644 drivers/staging/slicoss/TODO > > delete mode 100644 drivers/staging/slicoss/slic.h > > delete mode 100644 drivers/staging/slicoss/slichw.h > > delete mode 100644 drivers/staging/slicoss/slicoss.c > > Odd, I already did this in my staging-next tree, which should be showing > up in linux-next, correct? It's not merged into Linus's tree just yet, > give me a chance to get it to him please, I've been traveling. :) > No problem. It was still in my copy of -next, so I thought it got lost. Guess I should have updated it ;-). Sorry for the noise. Guenter _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
