On Fri, Jun 01, 2012 at 10:38:53AM -0700, Linus Torvalds wrote: > On Fri, Jun 1, 2012 at 9:56 AM, Al Viro <viro@xxxxxxxxxxxxxxxxxx> 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. Umm... It's a lot of misc stuff, unfortunately. The obvious groups: * Miklos' atomic_open series; kills the damn abuse of ->d_revalidate() by NFS, which was the major stumbling block for all work in that area. * ripping security_file_mmap() and dealing with deadlocks in the area; sanitizing the neighborhood of vm_mmap()/vm_munmap() in general. * ->encode_fh() switched to saner API; insane fake dentry in mm/cleancache.c gone. * assorted annotations in fs (endianness, __user) * parts of Artem's ->s_dirty work (jff2 and reiserfs parts) * ->update_time() work from Josef. * other bits and pieces all over the place. Normally it would've been in two or three pull requests, but signal.git stuff had eaten a lot of time during this cycle ;-/ -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
