History

Backmerge v6.12-rc6 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

Backmerge Linus tree for some drm-fixes needed for msm and xe merges.

Dave Airlie committed 2 years ago

Commit 30169bb2 parents bcfe43f 59b723c1329 files · +18685 −12595Browse files

Showing the changes to include/uapi (3 of 1329 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/bpf.h +8 −8
  2. include/uapi/linux/ublk_cmd.h +7 −1
  3. include/uapi/sound/asoc.h +1 −1
include/uapi/linux/bpf.h+8−8
@@ -1121,6 +1121,9 @@ enum bpf_attach_type { · 1120 unmodified lines
1121 1121
1122#define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE1122#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 */
1124enum bpf_link_type {1127enum bpf_link_type {
1125 BPF_LINK_TYPE_UNSPEC = 0,1128 BPF_LINK_TYPE_UNSPEC = 0,
1126 BPF_LINK_TYPE_RAW_TRACEPOINT = 1,1129 BPF_LINK_TYPE_RAW_TRACEPOINT = 1,
@@ -6047,11 +6050,6 @@ enum { · 4920 unmodified lines
6047 BPF_F_MARK_ENFORCE = (1ULL << 6),6050 BPF_F_MARK_ENFORCE = (1ULL << 6),
6048};6051};
6049 6052
6050/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
6051enum {
6052 BPF_F_INGRESS = (1ULL << 0),
6053};
6054
6055/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */6053/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
6056enum {6054enum {
6057 BPF_F_TUNINFO_IPV6 = (1ULL << 0),6055 BPF_F_TUNINFO_IPV6 = (1ULL << 0),
@@ -6198,10 +6196,12 @@ enum { · 140 unmodified lines
6198 BPF_F_BPRM_SECUREEXEC = (1ULL << 0),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 */
6202enum {6200enum {
6203 BPF_F_BROADCAST = (1ULL << 3),6201 BPF_F_INGRESS = (1ULL << 0), /* used for skb path */
6204 BPF_F_EXCLUDE_INGRESS = (1ULL << 4),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#define __bpf_md_ptr(type, name) \6207#define __bpf_md_ptr(type, name) \
include/uapi/linux/ublk_cmd.h+7−1
@@ -175,7 +175,13 @@ · 174 unmodified lines
175/* use ioctl encoding for uring command */175/* use ioctl encoding for uring command */
176#define UBLK_F_CMD_IOCTL_ENCODE (1UL << 6)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#define UBLK_F_USER_COPY (1UL << 7)185#define UBLK_F_USER_COPY (1UL << 7)
180 186
181/*187/*
include/uapi/sound/asoc.h+1−1
@@ -88,7 +88,7 @@ · 87 unmodified lines
88 88
89/* ABI version */89/* ABI version */
90#define SND_SOC_TPLG_ABI_VERSION 0x5 /* current version */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/* Max size of TLV data */93/* Max size of TLV data */
94#define SND_SOC_TPLG_TLV_SIZE 3294#define SND_SOC_TPLG_TLV_SIZE 32