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

@@ -135,7 +135,7 @@ struct in_addr { · 134 unmodified lines
135	* this socket to prevent accepting spoofed ones.	135	* this socket to prevent accepting spoofed ones.
136	*/	136	*/
137	#define IP_PMTUDISC_INTERFACE 4	137	#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
139	* fragmented if they exeed the interface mtu	139	* fragmented if they exeed the interface mtu
140	*/	140	*/
141	#define IP_PMTUDISC_OMIT 5	141	#define IP_PMTUDISC_OMIT 5

 #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

@@ -133,7 +133,7 @@ enum nf_tables_msg_types { · 132 unmodified lines
133	* @NFTA_LIST_ELEM: list element (NLA_NESTED)	133	* @NFTA_LIST_ELEM: list element (NLA_NESTED)
134	*/	134	*/
135	enum nft_list_attributes {	135	enum nft_list_attributes {
136	NFTA_LIST_UNPEC,	136	NFTA_LIST_UNSPEC,
137	NFTA_LIST_ELEM,	137	NFTA_LIST_ELEM,
138	__NFTA_LIST_MAX	138	__NFTA_LIST_MAX
139	};	139	};