lael-labs/linux

include/uapi/drm/drm.h+8−0

  */
 #define DRM_CLIENT_CAP_UNIVERSAL_PLANES  2
+/**
+ * DRM_CLIENT_CAP_ATOMIC
+ *
+ * If set to 1, the DRM core will expose atomic properties to userspace
+ */
+#define DRM_CLIENT_CAP_ATOMIC	3
 /** DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */
 struct drm_set_client_cap {
 	__u64 capability;
 #define DRM_IOCTL_MODE_OBJ_GETPROPERTIES	DRM_IOWR(0xB9, struct drm_mode_obj_get_properties)
 #define DRM_IOCTL_MODE_OBJ_SETPROPERTY	DRM_IOWR(0xBA, struct drm_mode_obj_set_property)
 #define DRM_IOCTL_MODE_CURSOR2		DRM_IOWR(0xBB, struct drm_mode_cursor2)
+#define DRM_IOCTL_MODE_ATOMIC		DRM_IOWR(0xBC, struct drm_mode_atomic)
 /**
  * Device specific ioctls should only be in their respective headers

include/uapi/drm/drm_fourcc.h+0−3

@@ -109,9 +109,6 @@ · 108 unmodified lines
109	#define DRM_FORMAT_NV24 fourcc_code('N', 'V', '2', '4') /* non-subsampled Cr:Cb plane */	109	#define DRM_FORMAT_NV24 fourcc_code('N', 'V', '2', '4') /* non-subsampled Cr:Cb plane */
110	#define DRM_FORMAT_NV42 fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */	110	#define DRM_FORMAT_NV42 fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
111		111
112	/* special NV12 tiled format */
113	#define DRM_FORMAT_NV12MT fourcc_code('T', 'M', '1', '2') /* 2x2 subsampled Cr:Cb plane 64x32 macroblocks */
114
115	/*	112	/*
116	* 3 plane YCbCr	113	* 3 plane YCbCr
117	* index 0: Y plane, [7:0] Y	114	* index 0: Y plane, [7:0] Y

include/uapi/drm/drm_mode.h+34−4

@@ -272,6 +272,13 @@ struct drm_mode_get_connector { · 271 unmodified lines
272	#define DRM_MODE_PROP_OBJECT DRM_MODE_PROP_TYPE(1)	272	#define DRM_MODE_PROP_OBJECT DRM_MODE_PROP_TYPE(1)
273	#define DRM_MODE_PROP_SIGNED_RANGE DRM_MODE_PROP_TYPE(2)	273	#define DRM_MODE_PROP_SIGNED_RANGE DRM_MODE_PROP_TYPE(2)
274		274
		275	/* the PROP_ATOMIC flag is used to hide properties from userspace that
		276	* is not aware of atomic properties. This is mostly to work around
		277	* older userspace (DDX drivers) that read/write each prop they find,
		278	* witout being aware that this could be triggering a lengthy modeset.
		279	*/
		280	#define DRM_MODE_PROP_ATOMIC 0x80000000
		281
275	struct drm_mode_property_enum {	282	struct drm_mode_property_enum {
276	__u64 value;	283	__u64 value;
277	char name[DRM_PROP_NAME_LEN];	284	char name[DRM_PROP_NAME_LEN];
@@ -338,7 +345,7 @@ struct drm_mode_fb_cmd2 { · 60 unmodified lines
338		345
339	/*	346	/*
340	* In case of planar formats, this ioctl allows up to 4	347	* In case of planar formats, this ioctl allows up to 4
341	* buffer objects with offets and pitches per plane.	348	* buffer objects with offsets and pitches per plane.
342	* The pitch and offset order is dictated by the fourcc,	349	* The pitch and offset order is dictated by the fourcc,
343	* e.g. NV12 (http://fourcc.org/yuv.php#NV12) is described as:	350	* e.g. NV12 (http://fourcc.org/yuv.php#NV12) is described as:
344	*	351	*
@@ -346,9 +353,9 @@ struct drm_mode_fb_cmd2 { · 1 unmodified line
346	* followed by an interleaved U/V plane containing	353	* followed by an interleaved U/V plane containing
347	* 8 bit 2x2 subsampled colour difference samples.	354	* 8 bit 2x2 subsampled colour difference samples.
348	*	355	*
349	* So it would consist of Y as offset[0] and UV as	356	* So it would consist of Y as offsets[0] and UV as
350	* offeset[1]. Note that offset[0] will generally	357	* offsets[1]. Note that offsets[0] will generally
351	* be 0.	358	* be 0 (but this is not required).
352	*/	359	*/
353	__u32 handles[4];	360	__u32 handles[4];
354	__u32 pitches[4]; /* pitch for each plane */	361	__u32 pitches[4]; /* pitch for each plane */
@@ -519,4 +526,27 @@ struct drm_mode_destroy_dumb { · 164 unmodified lines
519	uint32_t handle;	526	uint32_t handle;
520	};	527	};
521		528
		529	/* page-flip flags are valid, plus: */
		530	#define DRM_MODE_ATOMIC_TEST_ONLY 0x0100
		531	#define DRM_MODE_ATOMIC_NONBLOCK 0x0200
		532	#define DRM_MODE_ATOMIC_ALLOW_MODESET 0x0400
		533
		534	#define DRM_MODE_ATOMIC_FLAGS (\
		535	DRM_MODE_PAGE_FLIP_EVENT \|\
		536	DRM_MODE_PAGE_FLIP_ASYNC \|\
		537	DRM_MODE_ATOMIC_TEST_ONLY \|\
		538	DRM_MODE_ATOMIC_NONBLOCK \|\
		539	DRM_MODE_ATOMIC_ALLOW_MODESET)
		540
		541	struct drm_mode_atomic {
		542	__u32 flags;
		543	__u32 count_objs;
		544	__u64 objs_ptr;
		545	__u64 count_props_ptr;
		546	__u64 props_ptr;
		547	__u64 prop_values_ptr;
		548	__u64 reserved;
		549	__u64 user_data;
		550	};
		551
522	#endif	552	#endif

include/uapi/drm/i915_drm.h+29−1

 #define DRM_I915_REG_READ		0x31
 #define DRM_I915_GET_RESET_STATS	0x32
 #define DRM_I915_GEM_USERPTR		0x33
+#define DRM_I915_GEM_CONTEXT_GETPARAM	0x34
+#define DRM_I915_GEM_CONTEXT_SETPARAM	0x35
 #define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
 #define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
 #define DRM_IOCTL_I915_REG_READ			DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_REG_READ, struct drm_i915_reg_read)
 #define DRM_IOCTL_I915_GET_RESET_STATS		DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GET_RESET_STATS, struct drm_i915_reset_stats)
 #define DRM_IOCTL_I915_GEM_USERPTR			DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_USERPTR, struct drm_i915_gem_userptr)
+#define DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_GETPARAM, struct drm_i915_gem_context_param)
+#define DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_SETPARAM, struct drm_i915_gem_context_param)
 /* Allow drivers to submit batchbuffers directly to hardware, relying
  * on the security mechanisms provided by hardware.
 #define I915_PARAM_HAS_WT     	 	 27
 #define I915_PARAM_CMD_PARSER_VERSION	 28
 #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
+#define I915_PARAM_MMAP_VERSION          30
+#define I915_PARAM_HAS_BSD2		 31
 typedef struct drm_i915_getparam {
 	int param;
 	 * This is a fixed-size type for 32/64 compatibility.
 	 */
 	__u64 addr_ptr;
+	/**
+	 * Flags for extended behaviour.
+	 *
+	 * Added in version 2.
+	 */
+	__u64 flags;
+#define I915_MMAP_WC 0x1
 };
 struct drm_i915_gem_mmap_gtt {
  */
 #define I915_EXEC_HANDLE_LUT		(1<<12)
-#define __I915_EXEC_UNKNOWN_FLAGS -(I915_EXEC_HANDLE_LUT<<1)
+/** Used for switching BSD rings on the platforms with two BSD rings */
+#define I915_EXEC_BSD_MASK		(3<<13)
+#define I915_EXEC_BSD_DEFAULT		(0<<13) /* default ping-pong mode */
+#define I915_EXEC_BSD_RING1		(1<<13)
+#define I915_EXEC_BSD_RING2		(2<<13)
+#define __I915_EXEC_UNKNOWN_FLAGS -(1<<15)
 #define I915_EXEC_CONTEXT_ID_MASK	(0xffffffff)
 #define i915_execbuffer2_set_context_id(eb2, context) \
 	__u32 handle;
 };
+struct drm_i915_gem_context_param {
+	__u32 ctx_id;
+	__u32 size;
+	__u64 param;
+#define I915_CONTEXT_PARAM_BAN_PERIOD 0x1
+	__u64 value;
+};
 #endif /* _UAPI_I915_DRM_H_ */

include/uapi/linux/Kbuild+2−1

 header-y += affs_hardblocks.h
 header-y += agpgart.h
 header-y += aio_abi.h
+header-y += am437x-vpfe.h
 header-y += apm_bios.h
 header-y += arcfb.h
 header-y += atalk.h
 header-y += netlink_diag.h
 header-y += netlink.h
 header-y += netrom.h
+header-y += net_namespace.h
 header-y += net_tstamp.h
 header-y += nfc.h
 header-y += nfs2.h
 header-y += sock_diag.h
 header-y += socket.h
 header-y += sockios.h
-header-y += som.h
 header-y += sonet.h
 header-y += sonypi.h
 header-y += soundcard.h

include/uapi/linux/am437x-vpfe.h+122−0

@@ -0,0 +1,122 @@
	1	/*
	2	* Copyright (C) 2013 - 2014 Texas Instruments, Inc.
	3	*
	4	* Benoit Parrot <bparrot@ti.com>
	5	* Lad, Prabhakar <prabhakar.csengg@gmail.com>
	6	*
	7	* This program is free software; you may redistribute it and/or modify
	8	* it under the terms of the GNU General Public License as published by
	9	* the Free Software Foundation; version 2 of the License.
	10	*
	11	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	12	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	13	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	14	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
	15	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
	16	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	17	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	18	* SOFTWARE.
	19	*/
	20
	21	#ifndef AM437X_VPFE_USER_H
	22	#define AM437X_VPFE_USER_H
	23
	24	enum vpfe_ccdc_data_size {
	25	VPFE_CCDC_DATA_16BITS = 0,
	26	VPFE_CCDC_DATA_15BITS,
	27	VPFE_CCDC_DATA_14BITS,
	28	VPFE_CCDC_DATA_13BITS,
	29	VPFE_CCDC_DATA_12BITS,
	30	VPFE_CCDC_DATA_11BITS,
	31	VPFE_CCDC_DATA_10BITS,
	32	VPFE_CCDC_DATA_8BITS,
	33	};
	34
	35	/* enum for No of pixel per line to be avg. in Black Clamping*/
	36	enum vpfe_ccdc_sample_length {
	37	VPFE_CCDC_SAMPLE_1PIXELS = 0,
	38	VPFE_CCDC_SAMPLE_2PIXELS,
	39	VPFE_CCDC_SAMPLE_4PIXELS,
	40	VPFE_CCDC_SAMPLE_8PIXELS,
	41	VPFE_CCDC_SAMPLE_16PIXELS,
	42	};
	43
	44	/* enum for No of lines in Black Clamping */
	45	enum vpfe_ccdc_sample_line {
	46	VPFE_CCDC_SAMPLE_1LINES = 0,
	47	VPFE_CCDC_SAMPLE_2LINES,
	48	VPFE_CCDC_SAMPLE_4LINES,
	49	VPFE_CCDC_SAMPLE_8LINES,
	50	VPFE_CCDC_SAMPLE_16LINES,
	51	};
	52
	53	/* enum for Alaw gamma width */
	54	enum vpfe_ccdc_gamma_width {
	55	VPFE_CCDC_GAMMA_BITS_15_6 = 0, /* use bits 15-6 for gamma */
	56	VPFE_CCDC_GAMMA_BITS_14_5,
	57	VPFE_CCDC_GAMMA_BITS_13_4,
	58	VPFE_CCDC_GAMMA_BITS_12_3,
	59	VPFE_CCDC_GAMMA_BITS_11_2,
	60	VPFE_CCDC_GAMMA_BITS_10_1,
	61	VPFE_CCDC_GAMMA_BITS_09_0, /* use bits 9-0 for gamma */
	62	};
	63
	64	/* structure for ALaw */
	65	struct vpfe_ccdc_a_law {
	66	/* Enable/disable A-Law */
	67	unsigned char enable;
	68	/* Gamma Width Input */
	69	enum vpfe_ccdc_gamma_width gamma_wd;
	70	};
	71
	72	/* structure for Black Clamping */
	73	struct vpfe_ccdc_black_clamp {
	74	unsigned char enable;
	75	/* only if bClampEnable is TRUE */
	76	enum vpfe_ccdc_sample_length sample_pixel;
	77	/* only if bClampEnable is TRUE */
	78	enum vpfe_ccdc_sample_line sample_ln;
	79	/* only if bClampEnable is TRUE */
	80	unsigned short start_pixel;
	81	/* only if bClampEnable is TRUE */
	82	unsigned short sgain;
	83	/* only if bClampEnable is FALSE */
	84	unsigned short dc_sub;
	85	};
	86
	87	/* structure for Black Level Compensation */
	88	struct vpfe_ccdc_black_compensation {
	89	/* Constant value to subtract from Red component */
	90	char r;
	91	/* Constant value to subtract from Gr component */
	92	char gr;
	93	/* Constant value to subtract from Blue component */
	94	char b;
	95	/* Constant value to subtract from Gb component */
	96	char gb;
	97	};
	98
	99	/* Structure for CCDC configuration parameters for raw capture mode passed
	100	* by application
	101	*/
	102	struct vpfe_ccdc_config_params_raw {
	103	/* data size value from 8 to 16 bits */
	104	enum vpfe_ccdc_data_size data_sz;
	105	/* Structure for Optional A-Law */
	106	struct vpfe_ccdc_a_law alaw;
	107	/* Structure for Optical Black Clamp */
	108	struct vpfe_ccdc_black_clamp blk_clamp;
	109	/* Structure for Black Compensation */
	110	struct vpfe_ccdc_black_compensation blk_comp;
	111	};
	112
	113	/*
	114	* Private IOCTL
	115	* VIDIOC_AM437X_CCDC_CFG - Set CCDC configuration for raw capture
	116	* This is an experimental ioctl that will change in future kernels. So use
	117	* this ioctl with care !
	118	**/
	119	#define VIDIOC_AM437X_CCDC_CFG \
	120	_IOW('V', BASE_VIDIOC_PRIVATE + 1, void *)
	121
	122	#endif /* AM437X_VPFE_USER_H */

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

@@ -495,8 +495,7 @@ struct btrfs_ioctl_send_args { · 494 unmodified lines
495		495
496	/* Error codes as returned by the kernel */	496	/* Error codes as returned by the kernel */
497	enum btrfs_err_code {	497	enum btrfs_err_code {
498	notused,	498	BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET = 1,
499	BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET,
500	BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET,	499	BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET,
501	BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET,	500	BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET,
502	BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET,	501	BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET,

include/uapi/linux/dm-ioctl.h+2−2

@@ -267,9 +267,9 @@ enum { · 266 unmodified lines
267	#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)	267	#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
268		268
269	#define DM_VERSION_MAJOR 4	269	#define DM_VERSION_MAJOR 4
270	#define DM_VERSION_MINOR 29	270	#define DM_VERSION_MINOR 30
271	#define DM_VERSION_PATCHLEVEL 0	271	#define DM_VERSION_PATCHLEVEL 0
272	#define DM_VERSION_EXTRA "-ioctl (2014-10-28)"	272	#define DM_VERSION_EXTRA "-ioctl (2014-12-22)"
273		273
274	/* Status bits */	274	/* Status bits */
275	#define DM_READONLY_FLAG (1 << 0) /* In/Out */	275	#define DM_READONLY_FLAG (1 << 0) /* In/Out */

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

 #define ETHTOOL_FWVERS_LEN	32
 #define ETHTOOL_BUSINFO_LEN	32
+#define ETHTOOL_EROMVERS_LEN	32
 /**
  * struct ethtool_drvinfo - general driver and device information
  *	not be an empty string.
  * @version: Driver version string; may be an empty string
  * @fw_version: Firmware version string; may be an empty string
+ * @erom_version: Expansion ROM version string; may be an empty string
  * @bus_info: Device bus address.  This should match the dev_name()
  *	string for the underlying bus device, if there is one.  May be
  *	an empty string.
 	char	version[32];
 	char	fw_version[ETHTOOL_FWVERS_LEN];
 	char	bus_info[ETHTOOL_BUSINFO_LEN];
-	char	reserved1[32];
+	char	erom_version[ETHTOOL_EROMVERS_LEN];
 	char	reserved2[12];
 	__u32	n_priv_flags;
 	__u32	n_stats;

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

@@ -14,6 +14,7 @@ enum { · 13 unmodified lines
14	FOU_ATTR_AF, /* u8 */	14	FOU_ATTR_AF, /* u8 */
15	FOU_ATTR_IPPROTO, /* u8 */	15	FOU_ATTR_IPPROTO, /* u8 */
16	FOU_ATTR_TYPE, /* u8 */	16	FOU_ATTR_TYPE, /* u8 */
		17	FOU_ATTR_REMCSUM_NOPARTIAL, /* flag */
17		18
18	__FOU_ATTR_MAX,	19	__FOU_ATTR_MAX,
19	};	20	};

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

 #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
 #define MS_I_VERSION	(1<<23) /* Update inode I_version field */
 #define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
+#define MS_LAZYTIME	(1<<25) /* Update the on-disk [acm]times lazily */
 /* These sb flags are internal to the kernel */
 #define MS_NOSEC	(1<<28)
 /*
  * Superblock flags that can be altered by MS_REMOUNT
  */
-#define MS_RMT_MASK	(MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
+#define MS_RMT_MASK	(MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION|\
+			 MS_LAZYTIME)
 /*
  * Old magic mount flag and mask

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

@@ -125,6 +125,8 @@ enum { · 124 unmodified lines
125	#define BRIDGE_VLAN_INFO_MASTER (1<<0) /* Operate on Bridge device as well */	125	#define BRIDGE_VLAN_INFO_MASTER (1<<0) /* Operate on Bridge device as well */
126	#define BRIDGE_VLAN_INFO_PVID (1<<1) /* VLAN is PVID, ingress untagged */	126	#define BRIDGE_VLAN_INFO_PVID (1<<1) /* VLAN is PVID, ingress untagged */
127	#define BRIDGE_VLAN_INFO_UNTAGGED (1<<2) /* VLAN egresses untagged */	127	#define BRIDGE_VLAN_INFO_UNTAGGED (1<<2) /* VLAN egresses untagged */
		128	#define BRIDGE_VLAN_INFO_RANGE_BEGIN (1<<3) /* VLAN is start of vlan range */
		129	#define BRIDGE_VLAN_INFO_RANGE_END (1<<4) /* VLAN is end of vlan range */
128		130
129	struct bridge_vlan_info {	131	struct bridge_vlan_info {
130	__u16 flags;	132	__u16 flags;

include/uapi/linux/if_link.h+5−0

 	IFLA_PHYS_PORT_ID,
 	IFLA_CARRIER_CHANGES,
 	IFLA_PHYS_SWITCH_ID,
+	IFLA_LINK_NETNSID,
 	__IFLA_MAX
 };
 	IFLA_VXLAN_UDP_CSUM,
 	IFLA_VXLAN_UDP_ZERO_CSUM6_TX,
 	IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
+	IFLA_VXLAN_REMCSUM_TX,
+	IFLA_VXLAN_REMCSUM_RX,
+	IFLA_VXLAN_GBP,
+	IFLA_VXLAN_REMCSUM_NOPARTIAL,
 	__IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)

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

@@ -109,6 +109,7 @@ struct in_addr { · 108 unmodified lines
109		109
110	#define IP_MINTTL 21	110	#define IP_MINTTL 21
111	#define IP_NODEFRAG 22	111	#define IP_NODEFRAG 22
		112	#define IP_CHECKSUM 23
112		113
113	/* IP_MTU_DISCOVER values */	114	/* IP_MTU_DISCOVER values */
114	#define IP_PMTUDISC_DONT 0 /* Never send DF frames */	115	#define IP_PMTUDISC_DONT 0 /* Never send DF frames */

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

@@ -166,6 +166,7 @@ struct input_keymap_entry { · 165 unmodified lines
166	#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */	166	#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */
167	#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */	167	#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
168	#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */	168	#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */
		169	#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */
169		170
170	#define INPUT_PROP_MAX 0x1f	171	#define INPUT_PROP_MAX 0x1f
171	#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)	172	#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)

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

@@ -1,6 +1,7 @@
1	#ifndef _UAPI_IPV6_H	1	#ifndef _UAPI_IPV6_H
2	#define _UAPI_IPV6_H	2	#define _UAPI_IPV6_H
3		3
		4	#include <linux/libc-compat.h>
4	#include <linux/types.h>	5	#include <linux/types.h>
5	#include <linux/in6.h>	6	#include <linux/in6.h>
6	#include <asm/byteorder.h>	7	#include <asm/byteorder.h>
@@ -15,16 +16,19 @@ · 8 unmodified lines
15	* under construction	16	* under construction
16	*/	17	*/
17		18
18		19	#if __UAPI_DEF_IN6_PKTINFO
19	struct in6_pktinfo {	20	struct in6_pktinfo {
20	struct in6_addr ipi6_addr;	21	struct in6_addr ipi6_addr;
21	int ipi6_ifindex;	22	int ipi6_ifindex;
22	};	23	};
		24	#endif
23		25
		26	#if __UAPI_DEF_IP6_MTUINFO
24	struct ip6_mtuinfo {	27	struct ip6_mtuinfo {
25	struct sockaddr_in6 ip6m_addr;	28	struct sockaddr_in6 ip6m_addr;
26	__u32 ip6m_mtu;	29	__u32 ip6m_mtu;
27	};	30	};
		31	#endif
28		32
29	struct in6_ifreq {	33	struct in6_ifreq {
30	struct in6_addr ifr6_addr;	34	struct in6_addr ifr6_addr;
@@ -165,6 +169,7 @@ enum { · 134 unmodified lines
165	DEVCONF_SUPPRESS_FRAG_NDISC,	169	DEVCONF_SUPPRESS_FRAG_NDISC,
166	DEVCONF_ACCEPT_RA_FROM_LOCAL,	170	DEVCONF_ACCEPT_RA_FROM_LOCAL,
167	DEVCONF_USE_OPTIMISTIC,	171	DEVCONF_USE_OPTIMISTIC,
		172	DEVCONF_ACCEPT_RA_MTU,
168	DEVCONF_MAX	173	DEVCONF_MAX
169	};	174	};
170		175

include/uapi/linux/kernel-page-flags.h+1−0

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	#define KPF_KSM 21	32	#define KPF_KSM 21
33	#define KPF_THP 22	33	#define KPF_THP 22
34	#define KPF_BALLOON 23	34	#define KPF_BALLOON 23
		35	#define KPF_ZERO_PAGE 24
35		36
36		37
37	#endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */	38	#endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */

include/uapi/linux/kexec.h+0−6

 	size_t memsz;
 };
-/* Load a new kernel image as described by the kexec_segment array
- * consisting of passed number of segments at the entry-point address.
- * The flags allow different useage types.
- */
-extern int kexec_load(void *, size_t, struct kexec_segment *,
-		unsigned long int);
 #endif /* __KERNEL__ */
 #endif /* _UAPILINUX_KEXEC_H */

include/uapi/linux/kvm.h+9−0

 	__u16 code;
 };
+#define KVM_S390_STOP_FLAG_STORE_STATUS	0x01
+struct kvm_s390_stop_info {
+	__u32 flags;
+};
 struct kvm_s390_mchk_info {
 	__u64 cr14;
 	__u64 mcic;
 		struct kvm_s390_emerg_info emerg;
 		struct kvm_s390_extcall_info extcall;
 		struct kvm_s390_prefix_info prefix;
+		struct kvm_s390_stop_info stop;
 		struct kvm_s390_mchk_info mchk;
 		char reserved[64];
 	} u;
 #define KVM_CAP_PPC_FIXUP_HCALL 103
 #define KVM_CAP_PPC_ENABLE_HCALL 104
 #define KVM_CAP_CHECK_EXTENSION_VM 105
+#define KVM_CAP_S390_USER_SIGP 106
 #ifdef KVM_CAP_IRQ_ROUTING
 #define KVM_DEV_TYPE_ARM_VGIC_V2	KVM_DEV_TYPE_ARM_VGIC_V2
 	KVM_DEV_TYPE_FLIC,
 #define KVM_DEV_TYPE_FLIC		KVM_DEV_TYPE_FLIC
+	KVM_DEV_TYPE_ARM_VGIC_V3,
+#define KVM_DEV_TYPE_ARM_VGIC_V3	KVM_DEV_TYPE_ARM_VGIC_V3
 	KVM_DEV_TYPE_MAX,
 };

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

@@ -178,5 +178,6 @@ enum l2tp_seqmode { · 177 unmodified lines
178	*/	178	*/
179	#define L2TP_GENL_NAME "l2tp"	179	#define L2TP_GENL_NAME "l2tp"
180	#define L2TP_GENL_VERSION 0x1	180	#define L2TP_GENL_VERSION 0x1
		181	#define L2TP_GENL_MCGROUP "l2tp"
181		182
182	#endif /* _UAPI_LINUX_L2TP_H_ */	183	#endif /* _UAPI_LINUX_L2TP_H_ */

include/uapi/linux/libc-compat.h+6−0

 #define __UAPI_DEF_IPV6_MREQ		0
 #define __UAPI_DEF_IPPROTO_V6		0
 #define __UAPI_DEF_IPV6_OPTIONS		0
+#define __UAPI_DEF_IN6_PKTINFO		0
+#define __UAPI_DEF_IP6_MTUINFO		0
 #else
 #define __UAPI_DEF_IPV6_MREQ		1
 #define __UAPI_DEF_IPPROTO_V6		1
 #define __UAPI_DEF_IPV6_OPTIONS		1
+#define __UAPI_DEF_IN6_PKTINFO		1
+#define __UAPI_DEF_IP6_MTUINFO		1
 #endif /* _NETINET_IN_H */
 #define __UAPI_DEF_IPV6_MREQ		1
 #define __UAPI_DEF_IPPROTO_V6		1
 #define __UAPI_DEF_IPV6_OPTIONS		1
+#define __UAPI_DEF_IN6_PKTINFO		1
+#define __UAPI_DEF_IP6_MTUINFO		1
 /* Definitions for xattr.h */
 #define __UAPI_DEF_XATTR		1

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

@@ -67,7 +67,7 @@ enum mpol_rebind_step { · 66 unmodified lines
67	#define MPOL_F_LOCAL (1 << 1) /* preferred local allocation */	67	#define MPOL_F_LOCAL (1 << 1) /* preferred local allocation */
68	#define MPOL_F_REBINDING (1 << 2) /* identify policies in rebinding */	68	#define MPOL_F_REBINDING (1 << 2) /* identify policies in rebinding */
69	#define MPOL_F_MOF (1 << 3) /* this policy wants migrate on fault */	69	#define MPOL_F_MOF (1 << 3) /* this policy wants migrate on fault */
70	#define MPOL_F_MORON (1 << 4) /* Migrate On pte_numa Reference On Node */	70	#define MPOL_F_MORON (1 << 4) /* Migrate On protnone Reference On Node */
71		71
72		72
73	#endif /* _UAPI_LINUX_MEMPOLICY_H */	73	#endif /* _UAPI_LINUX_MEMPOLICY_H */

include/uapi/linux/msdos_fs.h+2−2

@@ -134,7 +134,7 @@ struct fat_boot_sector { · 133 unmodified lines
134	__u8 vol_id[4]; /* volume ID */	134	__u8 vol_id[4]; /* volume ID */
135	__u8 vol_label[11]; /* volume label */	135	__u8 vol_label[11]; /* volume label */
136	__u8 fs_type[8]; /* file system type */	136	__u8 fs_type[8]; /* file system type */
137	/* other fiealds are not added here */	137	/* other fields are not added here */
138	} fat16;	138	} fat16;
139		139
140	struct {	140	struct {
@@ -157,7 +157,7 @@ struct fat_boot_sector { · 16 unmodified lines
157	__u8 vol_id[4]; /* volume ID */	157	__u8 vol_id[4]; /* volume ID */
158	__u8 vol_label[11]; /* volume label */	158	__u8 vol_label[11]; /* volume label */
159	__u8 fs_type[8]; /* file system type */	159	__u8 fs_type[8]; /* file system type */
160	/* other fiealds are not added here */	160	/* other fields are not added here */
161	} fat32;	161	} fat32;
162	};	162	};
163	};	163	};

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

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

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

@@ -0,0 +1,23 @@
	1	/* Copyright (c) 2015 6WIND S.A.
	2	* Author: Nicolas Dichtel <nicolas.dichtel@6wind.com>
	3	*
	4	* This program is free software; you can redistribute it and/or modify it
	5	* under the terms and conditions of the GNU General Public License,
	6	* version 2, as published by the Free Software Foundation.
	7	*/
	8	#ifndef _UAPI_LINUX_NET_NAMESPACE_H_
	9	#define _UAPI_LINUX_NET_NAMESPACE_H_
	10
	11	/* Attributes of RTM_NEWNSID/RTM_GETNSID messages */
	12	enum {
	13	NETNSA_NONE,
	14	#define NETNSA_NSID_NOT_ASSIGNED -1
	15	NETNSA_NSID,
	16	NETNSA_PID,
	17	NETNSA_FD,
	18	__NETNSA_MAX,
	19	};
	20
	21	#define NETNSA_MAX (__NETNSA_MAX - 1)
	22
	23	#endif /* _UAPI_LINUX_NET_NAMESPACE_H_ */

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

 	SOF_TIMESTAMPING_TX_SCHED = (1<<8),
 	SOF_TIMESTAMPING_TX_ACK = (1<<9),
 	SOF_TIMESTAMPING_OPT_CMSG = (1<<10),
+	SOF_TIMESTAMPING_OPT_TSONLY = (1<<11),
-	SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_CMSG,
+	SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_TSONLY,
 	SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) |
 				 SOF_TIMESTAMPING_LAST
 };

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

@@ -183,6 +183,7 @@ enum nfc_attrs { · 182 unmodified lines
183	NFC_ATTR_SE_APDU,	183	NFC_ATTR_SE_APDU,
184	NFC_ATTR_TARGET_ISO15693_DSFID,	184	NFC_ATTR_TARGET_ISO15693_DSFID,
185	NFC_ATTR_TARGET_ISO15693_UID,	185	NFC_ATTR_TARGET_ISO15693_UID,
		186	NFC_ATTR_SE_PARAMS,
186	/* private: internal use only */	187	/* private: internal use only */
187	__NFC_ATTR_AFTER_LAST	188	__NFC_ATTR_AFTER_LAST
188	};	189	};

include/uapi/linux/nfsd/debug.h+1−0

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	#define NFSDDBG_REPCACHE 0x0080	32	#define NFSDDBG_REPCACHE 0x0080
33	#define NFSDDBG_XDR 0x0100	33	#define NFSDDBG_XDR 0x0100
34	#define NFSDDBG_LOCKD 0x0200	34	#define NFSDDBG_LOCKD 0x0200
		35	#define NFSDDBG_PNFS 0x0400
35	#define NFSDDBG_ALL 0x7FFF	36	#define NFSDDBG_ALL 0x7FFF
36	#define NFSDDBG_NOCHANGE 0xFFFF	37	#define NFSDDBG_NOCHANGE 0xFFFF
37		38

include/uapi/linux/nfsd/export.h+3−1

  * exported filesystem.
  */
 #define	NFSEXP_V4ROOT		0x10000
+#define NFSEXP_NOPNFS		0x20000
 /* All flags that we claim to support.  (Note we don't support NOACL.) */
-#define NFSEXP_ALLFLAGS		0x1FE7F
+#define NFSEXP_ALLFLAGS		0x3FE7F
 /* The flags that may vary depending on security flavor: */
 #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \

include/uapi/linux/nl80211.h+176−31

 #define NL80211_GENL_NAME "nl80211"
+#define NL80211_MULTICAST_GROUP_CONFIG		"config"
+#define NL80211_MULTICAST_GROUP_SCAN		"scan"
+#define NL80211_MULTICAST_GROUP_REG		"regulatory"
+#define NL80211_MULTICAST_GROUP_MLME		"mlme"
+#define NL80211_MULTICAST_GROUP_VENDOR		"vendor"
+#define NL80211_MULTICAST_GROUP_TESTMODE	"testmode"
 /**
  * DOC: Station handling
  *
  *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
  *
  * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
- *	either a dump request on a %NL80211_ATTR_WIPHY or a specific get
+ *	either a dump request for all interfaces or a specific get with a
- *	on an %NL80211_ATTR_IFINDEX is supported.
+ *	single %NL80211_ATTR_IFINDEX is supported.
  * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
  *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
  * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
  *	%NL80211_ATTR_IFINDEX.
  *
  * @NL80211_CMD_GET_REG: ask the wireless core to send us its currently set
- * 	regulatory domain.
+ *	regulatory domain. If %NL80211_ATTR_WIPHY is specified and the device
+ *	has a private regulatory domain, it will be returned. Otherwise, the
+ *	global regdomain will be returned.
+ *	A device will have a private regulatory domain if it uses the
+ *	regulatory_hint() API. Even when a private regdomain is used the channel
+ *	information will still be mended according to further hints from
+ *	the regulatory core to help with compliance. A dump version of this API
+ *	is now available which will returns the global regdomain as well as
+ *	all private regdomains of present wiphys (for those that have it).
+ *	If a wiphy is self-managed (%NL80211_ATTR_WIPHY_SELF_MANAGED_REG), then
+ *	its private regdomain is the only valid one for it. The regulatory
+ *	core is not used to help with compliance in this case.
  * @NL80211_CMD_SET_REG: Set current regulatory domain. CRDA sends this command
  *	after being queried by the kernel. CRDA replies by sending a regulatory
  *	domain structure which consists of %NL80211_ATTR_REG_ALPHA set to our
  *	if passed, define which channels should be scanned; if not
  *	passed, all channels allowed for the current regulatory domain
  *	are used.  Extra IEs can also be passed from the userspace by
- *	using the %NL80211_ATTR_IE attribute.
+ *	using the %NL80211_ATTR_IE attribute.  The first cycle of the
+ *	scheduled scan can be delayed by %NL80211_ATTR_SCHED_SCAN_DELAY
+ *	is supplied.
  * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan. Returns -ENOENT if
  *	scheduled scan is not running. The caller may assume that as soon
  *	as the call returns, it is safe to start a new scheduled scan again.
  *	peer given by %NL80211_ATTR_MAC. Both peers must be on the base channel
  *	when this command completes.
  *
+ * @NL80211_CMD_WIPHY_REG_CHANGE: Similar to %NL80211_CMD_REG_CHANGE, but used
+ *	as an event to indicate changes for devices with wiphy-specific regdom
+ *	management.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
 	NL80211_CMD_TDLS_CHANNEL_SWITCH,
 	NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH,
+	NL80211_CMD_WIPHY_REG_CHANGE,
 	/* add new commands above here */
 	/* used to define NL80211_CMD_MAX below */
  * @NL80211_ATTR_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.
+ *	If set during scheduled scan start then the new scan req will be
+ *	owned by the netlink socket that created it and the scheduled scan will
+ *	be stopped when the socket is closed.
  *
  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
  *	the TDLS link initiator.
  *
  * @NL80211_ATTR_MAC_MASK: MAC address mask
  *
+ * @NL80211_ATTR_WIPHY_SELF_MANAGED_REG: flag attribute indicating this device
+ *	is self-managing its regulatory information and any regulatory domain
+ *	obtained from it is coming from the device's wiphy and not the global
+ *	cfg80211 regdomain.
+ *
+ * @NL80211_ATTR_EXT_FEATURES: extended feature flags contained in a byte
+ *	array. The feature flags are identified by their bit index (see &enum
+ *	nl80211_ext_feature_index). The bit index is ordered starting at the
+ *	least-significant bit of the first byte in the array, ie. bit index 0
+ *	is located at bit 0 of byte 0. bit index 25 would be located at bit 1
+ *	of byte 3 (u8 array).
+ *
+ * @NL80211_ATTR_SURVEY_RADIO_STATS: Request overall radio statistics to be
+ *	returned along with other survey data. If set, @NL80211_CMD_GET_SURVEY
+ *	may return a survey entry without a channel indicating global radio
+ *	statistics (only some values are valid and make sense.)
+ *	For devices that don't return such an entry even then, the information
+ *	should be contained in the result as the sum of the respective counters
+ *	over all channels.
+ *
+ * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before a scheduled scan (or a
+ *	WoWLAN net-detect scan) is started, u32 in seconds.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
 	NL80211_ATTR_MAC_MASK,
+	NL80211_ATTR_WIPHY_SELF_MANAGED_REG,
+	NL80211_ATTR_EXT_FEATURES,
+	NL80211_ATTR_SURVEY_RADIO_STATS,
+	NL80211_ATTR_NETNS_FD,
+	NL80211_ATTR_SCHED_SCAN_DELAY,
 	/* add attributes here, update the policy in nl80211.c */
 	__NL80211_ATTR_AFTER_LAST,
 #define NL80211_MAX_SUPP_RATES			32
 #define NL80211_MAX_SUPP_HT_RATES		77
-#define NL80211_MAX_SUPP_REG_RULES		32
+#define NL80211_MAX_SUPP_REG_RULES		64
 #define NL80211_TKIP_DATA_OFFSET_ENCR_KEY	0
 #define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY	16
 #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY	24
  * @NL80211_RATE_INFO_VHT_MCS: MCS index for VHT (u8)
  * @NL80211_RATE_INFO_VHT_NSS: number of streams in VHT (u8)
  * @NL80211_RATE_INFO_80_MHZ_WIDTH: 80 MHz VHT rate
- * @NL80211_RATE_INFO_80P80_MHZ_WIDTH: 80+80 MHz VHT rate
+ * @NL80211_RATE_INFO_80P80_MHZ_WIDTH: unused - 80+80 is treated the
+ *	same as 160 for purposes of the bitrates
  * @NL80211_RATE_INFO_160_MHZ_WIDTH: 160 MHz VHT rate
+ * @NL80211_RATE_INFO_10_MHZ_WIDTH: 10 MHz width - note that this is
+ *	a legacy rate and will be reported as the actual bitrate, i.e.
+ *	half the base (20 MHz) rate
+ * @NL80211_RATE_INFO_5_MHZ_WIDTH: 5 MHz width - note that this is
+ *	a legacy rate and will be reported as the actual bitrate, i.e.
+ *	a quarter of the base (20 MHz) rate
  * @__NL80211_RATE_INFO_AFTER_LAST: internal use
  */
 enum nl80211_rate_info {
 	NL80211_RATE_INFO_80_MHZ_WIDTH,
 	NL80211_RATE_INFO_80P80_MHZ_WIDTH,
 	NL80211_RATE_INFO_160_MHZ_WIDTH,
+	NL80211_RATE_INFO_10_MHZ_WIDTH,
+	NL80211_RATE_INFO_5_MHZ_WIDTH,
 	/* keep last */
 	__NL80211_RATE_INFO_AFTER_LAST,
  *
  * @__NL80211_STA_INFO_INVALID: attribute number 0 is reserved
  * @NL80211_STA_INFO_INACTIVE_TIME: time since last activity (u32, msecs)
- * @NL80211_STA_INFO_RX_BYTES: total received bytes (u32, from this station)
+ * @NL80211_STA_INFO_RX_BYTES: total received bytes (MPDU length)
- * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)
+ *	(u32, from this station)
- * @NL80211_STA_INFO_RX_BYTES64: total received bytes (u64, from this station)
+ * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (MPDU length)
- * @NL80211_STA_INFO_TX_BYTES64: total transmitted bytes (u64, to this station)
+ *	(u32, to this station)
+ * @NL80211_STA_INFO_RX_BYTES64: total received bytes (MPDU length)
+ *	(u64, from this station)
+ * @NL80211_STA_INFO_TX_BYTES64: total transmitted bytes (MPDU length)
+ *	(u64, to this station)
  * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
  * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
  * 	containing info as possible, see &enum nl80211_rate_info
- * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)
+ * @NL80211_STA_INFO_RX_PACKETS: total received packet (MSDUs and MMPDUs)
- * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this
+ *	(u32, from this station)
- *	station)
+ * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (MSDUs and MMPDUs)
- * @NL80211_STA_INFO_TX_RETRIES: total retries (u32, to this station)
+ *	(u32, to this station)
- * @NL80211_STA_INFO_TX_FAILED: total failed packets (u32, to this station)
+ * @NL80211_STA_INFO_TX_RETRIES: total retries (MPDUs) (u32, to this station)
+ * @NL80211_STA_INFO_TX_FAILED: total failed packets (MPDUs)
+ *	(u32, to this station)
  * @NL80211_STA_INFO_SIGNAL_AVG: signal strength average (u8, dBm)
  * @NL80211_STA_INFO_LLID: the station's mesh LLID
  * @NL80211_STA_INFO_PLID: the station's mesh PLID
  *	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_RX_DROP_MISC: RX packets dropped for unspecified reasons
+ *	(u64)
+ * @NL80211_STA_INFO_BEACON_RX: number of beacons received from this peer (u64)
+ * @NL80211_STA_INFO_BEACON_SIGNAL_AVG: signal strength average
+ *	for beacons only (u8, dBm)
+ * @NL80211_STA_INFO_TID_STATS: per-TID statistics (see &enum nl80211_tid_stats)
+ *	This is a nested attribute where each the inner attribute number is the
+ *	TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames;
+ *	each one of those is again nested with &enum nl80211_tid_stats
+ *	attributes carrying the actual values.
  * @__NL80211_STA_INFO_AFTER_LAST: internal
  * @NL80211_STA_INFO_MAX: highest possible station info attribute
  */
 	NL80211_STA_INFO_CHAIN_SIGNAL,
 	NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
 	NL80211_STA_INFO_EXPECTED_THROUGHPUT,
+	NL80211_STA_INFO_RX_DROP_MISC,
+	NL80211_STA_INFO_BEACON_RX,
+	NL80211_STA_INFO_BEACON_SIGNAL_AVG,
+	NL80211_STA_INFO_TID_STATS,
 	/* keep last */
 	__NL80211_STA_INFO_AFTER_LAST,
 	NL80211_STA_INFO_MAX = __NL80211_STA_INFO_AFTER_LAST - 1
 };
+/**
+ * enum nl80211_tid_stats - per TID statistics attributes
+ * @__NL80211_TID_STATS_INVALID: attribute number 0 is reserved
+ * @NL80211_TID_STATS_RX_MSDU: number of MSDUs received (u64)
+ * @NL80211_TID_STATS_TX_MSDU: number of MSDUs transmitted (or
+ *	attempted to transmit; u64)
+ * @NL80211_TID_STATS_TX_MSDU_RETRIES: number of retries for
+ *	transmitted MSDUs (not counting the first attempt; u64)
+ * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted
+ *	MSDUs (u64)
+ * @NUM_NL80211_TID_STATS: number of attributes here
+ * @NL80211_TID_STATS_MAX: highest numbered attribute here
+ */
+enum nl80211_tid_stats {
+	__NL80211_TID_STATS_INVALID,
+	NL80211_TID_STATS_RX_MSDU,
+	NL80211_TID_STATS_TX_MSDU,
+	NL80211_TID_STATS_TX_MSDU_RETRIES,
+	NL80211_TID_STATS_TX_MSDU_FAILED,
+	/* keep last */
+	NUM_NL80211_TID_STATS,
+	NL80211_TID_STATS_MAX = NUM_NL80211_TID_STATS - 1
+};
 /**
  * enum nl80211_mpath_flags - nl80211 mesh path flags
  *
  * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
  * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
  * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
- * @NL80211_SURVEY_INFO_CHANNEL_TIME: amount of time (in ms) that the radio
+ * @NL80211_SURVEY_INFO_TIME: amount of time (in ms) that the radio
- *	spent on this channel
+ *	was turned on (on channel or globally)
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY: amount of the time the primary
+ * @NL80211_SURVEY_INFO_TIME_BUSY: amount of the time the primary
  *	channel was sensed busy (either due to activity or energy detect)
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: amount of time the extension
+ * @NL80211_SURVEY_INFO_TIME_EXT_BUSY: amount of time the extension
  *	channel was sensed busy
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_RX: amount of time the radio spent
+ * @NL80211_SURVEY_INFO_TIME_RX: amount of time the radio spent
- *	receiving data
+ *	receiving data (on channel or globally)
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_TX: amount of time the radio spent
+ * @NL80211_SURVEY_INFO_TIME_TX: amount of time the radio spent
- *	transmitting data
+ *	transmitting data (on channel or globally)
+ * @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan
+ *	(on this channel or globally)
  * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
  *	currently defined
  * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
 	NL80211_SURVEY_INFO_FREQUENCY,
 	NL80211_SURVEY_INFO_NOISE,
 	NL80211_SURVEY_INFO_IN_USE,
-	NL80211_SURVEY_INFO_CHANNEL_TIME,
+	NL80211_SURVEY_INFO_TIME,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY,
+	NL80211_SURVEY_INFO_TIME_BUSY,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY,
+	NL80211_SURVEY_INFO_TIME_EXT_BUSY,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_RX,
+	NL80211_SURVEY_INFO_TIME_RX,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_TX,
+	NL80211_SURVEY_INFO_TIME_TX,
+	NL80211_SURVEY_INFO_TIME_SCAN,
 	/* keep last */
 	__NL80211_SURVEY_INFO_AFTER_LAST,
 	NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
 };
+/* keep old names for compatibility */
+#define NL80211_SURVEY_INFO_CHANNEL_TIME		NL80211_SURVEY_INFO_TIME
+#define NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY		NL80211_SURVEY_INFO_TIME_BUSY
+#define NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY	NL80211_SURVEY_INFO_TIME_EXT_BUSY
+#define NL80211_SURVEY_INFO_CHANNEL_TIME_RX		NL80211_SURVEY_INFO_TIME_RX
+#define NL80211_SURVEY_INFO_CHANNEL_TIME_TX		NL80211_SURVEY_INFO_TIME_TX
 /**
  * enum nl80211_mntr_flags - monitor configuration flags
  *
 /**
  * enum nl80211_bss_status - BSS "status"
  * @NL80211_BSS_STATUS_AUTHENTICATED: Authenticated with this BSS.
+ *	Note that this is no longer used since cfg80211 no longer
+ *	keeps track of whether or not authentication was done with
+ *	a given BSS.
  * @NL80211_BSS_STATUS_ASSOCIATED: Associated with this BSS.
  * @NL80211_BSS_STATUS_IBSS_JOINED: Joined to this IBSS.
  *
  * @NL80211_WOWLAN_TRIG_NET_DETECT: wake up when a configured network
  *	is detected.  This is a nested attribute that contains the
  *	same attributes used with @NL80211_CMD_START_SCHED_SCAN.  It
- *	specifies how the scan is performed (e.g. the interval and the
+ *	specifies how the scan is performed (e.g. the interval, the
- *	channels to scan) as well as the scan results that will
+ *	channels to scan and the initial delay) as well as the scan
- *	trigger a wake (i.e. the matchsets).
+ *	results that will trigger a wake (i.e. the matchsets).  This
+ *	attribute is also sent in a response to
+ *	@NL80211_CMD_GET_WIPHY, indicating the number of match sets
+ *	supported by the driver (u32).
  * @NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS: nested attribute
  *	containing an array with information about what triggered the
  *	wake up.  If no elements are present in the array, it means
 	NL80211_FEATURE_ND_RANDOM_MAC_ADDR		= 1 << 31,
 };
+/**
+ * enum nl80211_ext_feature_index - bit index of extended features.
+ *
+ * @NUM_NL80211_EXT_FEATURES: number of extended features.
+ * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
+ */
+enum nl80211_ext_feature_index {
+	/* add new features before the definition below */
+	NUM_NL80211_EXT_FEATURES,
+	MAX_NL80211_EXT_FEATURES = NUM_NL80211_EXT_FEATURES - 1
+};
 /**
  * enum nl80211_probe_resp_offload_support_attr - optional supported
  *	protocols for probe-response offloading by the driver/FW.

include/uapi/linux/nvme.h+25−1

 	__le16			nawun;
 	__le16			nawupf;
 	__le16			nacwu;
-	__u8			rsvd40[80];
+	__le16			nabsn;
+	__le16			nabo;
+	__le16			nabspf;
+	__u16			rsvd46;
+	__le64			nvmcap[2];
+	__u8			rsvd64[40];
+	__u8			nguid[16];
 	__u8			eui64[8];
 	struct nvme_lbaf	lbaf[16];
 	__u8			rsvd192[192];
 enum {
 	NVME_NS_FEAT_THIN	= 1 << 0,
+	NVME_NS_FLBAS_LBA_MASK	= 0xf,
+	NVME_NS_FLBAS_META_EXT	= 0x10,
 	NVME_LBAF_RP_BEST	= 0,
 	NVME_LBAF_RP_BETTER	= 1,
 	NVME_LBAF_RP_GOOD	= 2,
 	NVME_LBAF_RP_DEGRADED	= 3,
+	NVME_NS_DPC_PI_LAST	= 1 << 4,
+	NVME_NS_DPC_PI_FIRST	= 1 << 3,
+	NVME_NS_DPC_PI_TYPE3	= 1 << 2,
+	NVME_NS_DPC_PI_TYPE2	= 1 << 1,
+	NVME_NS_DPC_PI_TYPE1	= 1 << 0,
+	NVME_NS_DPS_PI_FIRST	= 1 << 3,
+	NVME_NS_DPS_PI_MASK	= 0x7,
+	NVME_NS_DPS_PI_TYPE1	= 1,
+	NVME_NS_DPS_PI_TYPE2	= 2,
+	NVME_NS_DPS_PI_TYPE3	= 3,
 };
 struct nvme_smart_log {
 	NVME_RW_DSM_LATENCY_LOW		= 3 << 4,
 	NVME_RW_DSM_SEQ_REQ		= 1 << 6,
 	NVME_RW_DSM_COMPRESSED		= 1 << 7,
+	NVME_RW_PRINFO_PRCHK_REF	= 1 << 10,
+	NVME_RW_PRINFO_PRCHK_APP	= 1 << 11,
+	NVME_RW_PRINFO_PRCHK_GUARD	= 1 << 12,
+	NVME_RW_PRINFO_PRACT		= 1 << 13,
 };
 struct nvme_dsm_cmd {
 	__u32	result;
 };
+#define NVME_VS(major, minor) (((major) << 16) | ((minor) << 8))
 #define nvme_admin_cmd nvme_passthru_cmd
 #define NVME_IOCTL_ID		_IO('N', 0x40)

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

 #define OVS_VPORT_ATTR_MAX (__OVS_VPORT_ATTR_MAX - 1)
+enum {
+	OVS_VXLAN_EXT_UNSPEC,
+	OVS_VXLAN_EXT_GBP,	/* Flag or __u32 */
+	__OVS_VXLAN_EXT_MAX,
+};
+#define OVS_VXLAN_EXT_MAX (__OVS_VXLAN_EXT_MAX - 1)
 /* OVS_VPORT_ATTR_OPTIONS attributes for tunnels.
  */
 enum {
 	OVS_TUNNEL_ATTR_UNSPEC,
 	OVS_TUNNEL_ATTR_DST_PORT, /* 16-bit UDP port, used by L4 tunnels. */
+	OVS_TUNNEL_ATTR_EXTENSION,
 	__OVS_TUNNEL_ATTR_MAX
 };
 	OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS,        /* Array of Geneve options. */
 	OVS_TUNNEL_KEY_ATTR_TP_SRC,		/* be16 src Transport Port. */
 	OVS_TUNNEL_KEY_ATTR_TP_DST,		/* be16 dst Transport Port. */
+	OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS,		/* Nested OVS_VXLAN_EXT_* */
 	__OVS_TUNNEL_KEY_ATTR_MAX
 };
  * a wildcarded match. Omitting attribute is treated as wildcarding all
  * corresponding fields. Optional for all requests. If not present,
  * all flow key bits are exact match bits.
+ * @OVS_FLOW_ATTR_UFID: A value between 1-16 octets specifying a unique
+ * identifier for the flow. Causes the flow to be indexed by this value rather
+ * than the value of the %OVS_FLOW_ATTR_KEY attribute. Optional for all
+ * requests. Present in notifications if the flow was created with this
+ * attribute.
+ * @OVS_FLOW_ATTR_UFID_FLAGS: A 32-bit value of OR'd %OVS_UFID_F_*
+ * flags that provide alternative semantics for flow installation and
+ * retrieval. Optional for all requests.
  *
  * These attributes follow the &struct ovs_header within the Generic Netlink
  * payload for %OVS_FLOW_* commands.
 	OVS_FLOW_ATTR_MASK,      /* Sequence of OVS_KEY_ATTR_* attributes. */
 	OVS_FLOW_ATTR_PROBE,     /* Flow operation is a feature probe, error
 				  * logging should be suppressed. */
+	OVS_FLOW_ATTR_UFID,      /* Variable length unique flow identifier. */
+	OVS_FLOW_ATTR_UFID_FLAGS,/* u32 of OVS_UFID_F_*. */
 	__OVS_FLOW_ATTR_MAX
 };
 #define OVS_FLOW_ATTR_MAX (__OVS_FLOW_ATTR_MAX - 1)
+/**
+ * Omit attributes for notifications.
+ *
+ * If a datapath request contains an %OVS_UFID_F_OMIT_* flag, then the datapath
+ * may omit the corresponding %OVS_FLOW_ATTR_* from the response.
+ */
+#define OVS_UFID_F_OMIT_KEY      (1 << 0)
+#define OVS_UFID_F_OMIT_MASK     (1 << 1)
+#define OVS_UFID_F_OMIT_ACTIONS  (1 << 2)
 /**
  * enum ovs_sample_attr - Attributes for %OVS_ACTION_ATTR_SAMPLE action.
  * @OVS_SAMPLE_ATTR_PROBABILITY: 32-bit fraction of packets to sample with
  * @OVS_ACTION_ATTR_SET: Replaces the contents of an existing header.  The
  * single nested %OVS_KEY_ATTR_* attribute specifies a header to modify and its
  * value.
+ * @OVS_ACTION_ATTR_SET_MASKED: Replaces the contents of an existing header.  A
+ * nested %OVS_KEY_ATTR_* attribute specifies a header to modify, its value,
+ * and a mask.  For every bit set in the mask, the corresponding bit value
+ * is copied from the value to the packet header field, rest of the bits are
+ * left unchanged.  The non-masked value bits must be passed in as zeroes.
+ * Masking is not supported for the %OVS_KEY_ATTR_TUNNEL attribute.
  * @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q header onto the
  * packet.
  * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q header off the packet.
  * Only a single header can be set with a single %OVS_ACTION_ATTR_SET.  Not all
  * fields within a header are modifiable, e.g. the IPv4 protocol and fragment
  * type may not be changed.
+ *
+ * @OVS_ACTION_ATTR_SET_TO_MASKED: Kernel internal masked set action translated
+ * from the @OVS_ACTION_ATTR_SET.
  */
 enum ovs_action_attr {
 	OVS_ACTION_ATTR_HASH,	      /* struct ovs_action_hash. */
 	OVS_ACTION_ATTR_PUSH_MPLS,    /* struct ovs_action_push_mpls. */
 	OVS_ACTION_ATTR_POP_MPLS,     /* __be16 ethertype. */
+	OVS_ACTION_ATTR_SET_MASKED,   /* One nested OVS_KEY_ATTR_* including
+				       * data immediately followed by a mask.
+				       * The data must be zero for the unmasked
+				       * bits. */
-	__OVS_ACTION_ATTR_MAX
+	__OVS_ACTION_ATTR_MAX,	      /* Nothing past this will be accepted
+				       * from userspace. */
+#ifdef __KERNEL__
+	OVS_ACTION_ATTR_SET_TO_MASKED, /* Kernel module internal masked
+					* set action converted from
+					* OVS_ACTION_ATTR_SET. */
+#endif
 };
 #define OVS_ACTION_ATTR_MAX (__OVS_ACTION_ATTR_MAX - 1)

include/uapi/linux/pci_regs.h+4−0

 #define  PCI_EXP_DEVCTL_AUX_PME	0x0400	/* Auxiliary Power PM Enable */
 #define  PCI_EXP_DEVCTL_NOSNOOP_EN 0x0800  /* Enable No Snoop */
 #define  PCI_EXP_DEVCTL_READRQ	0x7000	/* Max_Read_Request_Size */
+#define  PCI_EXP_DEVCTL_READRQ_128B  0x0000 /* 128 Bytes */
+#define  PCI_EXP_DEVCTL_READRQ_256B  0x1000 /* 256 Bytes */
+#define  PCI_EXP_DEVCTL_READRQ_512B  0x2000 /* 512 Bytes */
+#define  PCI_EXP_DEVCTL_READRQ_1024B 0x3000 /* 1024 Bytes */
 #define  PCI_EXP_DEVCTL_BCR_FLR 0x8000  /* Bridge Configuration Retry / FLR */
 #define PCI_EXP_DEVSTA		10	/* Device Status */
 #define  PCI_EXP_DEVSTA_CED	0x0001	/* Correctable Error Detected */

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

@@ -774,6 +774,8 @@ enum { · 773 unmodified lines
774		774
775	TCA_FQ_FLOW_REFILL_DELAY, /* flow credit refill delay in usec */	775	TCA_FQ_FLOW_REFILL_DELAY, /* flow credit refill delay in usec */
776		776
		777	TCA_FQ_ORPHAN_MASK, /* mask applied to orphaned skb hashes */
		778
777	__TCA_FQ_MAX	779	__TCA_FQ_MAX
778	};	780	};
779		781

include/uapi/linux/prctl.h+5−0

@@ -185,4 +185,9 @@ struct prctl_mm_map { · 184 unmodified lines
185	#define PR_MPX_ENABLE_MANAGEMENT 43	185	#define PR_MPX_ENABLE_MANAGEMENT 43
186	#define PR_MPX_DISABLE_MANAGEMENT 44	186	#define PR_MPX_DISABLE_MANAGEMENT 44
187		187
		188	#define PR_SET_FP_MODE 45
		189	#define PR_GET_FP_MODE 46
		190	# define PR_FP_MODE_FR (1 << 0) /* 64b FP registers */
		191	# define PR_FP_MODE_FRE (1 << 1) /* 32b compatibility */
		192
188	#endif /* _LINUX_PRCTL_H */	193	#endif /* _LINUX_PRCTL_H */

include/uapi/linux/quota.h+13−1

@@ -126,10 +126,22 @@ struct if_dqblk { · 125 unmodified lines
126	#define IIF_FLAGS 4	126	#define IIF_FLAGS 4
127	#define IIF_ALL (IIF_BGRACE \| IIF_IGRACE \| IIF_FLAGS)	127	#define IIF_ALL (IIF_BGRACE \| IIF_IGRACE \| IIF_FLAGS)
128		128
		129	enum {
		130	DQF_ROOT_SQUASH_B = 0,
		131	DQF_SYS_FILE_B = 16,
		132	/* Kernel internal flags invisible to userspace */
		133	DQF_PRIVATE
		134	};
		135
		136	/* Root squash enabled (for v1 quota format) */
		137	#define DQF_ROOT_SQUASH (1 << DQF_ROOT_SQUASH_B)
		138	/* Quota stored in a system file */
		139	#define DQF_SYS_FILE (1 << DQF_SYS_FILE_B)
		140
129	struct if_dqinfo {	141	struct if_dqinfo {
130	__u64 dqi_bgrace;	142	__u64 dqi_bgrace;
131	__u64 dqi_igrace;	143	__u64 dqi_igrace;
132	__u32 dqi_flags;	144	__u32 dqi_flags; /* DFQ_* */
133	__u32 dqi_valid;	145	__u32 dqi_valid;
134	};	146	};
135		147

include/uapi/linux/rtnetlink.h+8−0

 	RTM_GETMDB = 86,
 #define RTM_GETMDB RTM_GETMDB
+	RTM_NEWNSID = 88,
+#define RTM_NEWNSID RTM_NEWNSID
+	RTM_GETNSID = 90,
+#define RTM_GETNSID RTM_GETNSID
 	__RTM_MAX,
 #define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)
 };
 #define RTAX_INITRWND RTAX_INITRWND
 	RTAX_QUICKACK,
 #define RTAX_QUICKACK RTAX_QUICKACK
+	RTAX_CC_ALGO,
+#define RTAX_CC_ALGO RTAX_CC_ALGO
 	__RTAX_MAX
 };
 /* New extended info filters for IFLA_EXT_MASK */
 #define RTEXT_FILTER_VF		(1 << 0)
 #define RTEXT_FILTER_BRVLAN	(1 << 1)
+#define RTEXT_FILTER_BRVLAN_COMPRESSED	(1 << 2)
 /* End of information exported to user level */

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

 #define PORT_ALTR_16550_F64 27	/* Altera 16550 UART with 64 FIFOs */
 #define PORT_ALTR_16550_F128 28 /* Altera 16550 UART with 128 FIFOs */
 #define PORT_RT2880	29	/* Ralink RT2880 internal UART */
-#define PORT_MAX_8250	29	/* max port ID */
+#define PORT_16550A_FSL64 30	/* Freescale 16550 UART with 64 FIFOs */
+#define PORT_MAX_8250	30	/* max port ID */
 /*
  * ARM specific type numbers.  These are not currently guaranteed
 /* MESON */
 #define PORT_MESON	109
+/* Conexant Digicolor */
+#define PORT_DIGICOLOR	110
+/* SPRD SERIAL  */
+#define PORT_SPRD	111
+/* Cris v10 / v32 SoC */
+#define PORT_CRIS	112
 #endif /* _UAPILINUX_SERIAL_CORE_H */

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

@@ -86,7 +86,8 @@ · 85 unmodified lines
86	#define UART_FCR6_T_TRIGGER_8 0x10 /* Mask for transmit trigger set at 8 */	86	#define UART_FCR6_T_TRIGGER_8 0x10 /* Mask for transmit trigger set at 8 */
87	#define UART_FCR6_T_TRIGGER_24 0x20 /* Mask for transmit trigger set at 24 */	87	#define UART_FCR6_T_TRIGGER_24 0x20 /* Mask for transmit trigger set at 24 */
88	#define UART_FCR6_T_TRIGGER_30 0x30 /* Mask for transmit trigger set at 30 */	88	#define UART_FCR6_T_TRIGGER_30 0x30 /* Mask for transmit trigger set at 30 */
89	#define UART_FCR7_64BYTE 0x20 /* Go into 64 byte mode (TI16C750) */	89	#define UART_FCR7_64BYTE 0x20 /* Go into 64 byte mode (TI16C750 and
		90	some Freescale UARTs) */
90		91
91	#define UART_FCR_R_TRIG_SHIFT 6	92	#define UART_FCR_R_TRIG_SHIFT 6
92	#define UART_FCR_R_TRIG_BITS(x) \	93	#define UART_FCR_R_TRIG_BITS(x) \

include/uapi/linux/snmp.h+6−0

 	LINUX_MIB_TCPHYSTARTTRAINCWND,		/* TCPHystartTrainCwnd */
 	LINUX_MIB_TCPHYSTARTDELAYDETECT,	/* TCPHystartDelayDetect */
 	LINUX_MIB_TCPHYSTARTDELAYCWND,		/* TCPHystartDelayCwnd */
+	LINUX_MIB_TCPACKSKIPPEDSYNRECV,		/* TCPACKSkippedSynRecv */
+	LINUX_MIB_TCPACKSKIPPEDPAWS,		/* TCPACKSkippedPAWS */
+	LINUX_MIB_TCPACKSKIPPEDSEQ,		/* TCPACKSkippedSeq */
+	LINUX_MIB_TCPACKSKIPPEDFINWAIT2,	/* TCPACKSkippedFinWait2 */
+	LINUX_MIB_TCPACKSKIPPEDTIMEWAIT,	/* TCPACKSkippedTimeWait */
+	LINUX_MIB_TCPACKSKIPPEDCHALLENGE,	/* TCPACKSkippedChallenge */
 	__LINUX_MIB_MAX
 };

include/uapi/linux/som.h+0−154

@@ -1,154 +0,0 @@
1	#ifndef _LINUX_SOM_H
2	#define _LINUX_SOM_H
3
4	/* File format definition for SOM executables / shared libraries */
5
6	/* we need struct timespec */
7	#include <linux/time.h>
8
9	#define SOM_PAGESIZE 4096
10
11	/* this is the SOM header */
12	struct som_hdr {
13	short system_id; /* magic number - system */
14	short a_magic; /* magic number - file type */
15	unsigned int version_id; /* versiod ID: YYMMDDHH */
16	struct timespec file_time; /* system clock */
17	unsigned int entry_space; /* space for entry point */
18	unsigned int entry_subspace; /* subspace for entry point */
19	unsigned int entry_offset; /* offset of entry point */
20	unsigned int aux_header_location; /* auxiliary header location */
21	unsigned int aux_header_size; /* auxiliary header size */
22	unsigned int som_length; /* length of entire SOM */
23	unsigned int presumed_dp; /* compiler's DP value */
24	unsigned int space_location; /* space dictionary location */
25	unsigned int space_total; /* number of space entries */
26	unsigned int subspace_location; /* subspace entries location */
27	unsigned int subspace_total; /* number of subspace entries */
28	unsigned int loader_fixup_location; /* MPE/iX loader fixup */
29	unsigned int loader_fixup_total; /* number of fixup records */
30	unsigned int space_strings_location; /* (sub)space names */
31	unsigned int space_strings_size; /* size of strings area */
32	unsigned int init_array_location; /* reserved */
33	unsigned int init_array_total; /* reserved */
34	unsigned int compiler_location; /* module dictionary */
35	unsigned int compiler_total; /* number of modules */
36	unsigned int symbol_location; /* symbol dictionary */
37	unsigned int symbol_total; /* number of symbols */
38	unsigned int fixup_request_location; /* fixup requests */
39	unsigned int fixup_request_total; /* number of fixup requests */
40	unsigned int symbol_strings_location;/* module & symbol names area */
41	unsigned int symbol_strings_size; /* size of strings area */
42	unsigned int unloadable_sp_location; /* unloadable spaces location */
43	unsigned int unloadable_sp_size; /* size of data */
44	unsigned int checksum;
45	};
46
47	/* values for system_id */
48
49	#define SOM_SID_PARISC_1_0 0x020b
50	#define SOM_SID_PARISC_1_1 0x0210
51	#define SOM_SID_PARISC_2_0 0x0214
52
53	/* values for a_magic */
54
55	#define SOM_LIB_EXEC 0x0104
56	#define SOM_RELOCATABLE 0x0106
57	#define SOM_EXEC_NONSHARE 0x0107
58	#define SOM_EXEC_SHARE 0x0108
59	#define SOM_EXEC_DEMAND 0x010B
60	#define SOM_LIB_DYN 0x010D
61	#define SOM_LIB_SHARE 0x010E
62	#define SOM_LIB_RELOC 0x0619
63
64	/* values for version_id. Decimal not hex, yes. Grr. */
65
66	#define SOM_ID_OLD 85082112
67	#define SOM_ID_NEW 87102412
68
69	struct aux_id {
70	unsigned int mandatory :1; /* the linker must understand this */
71	unsigned int copy :1; /* Must be copied by the linker */
72	unsigned int append :1; /* Must be merged by the linker */
73	unsigned int ignore :1; /* Discard section if unknown */
74	unsigned int reserved :12;
75	unsigned int type :16; /* Header type */
76	unsigned int length; /* length of _following_ data */
77	};
78
79	/* The Exec Auxiliary Header. Called The HP-UX Header within HP apparently. */
80	struct som_exec_auxhdr {
81	struct aux_id som_auxhdr;
82	int exec_tsize; /* Text size in bytes */
83	int exec_tmem; /* Address to load text at */
84	int exec_tfile; /* Location of text in file */
85	int exec_dsize; /* Data size in bytes */
86	int exec_dmem; /* Address to load data at */
87	int exec_dfile; /* Location of data in file */
88	int exec_bsize; /* Uninitialised data (bss) */
89	int exec_entry; /* Address to start executing */
90	int exec_flags; /* loader flags */
91	int exec_bfill; /* initialisation value for bss */
92	};
93
94	/* Oh, the things people do to avoid casts. Shame it'll break with gcc's
95	* new aliasing rules really.
96	*/
97	union name_pt {
98	char * n_name;
99	unsigned int n_strx;
100	};
101
102	/* The Space Dictionary */
103	struct space_dictionary_record {
104	union name_pt name; /* index to subspace name */
105	unsigned int is_loadable :1; /* loadable */
106	unsigned int is_defined :1; /* defined within file */
107	unsigned int is_private :1; /* not sharable */
108	unsigned int has_intermediate_code :1; /* contains intermediate code */
109	unsigned int is_tspecific :1; /* thread specific */
110	unsigned int reserved :11; /* for future expansion */
111	unsigned int sort_key :8; /* for linker */
112	unsigned int reserved2 :8; /* for future expansion */
113
114	int space_number; /* index */
115	int subspace_index; /* index into subspace dict */
116	unsigned int subspace_quantity; /* number of subspaces */
117	int loader_fix_index; /* for loader */
118	unsigned int loader_fix_quantity; /* for loader */
119	int init_pointer_index; /* data pointer array index */
120	unsigned int init_pointer_quantity; /* number of data pointers */
121	};
122
123	/* The Subspace Dictionary */
124	struct subspace_dictionary_record {
125	int space_index;
126	unsigned int access_control_bits :7;
127	unsigned int memory_resident :1;
128	unsigned int dup_common :1;
129	unsigned int is_common :1;
130	unsigned int quadrant :2;
131	unsigned int initially_frozen :1;
132	unsigned int is_first :1;
133	unsigned int code_only :1;
134	unsigned int sort_key :8;
135	unsigned int replicate_init :1;
136	unsigned int continuation :1;
137	unsigned int is_tspecific :1;
138	unsigned int is_comdat :1;
139	unsigned int reserved :4;
140
141	int file_loc_init_value;
142	unsigned int initialization_length;
143	unsigned int subspace_start;
144	unsigned int subspace_length;
145
146	unsigned int reserved2 :5;
147	unsigned int alignment :27;
148
149	union name_pt name;
150	int fixup_request_index;
151	unsigned int fixup_request_quantity;
152	};
153
154	#endif /* _LINUX_SOM_H */

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

@@ -8,3 +8,4 @@ header-y += tc_nat.h · 7 unmodified lines
8	header-y += tc_pedit.h	8	header-y += tc_pedit.h
9	header-y += tc_skbedit.h	9	header-y += tc_skbedit.h
10	header-y += tc_vlan.h	10	header-y += tc_vlan.h
		11	header-y += tc_bpf.h

include/uapi/linux/tc_act/tc_bpf.h+31−0

@@ -0,0 +1,31 @@
	1	/*
	2	* Copyright (c) 2015 Jiri Pirko <jiri@resnulli.us>
	3	*
	4	* This program is free software; you can redistribute it and/or modify
	5	* it under the terms of the GNU General Public License as published by
	6	* the Free Software Foundation; either version 2 of the License, or
	7	* (at your option) any later version.
	8	*/
	9
	10	#ifndef __LINUX_TC_BPF_H
	11	#define __LINUX_TC_BPF_H
	12
	13	#include <linux/pkt_cls.h>
	14
	15	#define TCA_ACT_BPF 13
	16
	17	struct tc_act_bpf {
	18	tc_gen;
	19	};
	20
	21	enum {
	22	TCA_ACT_BPF_UNSPEC,
	23	TCA_ACT_BPF_TM,
	24	TCA_ACT_BPF_PARMS,
	25	TCA_ACT_BPF_OPS_LEN,
	26	TCA_ACT_BPF_OPS,
	27	__TCA_ACT_BPF_MAX,
	28	};
	29	#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
	30
	31	#endif

include/uapi/linux/tc_act/tc_connmark.h+22−0

@@ -0,0 +1,22 @@
	1	#ifndef __UAPI_TC_CONNMARK_H
	2	#define __UAPI_TC_CONNMARK_H
	3
	4	#include <linux/types.h>
	5	#include <linux/pkt_cls.h>
	6
	7	#define TCA_ACT_CONNMARK 14
	8
	9	struct tc_connmark {
	10	tc_gen;
	11	__u16 zone;
	12	};
	13
	14	enum {
	15	TCA_CONNMARK_UNSPEC,
	16	TCA_CONNMARK_PARMS,
	17	TCA_CONNMARK_TM,
	18	__TCA_CONNMARK_MAX
	19	};
	20	#define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1)
	21
	22	#endif

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

@@ -272,6 +272,26 @@ static inline int TLV_CHECK(const void *tlv, __u16 space, __u16 exp_type) · 271 unmodified lines
272	(ntohs(((struct tlv_desc *)tlv)->tlv_type) == exp_type);	272	(ntohs(((struct tlv_desc *)tlv)->tlv_type) == exp_type);
273	}	273	}
274		274
		275	static inline int TLV_GET_LEN(struct tlv_desc *tlv)
		276	{
		277	return ntohs(tlv->tlv_len);
		278	}
		279
		280	static inline void TLV_SET_LEN(struct tlv_desc *tlv, __u16 len)
		281	{
		282	tlv->tlv_len = htons(len);
		283	}
		284
		285	static inline int TLV_CHECK_TYPE(struct tlv_desc *tlv, __u16 type)
		286	{
		287	return (ntohs(tlv->tlv_type) == type);
		288	}
		289
		290	static inline void TLV_SET_TYPE(struct tlv_desc *tlv, __u16 type)
		291	{
		292	tlv->tlv_type = htons(type);
		293	}
		294
275	static inline int TLV_SET(void tlv, __u16 type, void data, __u16 len)	295	static inline int TLV_SET(void tlv, __u16 type, void data, __u16 len)
276	{	296	{
277	struct tlv_desc *tlv_ptr;	297	struct tlv_desc *tlv_ptr;

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

@@ -20,6 +20,7 @@ enum functionfs_flags { · 19 unmodified lines
20	FUNCTIONFS_HAS_SS_DESC = 4,	20	FUNCTIONFS_HAS_SS_DESC = 4,
21	FUNCTIONFS_HAS_MS_OS_DESC = 8,	21	FUNCTIONFS_HAS_MS_OS_DESC = 8,
22	FUNCTIONFS_VIRTUAL_ADDR = 16,	22	FUNCTIONFS_VIRTUAL_ADDR = 16,
		23	FUNCTIONFS_EVENTFD = 32,
23	};	24	};
24		25
25	/* Descriptor of an non-audio endpoint */	26	/* Descriptor of an non-audio endpoint */

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

 	char port [127];	/* e.g. port 3 connects to device 27 */
 };
-/* Device capability flags */
+/* System and bus capability flags */
 #define USBDEVFS_CAP_ZERO_PACKET		0x01
 #define USBDEVFS_CAP_BULK_CONTINUATION		0x02
 #define USBDEVFS_CAP_NO_PACKET_SIZE_LIM		0x04
 #define USBDEVFS_CAP_BULK_SCATTER_GATHER	0x08
+#define USBDEVFS_CAP_REAP_AFTER_DISCONNECT	0x10
 /* USBDEVFS_DISCONNECT_CLAIM flags & struct */

include/uapi/linux/v4l2-controls.h+4−0

  * We reserve 16 controls for this driver. */
 #define V4L2_CID_USER_SAA7134_BASE		(V4L2_CID_USER_BASE + 0x1060)
+/* The base for the adv7180 driver controls.
+ * We reserve 16 controls for this driver. */
+#define V4L2_CID_USER_ADV7180_BASE		(V4L2_CID_USER_BASE + 0x1070)
 /* MPEG-class control IDs */
 /* The MPEG controls are applicable to all codec controls
  * and the 'MPEG' part of the define is historical */

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

@@ -333,6 +333,7 @@ enum { · 332 unmodified lines
333	VFIO_PCI_MSI_IRQ_INDEX,	333	VFIO_PCI_MSI_IRQ_INDEX,
334	VFIO_PCI_MSIX_IRQ_INDEX,	334	VFIO_PCI_MSIX_IRQ_INDEX,
335	VFIO_PCI_ERR_IRQ_INDEX,	335	VFIO_PCI_ERR_IRQ_INDEX,
		336	VFIO_PCI_REQ_IRQ_INDEX,
336	VFIO_PCI_NUM_IRQS	337	VFIO_PCI_NUM_IRQS
337	};	338	};
338		339

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

 #define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
 #define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
 #define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
-#define V4L2_PIX_FMT_SBGGR12 v4l2_fourcc('B', 'G', '1', '2') /* 12  BGBG.. GRGR.. */
+	/* 10bit raw bayer packed, 5 bytes for every 4 pixels */
-#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12  GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SBGGR10P v4l2_fourcc('p', 'B', 'A', 'A')
-#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12  GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SGBRG10P v4l2_fourcc('p', 'G', 'A', 'A')
-#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12  RGRG.. GBGB.. */
+#define V4L2_PIX_FMT_SGRBG10P v4l2_fourcc('p', 'g', 'A', 'A')
+#define V4L2_PIX_FMT_SRGGB10P v4l2_fourcc('p', 'R', 'A', 'A')
 	/* 10bit raw bayer a-law compressed to 8 bits */
 #define V4L2_PIX_FMT_SBGGR10ALAW8 v4l2_fourcc('a', 'B', 'A', '8')
 #define V4L2_PIX_FMT_SGBRG10ALAW8 v4l2_fourcc('a', 'G', 'A', '8')
 #define V4L2_PIX_FMT_SGBRG10DPCM8 v4l2_fourcc('b', 'G', 'A', '8')
 #define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
 #define V4L2_PIX_FMT_SRGGB10DPCM8 v4l2_fourcc('b', 'R', 'A', '8')
-	/*
+#define V4L2_PIX_FMT_SBGGR12 v4l2_fourcc('B', 'G', '1', '2') /* 12  BGBG.. GRGR.. */
-	 * 10bit raw bayer, expanded to 16 bits
+#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12  GBGB.. RGRG.. */
-	 * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
+#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12  GRGR.. BGBG.. */
-	 */
+#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12  RGRG.. GBGB.. */
 #define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
 /* compressed formats */

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

@@ -36,8 +36,7 @@ · 35 unmodified lines
36	/* Size of a PFN in the balloon interface. */	36	/* Size of a PFN in the balloon interface. */
37	#define VIRTIO_BALLOON_PFN_SHIFT 12	37	#define VIRTIO_BALLOON_PFN_SHIFT 12
38		38
39	struct virtio_balloon_config	39	struct virtio_balloon_config {
40	{
41	/* Number of pages host wants Guest to give up. */	40	/* Number of pages host wants Guest to give up. */
42	__le32 num_pages;	41	__le32 num_pages;
43	/* Number of pages we've actually got in balloon. */	42	/* Number of pages we've actually got in balloon. */

include/uapi/linux/virtio_blk.h+13−4

 #include <linux/virtio_types.h>
 /* Feature bits */
-#define VIRTIO_BLK_F_BARRIER	0	/* Does host support barriers? */
 #define VIRTIO_BLK_F_SIZE_MAX	1	/* Indicates maximum segment size */
 #define VIRTIO_BLK_F_SEG_MAX	2	/* Indicates maximum # of segments */
 #define VIRTIO_BLK_F_GEOMETRY	4	/* Legacy geometry available  */
 #define VIRTIO_BLK_F_RO		5	/* Disk is read-only */
 #define VIRTIO_BLK_F_BLK_SIZE	6	/* Block size of disk is available*/
-#define VIRTIO_BLK_F_SCSI	7	/* Supports scsi command passthru */
-#define VIRTIO_BLK_F_WCE	9	/* Writeback mode enabled after reset */
 #define VIRTIO_BLK_F_TOPOLOGY	10	/* Topology information is available */
-#define VIRTIO_BLK_F_CONFIG_WCE	11	/* Writeback mode available in config */
 #define VIRTIO_BLK_F_MQ		12	/* support more than one vq */
+/* Legacy feature bits */
+#ifndef VIRTIO_BLK_NO_LEGACY
+#define VIRTIO_BLK_F_BARRIER	0	/* Does host support barriers? */
+#define VIRTIO_BLK_F_SCSI	7	/* Supports scsi command passthru */
+#define VIRTIO_BLK_F_WCE	9	/* Writeback mode enabled after reset */
+#define VIRTIO_BLK_F_CONFIG_WCE	11	/* Writeback mode available in config */
 #ifndef __KERNEL__
 /* Old (deprecated) name for VIRTIO_BLK_F_WCE. */
 #define VIRTIO_BLK_F_FLUSH VIRTIO_BLK_F_WCE
 #endif
+#endif /* !VIRTIO_BLK_NO_LEGACY */
 #define VIRTIO_BLK_ID_BYTES	20	/* ID string length */
 #define VIRTIO_BLK_T_IN		0
 #define VIRTIO_BLK_T_OUT	1
+#ifndef VIRTIO_BLK_NO_LEGACY
 /* This bit says it's a scsi command, not an actual read or write. */
 #define VIRTIO_BLK_T_SCSI_CMD	2
+#endif /* VIRTIO_BLK_NO_LEGACY */
 /* Cache flush command */
 #define VIRTIO_BLK_T_FLUSH	4
 /* Get device ID command */
 #define VIRTIO_BLK_T_GET_ID    8
+#ifndef VIRTIO_BLK_NO_LEGACY
 /* Barrier before this op. */
 #define VIRTIO_BLK_T_BARRIER	0x80000000
+#endif /* !VIRTIO_BLK_NO_LEGACY */
 /* This is the first element of the read scatter-gather list. */
 struct virtio_blk_outhdr {
 	__virtio64 sector;
 };
+#ifndef VIRTIO_BLK_NO_LEGACY
 struct virtio_scsi_inhdr {
 	__virtio32 errors;
 	__virtio32 data_len;
 	__virtio32 sense_len;
 	__virtio32 residual;
 };
+#endif /* !VIRTIO_BLK_NO_LEGACY */
 /* And this is the final byte of the write scatter-gather list. */
 #define VIRTIO_BLK_S_OK		0

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

 #define VIRTIO_TRANSPORT_F_START	28
 #define VIRTIO_TRANSPORT_F_END		33
+#ifndef VIRTIO_CONFIG_NO_LEGACY
 /* Do we get callbacks when the ring is completely used, even if we've
  * suppressed them? */
 #define VIRTIO_F_NOTIFY_ON_EMPTY	24
 /* Can the device handle any descriptor layout? */
 #define VIRTIO_F_ANY_LAYOUT		27
+#endif /* VIRTIO_CONFIG_NO_LEGACY */
 /* v1.0 compliant. */
 #define VIRTIO_F_VERSION_1		32

include/uapi/linux/virtio_net.h+33−9

 #define VIRTIO_NET_F_CSUM	0	/* Host handles pkts w/ partial csum */
 #define VIRTIO_NET_F_GUEST_CSUM	1	/* Guest handles pkts w/ partial csum */
 #define VIRTIO_NET_F_MAC	5	/* Host has given MAC address. */
-#define VIRTIO_NET_F_GSO	6	/* Host handles pkts w/ any GSO type */
 #define VIRTIO_NET_F_GUEST_TSO4	7	/* Guest can handle TSOv4 in. */
 #define VIRTIO_NET_F_GUEST_TSO6	8	/* Guest can handle TSOv6 in. */
 #define VIRTIO_NET_F_GUEST_ECN	9	/* Guest can handle TSO[6] w/ ECN in. */
 					 * Steering */
 #define VIRTIO_NET_F_CTRL_MAC_ADDR 23	/* Set MAC address */
+#ifndef VIRTIO_NET_NO_LEGACY
+#define VIRTIO_NET_F_GSO	6	/* Host handles pkts w/ any GSO type */
+#endif /* VIRTIO_NET_NO_LEGACY */
 #define VIRTIO_NET_S_LINK_UP	1	/* Link is up */
 #define VIRTIO_NET_S_ANNOUNCE	2	/* Announcement is needed */
 	__u16 max_virtqueue_pairs;
 } __attribute__((packed));
+/*
+ * This header comes first in the scatter-gather list.  If you don't
+ * specify GSO or CSUM features, you can simply ignore the header.
+ *
+ * This is bitwise-equivalent to the legacy struct virtio_net_hdr_mrg_rxbuf,
+ * only flattened.
+ */
+struct virtio_net_hdr_v1 {
+#define VIRTIO_NET_HDR_F_NEEDS_CSUM	1	/* Use csum_start, csum_offset */
+#define VIRTIO_NET_HDR_F_DATA_VALID	2	/* Csum is valid */
+	__u8 flags;
+#define VIRTIO_NET_HDR_GSO_NONE		0	/* Not a GSO frame */
+#define VIRTIO_NET_HDR_GSO_TCPV4	1	/* GSO frame, IPv4 TCP (TSO) */
+#define VIRTIO_NET_HDR_GSO_UDP		3	/* GSO frame, IPv4 UDP (UFO) */
+#define VIRTIO_NET_HDR_GSO_TCPV6	4	/* GSO frame, IPv6 TCP */
+#define VIRTIO_NET_HDR_GSO_ECN		0x80	/* TCP has ECN set */
+	__u8 gso_type;
+	__virtio16 hdr_len;	/* Ethernet + IP + tcp/udp hdrs */
+	__virtio16 gso_size;	/* Bytes to append to hdr_len per frame */
+	__virtio16 csum_start;	/* Position to start checksumming from */
+	__virtio16 csum_offset;	/* Offset after that to place checksum */
+	__virtio16 num_buffers;	/* Number of merged rx buffers */
+};
+#ifndef VIRTIO_NET_NO_LEGACY
 /* This header comes first in the scatter-gather list.
- * If VIRTIO_F_ANY_LAYOUT is not negotiated, it must
+ * For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, it must
  * be the first element of the scatter-gather list.  If you don't
  * specify GSO or CSUM features, you can simply ignore the header. */
 struct virtio_net_hdr {
-#define VIRTIO_NET_HDR_F_NEEDS_CSUM	1	// Use csum_start, csum_offset
+	/* See VIRTIO_NET_HDR_F_* */
-#define VIRTIO_NET_HDR_F_DATA_VALID	2	// Csum is valid
 	__u8 flags;
-#define VIRTIO_NET_HDR_GSO_NONE		0	// Not a GSO frame
+	/* See VIRTIO_NET_HDR_GSO_* */
-#define VIRTIO_NET_HDR_GSO_TCPV4	1	// GSO frame, IPv4 TCP (TSO)
-#define VIRTIO_NET_HDR_GSO_UDP		3	// GSO frame, IPv4 UDP (UFO)
-#define VIRTIO_NET_HDR_GSO_TCPV6	4	// GSO frame, IPv6 TCP
-#define VIRTIO_NET_HDR_GSO_ECN		0x80	// TCP has ECN set
 	__u8 gso_type;
 	__virtio16 hdr_len;		/* Ethernet + IP + tcp/udp hdrs */
 	__virtio16 gso_size;		/* Bytes to append to hdr_len per frame */
 	struct virtio_net_hdr hdr;
 	__virtio16 num_buffers;	/* Number of merged rx buffers */
 };
+#endif /* ...VIRTIO_NET_NO_LEGACY */
 /*
  * Control virtqueue data structures

include/uapi/linux/virtio_pci.h+92−1

@@ -39,7 +39,7 @@ · 38 unmodified lines
39	#ifndef _LINUX_VIRTIO_PCI_H	39	#ifndef _LINUX_VIRTIO_PCI_H
40	#define _LINUX_VIRTIO_PCI_H	40	#define _LINUX_VIRTIO_PCI_H
41		41
42	#include <linux/virtio_config.h>	42	#include <linux/types.h>
43		43
44	#ifndef VIRTIO_PCI_NO_LEGACY	44	#ifndef VIRTIO_PCI_NO_LEGACY
45		45
@@ -99,4 +99,95 @@ · 53 unmodified lines
99	/* Vector value used to disable MSI for queue */	99	/* Vector value used to disable MSI for queue */
100	#define VIRTIO_MSI_NO_VECTOR 0xffff	100	#define VIRTIO_MSI_NO_VECTOR 0xffff
101		101
		102	#ifndef VIRTIO_PCI_NO_MODERN
		103
		104	/* IDs for different capabilities. Must all exist. */
		105
		106	/* Common configuration */
		107	#define VIRTIO_PCI_CAP_COMMON_CFG 1
		108	/* Notifications */
		109	#define VIRTIO_PCI_CAP_NOTIFY_CFG 2
		110	/* ISR access */
		111	#define VIRTIO_PCI_CAP_ISR_CFG 3
		112	/* Device specific configuration */
		113	#define VIRTIO_PCI_CAP_DEVICE_CFG 4
		114	/* PCI configuration access */
		115	#define VIRTIO_PCI_CAP_PCI_CFG 5
		116
		117	/* This is the PCI capability header: */
		118	struct virtio_pci_cap {
		119	__u8 cap_vndr; /* Generic PCI field: PCI_CAP_ID_VNDR */
		120	__u8 cap_next; /* Generic PCI field: next ptr. */
		121	__u8 cap_len; /* Generic PCI field: capability length */
		122	__u8 cfg_type; /* Identifies the structure. */
		123	__u8 bar; /* Where to find it. */
		124	__u8 padding[3]; /* Pad to full dword. */
		125	__le32 offset; /* Offset within bar. */
		126	__le32 length; /* Length of the structure, in bytes. */
		127	};
		128
		129	struct virtio_pci_notify_cap {
		130	struct virtio_pci_cap cap;
		131	__le32 notify_off_multiplier; /* Multiplier for queue_notify_off. */
		132	};
		133
		134	/* Fields in VIRTIO_PCI_CAP_COMMON_CFG: */
		135	struct virtio_pci_common_cfg {
		136	/* About the whole device. */
		137	__le32 device_feature_select; /* read-write */
		138	__le32 device_feature; /* read-only */
		139	__le32 guest_feature_select; /* read-write */
		140	__le32 guest_feature; /* read-write */
		141	__le16 msix_config; /* read-write */
		142	__le16 num_queues; /* read-only */
		143	__u8 device_status; /* read-write */
		144	__u8 config_generation; /* read-only */
		145
		146	/* About a specific virtqueue. */
		147	__le16 queue_select; /* read-write */
		148	__le16 queue_size; /* read-write, power of 2. */
		149	__le16 queue_msix_vector; /* read-write */
		150	__le16 queue_enable; /* read-write */
		151	__le16 queue_notify_off; /* read-only */
		152	__le32 queue_desc_lo; /* read-write */
		153	__le32 queue_desc_hi; /* read-write */
		154	__le32 queue_avail_lo; /* read-write */
		155	__le32 queue_avail_hi; /* read-write */
		156	__le32 queue_used_lo; /* read-write */
		157	__le32 queue_used_hi; /* read-write */
		158	};
		159
		160	/* Macro versions of offsets for the Old Timers! */
		161	#define VIRTIO_PCI_CAP_VNDR 0
		162	#define VIRTIO_PCI_CAP_NEXT 1
		163	#define VIRTIO_PCI_CAP_LEN 2
		164	#define VIRTIO_PCI_CAP_CFG_TYPE 3
		165	#define VIRTIO_PCI_CAP_BAR 4
		166	#define VIRTIO_PCI_CAP_OFFSET 8
		167	#define VIRTIO_PCI_CAP_LENGTH 12
		168
		169	#define VIRTIO_PCI_NOTIFY_CAP_MULT 16
		170
		171	#define VIRTIO_PCI_COMMON_DFSELECT 0
		172	#define VIRTIO_PCI_COMMON_DF 4
		173	#define VIRTIO_PCI_COMMON_GFSELECT 8
		174	#define VIRTIO_PCI_COMMON_GF 12
		175	#define VIRTIO_PCI_COMMON_MSIX 16
		176	#define VIRTIO_PCI_COMMON_NUMQ 18
		177	#define VIRTIO_PCI_COMMON_STATUS 20
		178	#define VIRTIO_PCI_COMMON_CFGGENERATION 21
		179	#define VIRTIO_PCI_COMMON_Q_SELECT 22
		180	#define VIRTIO_PCI_COMMON_Q_SIZE 24
		181	#define VIRTIO_PCI_COMMON_Q_MSIX 26
		182	#define VIRTIO_PCI_COMMON_Q_ENABLE 28
		183	#define VIRTIO_PCI_COMMON_Q_NOFF 30
		184	#define VIRTIO_PCI_COMMON_Q_DESCLO 32
		185	#define VIRTIO_PCI_COMMON_Q_DESCHI 36
		186	#define VIRTIO_PCI_COMMON_Q_AVAILLO 40
		187	#define VIRTIO_PCI_COMMON_Q_AVAILHI 44
		188	#define VIRTIO_PCI_COMMON_Q_USEDLO 48
		189	#define VIRTIO_PCI_COMMON_Q_USEDHI 52
		190
		191	#endif /* VIRTIO_PCI_NO_MODERN */
		192
102	#endif	193	#endif

include/uapi/rdma/ib_user_verbs.h+1−5

 	__u8  reserved[4];
 };
-enum {
-	IB_USER_VERBS_EX_QUERY_DEVICE_ODP =		1ULL << 0,
-};
 struct ib_uverbs_ex_query_device {
 	__u32 comp_mask;
 	__u32 reserved;
 struct ib_uverbs_ex_query_device_resp {
 	struct ib_uverbs_query_device_resp base;
 	__u32 comp_mask;
-	__u32 reserved;
+	__u32 response_length;
 	struct ib_uverbs_odp_caps odp_caps;
 };

include/uapi/sound/asound.h+1−0

@@ -268,6 +268,7 @@ typedef int __bitwise snd_pcm_subformat_t; · 267 unmodified lines
268	#define SNDRV_PCM_INFO_SYNC_START 0x00400000 /* pcm support some kind of sync go */	268	#define SNDRV_PCM_INFO_SYNC_START 0x00400000 /* pcm support some kind of sync go */
269	#define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP 0x00800000 /* period wakeup can be disabled */	269	#define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP 0x00800000 /* period wakeup can be disabled */
270	#define SNDRV_PCM_INFO_HAS_WALL_CLOCK 0x01000000 /* has audio wall clock for audio/system time sync */	270	#define SNDRV_PCM_INFO_HAS_WALL_CLOCK 0x01000000 /* has audio wall clock for audio/system time sync */
		271	#define SNDRV_PCM_INFO_DRAIN_TRIGGER 0x40000000 /* internal kernel flag - trigger in drain */
271	#define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */	272	#define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */
272		273
273	typedef int __bitwise snd_pcm_state_t;	274	typedef int __bitwise snd_pcm_state_t;

include/uapi/sound/usb_stream.h+76−0

@@ -0,0 +1,76 @@
	1	/*
	2	* Copyright (C) 2007, 2008 Karsten Wiese <fzu@wemgehoertderstaat.de>
	3	*
	4	* This program is free software; you can redistribute it and/or modify it
	5	* under the terms of the GNU General Public License as published by the
	6	* Free Software Foundation; either version 2 of the License, or (at your
	7	* option) any later version.
	8	*
	9	* This program is distributed in the hope that it will be useful, but
	10	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
	11	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
	12	* for more details.
	13	*
	14	* You should have received a copy of the GNU General Public License
	15	* along with this program; if not, write to the Free Software Foundation,
	16	* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
	17	*/
	18
	19	#ifndef _UAPI__SOUND_USB_STREAM_H
	20	#define _UAPI__SOUND_USB_STREAM_H
	21
	22	#define USB_STREAM_INTERFACE_VERSION 2
	23
	24	#define SNDRV_USB_STREAM_IOCTL_SET_PARAMS \
	25	_IOW('H', 0x90, struct usb_stream_config)
	26
	27	struct usb_stream_packet {
	28	unsigned offset;
	29	unsigned length;
	30	};
	31
	32
	33	struct usb_stream_config {
	34	unsigned version;
	35	unsigned sample_rate;
	36	unsigned period_frames;
	37	unsigned frame_size;
	38	};
	39
	40	struct usb_stream {
	41	struct usb_stream_config cfg;
	42	unsigned read_size;
	43	unsigned write_size;
	44
	45	int period_size;
	46
	47	unsigned state;
	48
	49	int idle_insize;
	50	int idle_outsize;
	51	int sync_packet;
	52	unsigned insize_done;
	53	unsigned periods_done;
	54	unsigned periods_polled;
	55
	56	struct usb_stream_packet outpacket[2];
	57	unsigned inpackets;
	58	unsigned inpacket_head;
	59	unsigned inpacket_split;
	60	unsigned inpacket_split_at;
	61	unsigned next_inpacket_split;
	62	unsigned next_inpacket_split_at;
	63	struct usb_stream_packet inpacket[0];
	64	};
	65
	66	enum usb_stream_state {
	67	usb_stream_invalid,
	68	usb_stream_stopped,
	69	usb_stream_sync0,
	70	usb_stream_sync1,
	71	usb_stream_ready,
	72	usb_stream_running,
	73	usb_stream_xrun,
	74	};
	75
	76	#endif /* _UAPI__SOUND_USB_STREAM_H */

Merge tag 'v4.0-rc1' into perf/core, to refresh the tree

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code