diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 13:21:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 13:21:58 -0800 |
| commit | 5a3e0b196bbd63759e9eba836fc7ed16d1f2a1c1 (patch) | |
| tree | 60407bb01c482726f733d39acd93393a092bf46a /MAINTAINERS | |
| parent | cbda1b270f7ac23665f25fa513d2a73ea7149cbe (diff) | |
| parent | 4d2dc2cc766c3b51929658cacbc6e34fc8e242fb (diff) | |
Merge tag 'locks-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking update from Jeff Layton:
"A couple of fixes for a patch that went into v4.14, and the bug report
just came in a few days ago.. It passes my (minimal) testing, and has
been in linux-next for a few days now.
I also would like to get my address changed in MAINTAINERS to clear
that hurdle"
* tag 'locks-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
fcntl: don't cap l_start and l_end values for F_GETLK64 in compat syscall
fcntl: don't leak fd reference when fixup_compat_flock fails
MAINTAINERS: s/jlayton@poochiereds.net/jlayton@kernel.org/
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ec3ec17c6c11..2098512e9f10 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5216,7 +5216,7 @@ F: drivers/video/fbdev/s1d13xxxfb.c F: include/video/s1d13xxxfb.h ERRSEQ ERROR TRACKING INFRASTRUCTURE -M: Jeff Layton <jlayton@poochiereds.net> +M: Jeff Layton <jlayton@kernel.org> S: Maintained F: lib/errseq.c F: include/linux/errseq.h @@ -5404,7 +5404,7 @@ F: include/scsi/libfcoe.h F: include/uapi/scsi/fc/ FILE LOCKING (flock() and fcntl()/lockf()) -M: Jeff Layton <jlayton@poochiereds.net> +M: Jeff Layton <jlayton@kernel.org> M: "J. Bruce Fields" <bfields@fieldses.org> L: linux-fsdevel@vger.kernel.org S: Maintained @@ -7550,7 +7550,7 @@ S: Odd Fixes KERNEL NFSD, SUNRPC, AND LOCKD SERVERS M: "J. Bruce Fields" <bfields@fieldses.org> -M: Jeff Layton <jlayton@poochiereds.net> +M: Jeff Layton <jlayton@kernel.org> L: linux-nfs@vger.kernel.org W: http://nfs.sourceforge.net/ T: git git://linux-nfs.org/~bfields/linux.git |