Hi Dave, On Tue, 11 May 2010 23:13:39 -0700 (PDT) David Miller <davem@xxxxxxxxxxxxx> wrote: > > Tricky merge :-) Yeah, I got it right the second time :-) > I'll clear all of these issues up for you tonight Stephen, thanks! Thanks. > There should have been a merge conflict in > Documentation/feature-removal-schedule.txt due to some recent > netfilter commits too, I'll take care of that too of course :) Yeah, but I have stopped reporting those when they are just clashes between people adding new entries at the end. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpVatc4Ht3mF.pgp
Description: PGP signature
