Lots of easy overlapping changes in the confict resolutions here.
Showing the changes to include/uapi/linux (4 of 200 files). Show all
Unified · Split
| @@ -2716,7 +2716,7 @@ enum nl80211_attrs { · 2715 unmodified lines | |||
| 2716 | #define NL80211_ATTR_KEYS NL80211_ATTR_KEYS | 2716 | #define NL80211_ATTR_KEYS NL80211_ATTR_KEYS |
| 2717 | #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS | 2717 | #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS |
| 2718 | 2718 | ||
| 2719 | #define NL80211_WIPHY_NAME_MAXLEN 128 | 2719 | #define NL80211_WIPHY_NAME_MAXLEN 64 |
| 2720 | 2720 | ||
| 2721 | #define NL80211_MAX_SUPP_RATES 32 | 2721 | #define NL80211_MAX_SUPP_RATES 32 |
| 2722 | #define NL80211_MAX_SUPP_HT_RATES 77 | 2722 | #define NL80211_MAX_SUPP_HT_RATES 77 |
| @@ -106,7 +106,7 @@ struct pppol2tp_ioc_stats { · 105 unmodified lines | |||
| 106 | #define PPPIOCGIDLE _IOR('t', 63, struct ppp_idle) /* get idle time */ | 106 | #define PPPIOCGIDLE _IOR('t', 63, struct ppp_idle) /* get idle time */ |
| 107 | #define PPPIOCNEWUNIT _IOWR('t', 62, int) /* create new ppp unit */ | 107 | #define PPPIOCNEWUNIT _IOWR('t', 62, int) /* create new ppp unit */ |
| 108 | #define PPPIOCATTACH _IOW('t', 61, int) /* attach to ppp unit */ | 108 | #define PPPIOCATTACH _IOW('t', 61, int) /* attach to ppp unit */ |
| 109 | #define PPPIOCDETACH _IOW('t', 60, int) /* detach from ppp unit/chan */ | 109 | #define PPPIOCDETACH _IOW('t', 60, int) /* obsolete, do not use */ |
| 110 | #define PPPIOCSMRRU _IOW('t', 59, int) /* set multilink MRU */ | 110 | #define PPPIOCSMRRU _IOW('t', 59, int) /* set multilink MRU */ |
| 111 | #define PPPIOCCONNECT _IOW('t', 58, int) /* connect channel to unit */ | 111 | #define PPPIOCCONNECT _IOW('t', 58, int) /* connect channel to unit */ |
| 112 | #define PPPIOCDISCONN _IO('t', 57) /* disconnect channel */ | 112 | #define PPPIOCDISCONN _IO('t', 57) /* disconnect channel */ |
| @@ -207,4 +207,16 @@ struct prctl_mm_map { · 206 unmodified lines | |||
| 207 | # define PR_SVE_VL_LEN_MASK 0xffff | 207 | # define PR_SVE_VL_LEN_MASK 0xffff |
| 208 | # define PR_SVE_VL_INHERIT (1 << 17) /* inherit across exec */ | 208 | # define PR_SVE_VL_INHERIT (1 << 17) /* inherit across exec */ |
| 209 | 209 | ||
| 210 | /* Per task speculation control */ | ||
| 211 | #define PR_GET_SPECULATION_CTRL 52 | ||
| 212 | #define PR_SET_SPECULATION_CTRL 53 | ||
| 213 | /* Speculation control variants */ | ||
| 214 | # define PR_SPEC_STORE_BYPASS 0 | ||
| 215 | /* Return and control values for PR_SET/GET_SPECULATION_CTRL */ | ||
| 216 | # define PR_SPEC_NOT_AFFECTED 0 | ||
| 217 | # define PR_SPEC_PRCTL (1UL << 0) | ||
| 218 | # define PR_SPEC_ENABLE (1UL << 1) | ||
| 219 | # define PR_SPEC_DISABLE (1UL << 2) | ||
| 220 | # define PR_SPEC_FORCE_DISABLE (1UL << 3) | ||
| 221 | |||
| 210 | #endif /* _LINUX_PRCTL_H */ | 222 | #endif /* _LINUX_PRCTL_H */ |
| @@ -17,8 +17,9 @@ · 16 unmodified lines | |||
| 17 | #define SECCOMP_GET_ACTION_AVAIL 2 | 17 | #define SECCOMP_GET_ACTION_AVAIL 2 |
| 18 | 18 | ||
| 19 | /* Valid flags for SECCOMP_SET_MODE_FILTER */ | 19 | /* Valid flags for SECCOMP_SET_MODE_FILTER */ |
| 20 | #define SECCOMP_FILTER_FLAG_TSYNC 1 | 20 | #define SECCOMP_FILTER_FLAG_TSYNC (1UL << 0) |
| 21 | #define SECCOMP_FILTER_FLAG_LOG 2 | 21 | #define SECCOMP_FILTER_FLAG_LOG (1UL << 1) |
| 22 | #define SECCOMP_FILTER_FLAG_SPEC_ALLOW (1UL << 2) | ||
| 22 | 23 | ||
| 23 | /* | 24 | /* |
| 24 | * All BPF programs must return a 32-bit value. | 25 | * All BPF programs must return a 32-bit value. |