Merge tag 'v5.14-rc4' into media_tree

Linux 5.14-rc4 * tag 'v5.14-rc4': (948 commits) Linux 5.14-rc4 pipe: make pipe writes always wake up readers Revert "perf map: Fix dso->nsinfo refcounting" mm/memcg: fix NULL pointer dereference in memcg_slab_free_hook() slub: fix unreclaimable slab stat for bulk free mm/migrate: fix NR_ISOLATED corruption on 64-bit mm: memcontrol: fix blocking rstat function called from atomic cgroup1 thresholding code ocfs2: issue zeroout to EOF blocks ocfs2: fix zero out valid data lib/test_string.c: move string selftest in the Runtime Testing menu gve: Update MAINTAINERS list arch: Kconfig: clean up obsolete use of HAVE_IDE can: esd_usb2: fix memory leak can: ems_usb: fix memory leak can: usb_8dev: fix memory leak can: mcba_usb_start(): add missing urb->transfer_dma initialization can: hi311x: fix a signedness bug in hi3110_cmd() MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver scsi: fas216: Fix fall-through warning for Clang scsi: acornscsi: Fix fall-through warning for clang ...

Mauro Carvalho Chehab committed 5 years ago

Commit 9c3a0f22 parents bfee75f c500bee953 files · +13101 −8520Browse files

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

Unified · Split

6 files

include/uapi/linux/ethtool_netlink.h +15 −0
include/uapi/linux/idxd.h +1 −1
include/uapi/linux/net_tstamp.h +15 −2
include/uapi/linux/netfilter/nfnetlink_log.h +1 −1
include/uapi/linux/netfilter/nfnetlink_queue.h +2 −2
include/uapi/rdma/irdma-abi.h +1 −1

include/uapi/linux/ethtool_netlink.h+15−0

@@ -46,6 +46,7 @@ enum { · 45 unmodified lines
46	46	ETHTOOL_MSG_FEC_SET,
47	47	ETHTOOL_MSG_MODULE_EEPROM_GET,
48	48	ETHTOOL_MSG_STATS_GET,
	49	+ ETHTOOL_MSG_PHC_VCLOCKS_GET,
49	50
50	51	/* add new constants above here */
51	52	__ETHTOOL_MSG_USER_CNT,
@@ -88,6 +89,7 @@ enum { · 36 unmodified lines
88	89	ETHTOOL_MSG_FEC_NTF,
89	90	ETHTOOL_MSG_MODULE_EEPROM_GET_REPLY,
90	91	ETHTOOL_MSG_STATS_GET_REPLY,
	92	+ ETHTOOL_MSG_PHC_VCLOCKS_GET_REPLY,
91	93
92	94	/* add new constants above here */
93	95	__ETHTOOL_MSG_KERNEL_CNT,
@@ -440,6 +442,19 @@ enum { · 346 unmodified lines
440	442	ETHTOOL_A_TSINFO_MAX = (__ETHTOOL_A_TSINFO_CNT - 1)
441	443	};
442	444
	445	+/* PHC VCLOCKS */
	446	+
	447	+enum {
	448	+ ETHTOOL_A_PHC_VCLOCKS_UNSPEC,
	449	+ ETHTOOL_A_PHC_VCLOCKS_HEADER, /* nest - _A_HEADER_* */
	450	+ ETHTOOL_A_PHC_VCLOCKS_NUM, /* u32 */
	451	+ ETHTOOL_A_PHC_VCLOCKS_INDEX, /* array, s32 */
	452	+
	453	+ /* add new constants above here */
	454	+ __ETHTOOL_A_PHC_VCLOCKS_CNT,
	455	+ ETHTOOL_A_PHC_VCLOCKS_MAX = (__ETHTOOL_A_PHC_VCLOCKS_CNT - 1)
	456	+};
	457	+
443	458	/* CABLE TEST */
444	459
445	460	enum {

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

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	1	+/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */
2	2	/* Copyright(c) 2019 Intel Corporation. All rights rsvd. */
3	3	#ifndef _USR_IDXD_H_
4	4	#define _USR_IDXD_H_

include/uapi/linux/net_tstamp.h+15−2

@@ -13,7 +13,7 @@ · 12 unmodified lines
13	13	#include <linux/types.h>
14	14	#include <linux/socket.h> /* for SO_TIMESTAMPING */
15	15
16		−/* SO_TIMESTAMPING gets an integer bit field comprised of these values */
	16	+/* SO_TIMESTAMPING flags */
17	17	enum {
18	18	SOF_TIMESTAMPING_TX_HARDWARE = (1<<0),
19	19	SOF_TIMESTAMPING_TX_SOFTWARE = (1<<1),
@@ -30,8 +30,9 @@ enum { · 10 unmodified lines
30	30	SOF_TIMESTAMPING_OPT_STATS = (1<<12),
31	31	SOF_TIMESTAMPING_OPT_PKTINFO = (1<<13),
32	32	SOF_TIMESTAMPING_OPT_TX_SWHW = (1<<14),
	33	+ SOF_TIMESTAMPING_BIND_PHC = (1 << 15),
33	34
34		− SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_TX_SWHW,
	35	+ SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_BIND_PHC,
35	36	SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) \|
36	37	SOF_TIMESTAMPING_LAST
37	38	};
@@ -46,6 +47,18 @@ enum { · 8 unmodified lines
46	47	SOF_TIMESTAMPING_TX_SCHED \| \
47	48	SOF_TIMESTAMPING_TX_ACK)
48	49
	50	+/**
	51	+ * struct so_timestamping - SO_TIMESTAMPING parameter
	52	+ *
	53	+ * @flags: SO_TIMESTAMPING flags
	54	+ * @bind_phc: Index of PTP virtual clock bound to sock. This is available
	55	+ * if flag SOF_TIMESTAMPING_BIND_PHC is set.
	56	+ */
	57	+struct so_timestamping {
	58	+ int flags;
	59	+ int bind_phc;
	60	+};
	61	+
49	62	/**
50	63	* struct hwtstamp_config - %SIOCGHWTSTAMP and %SIOCSHWTSTAMP parameter
51	64	*

include/uapi/linux/netfilter/nfnetlink_log.h+1−1

@@ -61,7 +61,7 @@ enum nfulnl_attr_type { · 60 unmodified lines
61	61	NFULA_HWTYPE, /* hardware type */
62	62	NFULA_HWHEADER, /* hardware header */
63	63	NFULA_HWLEN, /* hardware header length */
64		− NFULA_CT, /* nf_conntrack_netlink.h */
	64	+ NFULA_CT, /* nfnetlink_conntrack.h */
65	65	NFULA_CT_INFO, /* enum ip_conntrack_info */
66	66	NFULA_VLAN, /* nested attribute: packet vlan info */
67	67	NFULA_L2HDR, /* full L2 header */

include/uapi/linux/netfilter/nfnetlink_queue.h+2−2

@@ -51,11 +51,11 @@ enum nfqnl_attr_type { · 50 unmodified lines
51	51	NFQA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */
52	52	NFQA_HWADDR, /* nfqnl_msg_packet_hw */
53	53	NFQA_PAYLOAD, /* opaque data payload */
54		− NFQA_CT, /* nf_conntrack_netlink.h */
	54	+ NFQA_CT, /* nfnetlink_conntrack.h */
55	55	NFQA_CT_INFO, /* enum ip_conntrack_info */
56	56	NFQA_CAP_LEN, /* __u32 length of captured packet */
57	57	NFQA_SKB_INFO, /* __u32 skb meta information */
58		− NFQA_EXP, /* nf_conntrack_netlink.h */
	58	+ NFQA_EXP, /* nfnetlink_conntrack.h */
59	59	NFQA_UID, /* __u32 sk uid */
60	60	NFQA_GID, /* __u32 sk gid */
61	61	NFQA_SECCTX, /* security context string */

include/uapi/rdma/irdma-abi.h+1−1

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */
	1	+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB */
2	2	/*
3	3	* Copyright (c) 2006 - 2021 Intel Corporation. All rights reserved.
4	4	* Copyright (c) 2005 Topspin Communications. All rights reserved.