diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 22:21:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 22:21:58 +0100 |
| commit | 5a3e0b196bbd63759e9eba836fc7ed16d1f2a1c1 (patch) | |
| tree | 60407bb01c482726f733d39acd93393a092bf46a /arch/parisc/include/asm | |
| parent | Merge branch 'work.cramfs' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff) | |
| parent | fcntl: don't cap l_start and l_end values for F_GETLK64 in compat syscall (diff) | |
| download | linux-5a3e0b196bbd63759e9eba836fc7ed16d1f2a1c1.tar.xz linux-5a3e0b196bbd63759e9eba836fc7ed16d1f2a1c1.zip | |
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 'arch/parisc/include/asm')
| -rw-r--r-- | arch/parisc/include/asm/compat.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h index 07f48827afda..acf8aa07cbe0 100644 --- a/arch/parisc/include/asm/compat.h +++ b/arch/parisc/include/asm/compat.h @@ -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; |