Commit 5a3e0b19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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/
parents cbda1b27 4d2dc2cc

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -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

arch/arm64/include/asm/compat.h

+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ typedef struct compat_siginfo { 
} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff

#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL



/*

 * A pointer passed in from user mode. This should not

arch/mips/include/asm/compat.h

+0 −1
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ typedef struct compat_siginfo { 
} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff

#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL



/*

 * A pointer passed in from user mode. This should not

arch/parisc/include/asm/compat.h

+0 −1
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ typedef struct compat_siginfo { 
} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff

#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL



struct compat_ipc64_perm {

	compat_key_t key;

arch/powerpc/include/asm/compat.h

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ typedef struct compat_siginfo { 
} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff

#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL



/*

 * A pointer passed in from user mode. This should not

CRA Git | Maintained and supported by SUSTech CRA and CCSE