Hi Andrew, I have been thinking about this some more. On Mon, 21 May 2012 15:13:23 -0700 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > 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. > > Well, it's a broader issue than that. I often see a large number of > rejects when syncing mainline with linux-next during the merge window. > Right now: > > Documentation/nfc/nfc-hci.txt:<<<<<<< HEAD . . . > net/nfc/hci/shdlc.c:<<<<<<< HEAD > net/nfc/nci/core.c:<<<<<<< HEAD What two SHA1s did you try to merge to get that. I can get some of it but nothing like that. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpGJRruvOQtE.pgp
Description: PGP signature