diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 07:30:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 07:30:03 -0700 |
| commit | d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a (patch) | |
| tree | ea756d49395ac4a08d6cdff98d74e60384a322a6 /arch/ia64/include/uapi/asm/unistd.h | |
| parent | 3f76a4ea5383ba2f9e76f9625f77ff246907a134 (diff) | |
| parent | 0f33be009b89d2268e94194dc4fd01a7851b6d51 (diff) | |
| download | op-kernel-dev-d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a.zip op-kernel-dev-d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a.tar.gz | |
Merge 3.17-rc6 into staging-next.
We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/ia64/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/ia64/include/uapi/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/uapi/asm/unistd.h b/arch/ia64/include/uapi/asm/unistd.h index 6a65bb7..18026b2 100644 --- a/arch/ia64/include/uapi/asm/unistd.h +++ b/arch/ia64/include/uapi/asm/unistd.h @@ -329,6 +329,6 @@ #define __NR_sched_getattr 1337 #define __NR_renameat2 1338 #define __NR_getrandom 1339 -#define __NR_memfd_create 1339 +#define __NR_memfd_create 1340 #endif /* _UAPI_ASM_IA64_UNISTD_H */ |
