Merge 5.0-rc6 into char-misc-next

We need the char-misc fixes in here as well.

Greg Kroah-Hartman committed 7 years ago

Commit 5c074882 parents b5390f4 d139371566 files · +5560 −2185Browse files

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

Unified · Split

3 files

@@ -78,6 +78,12 @@ · 77 unmodified lines
78	78	/* This feature indicates support for the packed virtqueue layout. */
79	79	#define VIRTIO_F_RING_PACKED 34
80	80
	81	+/*
	82	+ * This feature indicates that memory accesses by the driver and the
	83	+ * device are ordered in a way described by the platform.
	84	+ */
	85	+#define VIRTIO_F_ORDER_PLATFORM 36
	86	+
81	87	/*
82	88	* Does the device support Single Root I/O Virtualization?
83	89	*/

@@ -213,14 +213,4 @@ struct vring_packed_desc { · 212 unmodified lines
213	213	__le16 flags;
214	214	};
215	215
216		−struct vring_packed {
217		− unsigned int num;
218		−
219		− struct vring_packed_desc *desc;
220		−
221		− struct vring_packed_desc_event *driver;
222		−
223		− struct vring_packed_desc_event *device;
224		−};
225		−
226	216	#endif /* _UAPI_LINUX_VIRTIO_RING_H */

@@ -52,6 +52,11 @@ struct hns_roce_ib_create_srq { · 51 unmodified lines
52	52	__aligned_u64 que_addr;
53	53	};
54	54
	55	+struct hns_roce_ib_create_srq_resp {
	56	+ __u32 srqn;
	57	+ __u32 reserved;
	58	+};
	59	+
55	60	struct hns_roce_ib_create_qp {
56	61	__aligned_u64 buf_addr;
57	62	__aligned_u64 db_addr;

Keyboard shortcuts