On Tue, Jul 31, 2012 at 10:29:48AM -0400, bfields wrote: > Please pull nfsd (and some lockd and a couple locks/lease) changes from: By the way, for a few years now I've been semi-regularly picking up locks.c changes for my tree. I wonder if I should be. At the least we should probably remove this entry from MAINTAINERS? And by default I suppose that stuff reverts to Al, who rumor has it will have a fair number of locks.c patches next time around. Or I'm happy to claim to be maintainer of that file if somebody prefers, it doesn't matter much to me. --b. diff --git a/MAINTAINERS b/MAINTAINERS index 3e30a3a..305ac2c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2767,15 +2767,6 @@ F: include/scsi/fc/ F: include/scsi/libfc.h F: include/scsi/libfcoe.h -FILE LOCKING (flock() and fcntl()/lockf()) -M: Matthew Wilcox <matthew@xxxxxx> -L: linux-fsdevel@xxxxxxxxxxxxxxx -S: Maintained -F: include/linux/fcntl.h -F: include/linux/fs.h -F: fs/fcntl.c -F: fs/locks.c - FILESYSTEMS (VFS and infrastructure) M: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> L: linux-fsdevel@xxxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html