History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor overlapping changes in the conflicts. In the macsec case, the change of the default ID macro name overlapped with the 64-bit netlink attribute alignment fixes in net-next.

David S. Miller committed 10 years ago

Commit c0cc5312 parents 8c14586 f28f20d137 files · +1416 −698Browse files

Showing the changes to include/uapi (2 of 137 files). Show all

Unified · Split

2 files
  1. include/uapi/asm-generic/unistd.h +5 −1
  2. include/uapi/linux/if_macsec.h +2 −2
include/uapi/asm-generic/unistd.h+5−1
@@ -717,9 +717,13 @@ __SYSCALL(__NR_membarrier, sys_membarrier) · 716 unmodified lines
717717 __SYSCALL(__NR_mlock2, sys_mlock2)
718718 #define __NR_copy_file_range 285
719719 __SYSCALL(__NR_copy_file_range, sys_copy_file_range)
720+#define __NR_preadv2 286
721+__SYSCALL(__NR_preadv2, sys_preadv2)
722+#define __NR_pwritev2 287
723+__SYSCALL(__NR_pwritev2, sys_pwritev2)
720724
721725 #undef __NR_syscalls
722−#define __NR_syscalls 286
726+#define __NR_syscalls 288
723727
724728 /*
725729 * All syscalls below here should go away really,
include/uapi/linux/if_macsec.h+2−2
@@ -19,8 +19,8 @@ · 18 unmodified lines
1919
2020 #define MACSEC_MAX_KEY_LEN 128
2121
22−#define DEFAULT_CIPHER_ID 0x0080020001000001ULL
23−#define DEFAULT_CIPHER_ALT 0x0080C20001000001ULL
22+#define MACSEC_DEFAULT_CIPHER_ID 0x0080020001000001ULL
23+#define MACSEC_DEFAULT_CIPHER_ALT 0x0080C20001000001ULL
2424
2525 #define MACSEC_MIN_ICV_LEN 8
2626 #define MACSEC_MAX_ICV_LEN 32