Hi Linus, On Mon, 21 May 2012 15:00:28 -0700 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > On Mon, May 21, 2012 at 2:37 PM, Andrew Morton > <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > > > hm, we seem to have conflicting commits between mainline and linux-next. > > During the merge window. Again. Nobody knows why this happens. > > I didn't have my trivial cleanup branches in linux-next, I'm afraid. > Usually my pending cleanups are just small patches that I carry along > without even committing them, this time around I had slightly more > than that. You could set up a branch that is merged into linux-next if you want to ... it may lower the suprise factor. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpkmjTYmJ00W.pgp
Description: PGP signature