Backmerge tag 'v4.12-rc3' into drm-next

Linux 4.12-rc3 Daniel has requested this for some drm-intel-next work.

Dave Airlie committed 9 years ago

Commit 2a172032 parents a82256b 5ed02db647 files · +7494 −3408Browse files

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

Unified · Split

3 files

@@ -132,6 +132,13 @@ enum bpf_attach_type { · 131 unmodified lines
132	132	*/
133	133	#define BPF_F_ALLOW_OVERRIDE (1U << 0)
134	134
	135	+/* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the
	136	+ * verifier will perform strict alignment checking as if the kernel
	137	+ * has been built with CONFIG_EFFICIENT_UNALIGNED_ACCESS not set,
	138	+ * and NET_IP_ALIGN defined to 2.
	139	+ */
	140	+#define BPF_F_STRICT_ALIGNMENT (1U << 0)
	141	+
135	142	#define BPF_PSEUDO_MAP_FD 1
136	143
137	144	/* flags for BPF_MAP_UPDATE_ELEM command */
@@ -177,6 +184,7 @@ union bpf_attr { · 39 unmodified lines
177	184	__u32 log_size; /* size of user buffer */
178	185	__aligned_u64 log_buf; /* user supplied buffer */
179	186	__u32 kern_version; /* checked when prog_type=kprobe */
	187	+ __u32 prog_flags;
180	188	};
181	189
182	190	struct { /* anonymous struct used by BPF_OBJ_* commands */

@@ -888,9 +888,18 @@ enum { · 887 unmodified lines
888	888	/* XDP section */
889	889
890	890	#define XDP_FLAGS_UPDATE_IF_NOEXIST (1U << 0)
891		−#define XDP_FLAGS_SKB_MODE (2U << 0)
	891	+#define XDP_FLAGS_SKB_MODE (1U << 1)
	892	+#define XDP_FLAGS_DRV_MODE (1U << 2)
892	893	#define XDP_FLAGS_MASK (XDP_FLAGS_UPDATE_IF_NOEXIST \| \
893		− XDP_FLAGS_SKB_MODE)
	894	+ XDP_FLAGS_SKB_MODE \| \
	895	+ XDP_FLAGS_DRV_MODE)
	896	+
	897	+/* These are stored into IFLA_XDP_ATTACHED on dump. */
	898	+enum {
	899	+ XDP_ATTACHED_NONE = 0,
	900	+ XDP_ATTACHED_DRV,
	901	+ XDP_ATTACHED_SKB,
	902	+};
894	903
895	904	enum {
896	905	IFLA_XDP_UNSPEC,

Keyboard shortcuts