lael-labs/linux

include/uapi/linux/Kbuild+1−0

@@ -317,6 +317,7 @@ header-y += ppp-ioctl.h · 316 unmodified lines
317	header-y += ppp_defs.h	317	header-y += ppp_defs.h
318	header-y += pps.h	318	header-y += pps.h
319	header-y += prctl.h	319	header-y += prctl.h
		320	header-y += psci.h
320	header-y += ptp_clock.h	321	header-y += ptp_clock.h
321	header-y += ptrace.h	322	header-y += ptrace.h
322	header-y += qnx4_fs.h	323	header-y += qnx4_fs.h

include/uapi/linux/audit.h+20−0

 #define AUDIT_FAIL_PRINTK	1
 #define AUDIT_FAIL_PANIC	2
+/*
+ * These bits disambiguate different calling conventions that share an
+ * ELF machine type, bitness, and endianness
+ */
+#define __AUDIT_ARCH_CONVENTION_MASK 0x30000000
+#define __AUDIT_ARCH_CONVENTION_MIPS64_N32 0x20000000
 /* distinguish syscall tables */
 #define __AUDIT_ARCH_64BIT 0x80000000
 #define __AUDIT_ARCH_LE	   0x40000000
 #define AUDIT_ARCH_ALPHA	(EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_ARM		(EM_ARM|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_ARMEB	(EM_ARM)
 #define AUDIT_ARCH_MIPS		(EM_MIPS)
 #define AUDIT_ARCH_MIPSEL	(EM_MIPS|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_MIPS64	(EM_MIPS|__AUDIT_ARCH_64BIT)
+#define AUDIT_ARCH_MIPS64N32	(EM_MIPS|__AUDIT_ARCH_64BIT|\
+				 __AUDIT_ARCH_CONVENTION_MIPS64_N32)
 #define AUDIT_ARCH_MIPSEL64	(EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_MIPSEL64N32	(EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE|\
+				 __AUDIT_ARCH_CONVENTION_MIPS64_N32)
 #define AUDIT_ARCH_OPENRISC	(EM_OPENRISC)
 #define AUDIT_ARCH_PARISC	(EM_PARISC)
 #define AUDIT_ARCH_PARISC64	(EM_PARISC|__AUDIT_ARCH_64BIT)
  */
 #define AUDIT_MESSAGE_TEXT_MAX	8560
+/* Multicast Netlink socket groups (default up to 32) */
+enum audit_nlgrps {
+	AUDIT_NLGRP_NONE,	/* Group 0 not used */
+	AUDIT_NLGRP_READLOG,	/* "best effort" read only socket */
+	__AUDIT_NLGRP_MAX
+};
+#define AUDIT_NLGRP_MAX                (__AUDIT_NLGRP_MAX - 1)
 struct audit_status {
 	__u32		mask;		/* Bit mask for valid entries */
 	__u32		enabled;	/* 1 = enabled, 0 = disabled */

include/uapi/linux/btrfs.h+18−2

 #define BTRFS_SUBVOL_QGROUP_INHERIT	(1ULL << 2)
 #define BTRFS_FSID_SIZE 16
 #define BTRFS_UUID_SIZE 16
+#define BTRFS_UUID_UNPARSED_SIZE	37
 #define BTRFS_QGROUP_INHERIT_SET_LIMITS	(1ULL << 0)
 	__u64 max_id;				/* out */
 	__u64 num_devices;			/* out */
 	__u8 fsid[BTRFS_FSID_SIZE];		/* out */
-	__u64 reserved[124];			/* pad to 1k */
+	__u32 nodesize;				/* out */
+	__u32 sectorsize;			/* out */
+	__u32 clone_alignment;			/* out */
+	__u32 reserved32;
+	__u64 reserved[122];			/* pad to 1k */
 };
 struct btrfs_ioctl_feature_flags {
 	__u64 flags;
-	__u64 unused[8];
+	__u64 limit;		/* limit number of processed chunks */
+	__u64 unused[7];
 } __attribute__ ((__packed__));
 /* report balance progress to userspace */
 	char buf[BTRFS_SEARCH_ARGS_BUFSIZE];
 };
+struct btrfs_ioctl_search_args_v2 {
+	struct btrfs_ioctl_search_key key; /* in/out - search parameters */
+	__u64 buf_size;		   /* in - size of buffer
+					    * out - on EOVERFLOW: needed size
+					    *       to store item */
+	__u64 buf[0];                       /* out - found items */
+};
 struct btrfs_ioctl_clone_range_args {
   __s64 src_fd;
   __u64 src_offset, src_length;
 				struct btrfs_ioctl_defrag_range_args)
 #define BTRFS_IOC_TREE_SEARCH _IOWR(BTRFS_IOCTL_MAGIC, 17, \
 				   struct btrfs_ioctl_search_args)
+#define BTRFS_IOC_TREE_SEARCH_V2 _IOWR(BTRFS_IOCTL_MAGIC, 17, \
+					   struct btrfs_ioctl_search_args_v2)
 #define BTRFS_IOC_INO_LOOKUP _IOWR(BTRFS_IOCTL_MAGIC, 18, \
 				   struct btrfs_ioctl_ino_lookup_args)
 #define BTRFS_IOC_DEFAULT_SUBVOL _IOW(BTRFS_IOCTL_MAGIC, 19, __u64)

include/uapi/linux/can.h+3−3

@@ -42,8 +42,8 @@ · 41 unmodified lines
42	* DAMAGE.	42	* DAMAGE.
43	*/	43	*/
44		44
45	#ifndef CAN_H	45	#ifndef _UAPI_CAN_H
46	#define CAN_H	46	#define _UAPI_CAN_H
47		47
48	#include <linux/types.h>	48	#include <linux/types.h>
49	#include <linux/socket.h>	49	#include <linux/socket.h>
@@ -191,4 +191,4 @@ struct can_filter { · 141 unmodified lines
191		191
192	#define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */	192	#define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */
193		193
194	#endif /* CAN_H */	194	#endif /* !_UAPI_CAN_H */

include/uapi/linux/can/bcm.h+3−3

@@ -41,8 +41,8 @@ · 40 unmodified lines
41	* DAMAGE.	41	* DAMAGE.
42	*/	42	*/
43		43
44	#ifndef CAN_BCM_H	44	#ifndef _UAPI_CAN_BCM_H
45	#define CAN_BCM_H	45	#define _UAPI_CAN_BCM_H
46		46
47	#include <linux/types.h>	47	#include <linux/types.h>
48	#include <linux/can.h>	48	#include <linux/can.h>
@@ -95,4 +95,4 @@ enum { · 46 unmodified lines
95	#define TX_RESET_MULTI_IDX 0x0200	95	#define TX_RESET_MULTI_IDX 0x0200
96	#define RX_RTR_FRAME 0x0400	96	#define RX_RTR_FRAME 0x0400
97		97
98	#endif /* CAN_BCM_H */	98	#endif /* !_UAPI_CAN_BCM_H */

include/uapi/linux/can/error.h+3−3

@@ -41,8 +41,8 @@ · 40 unmodified lines
41	* DAMAGE.	41	* DAMAGE.
42	*/	42	*/
43		43
44	#ifndef CAN_ERROR_H	44	#ifndef _UAPI_CAN_ERROR_H
45	#define CAN_ERROR_H	45	#define _UAPI_CAN_ERROR_H
46		46
47	#define CAN_ERR_DLC 8 /* dlc for error message frames */	47	#define CAN_ERR_DLC 8 /* dlc for error message frames */
48		48
@@ -120,4 +120,4 @@ · 71 unmodified lines
120		120
121	/* controller specific additional information / data[5..7] */	121	/* controller specific additional information / data[5..7] */
122		122
123	#endif /* CAN_ERROR_H */	123	#endif /* _UAPI_CAN_ERROR_H */

include/uapi/linux/can/gw.h+3−3

@@ -41,8 +41,8 @@ · 40 unmodified lines
41	* DAMAGE.	41	* DAMAGE.
42	*/	42	*/
43		43
44	#ifndef CAN_GW_H	44	#ifndef _UAPI_CAN_GW_H
45	#define CAN_GW_H	45	#define _UAPI_CAN_GW_H
46		46
47	#include <linux/types.h>	47	#include <linux/types.h>
48	#include <linux/can.h>	48	#include <linux/can.h>
@@ -200,4 +200,4 @@ enum { · 151 unmodified lines
200	* Beware of sending unpacked or aligned structs!	200	* Beware of sending unpacked or aligned structs!
201	*/	201	*/
202		202
203	#endif	203	#endif /* !_UAPI_CAN_GW_H */

include/uapi/linux/can/netlink.h+3−3

@@ -15,8 +15,8 @@ · 14 unmodified lines
15	* GNU General Public License for more details.	15	* GNU General Public License for more details.
16	*/	16	*/
17		17
18	#ifndef CAN_NETLINK_H	18	#ifndef _UAPI_CAN_NETLINK_H
19	#define CAN_NETLINK_H	19	#define _UAPI_CAN_NETLINK_H
20		20
21	#include <linux/types.h>	21	#include <linux/types.h>
22		22
@@ -130,4 +130,4 @@ enum { · 107 unmodified lines
130		130
131	#define IFLA_CAN_MAX (__IFLA_CAN_MAX - 1)	131	#define IFLA_CAN_MAX (__IFLA_CAN_MAX - 1)
132		132
133	#endif /* CAN_NETLINK_H */	133	#endif /* !_UAPI_CAN_NETLINK_H */

include/uapi/linux/can/raw.h+3−3

@@ -42,8 +42,8 @@ · 41 unmodified lines
42	* DAMAGE.	42	* DAMAGE.
43	*/	43	*/
44		44
45	#ifndef CAN_RAW_H	45	#ifndef _UAPI_CAN_RAW_H
46	#define CAN_RAW_H	46	#define _UAPI_CAN_RAW_H
47		47
48	#include <linux/can.h>	48	#include <linux/can.h>
49		49
@@ -59,4 +59,4 @@ enum { · 9 unmodified lines
59	CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */	59	CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */
60	};	60	};
61		61
62	#endif	62	#endif /* !_UAPI_CAN_RAW_H */

include/uapi/linux/capability.h+6−1

@@ -347,7 +347,12 @@ struct vfs_cap_data { · 346 unmodified lines
347		347
348	#define CAP_BLOCK_SUSPEND 36	348	#define CAP_BLOCK_SUSPEND 36
349		349
350	#define CAP_LAST_CAP CAP_BLOCK_SUSPEND	350	/* Allow reading the audit log via multicast netlink socket */
		351
		352	#define CAP_AUDIT_READ 37
		353
		354
		355	#define CAP_LAST_CAP CAP_AUDIT_READ
351		356
352	#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)	357	#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
353		358

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

@@ -846,6 +846,38 @@ struct ethtool_rxfh_indir { · 845 unmodified lines
846	__u32 ring_index[0];	846	__u32 ring_index[0];
847	};	847	};
848		848
		849	/**
		850	* struct ethtool_rxfh - command to get/set RX flow hash indir or/and hash key.
		851	* @cmd: Specific command number - %ETHTOOL_GRSSH or %ETHTOOL_SRSSH
		852	* @rss_context: RSS context identifier.
		853	* @indir_size: On entry, the array size of the user buffer for the
		854	* indirection table, which may be zero, or (for %ETHTOOL_SRSSH),
		855	* %ETH_RXFH_INDIR_NO_CHANGE. On return from %ETHTOOL_GRSSH,
		856	* the array size of the hardware indirection table.
		857	* @key_size: On entry, the array size of the user buffer for the hash key,
		858	* which may be zero. On return from %ETHTOOL_GRSSH, the size of the
		859	* hardware hash key.
		860	* @rsvd: Reserved for future extensions.
		861	* @rss_config: RX ring/queue index for each hash value i.e., indirection table
		862	* of @indir_size __u32 elements, followed by hash key of @key_size
		863	* bytes.
		864	*
		865	* For %ETHTOOL_GRSSH, a @indir_size and key_size of zero means that only the
		866	* size should be returned. For %ETHTOOL_SRSSH, an @indir_size of
		867	* %ETH_RXFH_INDIR_NO_CHANGE means that indir table setting is not requested
		868	* and a @indir_size of zero means the indir table should be reset to default
		869	* values.
		870	*/
		871	struct ethtool_rxfh {
		872	__u32 cmd;
		873	__u32 rss_context;
		874	__u32 indir_size;
		875	__u32 key_size;
		876	__u32 rsvd[2];
		877	__u32 rss_config[0];
		878	};
		879	#define ETH_RXFH_INDIR_NO_CHANGE 0xffffffff
		880
849	/**	881	/**
850	* struct ethtool_rx_ntuple_flow_spec - specification for RX flow filter	882	* struct ethtool_rx_ntuple_flow_spec - specification for RX flow filter
851	* @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW	883	* @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW
@@ -1118,6 +1150,9 @@ enum ethtool_sfeatures_retval_bits { · 266 unmodified lines
1118	#define ETHTOOL_GEEE 0x00000044 /* Get EEE settings */	1150	#define ETHTOOL_GEEE 0x00000044 /* Get EEE settings */
1119	#define ETHTOOL_SEEE 0x00000045 /* Set EEE settings */	1151	#define ETHTOOL_SEEE 0x00000045 /* Set EEE settings */
1120		1152
		1153	#define ETHTOOL_GRSSH 0x00000046 /* Get RX flow hash configuration */
		1154	#define ETHTOOL_SRSSH 0x00000047 /* Set RX flow hash configuration */
		1155
1121	/* compatibility with older code */	1156	/* compatibility with older code */
1122	#define SPARC_ETH_GSET ETHTOOL_GSET	1157	#define SPARC_ETH_GSET ETHTOOL_GSET
1123	#define SPARC_ETH_SSET ETHTOOL_SSET	1158	#define SPARC_ETH_SSET ETHTOOL_SSET

include/uapi/linux/filter.h+2−1

@@ -130,7 +130,8 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ · 129 unmodified lines
130	#define SKF_AD_VLAN_TAG 44	130	#define SKF_AD_VLAN_TAG 44
131	#define SKF_AD_VLAN_TAG_PRESENT 48	131	#define SKF_AD_VLAN_TAG_PRESENT 48
132	#define SKF_AD_PAY_OFFSET 52	132	#define SKF_AD_PAY_OFFSET 52
133	#define SKF_AD_MAX 56	133	#define SKF_AD_RANDOM 56
		134	#define SKF_AD_MAX 60
134	#define SKF_NET_OFF (-0x100000)	135	#define SKF_NET_OFF (-0x100000)
135	#define SKF_LL_OFF (-0x200000)	136	#define SKF_LL_OFF (-0x200000)
136		137

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

@@ -20,7 +20,7 @@ · 19 unmodified lines
20		20
21	#define GFS2_MOUNT_LOCK 0	21	#define GFS2_MOUNT_LOCK 0
22	#define GFS2_LIVE_LOCK 1	22	#define GFS2_LIVE_LOCK 1
23	#define GFS2_TRANS_LOCK 2	23	#define GFS2_FREEZE_LOCK 2
24	#define GFS2_RENAME_LOCK 3	24	#define GFS2_RENAME_LOCK 3
25	#define GFS2_CONTROL_LOCK 4	25	#define GFS2_CONTROL_LOCK 4
26	#define GFS2_MOUNTED_LOCK 5	26	#define GFS2_MOUNTED_LOCK 5

include/uapi/linux/if_fddi.h+46−44

include/uapi/linux/if_link.h+11−1

 	IFLA_VXLAN_PORT,	/* destination port */
 	IFLA_VXLAN_GROUP6,
 	IFLA_VXLAN_LOCAL6,
+	IFLA_VXLAN_UDP_CSUM,
+	IFLA_VXLAN_UDP_ZERO_CSUM6_TX,
+	IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
 	__IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
 	IFLA_VF_UNSPEC,
 	IFLA_VF_MAC,		/* Hardware queue specific attributes */
 	IFLA_VF_VLAN,
-	IFLA_VF_TX_RATE,	/* TX Bandwidth Allocation */
+	IFLA_VF_TX_RATE,	/* Max TX Bandwidth Allocation */
 	IFLA_VF_SPOOFCHK,	/* Spoof Checking on/off switch */
 	IFLA_VF_LINK_STATE,	/* link state enable/disable/auto switch */
+	IFLA_VF_RATE,		/* Min and Max TX Bandwidth Allocation */
 	__IFLA_VF_MAX,
 };
 	__u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
 };
+struct ifla_vf_rate {
+	__u32 vf;
+	__u32 min_tx_rate; /* Min Bandwidth in Mbps */
+	__u32 max_tx_rate; /* Max Bandwidth in Mbps */
+};
 struct ifla_vf_spoofchk {
 	__u32 vf;
 	__u32 setting;

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

@@ -100,7 +100,7 @@ enum { · 99 unmodified lines
100	#define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1)	100	#define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1)
101		101
102	/* VTI-mode i_flags */	102	/* VTI-mode i_flags */
103	#define VTI_ISVTI 0x0001	103	#define VTI_ISVTI ((__force __be16)0x0001)
104		104
105	enum {	105	enum {
106	IFLA_VTI_UNSPEC,	106	IFLA_VTI_UNSPEC,

include/uapi/linux/input.h+16−1

 #define KEY_VIDEO_NEXT		241	/* drive next video source */
 #define KEY_VIDEO_PREV		242	/* drive previous video source */
 #define KEY_BRIGHTNESS_CYCLE	243	/* brightness up, after max is min */
-#define KEY_BRIGHTNESS_ZERO	244	/* brightness off, use ambient */
+#define KEY_BRIGHTNESS_AUTO	244	/* Set Auto Brightness: manual
+					  brightness control is off,
+					  rely on ambient */
+#define KEY_BRIGHTNESS_ZERO	KEY_BRIGHTNESS_AUTO
 #define KEY_DISPLAY_OFF		245	/* display device to off state */
 #define KEY_WWAN		246	/* Wireless WAN (LTE, UMTS, GSM, etc.) */
 #define KEY_ADDRESSBOOK		0x1ad	/* AL Contacts/Address Book */
 #define KEY_MESSENGER		0x1ae	/* AL Instant Messaging */
 #define KEY_DISPLAYTOGGLE	0x1af	/* Turn display (LCD) on and off */
+#define KEY_BRIGHTNESS_TOGGLE	KEY_DISPLAYTOGGLE
 #define KEY_SPELLCHECK		0x1b0   /* AL Spell Check */
 #define KEY_LOGOFF		0x1b1   /* AL Logoff */
 #define KEY_ALS_TOGGLE		0x230	/* Ambient light sensor */
+#define KEY_BUTTONCONFIG		0x240	/* AL Button Configuration */
+#define KEY_TASKMANAGER		0x241	/* AL Task/Project Manager */
+#define KEY_JOURNAL		0x242	/* AL Log/Journal/Timecard */
+#define KEY_CONTROLPANEL		0x243	/* AL Control Panel */
+#define KEY_APPSELECT		0x244	/* AL Select Task/Application */
+#define KEY_SCREENSAVER		0x245	/* AL Screen Saver */
+#define KEY_VOICECOMMAND		0x246	/* Listening Voice Command */
+#define KEY_BRIGHTNESS_MIN		0x250	/* Set Brightness to Minimum */
+#define KEY_BRIGHTNESS_MAX		0x251	/* Set Brightness to Maximum */
 #define BTN_TRIGGER_HAPPY		0x2c0
 #define BTN_TRIGGER_HAPPY1		0x2c0
 #define BTN_TRIGGER_HAPPY2		0x2c1

include/uapi/linux/kvm.h+16−1

 #define KVM_EXIT_WATCHDOG         21
 #define KVM_EXIT_S390_TSCH        22
 #define KVM_EXIT_EPR              23
+#define KVM_EXIT_SYSTEM_EVENT     24
 /* For KVM_EXIT_INTERNAL_ERROR */
 /* Emulate instruction failed. */
 		struct {
 			__u32 epr;
 		} epr;
+		/* KVM_EXIT_SYSTEM_EVENT */
+		struct {
+#define KVM_SYSTEM_EVENT_SHUTDOWN       1
+#define KVM_SYSTEM_EVENT_RESET          2
+			__u32 type;
+			__u64 flags;
+		} system_event;
 		/* Fix the size of the union. */
 		char padding[256];
 	};
 #define KVM_S390_INT_PFAULT_INIT	0xfffe0004u
 #define KVM_S390_INT_PFAULT_DONE	0xfffe0005u
 #define KVM_S390_MCHK			0xfffe1000u
+#define KVM_S390_INT_CLOCK_COMP		0xffff1004u
+#define KVM_S390_INT_CPU_TIMER		0xffff1005u
 #define KVM_S390_INT_VIRTIO		0xffff2603u
 #define KVM_S390_INT_SERVICE		0xffff2401u
 #define KVM_S390_INT_EMERGENCY		0xffff1201u
 	kvm_ioeventfd_flag_nr_pio,
 	kvm_ioeventfd_flag_nr_deassign,
 	kvm_ioeventfd_flag_nr_virtio_ccw_notify,
+	kvm_ioeventfd_flag_nr_fast_mmio,
 	kvm_ioeventfd_flag_nr_max,
 };
 struct kvm_ioeventfd {
 	__u64 datamatch;
 	__u64 addr;        /* legal pio/mmio address */
-	__u32 len;         /* 1, 2, 4, or 8 bytes    */
+	__u32 len;         /* 1, 2, 4, or 8 bytes; or 0 to ignore length */
 	__s32 fd;
 	__u32 flags;
 	__u8  pad[36];
 #define KVM_CAP_IOAPIC_POLARITY_IGNORED 97
 #define KVM_CAP_ENABLE_CAP_VM 98
 #define KVM_CAP_S390_IRQCHIP 99
+#define KVM_CAP_IOEVENTFD_NO_LENGTH 100
+#define KVM_CAP_VM_ATTRIBUTES 101
+#define KVM_CAP_ARM_PSCI_0_2 102
+#define KVM_CAP_PPC_FIXUP_HCALL 103
 #ifdef KVM_CAP_IRQ_ROUTING

include/uapi/linux/kvm_para.h+3−0

 #define KVM_HC_FEATURES			3
 #define KVM_HC_PPC_MAP_MAGIC_PAGE	4
 #define KVM_HC_KICK_CPU			5
+#define KVM_HC_MIPS_GET_CLOCK_FREQ	6
+#define KVM_HC_MIPS_EXIT_VM		7
+#define KVM_HC_MIPS_CONSOLE_OUTPUT	8
 /*
  * hypercalls use architecture specific

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

@@ -124,6 +124,8 @@ enum { · 123 unmodified lines
124	L2TP_ATTR_STATS, /* nested */	124	L2TP_ATTR_STATS, /* nested */
125	L2TP_ATTR_IP6_SADDR, /* struct in6_addr */	125	L2TP_ATTR_IP6_SADDR, /* struct in6_addr */
126	L2TP_ATTR_IP6_DADDR, /* struct in6_addr */	126	L2TP_ATTR_IP6_DADDR, /* struct in6_addr */
		127	L2TP_ATTR_UDP_ZERO_CSUM6_TX, /* u8 */
		128	L2TP_ATTR_UDP_ZERO_CSUM6_RX, /* u8 */
127	__L2TP_ATTR_MAX,	129	__L2TP_ATTR_MAX,
128	};	130	};
129		131

include/uapi/linux/neighbour.h+1−0

@@ -24,6 +24,7 @@ enum { · 23 unmodified lines
24	NDA_PORT,	24	NDA_PORT,
25	NDA_VNI,	25	NDA_VNI,
26	NDA_IFINDEX,	26	NDA_IFINDEX,
		27	NDA_MASTER,
27	__NDA_MAX	28	__NDA_MAX
28	};	29	};
29		30

include/uapi/linux/netfilter/nf_tables.h+37−0

 	NFT_SET_MAP			= 0x8,
 };
+/**
+ * enum nft_set_policies - set selection policy
+ *
+ * @NFT_SET_POL_PERFORMANCE: prefer high performance over low memory use
+ * @NFT_SET_POL_MEMORY: prefer low memory use over high performance
+ */
+enum nft_set_policies {
+	NFT_SET_POL_PERFORMANCE,
+	NFT_SET_POL_MEMORY,
+};
+/**
+ * enum nft_set_desc_attributes - set element description
+ *
+ * @NFTA_SET_DESC_SIZE: number of elements in set (NLA_U32)
+ */
+enum nft_set_desc_attributes {
+	NFTA_SET_DESC_UNSPEC,
+	NFTA_SET_DESC_SIZE,
+	__NFTA_SET_DESC_MAX
+};
+#define NFTA_SET_DESC_MAX	(__NFTA_SET_DESC_MAX - 1)
 /**
  * enum nft_set_attributes - nf_tables set netlink attributes
  *
  * @NFTA_SET_KEY_LEN: key data length (NLA_U32)
  * @NFTA_SET_DATA_TYPE: mapping data type (NLA_U32)
  * @NFTA_SET_DATA_LEN: mapping data length (NLA_U32)
+ * @NFTA_SET_POLICY: selection policy (NLA_U32)
+ * @NFTA_SET_DESC: set description (NLA_NESTED)
+ * @NFTA_SET_ID: uniquely identifies a set in a transaction (NLA_U32)
  */
 enum nft_set_attributes {
 	NFTA_SET_UNSPEC,
 	NFTA_SET_KEY_LEN,
 	NFTA_SET_DATA_TYPE,
 	NFTA_SET_DATA_LEN,
+	NFTA_SET_POLICY,
+	NFTA_SET_DESC,
+	NFTA_SET_ID,
 	__NFTA_SET_MAX
 };
 #define NFTA_SET_MAX		(__NFTA_SET_MAX - 1)
  * @NFTA_SET_ELEM_LIST_TABLE: table of the set to be changed (NLA_STRING)
  * @NFTA_SET_ELEM_LIST_SET: name of the set to be changed (NLA_STRING)
  * @NFTA_SET_ELEM_LIST_ELEMENTS: list of set elements (NLA_NESTED: nft_set_elem_attributes)
+ * @NFTA_SET_ELEM_LIST_SET_ID: uniquely identifies a set in a transaction (NLA_U32)
  */
 enum nft_set_elem_list_attributes {
 	NFTA_SET_ELEM_LIST_UNSPEC,
 	NFTA_SET_ELEM_LIST_TABLE,
 	NFTA_SET_ELEM_LIST_SET,
 	NFTA_SET_ELEM_LIST_ELEMENTS,
+	NFTA_SET_ELEM_LIST_SET_ID,
 	__NFTA_SET_ELEM_LIST_MAX
 };
 #define NFTA_SET_ELEM_LIST_MAX	(__NFTA_SET_ELEM_LIST_MAX - 1)
  * @NFTA_LOOKUP_SET: name of the set where to look for (NLA_STRING)
  * @NFTA_LOOKUP_SREG: source register of the data to look for (NLA_U32: nft_registers)
  * @NFTA_LOOKUP_DREG: destination register (NLA_U32: nft_registers)
+ * @NFTA_LOOKUP_SET_ID: uniquely identifies a set in a transaction (NLA_U32)
  */
 enum nft_lookup_attributes {
 	NFTA_LOOKUP_UNSPEC,
 	NFTA_LOOKUP_SET,
 	NFTA_LOOKUP_SREG,
 	NFTA_LOOKUP_DREG,
+	NFTA_LOOKUP_SET_ID,
 	__NFTA_LOOKUP_MAX
 };
 #define NFTA_LOOKUP_MAX		(__NFTA_LOOKUP_MAX - 1)
  * @NFT_META_SECMARK: packet secmark (skb->secmark)
  * @NFT_META_NFPROTO: netfilter protocol
  * @NFT_META_L4PROTO: layer 4 protocol number
+ * @NFT_META_BRI_IIFNAME: packet input bridge interface name
+ * @NFT_META_BRI_OIFNAME: packet output bridge interface name
  */
 enum nft_meta_keys {
 	NFT_META_LEN,
 	NFT_META_SECMARK,
 	NFT_META_NFPROTO,
 	NFT_META_L4PROTO,
+	NFT_META_BRI_IIFNAME,
+	NFT_META_BRI_OIFNAME,
 };
 /**

include/uapi/linux/netfilter/nfnetlink.h+2−0

 #define NFNLGRP_CONNTRACK_EXP_DESTROY	NFNLGRP_CONNTRACK_EXP_DESTROY
 	NFNLGRP_NFTABLES,
 #define NFNLGRP_NFTABLES                NFNLGRP_NFTABLES
+	NFNLGRP_ACCT_QUOTA,
+#define NFNLGRP_ACCT_QUOTA		NFNLGRP_ACCT_QUOTA
 	__NFNLGRP_MAX,
 };
 #define NFNLGRP_MAX	(__NFNLGRP_MAX - 1)

include/uapi/linux/netfilter/nfnetlink_acct.h+9−0

 	NFNL_MSG_ACCT_GET,
 	NFNL_MSG_ACCT_GET_CTRZERO,
 	NFNL_MSG_ACCT_DEL,
+	NFNL_MSG_ACCT_OVERQUOTA,
 	NFNL_MSG_ACCT_MAX
 };
+enum nfnl_acct_flags {
+	NFACCT_F_QUOTA_PKTS	= (1 << 0),
+	NFACCT_F_QUOTA_BYTES	= (1 << 1),
+	NFACCT_F_OVERQUOTA	= (1 << 2), /* can't be set from userspace */
+};
 enum nfnl_acct_type {
 	NFACCT_UNSPEC,
 	NFACCT_NAME,
 	NFACCT_PKTS,
 	NFACCT_BYTES,
 	NFACCT_USE,
+	NFACCT_FLAGS,
+	NFACCT_QUOTA,
 	__NFACCT_MAX
 };
 #define NFACCT_MAX (__NFACCT_MAX - 1)

include/uapi/linux/nfc.h+12−4

  * First byte is the adapter index
  * Second byte contains flags
  *  - 0x01 - Direction (0=RX, 1=TX)
- *  - 0x02-0x80 - Reserved
+ *  - 0x02-0x04 - Payload type (000=LLCP, 001=NCI, 010=HCI, 011=Digital,
+ *                              100=Proprietary)
+ *  - 0x05-0x80 - Reserved
  **/
-#define NFC_LLCP_RAW_HEADER_SIZE	2
+#define NFC_RAW_HEADER_SIZE	2
-#define NFC_LLCP_DIRECTION_RX		0x00
+#define NFC_DIRECTION_RX		0x00
-#define NFC_LLCP_DIRECTION_TX		0x01
+#define NFC_DIRECTION_TX		0x01
+#define RAW_PAYLOAD_LLCP 0
+#define RAW_PAYLOAD_NCI	1
+#define RAW_PAYLOAD_HCI	2
+#define RAW_PAYLOAD_DIGITAL	3
+#define RAW_PAYLOAD_PROPRIETARY	4
 /* socket option names */
 #define NFC_LLCP_RW		0

include/uapi/linux/nfsd/nfsfh.h+7−25

@@ -1,13 +1,7 @@
1	/*	1	/*
2	* include/linux/nfsd/nfsfh.h
3	*
4	* This file describes the layout of the file handles as passed	2	* This file describes the layout of the file handles as passed
5	* over the wire.	3	* over the wire.
6	*	4	*
7	* Earlier versions of knfsd used to sign file handles using keyed MD5
8	* or SHA. I've removed this code, because it doesn't give you more
9	* security than blocking external access to port 2049 on your firewall.
10	*
11	* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>	5	* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
12	*/	6	*/
13		7
@@ -37,7 +31,7 @@ struct nfs_fhbase_old { · 23 unmodified lines
37	};	31	};
38		32
39	/*	33	/*
40	* This is the new flexible, extensible style NFSv2/v3 file handle.	34	* This is the new flexible, extensible style NFSv2/v3/v4 file handle.
41	* by Neil Brown <neilb@cse.unsw.edu.au> - March 2000	35	* by Neil Brown <neilb@cse.unsw.edu.au> - March 2000
42	*	36	*
43	* The file handle starts with a sequence of four-byte words.	37	* The file handle starts with a sequence of four-byte words.
@@ -47,14 +41,7 @@ struct nfs_fhbase_old { · 3 unmodified lines
47	*	41	*
48	* All four-byte values are in host-byte-order.	42	* All four-byte values are in host-byte-order.
49	*	43	*
50	* The auth_type field specifies how the filehandle can be authenticated	44	* The auth_type field is deprecated and must be set to 0.
51	* This might allow a file to be confirmed to be in a writable part of a
52	* filetree without checking the path from it up to the root.
53	* Current values:
54	* 0 - No authentication. fb_auth is 0 bytes long
55	* Possible future values:
56	* 1 - 4 bytes taken from MD5 hash of the remainer of the file handle
57	* prefixed by a secret and with the important export flags.
58	*	45	*
59	* The fsid_type identifies how the filesystem (or export point) is	46	* The fsid_type identifies how the filesystem (or export point) is
60	* encoded.	47	* encoded.
@@ -71,14 +58,9 @@ struct nfs_fhbase_old { · 10 unmodified lines
71	* 7 - 8 byte inode number and 16 byte uuid	58	* 7 - 8 byte inode number and 16 byte uuid
72	*	59	*
73	* The fileid_type identified how the file within the filesystem is encoded.	60	* The fileid_type identified how the file within the filesystem is encoded.
74	* This is (will be) passed to, and set by, the underlying filesystem if it supports	61	* The values for this field are filesystem specific, exccept that
75	* filehandle operations. The filesystem must not use the value '0' or '0xff' and may	62	* filesystems must not use the values '0' or '0xff'. 'See enum fid_type'
76	* only use the values 1 and 2 as defined below:	63	* in include/linux/exportfs.h for currently registered values.
77	* Current values:
78	* 0 - The root, or export point, of the filesystem. fb_fileid is 0 bytes.
79	* 1 - 32bit inode number, 32 bit generation number.
80	* 2 - 32bit inode number, 32 bit generation number, 32 bit parent directory inode number.
81	*
82	*/	64	*/
83	struct nfs_fhbase_new {	65	struct nfs_fhbase_new {
84	__u8 fb_version; /* == 1, even => nfs_fhbase_old */	66	__u8 fb_version; /* == 1, even => nfs_fhbase_old */
@@ -114,9 +96,9 @@ struct knfsd_fh { · 29 unmodified lines
114	#define fh_fsid_type fh_base.fh_new.fb_fsid_type	96	#define fh_fsid_type fh_base.fh_new.fb_fsid_type
115	#define fh_auth_type fh_base.fh_new.fb_auth_type	97	#define fh_auth_type fh_base.fh_new.fb_auth_type
116	#define fh_fileid_type fh_base.fh_new.fb_fileid_type	98	#define fh_fileid_type fh_base.fh_new.fb_fileid_type
117	#define fh_auth fh_base.fh_new.fb_auth
118	#define fh_fsid fh_base.fh_new.fb_auth	99	#define fh_fsid fh_base.fh_new.fb_auth
119		100
120		101	/* Do not use, provided for userspace compatiblity. */
		102	#define fh_auth fh_base.fh_new.fb_auth
121		103
122	#endif /* _UAPI_LINUX_NFSD_FH_H */	104	#endif /* _UAPI_LINUX_NFSD_FH_H */

include/uapi/linux/nl80211.h+66−5

  *	TX status event pertaining to the TX request.
  *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
  *	management frames at CCK rate or not in 2GHz band.
+ *	%NL80211_ATTR_CSA_C_OFFSETS_TX is an array of offsets to CSA
+ *	counters which will be updated to the current value. This attribute
+ *	is used during CSA period.
  * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this
  *	command may be used with the corresponding cookie to cancel the wait
  *	time if it is known that it is no longer necessary.
  *	operation).
  * @NL80211_ATTR_CSA_IES: Nested set of attributes containing the IE information
  *	for the time while performing a channel switch.
- * @NL80211_ATTR_CSA_C_OFF_BEACON: Offset of the channel switch counter
+ * @NL80211_ATTR_CSA_C_OFF_BEACON: An array of offsets (u16) to the channel
- *	field in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
+ *	switch counters in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
- * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter
+ * @NL80211_ATTR_CSA_C_OFF_PRESP: An array of offsets (u16) to the channel
- *	field in the probe response (%NL80211_ATTR_PROBE_RESP).
+ *	switch counters in the probe response (%NL80211_ATTR_PROBE_RESP).
  *
  * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32.
  *	As specified in the &enum nl80211_rxmgmt_flags.
  *	advertise values that cannot always be met. In such cases, an attempt
  *	to add a new station entry with @NL80211_CMD_NEW_STATION may fail.
  *
+ * @NL80211_ATTR_CSA_C_OFFSETS_TX: An array of csa counter offsets (u16) which
+ *	should be updated when the frame is transmitted.
+ * @NL80211_ATTR_MAX_CSA_COUNTERS: U8 attribute used to advertise the maximum
+ *	supported number of csa counters.
+ *
  * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32.
  *	As specified in the &enum nl80211_tdls_peer_capability.
  *
+ * @NL80211_ATTR_IFACE_SOCKET_OWNER: flag attribute, if set during interface
+ *	creation then the new interface will be owned by the netlink socket
+ *	that created it and will be destroyed when the socket is closed
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
 	NL80211_ATTR_TDLS_PEER_CAPABILITY,
+	NL80211_ATTR_IFACE_SOCKET_OWNER,
+	NL80211_ATTR_CSA_C_OFFSETS_TX,
+	NL80211_ATTR_MAX_CSA_COUNTERS,
 	/* add attributes here, update the policy in nl80211.c */
 	__NL80211_ATTR_AFTER_LAST,
  *	Contains a nested array of signal strength attributes (u8, dBm)
  * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
  *	Same format as NL80211_STA_INFO_CHAIN_SIGNAL.
+ * @NL80211_STA_EXPECTED_THROUGHPUT: expected throughput considering also the
+ *	802.11 header (u32, kbps)
  * @__NL80211_STA_INFO_AFTER_LAST: internal
  * @NL80211_STA_INFO_MAX: highest possible station info attribute
  */
 	NL80211_STA_INFO_TX_BYTES64,
 	NL80211_STA_INFO_CHAIN_SIGNAL,
 	NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
+	NL80211_STA_INFO_EXPECTED_THROUGHPUT,
 	/* keep last */
 	__NL80211_STA_INFO_AFTER_LAST,
  *	using this channel as the primary or any of the secondary channels
  *	isn't possible
  * @NL80211_FREQUENCY_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
+ * @NL80211_FREQUENCY_ATTR_INDOOR_ONLY: Only indoor use is permitted on this
+ *	channel. A channel that has the INDOOR_ONLY attribute can only be
+ *	used when there is a clear assessment that the device is operating in
+ *	an indoor surroundings, i.e., it is connected to AC power (and not
+ *	through portable DC inverters) or is under the control of a master
+ *	that is acting as an AP and is connected to AC power.
+ * @NL80211_FREQUENCY_ATTR_GO_CONCURRENT: GO operation is allowed on this
+ *	channel if it's connected concurrently to a BSS on the same channel on
+ *	the 2 GHz band or to a channel in the same UNII band (on the 5 GHz
+ *	band), and IEEE80211_CHAN_RADAR is not set. Instantiating a GO on a
+ *	channel that has the GO_CONCURRENT attribute set can be done when there
+ *	is a clear assessment that the device is operating under the guidance of
+ *	an authorized master, i.e., setting up a GO while the device is also
+ *	connected to an AP with DFS and radar detection on the UNII band (it is
+ *	up to user-space, i.e., wpa_supplicant to perform the required
+ *	verifications)
+ * @NL80211_FREQUENCY_ATTR_NO_20MHZ: 20 MHz operation is not allowed
+ *	on this channel in current regulatory domain.
+ * @NL80211_FREQUENCY_ATTR_NO_10MHZ: 10 MHz operation is not allowed
+ *	on this channel in current regulatory domain.
  * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
  *	currently defined
  * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
+ *
+ * See https://apps.fcc.gov/eas/comments/GetPublishedDocument.html?id=327&tn=528122
+ * for more information on the FCC description of the relaxations allowed
+ * by NL80211_FREQUENCY_ATTR_INDOOR_ONLY and
+ * NL80211_FREQUENCY_ATTR_GO_CONCURRENT.
  */
 enum nl80211_frequency_attr {
 	__NL80211_FREQUENCY_ATTR_INVALID,
 	NL80211_FREQUENCY_ATTR_NO_80MHZ,
 	NL80211_FREQUENCY_ATTR_NO_160MHZ,
 	NL80211_FREQUENCY_ATTR_DFS_CAC_TIME,
+	NL80211_FREQUENCY_ATTR_INDOOR_ONLY,
+	NL80211_FREQUENCY_ATTR_GO_CONCURRENT,
+	NL80211_FREQUENCY_ATTR_NO_20MHZ,
+	NL80211_FREQUENCY_ATTR_NO_10MHZ,
 	/* keep last */
 	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
  *	present has been registered with the wireless core that
  *	has listed NL80211_FEATURE_CELL_BASE_REG_HINTS as a
  *	supported feature.
+ * @NL80211_USER_REG_HINT_INDOOR: a user sent an hint indicating that the
+ *	platform is operating in an indoor environment.
  */
 enum nl80211_user_reg_hint_type {
 	NL80211_USER_REG_HINT_USER	= 0,
 	NL80211_USER_REG_HINT_CELL_BASE = 1,
+	NL80211_USER_REG_HINT_INDOOR    = 2,
 };
 /**
  *	different channels may be used within this group.
  * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap
  *	of supported channel widths for radar detection.
+ * @NL80211_IFACE_COMB_RADAR_DETECT_REGIONS: u32 attribute containing the bitmap
+ *	of supported regulatory regions for radar detection.
  * @NUM_NL80211_IFACE_COMB: number of attributes
  * @MAX_NL80211_IFACE_COMB: highest attribute number
  *
 	NL80211_IFACE_COMB_STA_AP_BI_MATCH,
 	NL80211_IFACE_COMB_NUM_CHANNELS,
 	NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
+	NL80211_IFACE_COMB_RADAR_DETECT_REGIONS,
 	/* keep last */
 	NUM_NL80211_IFACE_COMB,
  * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested
  *	to work properly to suppport receiving regulatory hints from
  *	cellular base stations.
+ * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: (no longer available, only
+ *	here to reserve the value for API/ABI compatibility)
  * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of
  *	equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station
  *	mode
  *	interface. An active monitor interface behaves like a normal monitor
  *	interface, but gets added to the driver. It ensures that incoming
  *	unicast packets directed at the configured interface address get ACKed.
+ * @NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE: This driver supports dynamic
+ *	channel bandwidth change (e.g., HT 20 <-> 40 MHz channel) during the
+ *	lifetime of a BSS.
  */
 enum nl80211_feature_flags {
 	NL80211_FEATURE_SK_TX_STATUS			= 1 << 0,
 	NL80211_FEATURE_HT_IBSS				= 1 << 1,
 	NL80211_FEATURE_INACTIVITY_TIMER		= 1 << 2,
 	NL80211_FEATURE_CELL_BASE_REG_HINTS		= 1 << 3,
-	/* bit 4 is reserved - don't use */
+	NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL	= 1 << 4,
 	NL80211_FEATURE_SAE				= 1 << 5,
 	NL80211_FEATURE_LOW_PRIORITY_SCAN		= 1 << 6,
 	NL80211_FEATURE_SCAN_FLUSH			= 1 << 7,
 	NL80211_FEATURE_FULL_AP_CLIENT_STATE		= 1 << 15,
 	NL80211_FEATURE_USERSPACE_MPM			= 1 << 16,
 	NL80211_FEATURE_ACTIVE_MONITOR			= 1 << 17,
+	NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE	= 1 << 18,
 };
 /**

include/uapi/linux/nvme.h+39−11

 /*
  * Definitions for the NVM Express interface
- * Copyright (c) 2011-2013, Intel Corporation.
+ * Copyright (c) 2011-2014, Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #ifndef _UAPI_LINUX_NVME_H
 	__u8			read_lat;
 	__u8			write_tput;
 	__u8			write_lat;
-	__u8			rsvd16[16];
+	__le16			idle_power;
+	__u8			idle_scale;
+	__u8			rsvd19;
+	__le16			active_power;
+	__u8			active_work_scale;
+	__u8			rsvd23[9];
 };
 enum {
 	__u8			ieee[3];
 	__u8			mic;
 	__u8			mdts;
-	__u8			rsvd78[178];
+	__u16			cntlid;
+	__u32			ver;
+	__u8			rsvd84[172];
 	__le16			oacs;
 	__u8			acl;
 	__u8			aerl;
 	__u8			lpa;
 	__u8			elpe;
 	__u8			npss;
-	__u8			rsvd264[248];
+	__u8			avscc;
+	__u8			apsta;
+	__le16			wctemp;
+	__le16			cctemp;
+	__u8			rsvd270[242];
 	__u8			sqes;
 	__u8			cqes;
 	__u8			rsvd514[2];
 	__u8			vwc;
 	__le16			awun;
 	__le16			awupf;
-	__u8			rsvd530[1518];
+	__u8			nvscc;
+	__u8			rsvd531;
+	__le16			acwu;
+	__u8			rsvd534[2];
+	__le32			sgls;
+	__u8			rsvd540[1508];
 	struct nvme_id_power_state	psd[32];
 	__u8			vs[1024];
 };
 	NVME_CTRL_ONCS_COMPARE			= 1 << 0,
 	NVME_CTRL_ONCS_WRITE_UNCORRECTABLE	= 1 << 1,
 	NVME_CTRL_ONCS_DSM			= 1 << 2,
+	NVME_CTRL_VWC_PRESENT			= 1 << 0,
 };
 struct nvme_lbaf {
 	__u8			mc;
 	__u8			dpc;
 	__u8			dps;
-	__u8			rsvd30[98];
+	__u8			nmic;
+	__u8			rescap;
+	__u8			fpi;
+	__u8			rsvd33;
+	__le16			nawun;
+	__le16			nawupf;
+	__le16			nacwu;
+	__u8			rsvd40[80];
+	__u8			eui64[8];
 	struct nvme_lbaf	lbaf[16];
 	__u8			rsvd192[192];
 	__u8			vs[3712];
 	__u8			unsafe_shutdowns[16];
 	__u8			media_errors[16];
 	__u8			num_err_log_entries[16];
-	__u8			rsvd192[320];
+	__le32			warning_temp_time;
+	__le32			critical_comp_time;
+	__le16			temp_sensor[8];
+	__u8			rsvd216[296];
 };
 enum {
 	NVME_FEAT_WRITE_ATOMIC	= 0x0a,
 	NVME_FEAT_ASYNC_EVENT	= 0x0b,
 	NVME_FEAT_SW_PROGRESS	= 0x0c,
+	NVME_LOG_ERROR		= 0x01,
+	NVME_LOG_SMART		= 0x02,
+	NVME_LOG_FW_SLOT	= 0x03,
+	NVME_LOG_RESERVATION	= 0x80,
 	NVME_FWACT_REPL		= (0 << 3),
 	NVME_FWACT_REPL_ACTV	= (1 << 3),
 	NVME_FWACT_ACTV		= (2 << 3),

include/uapi/linux/openvswitch.h+3−1

  * @OVS_FLOW_ATTR_ACTIONS: Nested %OVS_ACTION_ATTR_* attributes specifying
  * the actions to take for packets that match the key.  Always present in
  * notifications.  Required for %OVS_FLOW_CMD_NEW requests, optional for
- * %OVS_FLOW_CMD_SET requests.
+ * %OVS_FLOW_CMD_SET requests.  An %OVS_FLOW_CMD_SET without
+ * %OVS_FLOW_ATTR_ACTIONS will not modify the actions.  To clear the actions,
+ * an %OVS_FLOW_ATTR_ACTIONS without any nested attributes must be given.
  * @OVS_FLOW_ATTR_STATS: &struct ovs_flow_stats giving statistics for this
  * flow.  Present in notifications if the stats would be nonzero.  Ignored in
  * requests.

include/uapi/linux/perf_event.h+14−7

@@ -163,8 +163,9 @@ enum perf_branch_sample_type { · 162 unmodified lines
163	PERF_SAMPLE_BRANCH_ABORT_TX = 1U << 7, /* transaction aborts */	163	PERF_SAMPLE_BRANCH_ABORT_TX = 1U << 7, /* transaction aborts */
164	PERF_SAMPLE_BRANCH_IN_TX = 1U << 8, /* in transaction */	164	PERF_SAMPLE_BRANCH_IN_TX = 1U << 8, /* in transaction */
165	PERF_SAMPLE_BRANCH_NO_TX = 1U << 9, /* not in transaction */	165	PERF_SAMPLE_BRANCH_NO_TX = 1U << 9, /* not in transaction */
		166	PERF_SAMPLE_BRANCH_COND = 1U << 10, /* conditional branches */
166		167
167	PERF_SAMPLE_BRANCH_MAX = 1U << 10, /* non-ABI */	168	PERF_SAMPLE_BRANCH_MAX = 1U << 11, /* non-ABI */
168	};	169	};
169		170
170	#define PERF_SAMPLE_BRANCH_PLM_ALL \	171	#define PERF_SAMPLE_BRANCH_PLM_ALL \
@@ -301,8 +302,8 @@ struct perf_event_attr { · 130 unmodified lines
301	exclude_callchain_kernel : 1, /* exclude kernel callchains */	302	exclude_callchain_kernel : 1, /* exclude kernel callchains */
302	exclude_callchain_user : 1, /* exclude user callchains */	303	exclude_callchain_user : 1, /* exclude user callchains */
303	mmap2 : 1, /* include mmap with inode data */	304	mmap2 : 1, /* include mmap with inode data */
304		305	comm_exec : 1, /* flag comm events that are due to an exec */
305	__reserved_1 : 40;	306	__reserved_1 : 39;
306		307
307	union {	308	union {
308	__u32 wakeup_events; /* wakeup every n events */	309	__u32 wakeup_events; /* wakeup every n events */
@@ -501,7 +502,12 @@ struct perf_event_mmap_page { · 192 unmodified lines
501	#define PERF_RECORD_MISC_GUEST_KERNEL (4 << 0)	502	#define PERF_RECORD_MISC_GUEST_KERNEL (4 << 0)
502	#define PERF_RECORD_MISC_GUEST_USER (5 << 0)	503	#define PERF_RECORD_MISC_GUEST_USER (5 << 0)
503		504
		505	/*
		506	* PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on
		507	* different events so can reuse the same bit position.
		508	*/
504	#define PERF_RECORD_MISC_MMAP_DATA (1 << 13)	509	#define PERF_RECORD_MISC_MMAP_DATA (1 << 13)
		510	#define PERF_RECORD_MISC_COMM_EXEC (1 << 13)
505	/*	511	/*
506	* Indicates that the content of PERF_SAMPLE_IP points to	512	* Indicates that the content of PERF_SAMPLE_IP points to
507	* the actual instruction that triggered the event. See also	513	* the actual instruction that triggered the event. See also
@@ -699,6 +705,7 @@ enum perf_event_type { · 191 unmodified lines
699	* u32 min;	705	* u32 min;
700	* u64 ino;	706	* u64 ino;
701	* u64 ino_generation;	707	* u64 ino_generation;
		708	* u32 prot, flags;
702	* char filename[];	709	* char filename[];
703	* struct sample_id sample_id;	710	* struct sample_id sample_id;
704	* };	711	* };
@@ -722,10 +729,10 @@ enum perf_callchain_context { · 17 unmodified lines
722	PERF_CONTEXT_MAX = (__u64)-4095,	729	PERF_CONTEXT_MAX = (__u64)-4095,
723	};	730	};
724		731
725	#define PERF_FLAG_FD_NO_GROUP (1U << 0)	732	#define PERF_FLAG_FD_NO_GROUP (1UL << 0)
726	#define PERF_FLAG_FD_OUTPUT (1U << 1)	733	#define PERF_FLAG_FD_OUTPUT (1UL << 1)
727	#define PERF_FLAG_PID_CGROUP (1U << 2) /* pid=cgroup id, per-cpu mode only */	734	#define PERF_FLAG_PID_CGROUP (1UL << 2) /* pid=cgroup id, per-cpu mode only */
728	#define PERF_FLAG_FD_CLOEXEC (1U << 3) /* O_CLOEXEC */	735	#define PERF_FLAG_FD_CLOEXEC (1UL << 3) /* O_CLOEXEC */
729		736
730	union perf_mem_data_src {	737	union perf_mem_data_src {
731	__u64 val;	738	__u64 val;

include/uapi/linux/psci.h+90−0

@@ -0,0 +1,90 @@
	1	/*
	2	* ARM Power State and Coordination Interface (PSCI) header
	3	*
	4	* This header holds common PSCI defines and macros shared
	5	* by: ARM kernel, ARM64 kernel, KVM ARM/ARM64 and user space.
	6	*
	7	* Copyright (C) 2014 Linaro Ltd.
	8	* Author: Anup Patel <anup.patel@linaro.org>
	9	*/
	10
	11	#ifndef _UAPI_LINUX_PSCI_H
	12	#define _UAPI_LINUX_PSCI_H
	13
	14	/*
	15	* PSCI v0.1 interface
	16	*
	17	* The PSCI v0.1 function numbers are implementation defined.
	18	*
	19	* Only PSCI return values such as: SUCCESS, NOT_SUPPORTED,
	20	* INVALID_PARAMS, and DENIED defined below are applicable
	21	* to PSCI v0.1.
	22	*/
	23
	24	/* PSCI v0.2 interface */
	25	#define PSCI_0_2_FN_BASE 0x84000000
	26	#define PSCI_0_2_FN(n) (PSCI_0_2_FN_BASE + (n))
	27	#define PSCI_0_2_64BIT 0x40000000
	28	#define PSCI_0_2_FN64_BASE \
	29	(PSCI_0_2_FN_BASE + PSCI_0_2_64BIT)
	30	#define PSCI_0_2_FN64(n) (PSCI_0_2_FN64_BASE + (n))
	31
	32	#define PSCI_0_2_FN_PSCI_VERSION PSCI_0_2_FN(0)
	33	#define PSCI_0_2_FN_CPU_SUSPEND PSCI_0_2_FN(1)
	34	#define PSCI_0_2_FN_CPU_OFF PSCI_0_2_FN(2)
	35	#define PSCI_0_2_FN_CPU_ON PSCI_0_2_FN(3)
	36	#define PSCI_0_2_FN_AFFINITY_INFO PSCI_0_2_FN(4)
	37	#define PSCI_0_2_FN_MIGRATE PSCI_0_2_FN(5)
	38	#define PSCI_0_2_FN_MIGRATE_INFO_TYPE PSCI_0_2_FN(6)
	39	#define PSCI_0_2_FN_MIGRATE_INFO_UP_CPU PSCI_0_2_FN(7)
	40	#define PSCI_0_2_FN_SYSTEM_OFF PSCI_0_2_FN(8)
	41	#define PSCI_0_2_FN_SYSTEM_RESET PSCI_0_2_FN(9)
	42
	43	#define PSCI_0_2_FN64_CPU_SUSPEND PSCI_0_2_FN64(1)
	44	#define PSCI_0_2_FN64_CPU_ON PSCI_0_2_FN64(3)
	45	#define PSCI_0_2_FN64_AFFINITY_INFO PSCI_0_2_FN64(4)
	46	#define PSCI_0_2_FN64_MIGRATE PSCI_0_2_FN64(5)
	47	#define PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU PSCI_0_2_FN64(7)
	48
	49	/* PSCI v0.2 power state encoding for CPU_SUSPEND function */
	50	#define PSCI_0_2_POWER_STATE_ID_MASK 0xffff
	51	#define PSCI_0_2_POWER_STATE_ID_SHIFT 0
	52	#define PSCI_0_2_POWER_STATE_TYPE_SHIFT 16
	53	#define PSCI_0_2_POWER_STATE_TYPE_MASK \
	54	(0x1 << PSCI_0_2_POWER_STATE_TYPE_SHIFT)
	55	#define PSCI_0_2_POWER_STATE_AFFL_SHIFT 24
	56	#define PSCI_0_2_POWER_STATE_AFFL_MASK \
	57	(0x3 << PSCI_0_2_POWER_STATE_AFFL_SHIFT)
	58
	59	/* PSCI v0.2 affinity level state returned by AFFINITY_INFO */
	60	#define PSCI_0_2_AFFINITY_LEVEL_ON 0
	61	#define PSCI_0_2_AFFINITY_LEVEL_OFF 1
	62	#define PSCI_0_2_AFFINITY_LEVEL_ON_PENDING 2
	63
	64	/* PSCI v0.2 multicore support in Trusted OS returned by MIGRATE_INFO_TYPE */
	65	#define PSCI_0_2_TOS_UP_MIGRATE 0
	66	#define PSCI_0_2_TOS_UP_NO_MIGRATE 1
	67	#define PSCI_0_2_TOS_MP 2
	68
	69	/* PSCI version decoding (independent of PSCI version) */
	70	#define PSCI_VERSION_MAJOR_SHIFT 16
	71	#define PSCI_VERSION_MINOR_MASK \
	72	((1U << PSCI_VERSION_MAJOR_SHIFT) - 1)
	73	#define PSCI_VERSION_MAJOR_MASK ~PSCI_VERSION_MINOR_MASK
	74	#define PSCI_VERSION_MAJOR(ver) \
	75	(((ver) & PSCI_VERSION_MAJOR_MASK) >> PSCI_VERSION_MAJOR_SHIFT)
	76	#define PSCI_VERSION_MINOR(ver) \
	77	((ver) & PSCI_VERSION_MINOR_MASK)
	78
	79	/* PSCI return values (inclusive of all PSCI versions) */
	80	#define PSCI_RET_SUCCESS 0
	81	#define PSCI_RET_NOT_SUPPORTED -1
	82	#define PSCI_RET_INVALID_PARAMS -2
	83	#define PSCI_RET_DENIED -3
	84	#define PSCI_RET_ALREADY_ON -4
	85	#define PSCI_RET_ON_PENDING -5
	86	#define PSCI_RET_INTERNAL_FAILURE -6
	87	#define PSCI_RET_NOT_PRESENT -7
	88	#define PSCI_RET_DISABLED -8
	89
	90	#endif /* _UAPI_LINUX_PSCI_H */

include/uapi/linux/serial_core.h+7−1

 /* VIA VT8500 SoC */
 #define PORT_VT8500	97
-/* Xilinx PSS UART */
+/* Cadence (Xilinx Zynq) UART */
 #define PORT_XUARTPS	98
 /* Atheros AR933X SoC */
 /* Tilera TILE-Gx UART */
 #define PORT_TILEGX	106
+/* MEN 16z135 UART */
+#define PORT_MEN_Z135	107
+/* SC16IS74xx */
+#define PORT_SC16IS7XX   108
 #endif /* _UAPILINUX_SERIAL_CORE_H */

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

@@ -32,7 +32,7 @@ · 31 unmodified lines
32		32
33	#define UART_IIR 2 /* In: Interrupt ID Register */	33	#define UART_IIR 2 /* In: Interrupt ID Register */
34	#define UART_IIR_NO_INT 0x01 /* No interrupts pending */	34	#define UART_IIR_NO_INT 0x01 /* No interrupts pending */
35	#define UART_IIR_ID 0x06 /* Mask for the interrupt ID */	35	#define UART_IIR_ID 0x0e /* Mask for the interrupt ID */
36	#define UART_IIR_MSI 0x00 /* Modem status interrupt */	36	#define UART_IIR_MSI 0x00 /* Modem status interrupt */
37	#define UART_IIR_THRI 0x02 /* Transmitter holding register empty */	37	#define UART_IIR_THRI 0x02 /* Transmitter holding register empty */
38	#define UART_IIR_RDI 0x04 /* Receiver data interrupt */	38	#define UART_IIR_RDI 0x04 /* Receiver data interrupt */

include/uapi/linux/shm.h+9−8

 #endif
 /*
- * SHMMAX, SHMMNI and SHMALL are upper limits are defaults which can
+ * SHMMNI, SHMMAX and SHMALL are default upper limits which can be
- * be increased by sysctl
+ * modified by sysctl. The SHMMAX and SHMALL values have been chosen to
+ * be as large possible without facilitating scenarios where userspace
+ * causes overflows when adjusting the limits via operations of the form
+ * "retrieve current limit; add X; update limit". It is therefore not
+ * advised to make SHMMAX and SHMALL any larger. These limits are
+ * suitable for both 32 and 64-bit systems.
  */
-#define SHMMAX 0x2000000		 /* max shared seg size (bytes) */
 #define SHMMIN 1			 /* min shared seg size (bytes) */
 #define SHMMNI 4096			 /* max num of segs system wide */
-#ifndef __KERNEL__
+#define SHMMAX (ULONG_MAX - (1UL << 24)) /* max shared seg size (bytes) */
-#define SHMALL (SHMMAX/getpagesize()*(SHMMNI/16))
+#define SHMALL (ULONG_MAX - (1UL << 24)) /* max shm system wide (pages) */
-#endif
 #define SHMSEG SHMMNI			 /* max shared segs per process */
 /* Obsolete, used only for backwards compatibility and libc5 compiles */
 struct shmid_ds {
 	struct ipc_perm		shm_perm;	/* operation perms */

include/uapi/linux/tipc.h+23−0

@@ -38,6 +38,7 @@ · 37 unmodified lines
38	#define _LINUX_TIPC_H_	38	#define _LINUX_TIPC_H_
39		39
40	#include <linux/types.h>	40	#include <linux/types.h>
		41	#include <linux/sockios.h>
41		42
42	/*	43	/*
43	* TIPC addressing primitives	44	* TIPC addressing primitives
@@ -87,6 +88,7 @@ static inline unsigned int tipc_node(__u32 addr) · 43 unmodified lines
87		88
88	#define TIPC_CFG_SRV 0 /* configuration service name type */	89	#define TIPC_CFG_SRV 0 /* configuration service name type */
89	#define TIPC_TOP_SRV 1 /* topology service name type */	90	#define TIPC_TOP_SRV 1 /* topology service name type */
		91	#define TIPC_LINK_STATE 2 /* link state name type */
90	#define TIPC_RESERVED_TYPES 64 /* lowest user-publishable name type */	92	#define TIPC_RESERVED_TYPES 64 /* lowest user-publishable name type */
91		93
92	/*	94	/*
@@ -206,4 +208,25 @@ struct sockaddr_tipc { · 113 unmodified lines
206	#define TIPC_NODE_RECVQ_DEPTH 131 /* Default: none (read only) */	208	#define TIPC_NODE_RECVQ_DEPTH 131 /* Default: none (read only) */
207	#define TIPC_SOCK_RECVQ_DEPTH 132 /* Default: none (read only) */	209	#define TIPC_SOCK_RECVQ_DEPTH 132 /* Default: none (read only) */
208		210
		211	/*
		212	* Maximum sizes of TIPC bearer-related names (including terminating NULL)
		213	* The string formatting for each name element is:
		214	* media: media
		215	* interface: media:interface name
		216	* link: Z.C.N:interface-Z.C.N:interface
		217	*
		218	*/
		219
		220	#define TIPC_MAX_MEDIA_NAME 16
		221	#define TIPC_MAX_IF_NAME 16
		222	#define TIPC_MAX_BEARER_NAME 32
		223	#define TIPC_MAX_LINK_NAME 60
		224
		225	#define SIOCGETLINKNAME SIOCPROTOPRIVATE
		226
		227	struct tipc_sioc_ln_req {
		228	__u32 peer;
		229	__u32 bearer_id;
		230	char linkname[TIPC_MAX_LINK_NAME];
		231	};
209	#endif	232	#endif

include/uapi/linux/tipc_config.h+1−9

 #include <linux/types.h>
 #include <linux/string.h>
+#include <linux/tipc.h>
 #include <asm/byteorder.h>
 #ifndef __KERNEL__
 #define TIPC_TLV_NAME_TBL_QUERY	25	/* struct tipc_name_table_query */
 #define TIPC_TLV_PORT_REF	26	/* 32-bit port reference */
-/*
- * Maximum sizes of TIPC bearer-related names (including terminating NUL)
- */
-#define TIPC_MAX_MEDIA_NAME	16	/* format = media */
-#define TIPC_MAX_IF_NAME	16	/* format = interface */
-#define TIPC_MAX_BEARER_NAME	32	/* format = media:interface */
-#define TIPC_MAX_LINK_NAME	60	/* format = Z.C.N:interface-Z.C.N:interface */
 /*
  * Link priority limits (min, default, max, media default)
  */

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

@@ -29,6 +29,8 @@ struct udphdr { · 28 unmodified lines
29	/* UDP socket options */	29	/* UDP socket options */
30	#define UDP_CORK 1 /* Never send partially complete segments */	30	#define UDP_CORK 1 /* Never send partially complete segments */
31	#define UDP_ENCAP 100 /* Set the socket to accept encapsulated packets */	31	#define UDP_ENCAP 100 /* Set the socket to accept encapsulated packets */
		32	#define UDP_NO_CHECK6_TX 101 /* Disable sending checksum for UDP6X */
		33	#define UDP_NO_CHECK6_RX 102 /* Disable accpeting checksum for UDP6 */
32		34
33	/* UDP encapsulation types */	35	/* UDP encapsulation types */
34	#define UDP_ENCAP_ESPINUDP_NON_IKE 1 /* draft-ietf-ipsec-nat-t-ike-00/01 */	36	#define UDP_ENCAP_ESPINUDP_NON_IKE 1 /* draft-ietf-ipsec-nat-t-ike-00/01 */

include/uapi/linux/usb/Kbuild+1−0

@@ -1,6 +1,7 @@
1	# UAPI Header export list	1	# UAPI Header export list
2	header-y += audio.h	2	header-y += audio.h
3	header-y += cdc.h	3	header-y += cdc.h
		4	header-y += cdc-wdm.h
4	header-y += ch11.h	5	header-y += ch11.h
5	header-y += ch9.h	6	header-y += ch9.h
6	header-y += functionfs.h	7	header-y += functionfs.h

include/uapi/linux/usb/cdc-wdm.h+2−0

@@ -9,6 +9,8 @@ · 8 unmodified lines
9	#ifndef _UAPI__LINUX_USB_CDC_WDM_H	9	#ifndef _UAPI__LINUX_USB_CDC_WDM_H
10	#define _UAPI__LINUX_USB_CDC_WDM_H	10	#define _UAPI__LINUX_USB_CDC_WDM_H
11		11
		12	#include <linux/types.h>
		13
12	/*	14	/*
13	* This IOCTL is used to retrieve the wMaxCommand for the device,	15	* This IOCTL is used to retrieve the wMaxCommand for the device,
14	* defining the message limit for both reading and writing.	16	* defining the message limit for both reading and writing.

include/uapi/linux/usb/functionfs.h+7−0

@@ -33,6 +33,13 @@ struct usb_endpoint_descriptor_no_audio { · 32 unmodified lines
33	__u8 bInterval;	33	__u8 bInterval;
34	} __attribute__((packed));	34	} __attribute__((packed));
35		35
		36	/* Legacy format, deprecated as of 3.14. */
		37	struct usb_functionfs_descs_head {
		38	__le32 magic;
		39	__le32 length;
		40	__le32 fs_count;
		41	__le32 hs_count;
		42	} __attribute__((packed, deprecated));
36		43
37	/*	44	/*
38	* Descriptors format:	45	* Descriptors format:

include/uapi/linux/v4l2-common.h+1−1

@@ -75,7 +75,7 @@ struct v4l2_edid { · 74 unmodified lines
75	__u32 start_block;	75	__u32 start_block;
76	__u32 blocks;	76	__u32 blocks;
77	__u32 reserved[5];	77	__u32 reserved[5];
78	__u8 __user *edid;	78	__u8 *edid;
79	};	79	};
80		80
81	#endif /* __V4L2_COMMON__ */	81	#endif /* __V4L2_COMMON__ */

include/uapi/linux/v4l2-dv-timings.h+70−0

@@ -173,6 +173,76 @@ · 172 unmodified lines
173	V4L2_DV_FL_CAN_REDUCE_FPS) \	173	V4L2_DV_FL_CAN_REDUCE_FPS) \
174	}	174	}
175		175
		176	#define V4L2_DV_BT_CEA_3840X2160P24 { \
		177	.type = V4L2_DV_BT_656_1120, \
		178	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		179	297000000, 1276, 88, 296, 8, 10, 72, 0, 0, 0, \
		180	V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
		181	}
		182
		183	#define V4L2_DV_BT_CEA_3840X2160P25 { \
		184	.type = V4L2_DV_BT_656_1120, \
		185	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		186	297000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
		187	V4L2_DV_BT_STD_CEA861, 0) \
		188	}
		189
		190	#define V4L2_DV_BT_CEA_3840X2160P30 { \
		191	.type = V4L2_DV_BT_656_1120, \
		192	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		193	297000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
		194	V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
		195	}
		196
		197	#define V4L2_DV_BT_CEA_3840X2160P50 { \
		198	.type = V4L2_DV_BT_656_1120, \
		199	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		200	594000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
		201	V4L2_DV_BT_STD_CEA861, 0) \
		202	}
		203
		204	#define V4L2_DV_BT_CEA_3840X2160P60 { \
		205	.type = V4L2_DV_BT_656_1120, \
		206	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		207	594000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
		208	V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
		209	}
		210
		211	#define V4L2_DV_BT_CEA_4096X2160P24 { \
		212	.type = V4L2_DV_BT_656_1120, \
		213	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		214	297000000, 1020, 88, 296, 8, 10, 72, 0, 0, 0, \
		215	V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
		216	}
		217
		218	#define V4L2_DV_BT_CEA_4096X2160P25 { \
		219	.type = V4L2_DV_BT_656_1120, \
		220	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		221	297000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
		222	V4L2_DV_BT_STD_CEA861, 0) \
		223	}
		224
		225	#define V4L2_DV_BT_CEA_4096X2160P30 { \
		226	.type = V4L2_DV_BT_656_1120, \
		227	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		228	297000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
		229	V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
		230	}
		231
		232	#define V4L2_DV_BT_CEA_4096X2160P50 { \
		233	.type = V4L2_DV_BT_656_1120, \
		234	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		235	594000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
		236	V4L2_DV_BT_STD_CEA861, 0) \
		237	}
		238
		239	#define V4L2_DV_BT_CEA_4096X2160P60 { \
		240	.type = V4L2_DV_BT_656_1120, \
		241	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
		242	594000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
		243	V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
		244	}
		245
176		246
177	/* VESA Discrete Monitor Timings as per version 1.0, revision 12 */	247	/* VESA Discrete Monitor Timings as per version 1.0, revision 12 */
178		248

include/uapi/linux/v4l2-mediabus.h+13−1

 	V4L2_MBUS_FMT_RGB888_2X12_LE = 0x100c,
 	V4L2_MBUS_FMT_ARGB8888_1X32 = 0x100d,
-	/* YUV (including grey) - next is 0x2018 */
+	/* YUV (including grey) - next is 0x2024 */
 	V4L2_MBUS_FMT_Y8_1X8 = 0x2001,
 	V4L2_MBUS_FMT_UV8_1X8 = 0x2015,
 	V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002,
 	V4L2_MBUS_FMT_YUYV8_2X8 = 0x2008,
 	V4L2_MBUS_FMT_YVYU8_2X8 = 0x2009,
 	V4L2_MBUS_FMT_Y10_1X10 = 0x200a,
+	V4L2_MBUS_FMT_UYVY10_2X10 = 0x2018,
+	V4L2_MBUS_FMT_VYUY10_2X10 = 0x2019,
 	V4L2_MBUS_FMT_YUYV10_2X10 = 0x200b,
 	V4L2_MBUS_FMT_YVYU10_2X10 = 0x200c,
 	V4L2_MBUS_FMT_Y12_1X12 = 0x2013,
 	V4L2_MBUS_FMT_YUYV8_1X16 = 0x2011,
 	V4L2_MBUS_FMT_YVYU8_1X16 = 0x2012,
 	V4L2_MBUS_FMT_YDYUYDYV8_1X16 = 0x2014,
+	V4L2_MBUS_FMT_UYVY10_1X20 = 0x201a,
+	V4L2_MBUS_FMT_VYUY10_1X20 = 0x201b,
 	V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
 	V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
 	V4L2_MBUS_FMT_YUV10_1X30 = 0x2016,
 	V4L2_MBUS_FMT_AYUV8_1X32 = 0x2017,
+	V4L2_MBUS_FMT_UYVY12_2X12 = 0x201c,
+	V4L2_MBUS_FMT_VYUY12_2X12 = 0x201d,
+	V4L2_MBUS_FMT_YUYV12_2X12 = 0x201e,
+	V4L2_MBUS_FMT_YVYU12_2X12 = 0x201f,
+	V4L2_MBUS_FMT_UYVY12_1X24 = 0x2020,
+	V4L2_MBUS_FMT_VYUY12_1X24 = 0x2021,
+	V4L2_MBUS_FMT_YUYV12_1X24 = 0x2022,
+	V4L2_MBUS_FMT_YVYU12_1X24 = 0x2023,
 	/* Bayer - next is 0x3019 */
 	V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,

include/uapi/linux/v4l2-subdev.h+19−21

@@ -151,26 +151,24 @@ struct v4l2_subdev_selection { · 150 unmodified lines
151	/* Backwards compatibility define --- to be removed */	151	/* Backwards compatibility define --- to be removed */
152	#define v4l2_subdev_edid v4l2_edid	152	#define v4l2_subdev_edid v4l2_edid
153		153
154	#define VIDIOC_SUBDEV_G_FMT _IOWR('V', 4, struct v4l2_subdev_format)	154	#define VIDIOC_SUBDEV_G_FMT _IOWR('V', 4, struct v4l2_subdev_format)
155	#define VIDIOC_SUBDEV_S_FMT _IOWR('V', 5, struct v4l2_subdev_format)	155	#define VIDIOC_SUBDEV_S_FMT _IOWR('V', 5, struct v4l2_subdev_format)
156	#define VIDIOC_SUBDEV_G_FRAME_INTERVAL \	156	#define VIDIOC_SUBDEV_G_FRAME_INTERVAL _IOWR('V', 21, struct v4l2_subdev_frame_interval)
157	_IOWR('V', 21, struct v4l2_subdev_frame_interval)	157	#define VIDIOC_SUBDEV_S_FRAME_INTERVAL _IOWR('V', 22, struct v4l2_subdev_frame_interval)
158	#define VIDIOC_SUBDEV_S_FRAME_INTERVAL \	158	#define VIDIOC_SUBDEV_ENUM_MBUS_CODE _IOWR('V', 2, struct v4l2_subdev_mbus_code_enum)
159	_IOWR('V', 22, struct v4l2_subdev_frame_interval)	159	#define VIDIOC_SUBDEV_ENUM_FRAME_SIZE _IOWR('V', 74, struct v4l2_subdev_frame_size_enum)
160	#define VIDIOC_SUBDEV_ENUM_MBUS_CODE \	160	#define VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL _IOWR('V', 75, struct v4l2_subdev_frame_interval_enum)
161	_IOWR('V', 2, struct v4l2_subdev_mbus_code_enum)	161	#define VIDIOC_SUBDEV_G_CROP _IOWR('V', 59, struct v4l2_subdev_crop)
162	#define VIDIOC_SUBDEV_ENUM_FRAME_SIZE \	162	#define VIDIOC_SUBDEV_S_CROP _IOWR('V', 60, struct v4l2_subdev_crop)
163	_IOWR('V', 74, struct v4l2_subdev_frame_size_enum)	163	#define VIDIOC_SUBDEV_G_SELECTION _IOWR('V', 61, struct v4l2_subdev_selection)
164	#define VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL \	164	#define VIDIOC_SUBDEV_S_SELECTION _IOWR('V', 62, struct v4l2_subdev_selection)
165	_IOWR('V', 75, struct v4l2_subdev_frame_interval_enum)	165	/* The following ioctls are identical to the ioctls in videodev2.h */
166	#define VIDIOC_SUBDEV_G_CROP _IOWR('V', 59, struct v4l2_subdev_crop)	166	#define VIDIOC_SUBDEV_G_EDID _IOWR('V', 40, struct v4l2_edid)
167	#define VIDIOC_SUBDEV_S_CROP _IOWR('V', 60, struct v4l2_subdev_crop)	167	#define VIDIOC_SUBDEV_S_EDID _IOWR('V', 41, struct v4l2_edid)
168	#define VIDIOC_SUBDEV_G_SELECTION \	168	#define VIDIOC_SUBDEV_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings)
169	_IOWR('V', 61, struct v4l2_subdev_selection)	169	#define VIDIOC_SUBDEV_G_DV_TIMINGS _IOWR('V', 88, struct v4l2_dv_timings)
170	#define VIDIOC_SUBDEV_S_SELECTION \	170	#define VIDIOC_SUBDEV_ENUM_DV_TIMINGS _IOWR('V', 98, struct v4l2_enum_dv_timings)
171	_IOWR('V', 62, struct v4l2_subdev_selection)	171	#define VIDIOC_SUBDEV_QUERY_DV_TIMINGS _IOR('V', 99, struct v4l2_dv_timings)
172	/* These two G/S_EDID ioctls are identical to the ioctls in videodev2.h */	172	#define VIDIOC_SUBDEV_DV_TIMINGS_CAP _IOWR('V', 100, struct v4l2_dv_timings_cap)
173	#define VIDIOC_SUBDEV_G_EDID _IOWR('V', 40, struct v4l2_edid)
174	#define VIDIOC_SUBDEV_S_EDID _IOWR('V', 41, struct v4l2_edid)
175		173
176	#endif	174	#endif

include/uapi/linux/videodev2.h+16−3

  * @length:	size in bytes of the buffer (NOT its payload) for single-plane
  *		buffers (when type != *_MPLANE); number of elements in the
  *		planes array for multi-plane buffers
- * @input:	input number from which the video data has has been captured
  *
  * Contains data exchanged by application and driver using one of the Streaming
  * I/O methods.
 /** struct v4l2_enum_dv_timings - DV timings enumeration
  * @index:	enumeration index
+ * @pad:	the pad number for which to enumerate timings (used with
+ *		v4l-subdev nodes only)
  * @reserved:	must be zeroed
  * @timings:	the timings for the given index
  */
 struct v4l2_enum_dv_timings {
 	__u32 index;
-	__u32 reserved[3];
+	__u32 pad;
+	__u32 reserved[2];
 	struct v4l2_dv_timings timings;
 };
 /** struct v4l2_dv_timings_cap - DV timings capabilities
  * @type:	the type of the timings (same as in struct v4l2_dv_timings)
+ * @pad:	the pad number for which to query capabilities (used with
+ *		v4l-subdev nodes only)
  * @bt:		the BT656/1120 timings capabilities
  */
 struct v4l2_dv_timings_cap {
 	__u32 type;
-	__u32 reserved[3];
+	__u32 pad;
+	__u32 reserved[2];
 	union {
 		struct v4l2_bt_timings_cap bt;
 		__u32 raw_data[32];
 #define V4L2_EVENT_EOS				2
 #define V4L2_EVENT_CTRL				3
 #define V4L2_EVENT_FRAME_SYNC			4
+#define V4L2_EVENT_SOURCE_CHANGE		5
 #define V4L2_EVENT_PRIVATE_START		0x08000000
 /* Payload for V4L2_EVENT_VSYNC */
 	__u32 frame_sequence;
 };
+#define V4L2_EVENT_SRC_CH_RESOLUTION		(1 << 0)
+struct v4l2_event_src_change {
+	__u32 changes;
+};
 struct v4l2_event {
 	__u32				type;
 	union {
 		struct v4l2_event_vsync		vsync;
 		struct v4l2_event_ctrl		ctrl;
 		struct v4l2_event_frame_sync	frame_sync;
+		struct v4l2_event_src_change	src_change;
 		__u8				data[64];
 	} u;
 	__u32				pending;

@@ -30,74 +30,76 @@ · 29 unmodified lines
30	* Define max and min legal sizes. The frame sizes do not include	30	* Define max and min legal sizes. The frame sizes do not include
31	* 4 byte FCS/CRC (frame check sequence).	31	* 4 byte FCS/CRC (frame check sequence).
32	*/	32	*/
33	#define FDDI_K_ALEN 6 /* Octets in one FDDI address */	33	#define FDDI_K_ALEN 6 /* Octets in one FDDI address */
34	#define FDDI_K_8022_HLEN 16 /* Total octets in 802.2 header */	34	#define FDDI_K_8022_HLEN 16 /* Total octets in 802.2 header */
35	#define FDDI_K_SNAP_HLEN 21 /* Total octets in 802.2 SNAP header */	35	#define FDDI_K_SNAP_HLEN 21 /* Total octets in 802.2 SNAP header */
36	#define FDDI_K_8022_ZLEN 16 /* Min octets in 802.2 frame sans FCS */	36	#define FDDI_K_8022_ZLEN 16 /* Min octets in 802.2 frame sans
37	#define FDDI_K_SNAP_ZLEN 21 /* Min octets in 802.2 SNAP frame sans FCS */	37	FCS */
		38	#define FDDI_K_SNAP_ZLEN 21 /* Min octets in 802.2 SNAP frame sans
		39	FCS */
38	#define FDDI_K_8022_DLEN 4475 /* Max octets in 802.2 payload */	40	#define FDDI_K_8022_DLEN 4475 /* Max octets in 802.2 payload */
39	#define FDDI_K_SNAP_DLEN 4470 /* Max octets in 802.2 SNAP payload */	41	#define FDDI_K_SNAP_DLEN 4470 /* Max octets in 802.2 SNAP payload */
40	#define FDDI_K_LLC_ZLEN 13 /* Min octets in LLC frame sans FCS */	42	#define FDDI_K_LLC_ZLEN 13 /* Min octets in LLC frame sans FCS */
41	#define FDDI_K_LLC_LEN 4491 /* Max octets in LLC frame sans FCS */	43	#define FDDI_K_LLC_LEN 4491 /* Max octets in LLC frame sans FCS */
		44	#define FDDI_K_OUI_LEN 3 /* Octets in OUI in 802.2 SNAP
		45	header */
42		46
43	/* Define FDDI Frame Control (FC) Byte values */	47	/* Define FDDI Frame Control (FC) Byte values */
44	#define FDDI_FC_K_VOID 0x00	48	#define FDDI_FC_K_VOID 0x00
45	#define FDDI_FC_K_NON_RESTRICTED_TOKEN 0x80	49	#define FDDI_FC_K_NON_RESTRICTED_TOKEN 0x80
46	#define FDDI_FC_K_RESTRICTED_TOKEN 0xC0	50	#define FDDI_FC_K_RESTRICTED_TOKEN 0xC0
47	#define FDDI_FC_K_SMT_MIN 0x41	51	#define FDDI_FC_K_SMT_MIN 0x41
48	#define FDDI_FC_K_SMT_MAX 0x4F	52	#define FDDI_FC_K_SMT_MAX 0x4F
49	#define FDDI_FC_K_MAC_MIN 0xC1	53	#define FDDI_FC_K_MAC_MIN 0xC1
50	#define FDDI_FC_K_MAC_MAX 0xCF	54	#define FDDI_FC_K_MAC_MAX 0xCF
51	#define FDDI_FC_K_ASYNC_LLC_MIN 0x50	55	#define FDDI_FC_K_ASYNC_LLC_MIN 0x50
52	#define FDDI_FC_K_ASYNC_LLC_DEF 0x54	56	#define FDDI_FC_K_ASYNC_LLC_DEF 0x54
53	#define FDDI_FC_K_ASYNC_LLC_MAX 0x5F	57	#define FDDI_FC_K_ASYNC_LLC_MAX 0x5F
54	#define FDDI_FC_K_SYNC_LLC_MIN 0xD0	58	#define FDDI_FC_K_SYNC_LLC_MIN 0xD0
55	#define FDDI_FC_K_SYNC_LLC_MAX 0xD7	59	#define FDDI_FC_K_SYNC_LLC_MAX 0xD7
56	#define FDDI_FC_K_IMPLEMENTOR_MIN 0x60	60	#define FDDI_FC_K_IMPLEMENTOR_MIN 0x60
57	#define FDDI_FC_K_IMPLEMENTOR_MAX 0x6F	61	#define FDDI_FC_K_IMPLEMENTOR_MAX 0x6F
58	#define FDDI_FC_K_RESERVED_MIN 0x70	62	#define FDDI_FC_K_RESERVED_MIN 0x70
59	#define FDDI_FC_K_RESERVED_MAX 0x7F	63	#define FDDI_FC_K_RESERVED_MAX 0x7F
60		64
61	/* Define LLC and SNAP constants */	65	/* Define LLC and SNAP constants */
62	#define FDDI_EXTENDED_SAP 0xAA	66	#define FDDI_EXTENDED_SAP 0xAA
63	#define FDDI_UI_CMD 0x03	67	#define FDDI_UI_CMD 0x03
64		68
65	/* Define 802.2 Type 1 header */	69	/* Define 802.2 Type 1 header */
66	struct fddi_8022_1_hdr {	70	struct fddi_8022_1_hdr {
67	__u8 dsap; /* destination service access point */	71	__u8 dsap; /* destination service access point */
68	__u8 ssap; /* source service access point */	72	__u8 ssap; /* source service access point */
69	__u8 ctrl; /* control byte #1 */	73	__u8 ctrl; /* control byte #1 */
70	} __attribute__((packed));	74	} __attribute__((packed));
71		75
72	/* Define 802.2 Type 2 header */	76	/* Define 802.2 Type 2 header */
73	struct fddi_8022_2_hdr {	77	struct fddi_8022_2_hdr {
74	__u8 dsap; /* destination service access point */	78	__u8 dsap; /* destination service access point */
75	__u8 ssap; /* source service access point */	79	__u8 ssap; /* source service access point */
76	__u8 ctrl_1; /* control byte #1 */	80	__u8 ctrl_1; /* control byte #1 */
77	__u8 ctrl_2; /* control byte #2 */	81	__u8 ctrl_2; /* control byte #2 */
78	} __attribute__((packed));	82	} __attribute__((packed));
79		83
80	/* Define 802.2 SNAP header */	84	/* Define 802.2 SNAP header */
81	#define FDDI_K_OUI_LEN 3
82	struct fddi_snap_hdr {	85	struct fddi_snap_hdr {
83	__u8 dsap; /* always 0xAA */	86	__u8 dsap; /* always 0xAA */
84	__u8 ssap; /* always 0xAA */	87	__u8 ssap; /* always 0xAA */
85	__u8 ctrl; /* always 0x03 */	88	__u8 ctrl; /* always 0x03 */
86	__u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */	89	__u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */
87	__be16 ethertype; /* packet type ID field */	90	__be16 ethertype; /* packet type ID field */
88	} __attribute__((packed));	91	} __attribute__((packed));
89		92
90	/* Define FDDI LLC frame header */	93	/* Define FDDI LLC frame header */
91	struct fddihdr {	94	struct fddihdr {
92	__u8 fc; /* frame control */	95	__u8 fc; /* frame control */
93	__u8 daddr[FDDI_K_ALEN]; /* destination address */	96	__u8 daddr[FDDI_K_ALEN]; /* destination address */
94	__u8 saddr[FDDI_K_ALEN]; /* source address */	97	__u8 saddr[FDDI_K_ALEN]; /* source address */
95	union	98	union {
96	{	99	struct fddi_8022_1_hdr llc_8022_1;
97	struct fddi_8022_1_hdr llc_8022_1;	100	struct fddi_8022_2_hdr llc_8022_2;
98	struct fddi_8022_2_hdr llc_8022_2;	101	struct fddi_snap_hdr llc_snap;
99	struct fddi_snap_hdr llc_snap;	102	} hdr;
100	} hdr;
101	} __attribute__((packed));	103	} __attribute__((packed));
102		104
103		105