Merge 5.9-rc8 into staging-next

We need the IIO fixes in here as well.

Greg Kroah-Hartman committed 6 years ago

Commit a944a1f2 parents c95e48b 549738f569 files · +5401 −3344Browse files

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

Unified · Split

2 files

@@ -79,6 +79,7 @@ enum { · 78 unmodified lines
79	ETHTOOL_MSG_TSINFO_GET_REPLY,	79	ETHTOOL_MSG_TSINFO_GET_REPLY,
80	ETHTOOL_MSG_CABLE_TEST_NTF,	80	ETHTOOL_MSG_CABLE_TEST_NTF,
81	ETHTOOL_MSG_CABLE_TEST_TDR_NTF,	81	ETHTOOL_MSG_CABLE_TEST_TDR_NTF,
		82	ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY,
82		83
83	/* add new constants above here */	84	/* add new constants above here */
84	__ETHTOOL_MSG_KERNEL_CNT,	85	__ETHTOOL_MSG_KERNEL_CNT,

 	V4L2_MEMORY_DMABUF           = 4,
 };
-#define V4L2_FLAG_MEMORY_NON_CONSISTENT		(1 << 0)
 /* see also http://vektor.theorem.ca/graphics/ycbcr/ */
 enum v4l2_colorspace {
 	/*
 	__u32			type;		/* enum v4l2_buf_type */
 	__u32			memory;		/* enum v4l2_memory */
 	__u32			capabilities;
-	union {
+	__u32			reserved[1];
-		__u32		flags;
-		__u32		reserved[1];
-	};
 };
 /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
  * @memory:	enum v4l2_memory; buffer memory type
  * @format:	frame format, for which buffers are requested
  * @capabilities: capabilities of this buffer type.
- * @flags:	additional buffer management attributes (ignored unless the
- *		queue has V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS capability
- *		and configured for MMAP streaming I/O).
  * @reserved:	future extensions
  */
 struct v4l2_create_buffers {
 	__u32			memory;
 	struct v4l2_format	format;
 	__u32			capabilities;
-	__u32			flags;
+	__u32			reserved[7];
-	__u32			reserved[6];
 };
 /*