Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf bpf-6.14-rc4

Cross-merge bpf fixes after downstream PR (bpf-6.14-rc4). Minor conflict: kernel/bpf/btf.c Adjacent changes: kernel/bpf/arena.c kernel/bpf/btf.c kernel/bpf/syscall.c kernel/bpf/verifier.c mm/memory.c

Alexei Starovoitov committed 1 year ago

Commit bd4319b2 parents 7042882 319fc77727 files · +8714 −4714Browse files

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

Unified · Split

4 files

include/uapi/linux/ethtool.h +2 −0
include/uapi/linux/taskstats.h +1 −1
include/uapi/linux/thermal.h +1 −1
include/uapi/linux/virtio_snd.h +1 −1

include/uapi/linux/ethtool.h+2−0

@@ -682,6 +682,7 @@ enum ethtool_link_ext_substate_module { · 681 unmodified lines
682	682	* @ETH_SS_STATS_ETH_CTRL: names of IEEE 802.3 MAC Control statistics
683	683	* @ETH_SS_STATS_RMON: names of RMON statistics
684	684	* @ETH_SS_STATS_PHY: names of PHY(dev) statistics
	685	+ * @ETH_SS_TS_FLAGS: hardware timestamping flags
685	686	*
686	687	* @ETH_SS_COUNT: number of defined string sets
687	688	*/
@@ -708,6 +709,7 @@ enum ethtool_stringset { · 20 unmodified lines
708	709	ETH_SS_STATS_ETH_CTRL,
709	710	ETH_SS_STATS_RMON,
710	711	ETH_SS_STATS_PHY,
	712	+ ETH_SS_TS_FLAGS,
711	713
712	714	/* add new constants above here */
713	715	ETH_SS_COUNT

include/uapi/linux/taskstats.h+1−1

@@ -34,7 +34,7 @@ · 33 unmodified lines
34	34	*/
35	35
36	36
37		−#define TASKSTATS_VERSION 14
	37	+#define TASKSTATS_VERSION 15
38	38	#define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN
39	39	* in linux/sched.h */
40	40

include/uapi/linux/thermal.h+1−1

@@ -30,7 +30,6 @@ enum thermal_genl_attr { · 29 unmodified lines
30	30	THERMAL_GENL_ATTR_TZ,
31	31	THERMAL_GENL_ATTR_TZ_ID,
32	32	THERMAL_GENL_ATTR_TZ_TEMP,
33		− THERMAL_GENL_ATTR_TZ_PREV_TEMP,
34	33	THERMAL_GENL_ATTR_TZ_TRIP,
35	34	THERMAL_GENL_ATTR_TZ_TRIP_ID,
36	35	THERMAL_GENL_ATTR_TZ_TRIP_TYPE,
@@ -54,6 +53,7 @@ enum thermal_genl_attr { · 17 unmodified lines
54	53	THERMAL_GENL_ATTR_THRESHOLD,
55	54	THERMAL_GENL_ATTR_THRESHOLD_TEMP,
56	55	THERMAL_GENL_ATTR_THRESHOLD_DIRECTION,
	56	+ THERMAL_GENL_ATTR_TZ_PREV_TEMP,
57	57	__THERMAL_GENL_ATTR_MAX,
58	58	};
59	59	#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)

include/uapi/linux/virtio_snd.h+1−1

@@ -25,7 +25,7 @@ struct virtio_snd_config { · 24 unmodified lines
25	25	__le32 streams;
26	26	/* # of available channel maps */
27	27	__le32 chmaps;
28		− /* # of available control elements */
	28	+ /* # of available control elements (if VIRTIO_SND_F_CTLS) */
29	29	__le32 controls;
30	30	};
31	31