On Mon, 17 Dec 2007 11:57:46 +0100 (CET) Jiri Kosina <[EMAIL PROTECTED]> wrote:
> [ CC list trimmed ] often a bad idea... > On Wed, 12 Dec 2007, David Sterba wrote: > > > Changelog: > > * files moved to ipwireless/, ipwireless_cs_ stripped from filenames > > * _cs stripped from driver name > > * kmalloc checks > > * sync irq during shutdown > > * removed /proc code, converted to module params > > > > When merged, please drop ipwireless_cs.git tree from -mm and > > include the patch instead. > > > > Regards, > > David Sterba > > > > Rewieved-by: Jiri Slaby <[EMAIL PROTECTED]> > > Signed-off-by: Ben Martel <[EMAIL PROTECTED]> > > Signed-off-by: Stephen Blackheath <[EMAIL PROTECTED]> > > Signed-off-by: David Sterba <[EMAIL PROTECTED]> > > Signed-off-by: Jiri Kosina <[EMAIL PROTECTED]> > > --- > > MAINTAINERS | 8 > > drivers/char/pcmcia/Kconfig | 9 > > drivers/char/pcmcia/Makefile | 2 > > drivers/char/pcmcia/ipwireless/Makefile | 10 > > drivers/char/pcmcia/ipwireless/hardware.c | 1784 > > ++++++++++++++++++++++++ > > drivers/char/pcmcia/ipwireless/hardware.h | 63 > > drivers/char/pcmcia/ipwireless/main.c | 496 ++++++ > > drivers/char/pcmcia/ipwireless/main.h | 70 > > drivers/char/pcmcia/ipwireless/network.c | 513 ++++++ > > drivers/char/pcmcia/ipwireless/network.h | 54 > > drivers/char/pcmcia/ipwireless/setup_protocol.h | 108 + > > drivers/char/pcmcia/ipwireless/tty.c | 687 +++++++++ > > drivers/char/pcmcia/ipwireless/tty.h | 48 > > 13 files changed, 3852 insertions(+) > > Andrew, what is your position on merging this into your 2.6.25 queue > please? David has fixed all the issues that came up during review, so it > seems to be that it's time for the driver to be merged during the upcoming > merge window. > > If you take it, I am perfectly fine with you dropping the > ipwireless_cs git tree from -mm lineup. > I'd have thought that you'd merge it into git-ipwireless_cs.patch and that you would then take care of merging it into mainline at an appropriate time? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/