History

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/linux (3 of 683 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/ethtool_netlink.h +1 −0
  2. include/uapi/linux/kvm.h +4 −2
  3. include/uapi/linux/videodev2.h +2 −11
include/uapi/linux/ethtool_netlink.h+1−0
@@ -79,6 +79,7 @@ enum { · 78 unmodified lines
7979 ETHTOOL_MSG_TSINFO_GET_REPLY,
8080 ETHTOOL_MSG_CABLE_TEST_NTF,
8181 ETHTOOL_MSG_CABLE_TEST_TDR_NTF,
82+ ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY,
8283
8384 /* add new constants above here */
8485 __ETHTOOL_MSG_KERNEL_CNT,
include/uapi/linux/kvm.h+4−2
@@ -790,9 +790,10 @@ struct kvm_ppc_resize_hpt { · 789 unmodified lines
790790 #define KVM_VM_PPC_HV 1
791791 #define KVM_VM_PPC_PR 2
792792
793−/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */
794−#define KVM_VM_MIPS_TE 0
793+/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */
794+#define KVM_VM_MIPS_AUTO 0
795795 #define KVM_VM_MIPS_VZ 1
796+#define KVM_VM_MIPS_TE 2
796797
797798 #define KVM_S390_SIE_PAGE_OFFSET 1
798799
@@ -1035,6 +1036,7 @@ struct kvm_ppc_resize_hpt { · 236 unmodified lines
10351036 #define KVM_CAP_LAST_CPU 184
10361037 #define KVM_CAP_SMALLER_MAXPHYADDR 185
10371038 #define KVM_CAP_S390_DIAG318 186
1039+#define KVM_CAP_STEAL_TIME 187
10381040
10391041 #ifdef KVM_CAP_IRQ_ROUTING
10401042
include/uapi/linux/videodev2.h+2−11
@@ -191,8 +191,6 @@ enum v4l2_memory { · 190 unmodified lines
191191 V4L2_MEMORY_DMABUF = 4,
192192 };
193193
194−#define V4L2_FLAG_MEMORY_NON_CONSISTENT (1 << 0)
195−
196194 /* see also http://vektor.theorem.ca/graphics/ycbcr/ */
197195 enum v4l2_colorspace {
198196 /*
@@ -954,10 +952,7 @@ struct v4l2_requestbuffers { · 755 unmodified lines
954952 __u32 type; /* enum v4l2_buf_type */
955953 __u32 memory; /* enum v4l2_memory */
956954 __u32 capabilities;
957− union {
958− __u32 flags;
959− __u32 reserved[1];
960− };
955+ __u32 reserved[1];
961956 };
962957
963958 /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
@@ -2461,9 +2456,6 @@ struct v4l2_dbg_chip_info { · 1497 unmodified lines
24612456 * @memory: enum v4l2_memory; buffer memory type
24622457 * @format: frame format, for which buffers are requested
24632458 * @capabilities: capabilities of this buffer type.
2464− * @flags: additional buffer management attributes (ignored unless the
2465− * queue has V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS capability
2466− * and configured for MMAP streaming I/O).
24672459 * @reserved: future extensions
24682460 */
24692461 struct v4l2_create_buffers {
@@ -2472,8 +2464,7 @@ struct v4l2_create_buffers { · 2 unmodified lines
24722464 __u32 memory;
24732465 struct v4l2_format format;
24742466 __u32 capabilities;
2475− __u32 flags;
2476− __u32 reserved[6];
2467+ __u32 reserved[7];
24772468 };
24782469
24792470 /*