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.
Showing the changes to include/uapi (2 of 137 files). Show all
Unified · Split
| @@ -717,9 +717,13 @@ __SYSCALL(__NR_membarrier, sys_membarrier) · 716 unmodified lines | |||
| 717 | __SYSCALL(__NR_mlock2, sys_mlock2) | 717 | __SYSCALL(__NR_mlock2, sys_mlock2) |
| 718 | #define __NR_copy_file_range 285 | 718 | #define __NR_copy_file_range 285 |
| 719 | __SYSCALL(__NR_copy_file_range, sys_copy_file_range) | 719 | __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) | ||
| 720 | 724 | ||
| 721 | #undef __NR_syscalls | 725 | #undef __NR_syscalls |
| 722 | #define __NR_syscalls 286 | 726 | #define __NR_syscalls 288 |
| 723 | 727 | ||
| 724 | /* | 728 | /* |
| 725 | * All syscalls below here should go away really, | 729 | * All syscalls below here should go away really, |
| @@ -19,8 +19,8 @@ · 18 unmodified lines | |||
| 19 | 19 | ||
| 20 | #define MACSEC_MAX_KEY_LEN 128 | 20 | #define MACSEC_MAX_KEY_LEN 128 |
| 21 | 21 | ||
| 22 | #define DEFAULT_CIPHER_ID 0x0080020001000001ULL | 22 | #define MACSEC_DEFAULT_CIPHER_ID 0x0080020001000001ULL |
| 23 | #define DEFAULT_CIPHER_ALT 0x0080C20001000001ULL | 23 | #define MACSEC_DEFAULT_CIPHER_ALT 0x0080C20001000001ULL |
| 24 | 24 | ||
| 25 | #define MACSEC_MIN_ICV_LEN 8 | 25 | #define MACSEC_MIN_ICV_LEN 8 |
| 26 | #define MACSEC_MAX_ICV_LEN 32 | 26 | #define MACSEC_MAX_ICV_LEN 32 |