Hi Arnd, On Thu, 14 May 2009 09:28:01 +0200 Arnd Bergmann <arnd@xxxxxxxx> wrote: > > I've tried to make this patch set as non-invasive as possible, basically > just adding files and making single line changes to existing files > where necessary. I've never seen conflicts when I tried merging > with linux-next/master. Yeah, I just did a test merge and no conflicts at all! A test merge against mmotm seems to get conflicts only in files not modified by your patches. Looks good from that point of view. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpjFQ3IEfNTA.pgp
Description: PGP signature
