Backmerge Linus tree for some drm-fixes needed for msm and xe merges.
Showing the changes to include/uapi (3 of 1329 files). Show all
Unified · Split
| @@ -1121,6 +1121,9 @@ enum bpf_attach_type { · 1120 unmodified lines | ||
| 1121 | 1121 | |
| 1122 | 1122 | #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE |
| 1123 | 1123 | |
| 1124 | +/* Add BPF_LINK_TYPE(type, name) in bpf_types.h to keep bpf_link_type_strs[] | |
| 1125 | + * in sync with the definitions below. | |
| 1126 | + */ | |
| 1124 | 1127 | enum bpf_link_type { |
| 1125 | 1128 | BPF_LINK_TYPE_UNSPEC = 0, |
| 1126 | 1129 | BPF_LINK_TYPE_RAW_TRACEPOINT = 1, |
| @@ -6047,11 +6050,6 @@ enum { · 4920 unmodified lines | ||
| 6047 | 6050 | BPF_F_MARK_ENFORCE = (1ULL << 6), |
| 6048 | 6051 | }; |
| 6049 | 6052 | |
| 6050 | −/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */ | |
| 6051 | −enum { | |
| 6052 | − BPF_F_INGRESS = (1ULL << 0), | |
| 6053 | −}; | |
| 6054 | − | |
| 6055 | 6053 | /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */ |
| 6056 | 6054 | enum { |
| 6057 | 6055 | BPF_F_TUNINFO_IPV6 = (1ULL << 0), |
| @@ -6198,10 +6196,12 @@ enum { · 140 unmodified lines | ||
| 6198 | 6196 | BPF_F_BPRM_SECUREEXEC = (1ULL << 0), |
| 6199 | 6197 | }; |
| 6200 | 6198 | |
| 6201 | −/* Flags for bpf_redirect_map helper */ | |
| 6199 | +/* Flags for bpf_redirect and bpf_redirect_map helpers */ | |
| 6202 | 6200 | enum { |
| 6203 | − BPF_F_BROADCAST = (1ULL << 3), | |
| 6204 | − BPF_F_EXCLUDE_INGRESS = (1ULL << 4), | |
| 6201 | + BPF_F_INGRESS = (1ULL << 0), /* used for skb path */ | |
| 6202 | + BPF_F_BROADCAST = (1ULL << 3), /* used for XDP path */ | |
| 6203 | + BPF_F_EXCLUDE_INGRESS = (1ULL << 4), /* used for XDP path */ | |
| 6204 | +#define BPF_F_REDIRECT_FLAGS (BPF_F_INGRESS | BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS) | |
| 6205 | 6205 | }; |
| 6206 | 6206 | |
| 6207 | 6207 | #define __bpf_md_ptr(type, name) \ |
| @@ -175,7 +175,13 @@ · 174 unmodified lines | ||
| 175 | 175 | /* use ioctl encoding for uring command */ |
| 176 | 176 | #define UBLK_F_CMD_IOCTL_ENCODE (1UL << 6) |
| 177 | 177 | |
| 178 | −/* Copy between request and user buffer by pread()/pwrite() */ | |
| 178 | +/* | |
| 179 | + * Copy between request and user buffer by pread()/pwrite() | |
| 180 | + * | |
| 181 | + * Not available for UBLK_F_UNPRIVILEGED_DEV, otherwise userspace may | |
| 182 | + * deceive us by not filling request buffer, then kernel uninitialized | |
| 183 | + * data may be leaked. | |
| 184 | + */ | |
| 179 | 185 | #define UBLK_F_USER_COPY (1UL << 7) |
| 180 | 186 | |
| 181 | 187 | /* |
| @@ -88,7 +88,7 @@ · 87 unmodified lines | ||
| 88 | 88 | |
| 89 | 89 | /* ABI version */ |
| 90 | 90 | #define SND_SOC_TPLG_ABI_VERSION 0x5 /* current version */ |
| 91 | −#define SND_SOC_TPLG_ABI_VERSION_MIN 0x4 /* oldest version supported */ | |
| 91 | +#define SND_SOC_TPLG_ABI_VERSION_MIN 0x5 /* oldest version supported */ | |
| 92 | 92 | |
| 93 | 93 | /* Max size of TLV data */ |
| 94 | 94 | #define SND_SOC_TPLG_TLV_SIZE 32 |