On Sun, Jul 22, 2012 at 09:20:30PM +0100, Al Viro wrote: > Result: for-linus-2 + v3.5 and for-linus + v3.5 give identical trees, > and for-linus-2 merges clean with nfs/nfs-for-3.6. Would you be OK > with pulling that one? Again, my apologies to everyone involved ;-/ > > If you are OK with pulling that one, the summary is unchanged, location is > git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus-2
BTW, Stephen, could you confirm that vfs.git#for-linus-2 has no conflicts with the rest of trees in linux-next? I've checked the lack of conflicts with nfs.git and you haven't mentioned any other conflicts, so I hope that this will do, but I haven't tried pulling and merging the rest of the stuff in -next; not with the link I'm behind right now... ;-/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
