Merge 5.16-rc8 into char-misc-next

We need the fixes in here as well for testing.

Greg Kroah-Hartman committed 4 years ago

Commit 824adf32 parents f2ee475 c9e6606494 files · +4256 −1907Browse files

Showing the changes to include/uapi (4 of 494 files). Show all

Unified · Split

4 files

@@ -9,6 +9,7 @@ · 8 unmodified lines
9	9	#define __LITTLE_ENDIAN_BITFIELD
10	10	#endif
11	11
	12	+#include <linux/stddef.h>
12	13	#include <linux/types.h>
13	14	#include <linux/swab.h>
14	15

@@ -136,19 +136,21 @@ struct mptcp_info { · 135 unmodified lines
136	136	* MPTCP_EVENT_REMOVED: token, rem_id
137	137	* An address has been lost by the peer.
138	138	*
139		− * MPTCP_EVENT_SUB_ESTABLISHED: token, family, saddr4 \| saddr6,
140		− * daddr4 \| daddr6, sport, dport, backup,
141		− * if_idx [, error]
	139	+ * MPTCP_EVENT_SUB_ESTABLISHED: token, family, loc_id, rem_id,
	140	+ * saddr4 \| saddr6, daddr4 \| daddr6, sport,
	141	+ * dport, backup, if_idx [, error]
142	142	* A new subflow has been established. 'error' should not be set.
143	143	*
144		− * MPTCP_EVENT_SUB_CLOSED: token, family, saddr4 \| saddr6, daddr4 \| daddr6,
145		− * sport, dport, backup, if_idx [, error]
	144	+ * MPTCP_EVENT_SUB_CLOSED: token, family, loc_id, rem_id, saddr4 \| saddr6,
	145	+ * daddr4 \| daddr6, sport, dport, backup, if_idx
	146	+ * [, error]
146	147	* A subflow has been closed. An error (copy of sk_err) could be set if an
147	148	* error has been detected for this subflow.
148	149	*
149		− * MPTCP_EVENT_SUB_PRIORITY: token, family, saddr4 \| saddr6, daddr4 \| daddr6,
150		− * sport, dport, backup, if_idx [, error]
151		− * The priority of a subflow has changed. 'error' should not be set.
	150	+ * MPTCP_EVENT_SUB_PRIORITY: token, family, loc_id, rem_id, saddr4 \| saddr6,
	151	+ * daddr4 \| daddr6, sport, dport, backup, if_idx
	152	+ * [, error]
	153	+ * The priority of a subflow has changed. 'error' should not be set.
152	154	*/
153	155	enum mptcp_event_type {
154	156	MPTCP_EVENT_UNSPEC = 0,

@@ -263,7 +263,7 @@ enum nfc_sdp_attr { · 262 unmodified lines
263	263	#define NFC_SE_ENABLED 0x1
264	264
265	265	struct sockaddr_nfc {
266		− sa_family_t sa_family;
	266	+ __kernel_sa_family_t sa_family;
267	267	__u32 dev_idx;
268	268	__u32 target_idx;
269	269	__u32 nfc_protocol;
@@ -271,14 +271,14 @@ struct sockaddr_nfc { · 1 unmodified line
271	271
272	272	#define NFC_LLCP_MAX_SERVICE_NAME 63
273	273	struct sockaddr_nfc_llcp {
274		− sa_family_t sa_family;
	274	+ __kernel_sa_family_t sa_family;
275	275	__u32 dev_idx;
276	276	__u32 target_idx;
277	277	__u32 nfc_protocol;
278	278	__u8 dsap; /* Destination SAP, if known */
279	279	__u8 ssap; /* Source SAP to be bound to */
280	280	char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */;
281		− size_t service_name_len;
	281	+ __kernel_size_t service_name_len;
282	282	};
283	283
284	284	/* NFC socket protocols */

Keyboard shortcuts