* commit '3728e6a255b5': (904 commits) Linux 4.14-rc5 x86/microcode: Do the family check first locking/lockdep: Disable cross-release features for now x86/mm: Flush more aggressively in lazy TLB mode mm, swap: use page-cluster as max window of VMA based swap readahead mm: page_vma_mapped: ensure pmd is loaded with READ_ONCE outside of lock kmemleak: clear stale pointers from task stacks fs/binfmt_misc.c: node could be NULL when evicting inode fs/mpage.c: fix mpage_writepage() for pages with buffers linux/kernel.h: add/correct kernel-doc notation tty: fall back to N_NULL if switching to N_TTY fails during hangup Revert "vmalloc: back off when the current task is killed" mm/cma.c: take __GFP_NOWARN into account in cma_alloc() scripts/kallsyms.c: ignore symbol type 'n' userfaultfd: selftest: exercise -EEXIST only in background transfer mm: only display online cpus of the numa node mm: remove unnecessary WARN_ONCE in page_vma_mapped_walk(). mm/mempolicy: fix NUMA_INTERLEAVE_HIT counter include/linux/of.h: provide of_n_{addr,size}_cells wrappers for !CONFIG_OF mm/madvise.c: add description for MADV_WIPEONFORK and MADV_KEEPONFORK ...
Showing the changes to include/uapi/linux (4 of 848 files). Show all
Unified · Split
| @@ -312,7 +312,7 @@ union bpf_attr { · 311 unmodified lines | |||
| 312 | * jump into another BPF program | 312 | * jump into another BPF program |
| 313 | * @ctx: context pointer passed to next program | 313 | * @ctx: context pointer passed to next program |
| 314 | * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY | 314 | * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY |
| 315 | * @index: index inside array that selects specific program to run | 315 | * @index: 32-bit index inside array that selects specific program to run |
| 316 | * Return: 0 on success or negative error | 316 | * Return: 0 on success or negative error |
| 317 | * | 317 | * |
| 318 | * int bpf_clone_redirect(skb, ifindex, flags) | 318 | * int bpf_clone_redirect(skb, ifindex, flags) |
| @@ -269,9 +269,9 @@ enum { · 268 unmodified lines | |||
| 269 | #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) | 269 | #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) |
| 270 | 270 | ||
| 271 | #define DM_VERSION_MAJOR 4 | 271 | #define DM_VERSION_MAJOR 4 |
| 272 | #define DM_VERSION_MINOR 36 | 272 | #define DM_VERSION_MINOR 37 |
| 273 | #define DM_VERSION_PATCHLEVEL 0 | 273 | #define DM_VERSION_PATCHLEVEL 0 |
| 274 | #define DM_VERSION_EXTRA "-ioctl (2017-06-09)" | 274 | #define DM_VERSION_EXTRA "-ioctl (2017-09-20)" |
| 275 | 275 | ||
| 276 | /* Status bits */ | 276 | /* Status bits */ |
| 277 | #define DM_READONLY_FLAG (1 << 0) /* In/Out */ | 277 | #define DM_READONLY_FLAG (1 << 0) /* In/Out */ |
| @@ -23,6 +23,7 @@ enum xt_bpf_modes { · 22 unmodified lines | |||
| 23 | XT_BPF_MODE_FD_PINNED, | 23 | XT_BPF_MODE_FD_PINNED, |
| 24 | XT_BPF_MODE_FD_ELF, | 24 | XT_BPF_MODE_FD_ELF, |
| 25 | }; | 25 | }; |
| 26 | #define XT_BPF_MODE_PATH_PINNED XT_BPF_MODE_FD_PINNED | ||
| 26 | 27 | ||
| 27 | struct xt_bpf_info_v1 { | 28 | struct xt_bpf_info_v1 { |
| 28 | __u16 mode; | 29 | __u16 mode; |
| @@ -780,6 +780,7 @@ struct usb_interface_assoc_descriptor { · 779 unmodified lines | |||
| 780 | __u8 iFunction; | 780 | __u8 iFunction; |
| 781 | } __attribute__ ((packed)); | 781 | } __attribute__ ((packed)); |
| 782 | 782 | ||
| 783 | #define USB_DT_INTERFACE_ASSOCIATION_SIZE 8 | ||
| 783 | 784 | ||
| 784 | /*-------------------------------------------------------------------------*/ | 785 | /*-------------------------------------------------------------------------*/ |
| 785 | 786 | ||