Hi David, On Mon, 10 Nov 2008 23:00:49 -0800 (PST) David Miller <davem@xxxxxxxxxxxxx> wrote: > > Thanks for the heads up. There will be even more conflicts, > between net-2.6 and net-next-2.6, that will need resolving > as well. Is there some reason that you can't merge net-next-2.6 into net-2.6 when these conflicts arise? -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgptHceDc4cET.pgp
Description: PGP signature
