leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2016-04-27 15:43:10 -04:00
parent 8c14586fc3 f28f20da70
commit c0cc53162a
137 changed files with 1416 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/uapi/asm-generic/unistd.h
View File

@@ -717,9 +717,13 @@ __SYSCALL(__NR_membarrier, sys_membarrier)
__SYSCALL(__NR_mlock2, sys_mlock2)
#define __NR_copy_file_range 285
__SYSCALL(__NR_copy_file_range, sys_copy_file_range)
#define __NR_preadv2 286
__SYSCALL(__NR_preadv2, sys_preadv2)
#define __NR_pwritev2 287
__SYSCALL(__NR_pwritev2, sys_pwritev2)
#undef __NR_syscalls
#define __NR_syscalls 286
#define __NR_syscalls 288
/*
* All syscalls below here should go away really,

4
include/uapi/linux/if_macsec.h
View File

@@ -19,8 +19,8 @@
#define MACSEC_MAX_KEY_LEN 128
#define DEFAULT_CIPHER_ID 0x0080020001000001ULL
#define DEFAULT_CIPHER_ALT 0x0080C20001000001ULL
#define MACSEC_DEFAULT_CIPHER_ID 0x0080020001000001ULL
#define MACSEC_DEFAULT_CIPHER_ALT 0x0080C20001000001ULL
#define MACSEC_MIN_ICV_LEN 8
#define MACSEC_MAX_ICV_LEN 32