History

Merge 5.9-rc5 into char-misc-next

We want the char/misc fixes in here as well.

Greg Kroah-Hartman committed 6 years ago

Commit 05fa34d2 parents f7dbcd1 856deb8586 files · +5472 −2681Browse files

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

Unified · Split

3 files
  1. include/uapi/linux/in.h +1 −1
  2. include/uapi/linux/kvm.h +4 −2
  3. include/uapi/linux/netfilter/nf_tables.h +1 −1
include/uapi/linux/in.h+1−1
@@ -135,7 +135,7 @@ struct in_addr { · 134 unmodified lines
135135 * this socket to prevent accepting spoofed ones.
136136 */
137137 #define IP_PMTUDISC_INTERFACE 4
138−/* weaker version of IP_PMTUDISC_INTERFACE, which allos packets to get
138+/* weaker version of IP_PMTUDISC_INTERFACE, which allows packets to get
139139 * fragmented if they exeed the interface mtu
140140 */
141141 #define IP_PMTUDISC_OMIT 5
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/netfilter/nf_tables.h+1−1
@@ -133,7 +133,7 @@ enum nf_tables_msg_types { · 132 unmodified lines
133133 * @NFTA_LIST_ELEM: list element (NLA_NESTED)
134134 */
135135 enum nft_list_attributes {
136− NFTA_LIST_UNPEC,
136+ NFTA_LIST_UNSPEC,
137137 NFTA_LIST_ELEM,
138138 __NFTA_LIST_MAX
139139 };