Backmerge tag 'v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

Linux 6.4-rc7 Need this to pull in the msm work.

Dave Airlie committed 3 years ago

Commit cce3b572 parents bcbede6 45a3e241551 files · +14032 −6945Browse files

Showing the changes to include/uapi (6 of 1551 files). Show all

Unified · Split

6 files

@@ -1035,6 +1035,7 @@ enum bpf_attach_type { · 1034 unmodified lines
1035	BPF_TRACE_KPROBE_MULTI,	1035	BPF_TRACE_KPROBE_MULTI,
1036	BPF_LSM_CGROUP,	1036	BPF_LSM_CGROUP,
1037	BPF_STRUCT_OPS,	1037	BPF_STRUCT_OPS,
		1038	BPF_NETFILTER,
1038	__MAX_BPF_ATTACH_TYPE	1039	__MAX_BPF_ATTACH_TYPE
1039	};	1040	};
1040		1041

@@ -783,7 +783,7 @@ enum { · 782 unmodified lines
783		783
784	/* add new constants above here */	784	/* add new constants above here */
785	__ETHTOOL_A_STATS_GRP_CNT,	785	__ETHTOOL_A_STATS_GRP_CNT,
786	ETHTOOL_A_STATS_GRP_MAX = (__ETHTOOL_A_STATS_CNT - 1)	786	ETHTOOL_A_STATS_GRP_MAX = (__ETHTOOL_A_STATS_GRP_CNT - 1)
787	};	787	};
788		788
789	enum {	789	enum {

@@ -44,6 +44,7 @@ enum { · 43 unmodified lines
44	HANDSHAKE_A_ACCEPT_AUTH_MODE,	44	HANDSHAKE_A_ACCEPT_AUTH_MODE,
45	HANDSHAKE_A_ACCEPT_PEER_IDENTITY,	45	HANDSHAKE_A_ACCEPT_PEER_IDENTITY,
46	HANDSHAKE_A_ACCEPT_CERTIFICATE,	46	HANDSHAKE_A_ACCEPT_CERTIFICATE,
		47	HANDSHAKE_A_ACCEPT_PEERNAME,
47		48
48	__HANDSHAKE_A_ACCEPT_MAX,	49	__HANDSHAKE_A_ACCEPT_MAX,
49	HANDSHAKE_A_ACCEPT_MAX = (__HANDSHAKE_A_ACCEPT_MAX - 1)	50	HANDSHAKE_A_ACCEPT_MAX = (__HANDSHAKE_A_ACCEPT_MAX - 1)

@@ -163,6 +163,7 @@ struct in_addr { · 162 unmodified lines
163	#define IP_MULTICAST_ALL 49	163	#define IP_MULTICAST_ALL 49
164	#define IP_UNICAST_IF 50	164	#define IP_UNICAST_IF 50
165	#define IP_LOCAL_PORT_RANGE 51	165	#define IP_LOCAL_PORT_RANGE 51
		166	#define IP_PROTOCOL 52
166		167
167	#define MCAST_EXCLUDE 0	168	#define MCAST_EXCLUDE 0
168	#define MCAST_INCLUDE 1	169	#define MCAST_INCLUDE 1

@@ -66,7 +66,8 @@ enum skl_ch_cfg { · 65 unmodified lines
66	SKL_CH_CFG_DUAL_MONO = 9,	66	SKL_CH_CFG_DUAL_MONO = 9,
67	SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10,	67	SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10,
68	SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11,	68	SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11,
69	SKL_CH_CFG_4_CHANNEL = 12,	69	SKL_CH_CFG_7_1 = 12,
		70	SKL_CH_CFG_4_CHANNEL = SKL_CH_CFG_7_1,
70	SKL_CH_CFG_INVALID	71	SKL_CH_CFG_INVALID
71	};	72	};
72		73

 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_INTERLEAVING_STYLE	1906
 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_FMT_CFG	1907
 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_SAMPLE_TYPE	1908
-#define SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX		1909
+#define SOF_TKN_CAVS_AUDIO_FORMAT_INPUT_PIN_INDEX	1909
 /* intentional token numbering discontinuity, reserved for future use */
 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_RATE	1930
 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_BIT_DEPTH	1931
 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_INTERLEAVING_STYLE	1936
 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_FMT_CFG	1937
 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_SAMPLE_TYPE	1938
+#define SOF_TKN_CAVS_AUDIO_FORMAT_OUTPUT_PIN_INDEX	1939
 /* intentional token numbering discontinuity, reserved for future use */
 #define SOF_TKN_CAVS_AUDIO_FORMAT_IBS		1970
 #define SOF_TKN_CAVS_AUDIO_FORMAT_OBS		1971

Keyboard shortcuts