diff options
| author | David S. Miller | 2017-03-23 23:11:56 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-03-24 00:41:27 +0100 |
| commit | 16ae1f223601c44e5cb65c99257ffae003504704 (patch) | |
| tree | 1f5284c0e82e4d94ca07eb022fa7911d99bb0cb6 /arch/parisc/include/uapi | |
| parent | qedf: fix wrong le16 conversion (diff) | |
| parent | Merge tag 'sound-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
| download | kernel-qcow2-linux-16ae1f223601c44e5cb65c99257ffae003504704.tar.gz kernel-qcow2-linux-16ae1f223601c44e5cb65c99257ffae003504704.tar.xz kernel-qcow2-linux-16ae1f223601c44e5cb65c99257ffae003504704.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/hyperv/netvsc.c
kernel/bpf/hashtab.c
Almost entirely overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/parisc/include/uapi')
| -rw-r--r-- | arch/parisc/include/uapi/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/include/uapi/asm/unistd.h b/arch/parisc/include/uapi/asm/unistd.h index 6b0741e7a7ed..667c99421003 100644 --- a/arch/parisc/include/uapi/asm/unistd.h +++ b/arch/parisc/include/uapi/asm/unistd.h @@ -362,8 +362,9 @@ #define __NR_copy_file_range (__NR_Linux + 346) #define __NR_preadv2 (__NR_Linux + 347) #define __NR_pwritev2 (__NR_Linux + 348) +#define __NR_statx (__NR_Linux + 349) -#define __NR_Linux_syscalls (__NR_pwritev2 + 1) +#define __NR_Linux_syscalls (__NR_statx + 1) #define __IGNORE_select /* newselect */ |