Merge tag 'v5.9-rc7' into patchwork

Linux 5.9-rc7 * tag 'v5.9-rc7': (683 commits) Linux 5.9-rc7 mm/thp: Split huge pmds/puds if they're pinned when fork() mm: Do early cow for pinned pages during fork() for ptes mm/fork: Pass new vma pointer into copy_page_range() mm: Introduce mm_struct.has_pinned mm: validate pmd after splitting mm: don't rely on system state to detect hot-plug operations mm: replace memmap_context by meminit_context arch/x86/lib/usercopy_64.c: fix __copy_user_flushcache() cache writeback lib/memregion.c: include memregion.h lib/string.c: implement stpcpy mm/migrate: correct thp migration stats mm/gup: fix gup_fast with dynamic page table folding mm: memcontrol: fix missing suffix of workingset_restore mm, THP, swap: fix allocating cluster for swapfile by mistake mm: slab: fix potential double free in ___cache_free Documentation/llvm: Fix clang target examples io_uring: ensure async buffered read-retry is setup properly KVM: SVM: Add a dedicated INVD intercept routine io_uring: don't unconditionally set plug->nowait = true ...

Mauro Carvalho Chehab committed 6 years ago

Commit 463c43f2 parents 7c9df3e a1b8638683 files · +6455 −3824Browse files

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

Unified · Split

3 files

include/uapi/linux/ethtool_netlink.h +1 −0
include/uapi/linux/kvm.h +4 −2
include/uapi/linux/videodev2.h +2 −11

include/uapi/linux/ethtool_netlink.h+1−0

@@ -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,

include/uapi/linux/kvm.h+4−2

 #define KVM_VM_PPC_HV 1
 #define KVM_VM_PPC_PR 2
-/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */
+/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */
-#define KVM_VM_MIPS_TE		0
+#define KVM_VM_MIPS_AUTO	0
 #define KVM_VM_MIPS_VZ		1
+#define KVM_VM_MIPS_TE		2
 #define KVM_S390_SIE_PAGE_OFFSET 1
 #define KVM_CAP_LAST_CPU 184
 #define KVM_CAP_SMALLER_MAXPHYADDR 185
 #define KVM_CAP_S390_DIAG318 186
+#define KVM_CAP_STEAL_TIME 187
 #ifdef KVM_CAP_IRQ_ROUTING

include/uapi/linux/videodev2.h+2−11

 	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];
 };
 /*