diff options
author | Felipe Balbi | 2014-09-08 21:39:01 +0200 |
---|---|---|
committer | Felipe Balbi | 2014-09-08 21:39:01 +0200 |
commit | f7cc38b16e2741186253be3dff61a9d124112126 (patch) | |
tree | efce170d7c0c4baf6924275e6a42d11fa47c9290 /arch/s390/include/uapi | |
parent | usb: gadget: uvc: move module parameters from f_uvc (diff) | |
parent | Linux 3.17-rc4 (diff) | |
download | kernel-qcow2-linux-f7cc38b16e2741186253be3dff61a9d124112126.tar.gz kernel-qcow2-linux-f7cc38b16e2741186253be3dff61a9d124112126.tar.xz kernel-qcow2-linux-f7cc38b16e2741186253be3dff61a9d124112126.zip |
Merge tag 'v3.17-rc4' into next
Merge Linux 3.17-rc4 here so we have all the latest
fixes on next too. This also cleans up a few conflicts
when applying patches.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/gadget/Makefile
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/legacy/Makefile
drivers/usb/phy/phy-samsung-usb.h
Diffstat (limited to 'arch/s390/include/uapi')
-rw-r--r-- | arch/s390/include/uapi/asm/unistd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/include/uapi/asm/unistd.h b/arch/s390/include/uapi/asm/unistd.h index 3802d2d3a18d..940ac49198db 100644 --- a/arch/s390/include/uapi/asm/unistd.h +++ b/arch/s390/include/uapi/asm/unistd.h @@ -283,7 +283,10 @@ #define __NR_sched_setattr 345 #define __NR_sched_getattr 346 #define __NR_renameat2 347 -#define NR_syscalls 348 +#define __NR_seccomp 348 +#define __NR_getrandom 349 +#define __NR_memfd_create 350 +#define NR_syscalls 351 /* * There are some system calls that are not present on 64 bit, some |