Messages in this thread | | | From | Linus Torvalds <> | Date | Fri, 1 Jun 2012 10:38:53 -0700 | Subject | Re: [git pull] vfs.git |
| |
On Fri, Jun 1, 2012 at 9:56 AM, Al Viro <viro@zeniv.linux.org.uk> wrote: > > There's a trivial conflict in Documentation/filesystems/vfs.txt - two > method prototypes added, one in mainline, one here. With the obvious > conflict resolution...
Actually, it's one removed in mainline, one added by your pull.
What I'd *really* like to see is a kind of summary of what this pull does, though. Please? That way I can make the merge messages be a whole lot more informative.
Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |