Merge from Upstream after the latest media fixes branch, because we need one patch that it is there. * commit '0072a0c14d5b7cb72c611d396f143f5dcd73ebe2': (1108 commits) ide: Change to use DEFINE_SHOW_ATTRIBUTE macro ide: pmac: add of_node_put() drivers/tty: add missing of_node_put() drivers/sbus/char: add of_node_put() sbus: char: add of_node_put() Linux 4.20-rc5 PCI: Fix incorrect value returned from pcie_get_speed_cap() MAINTAINERS: Update linux-mips mailing list address ocfs2: fix potential use after free mm/khugepaged: fix the xas_create_range() error path mm/khugepaged: collapse_shmem() do not crash on Compound mm/khugepaged: collapse_shmem() without freezing new_page mm/khugepaged: minor reorderings in collapse_shmem() mm/khugepaged: collapse_shmem() remember to clear holes mm/khugepaged: fix crashes due to misaccounted holes mm/khugepaged: collapse_shmem() stop if punched or truncated mm/huge_memory: fix lockdep complaint on 32-bit i_size_read() mm/huge_memory: splitting set mapping+index before unfreeze mm/huge_memory: rename freeze_page() to unmap_page() initramfs: clean old path before creating a hardlink ...
Showing the changes to include/uapi/linux (6 of 1088 files). Show all
Unified · Split
| @@ -716,7 +716,6 @@ · 715 unmodified lines | ||
| 716 | 716 | * the situation described above. |
| 717 | 717 | */ |
| 718 | 718 | #define REL_RESERVED 0x0a |
| 719 | −#define REL_WHEEL_HI_RES 0x0b | |
| 720 | 719 | #define REL_MAX 0x0f |
| 721 | 720 | #define REL_CNT (REL_MAX+1) |
| 722 | 721 | |
| @@ -753,15 +752,6 @@ · 30 unmodified lines | ||
| 753 | 752 | |
| 754 | 753 | #define ABS_MISC 0x28 |
| 755 | 754 | |
| 756 | −/* | |
| 757 | − * 0x2e is reserved and should not be used in input drivers. | |
| 758 | − * It was used by HID as ABS_MISC+6 and userspace needs to detect if | |
| 759 | − * the next ABS_* event is correct or is just ABS_MISC + n. | |
| 760 | − * We define here ABS_RESERVED so userspace can rely on it and detect | |
| 761 | − * the situation described above. | |
| 762 | − */ | |
| 763 | −#define ABS_RESERVED 0x2e | |
| 764 | − | |
| 765 | 755 | #define ABS_MT_SLOT 0x2f /* MT slot being modified */ |
| 766 | 756 | #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ |
| 767 | 757 | #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ |
| @@ -83,11 +83,11 @@ struct kfd_ioctl_set_cu_mask_args { · 82 unmodified lines | ||
| 83 | 83 | }; |
| 84 | 84 | |
| 85 | 85 | struct kfd_ioctl_get_queue_wave_state_args { |
| 86 | − uint64_t ctl_stack_address; /* to KFD */ | |
| 87 | − uint32_t ctl_stack_used_size; /* from KFD */ | |
| 88 | − uint32_t save_area_used_size; /* from KFD */ | |
| 89 | − uint32_t queue_id; /* to KFD */ | |
| 90 | − uint32_t pad; | |
| 86 | + __u64 ctl_stack_address; /* to KFD */ | |
| 87 | + __u32 ctl_stack_used_size; /* from KFD */ | |
| 88 | + __u32 save_area_used_size; /* from KFD */ | |
| 89 | + __u32 queue_id; /* to KFD */ | |
| 90 | + __u32 pad; | |
| 91 | 91 | }; |
| 92 | 92 | |
| 93 | 93 | /* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */ |
| @@ -255,10 +255,10 @@ struct kfd_hsa_memory_exception_data { · 161 unmodified lines | ||
| 255 | 255 | |
| 256 | 256 | /* hw exception data */ |
| 257 | 257 | struct kfd_hsa_hw_exception_data { |
| 258 | − uint32_t reset_type; | |
| 259 | − uint32_t reset_cause; | |
| 260 | − uint32_t memory_lost; | |
| 261 | − uint32_t gpu_id; | |
| 258 | + __u32 reset_type; | |
| 259 | + __u32 reset_cause; | |
| 260 | + __u32 memory_lost; | |
| 261 | + __u32 gpu_id; | |
| 262 | 262 | }; |
| 263 | 263 | |
| 264 | 264 | /* Event data */ |
| @@ -1635,8 +1635,8 @@ enum nft_ng_attributes { · 1634 unmodified lines | ||
| 1635 | 1635 | NFTA_NG_MODULUS, |
| 1636 | 1636 | NFTA_NG_TYPE, |
| 1637 | 1637 | NFTA_NG_OFFSET, |
| 1638 | − NFTA_NG_SET_NAME, | |
| 1639 | − NFTA_NG_SET_ID, | |
| 1638 | + NFTA_NG_SET_NAME, /* deprecated */ | |
| 1639 | + NFTA_NG_SET_ID, /* deprecated */ | |
| 1640 | 1640 | __NFTA_NG_MAX |
| 1641 | 1641 | }; |
| 1642 | 1642 | #define NFTA_NG_MAX (__NFTA_NG_MAX - 1) |
| @@ -11,6 +11,10 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <linux/if_vlan.h> |
| 12 | 12 | #include <linux/if_pppox.h> |
| 13 | 13 | |
| 14 | +#ifndef __KERNEL__ | |
| 15 | +#include <limits.h> /* for INT_MIN, INT_MAX */ | |
| 16 | +#endif | |
| 17 | + | |
| 14 | 18 | /* Bridge Hooks */ |
| 15 | 19 | /* After promisc drops, checksum checks. */ |
| 16 | 20 | #define NF_BR_PRE_ROUTING 0 |
| @@ -212,6 +212,7 @@ struct prctl_mm_map { · 211 unmodified lines | ||
| 212 | 212 | #define PR_SET_SPECULATION_CTRL 53 |
| 213 | 213 | /* Speculation control variants */ |
| 214 | 214 | # define PR_SPEC_STORE_BYPASS 0 |
| 215 | +# define PR_SPEC_INDIRECT_BRANCH 1 | |
| 215 | 216 | /* Return and control values for PR_SET/GET_SPECULATION_CTRL */ |
| 216 | 217 | # define PR_SPEC_NOT_AFFECTED 0 |
| 217 | 218 | # define PR_SPEC_PRCTL (1UL << 0) |
| @@ -568,6 +568,8 @@ struct sctp_assoc_reset_event { · 567 unmodified lines | ||
| 568 | 568 | |
| 569 | 569 | #define SCTP_ASSOC_CHANGE_DENIED 0x0004 |
| 570 | 570 | #define SCTP_ASSOC_CHANGE_FAILED 0x0008 |
| 571 | +#define SCTP_STREAM_CHANGE_DENIED SCTP_ASSOC_CHANGE_DENIED | |
| 572 | +#define SCTP_STREAM_CHANGE_FAILED SCTP_ASSOC_CHANGE_FAILED | |
| 571 | 573 | struct sctp_stream_change_event { |
| 572 | 574 | __u16 strchange_type; |
| 573 | 575 | __u16 strchange_flags; |
| @@ -1151,6 +1153,7 @@ struct sctp_add_streams { · 577 unmodified lines | ||
| 1151 | 1153 | /* SCTP Stream schedulers */ |
| 1152 | 1154 | enum sctp_sched_type { |
| 1153 | 1155 | SCTP_SS_FCFS, |
| 1156 | + SCTP_SS_DEFAULT = SCTP_SS_FCFS, | |
| 1154 | 1157 | SCTP_SS_PRIO, |
| 1155 | 1158 | SCTP_SS_RR, |
| 1156 | 1159 | SCTP_SS_MAX = SCTP_SS_RR |