Merge v4.18-rc3 into drm-next

Two requests have come in for a backmerge, and I've got some pull reqs on rc2, so this just makes sense.

Dave Airlie committed 8 years ago

Commit f29135e2 parents eab9766 021c917702 files · +6937 −3712Browse files

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

Unified · Split

3 files

@@ -39,8 +39,10 @@ enum { · 38 unmodified lines
39	39	IOCB_CMD_PWRITE = 1,
40	40	IOCB_CMD_FSYNC = 2,
41	41	IOCB_CMD_FDSYNC = 3,
42		− /* 4 was the experimental IOCB_CMD_PREADX */
43		− IOCB_CMD_POLL = 5,
	42	+ /* These two are experimental.
	43	+ * IOCB_CMD_PREADX = 4,
	44	+ * IOCB_CMD_POLL = 5,
	45	+ */
44	46	IOCB_CMD_NOOP = 6,
45	47	IOCB_CMD_PREADV = 7,
46	48	IOCB_CMD_PWRITEV = 8,

@@ -53,6 +53,9 @@ enum { · 52 unmodified lines
53	53	/* These are client behavior specific flags. */
54	54	#define NBD_CFLAG_DESTROY_ON_DISCONNECT (1 << 0) /* delete the nbd device on
55	55	disconnect. */
	56	+#define NBD_CFLAG_DISCONNECT_ON_CLOSE (1 << 1) /* disconnect the nbd device on
	57	+ * close by last opener.
	58	+ */
56	59
57	60	/* userspace doesn't need the nbd_device structure */
58	61

@@ -44,6 +44,7 @@ · 43 unmodified lines
44	44	#define TCMU_MAILBOX_VERSION 2
45	45	#define ALIGN_SIZE 64 /* Should be enough for most CPUs */
46	46	#define TCMU_MAILBOX_FLAG_CAP_OOOC (1 << 0) /* Out-of-order completions */
	47	+#define TCMU_MAILBOX_FLAG_CAP_READ_LEN (1 << 1) /* Read data length */
47	48
48	49	struct tcmu_mailbox {
49	50	__u16 version;
@@ -71,6 +72,7 @@ struct tcmu_cmd_entry_hdr { · 21 unmodified lines
71	72	__u16 cmd_id;
72	73	__u8 kflags;
73	74	#define TCMU_UFLAG_UNKNOWN_OP 0x1
	75	+#define TCMU_UFLAG_READ_LEN 0x2
74	76	__u8 uflags;
75	77
76	78	} __packed;
@@ -119,7 +121,7 @@ struct tcmu_cmd_entry { · 42 unmodified lines
119	121	__u8 scsi_status;
120	122	__u8 __pad1;
121	123	__u16 __pad2;
122		− __u32 __pad3;
	124	+ __u32 read_len;
123	125	char sense_buffer[TCMU_SENSE_BUFFERSIZE];
124	126	} rsp;
125	127	};

Keyboard shortcuts