Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Simple overlapping changes to linux/vermagic.h

David S. Miller committed 6 years ago

Commit d4833892 parents 6033ceb b2768df548 files · +5609 −3210Browse files

Showing the changes to include/uapi/linux (4 of 548 files). Show all

Unified · Split

4 files

@@ -1642,7 +1642,7 @@ union bpf_attr { · 1641 unmodified lines
1642	1642	* ifindex, but doesn't require a map to do so.
1643	1643	* Return
1644	1644	* XDP_REDIRECT on success, or the value of the two lower bits
1645		− * of the *flags argument on error.
	1645	+ * of the flags argument on error.
1646	1646	*
1647	1647	* int bpf_sk_redirect_map(struct sk_buff skb, struct bpf_map map, u32 key, u64 flags)
1648	1648	* Description

@@ -45,13 +45,13 @@ struct dlm_lock_params { · 44 unmodified lines
45	45	void __user *bastaddr;
46	46	struct dlm_lksb __user *lksb;
47	47	char lvb[DLM_USER_LVB_LEN];
48		− char name[0];
	48	+ char name[];
49	49	};
50	50
51	51	struct dlm_lspace_params {
52	52	__u32 flags;
53	53	__u32 minor;
54		− char name[0];
	54	+ char name[];
55	55	};
56	56
57	57	struct dlm_purge_params {

@@ -34,7 +34,7 @@ struct fiemap { · 33 unmodified lines
34	34	__u32 fm_mapped_extents;/* number of extents that were mapped (out) */
35	35	__u32 fm_extent_count; /* size of fm_extents array (in) */
36	36	__u32 fm_reserved;
37		− struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */
	37	+ struct fiemap_extent fm_extents[]; /* array of mapped extents (out) */
38	38	};
39	39
40	40	#define FIEMAP_MAX_OFFSET (~0ULL)

@@ -48,8 +48,15 @@ struct virtio_balloon_config { · 47 unmodified lines
48	48	__u32 num_pages;
49	49	/* Number of pages we've actually got in balloon. */
50	50	__u32 actual;
51		− /* Free page report command id, readonly by guest */
52		− __u32 free_page_report_cmd_id;
	51	+ /*
	52	+ * Free page hint command id, readonly by guest.
	53	+ * Was previously named free_page_report_cmd_id so we
	54	+ * need to carry that name for legacy support.
	55	+ */
	56	+ union {
	57	+ __u32 free_page_hint_cmd_id;
	58	+ __u32 free_page_report_cmd_id; /* deprecated */
	59	+ };
53	60	/* Stores PAGE_POISON if page poisoning is in use */
54	61	__u32 poison_val;
55	62	};