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

Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes.

David S. Miller committed 13 years ago

Commit c3fa32b2 parents 34d92d5 320437a557 files · +4329 −2970Browse files

Showing the changes to include/uapi (2 of 557 files). Show all

Unified · Split

2 files

@@ -223,6 +223,8 @@ struct drm_mode_get_connector { · 222 unmodified lines
223	223	__u32 connection;
224	224	__u32 mm_width, mm_height; /*< HxW in millimeters /
225	225	__u32 subpixel;
	226	+
	227	+ __u32 pad;
226	228	};
227	229
228	230	#define DRM_MODE_PROP_PENDING (1<<0)

@@ -87,8 +87,10 @@ enum { · 86 unmodified lines
87	87	IB_USER_VERBS_CMD_CLOSE_XRCD,
88	88	IB_USER_VERBS_CMD_CREATE_XSRQ,
89	89	IB_USER_VERBS_CMD_OPEN_QP,
	90	+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
90	91	IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
91	92	IB_USER_VERBS_CMD_DESTROY_FLOW
	93	+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
92	94	};
93	95
94	96	/*
@@ -126,6 +128,7 @@ struct ib_uverbs_cmd_hdr { · 31 unmodified lines
126	128	__u16 out_words;
127	129	};
128	130
	131	+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
129	132	struct ib_uverbs_cmd_hdr_ex {
130	133	__u32 command;
131	134	__u16 in_words;
@@ -134,6 +137,7 @@ struct ib_uverbs_cmd_hdr_ex { · 2 unmodified lines
134	137	__u16 provider_out_words;
135	138	__u32 cmd_hdr_reserved;
136	139	};
	140	+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
137	141
138	142	struct ib_uverbs_get_context {
139	143	__u64 response;
@@ -696,6 +700,7 @@ struct ib_uverbs_detach_mcast { · 556 unmodified lines
696	700	__u64 driver_data[0];
697	701	};
698	702
	703	+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
699	704	struct ib_kern_eth_filter {
700	705	__u8 dst_mac[6];
701	706	__u8 src_mac[6];
@@ -780,6 +785,7 @@ struct ib_uverbs_destroy_flow { · 78 unmodified lines
780	785	__u32 comp_mask;
781	786	__u32 flow_handle;
782	787	};
	788	+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
783	789
784	790	struct ib_uverbs_create_srq {
785	791	__u64 response;

Keyboard shortcuts