Merge Linus master into drm-next

The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: Dave Airlie <airlied@redhat.com>

32 files changed, 734 insertions, 34 deletions

diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 68ceb97c458c..38df23435ebb 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -6,6 +6,7 @@ header-y += caif/
 header-y += dvb/
 header-y += hdlc/
 header-y += hsi/
+header-y += iio/
 header-y += isdn/
 header-y += mmc/
 header-y += nfsd/
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 45da7ec7d274..a9ebdf5701e8 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -118,8 +118,13 @@ enum bpf_map_type {
 enum bpf_prog_type {
         BPF_PROG_TYPE_UNSPEC,
         BPF_PROG_TYPE_SOCKET_FILTER,
+        BPF_PROG_TYPE_KPROBE,
+        BPF_PROG_TYPE_SCHED_CLS,
+        BPF_PROG_TYPE_SCHED_ACT,
 };
 
+#define BPF_PSEUDO_MAP_FD       1
+
 /* flags for BPF_MAP_UPDATE_ELEM command */
 #define BPF_ANY         0 /* create new element or update existing */
 #define BPF_NOEXIST     1 /* create new element if it didn't exist */
@@ -151,6 +156,7 @@ union bpf_attr {
                 __u32           log_level;      /* verbosity level of verifier */
                 __u32           log_size;       /* size of user buffer */
                 __aligned_u64   log_buf;        /* user supplied buffer */
+                __u32           kern_version;   /* checked when prog_type=kprobe */
         };
 } __attribute__((aligned(8)));
 
@@ -162,7 +168,64 @@ enum bpf_func_id {
         BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */
         BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */
         BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */
+        BPF_FUNC_probe_read,      /* int bpf_probe_read(void *dst, int size, void *src) */
+        BPF_FUNC_ktime_get_ns,    /* u64 bpf_ktime_get_ns(void) */
+        BPF_FUNC_trace_printk,    /* int bpf_trace_printk(const char *fmt, int fmt_size, ...) */
+        BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */
+        BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */
+
+        /**
+         * skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet
+         * @skb: pointer to skb
+         * @offset: offset within packet from skb->mac_header
+         * @from: pointer where to copy bytes from
+         * @len: number of bytes to store into packet
+         * @flags: bit 0 - if true, recompute skb->csum
+         *         other bits - reserved
+         * Return: 0 on success
+         */
+        BPF_FUNC_skb_store_bytes,
+
+        /**
+         * l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum
+         * @skb: pointer to skb
+         * @offset: offset within packet where IP checksum is located
+         * @from: old value of header field
+         * @to: new value of header field
+         * @flags: bits 0-3 - size of header field
+         *         other bits - reserved
+         * Return: 0 on success
+         */
+        BPF_FUNC_l3_csum_replace,
+
+        /**
+         * l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum
+         * @skb: pointer to skb
+         * @offset: offset within packet where TCP/UDP checksum is located
+         * @from: old value of header field
+         * @to: new value of header field
+         * @flags: bits 0-3 - size of header field
+         *         bit 4 - is pseudo header
+         *         other bits - reserved
+         * Return: 0 on success
+         */
+        BPF_FUNC_l4_csum_replace,
         __BPF_FUNC_MAX_ID,
 };
 
+/* user accessible mirror of in-kernel sk_buff.
+ * new fields can only be added to the end of this structure
+ */
+struct __sk_buff {
+        __u32 len;
+        __u32 pkt_type;
+        __u32 mark;
+        __u32 queue_mapping;
+        __u32 protocol;
+        __u32 vlan_present;
+        __u32 vlan_tci;
+        __u32 vlan_proto;
+        __u32 priority;
+};
+
 #endif /* _UAPI__LINUX_BPF_H__ */
diff --git a/include/uapi/linux/can/raw.h b/include/uapi/linux/can/raw.h
index 78ec76fd89a6..8735f1080385 100644
--- a/include/uapi/linux/can/raw.h
+++ b/include/uapi/linux/can/raw.h
@@ -57,6 +57,7 @@ enum {
         CAN_RAW_LOOPBACK,       /* local loopback (default:on)       */
         CAN_RAW_RECV_OWN_MSGS,  /* receive my own msgs (default:off) */
         CAN_RAW_FD_FRAMES,      /* allow CAN FD frames (default:off) */
+        CAN_RAW_JOIN_FILTERS,   /* all filters must match to trigger */
 };
 
 #endif /* !_UAPI_CAN_RAW_H */
diff --git a/include/uapi/linux/dcbnl.h b/include/uapi/linux/dcbnl.h
index e711f20dc522..6497d7933d5b 100644
--- a/include/uapi/linux/dcbnl.h
+++ b/include/uapi/linux/dcbnl.h
@@ -78,6 +78,70 @@ struct ieee_maxrate {
         __u64   tc_maxrate[IEEE_8021QAZ_MAX_TCS];
 };
 
+enum dcbnl_cndd_states {
+        DCB_CNDD_RESET = 0,
+        DCB_CNDD_EDGE,
+        DCB_CNDD_INTERIOR,
+        DCB_CNDD_INTERIOR_READY,
+};
+
+/* This structure contains the IEEE 802.1Qau QCN managed object.
+ *
+ *@rpg_enable: enable QCN RP
+ *@rppp_max_rps: maximum number of RPs allowed for this CNPV on this port
+ *@rpg_time_reset: time between rate increases if no CNMs received.
+ *                 given in u-seconds
+ *@rpg_byte_reset: transmitted data between rate increases if no CNMs received.
+ *                 given in Bytes
+ *@rpg_threshold: The number of times rpByteStage or rpTimeStage can count
+ *                 before RP rate control state machine advances states
+ *@rpg_max_rate: the maxinun rate, in Mbits per second,
+ *               at which an RP can transmit
+ *@rpg_ai_rate: The rate, in Mbits per second,
+ *              used to increase rpTargetRate in the RPR_ACTIVE_INCREASE
+ *@rpg_hai_rate: The rate, in Mbits per second,
+ *               used to increase rpTargetRate in the RPR_HYPER_INCREASE state
+ *@rpg_gd: Upon CNM receive, flow rate is limited to (Fb/Gd)*CurrentRate.
+ *         rpgGd is given as log2(Gd), where Gd may only be powers of 2
+ *@rpg_min_dec_fac: The minimum factor by which the current transmit rate
+ *                  can be changed by reception of a CNM.
+ *                  value is given as percentage (1-100)
+ *@rpg_min_rate: The minimum value, in bits per second, for rate to limit
+ *@cndd_state_machine: The state of the congestion notification domain
+ *                     defense state machine, as defined by IEEE 802.3Qau
+ *                     section 32.1.1. In the interior ready state,
+ *                     the QCN capable hardware may add CN-TAG TLV to the
+ *                     outgoing traffic, to specifically identify outgoing
+ *                     flows.
+ */
+
+struct ieee_qcn {
+        __u8 rpg_enable[IEEE_8021QAZ_MAX_TCS];
+        __u32 rppp_max_rps[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_time_reset[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_byte_reset[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_threshold[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_max_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_ai_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_hai_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_gd[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_min_dec_fac[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_min_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 cndd_state_machine[IEEE_8021QAZ_MAX_TCS];
+};
+
+/* This structure contains the IEEE 802.1Qau QCN statistics.
+ *
+ *@rppp_rp_centiseconds: the number of RP-centiseconds accumulated
+ *                       by RPs at this priority level on this Port
+ *@rppp_created_rps: number of active RPs(flows) that react to CNMs
+ */
+
+struct ieee_qcn_stats {
+        __u64 rppp_rp_centiseconds[IEEE_8021QAZ_MAX_TCS];
+        __u32 rppp_created_rps[IEEE_8021QAZ_MAX_TCS];
+};
+
 /* This structure contains the IEEE 802.1Qaz PFC managed object
  *
  * @pfc_cap: Indicates the number of traffic classes on the local device
@@ -334,6 +398,8 @@ enum ieee_attrs {
         DCB_ATTR_IEEE_PEER_PFC,
         DCB_ATTR_IEEE_PEER_APP,
         DCB_ATTR_IEEE_MAXRATE,
+        DCB_ATTR_IEEE_QCN,
+        DCB_ATTR_IEEE_QCN_STATS,
         __DCB_ATTR_IEEE_MAX
 };
 #define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1)
diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h
index 889f3a5b7b18..eac8c3641f39 100644
--- a/include/uapi/linux/dm-ioctl.h
+++ b/include/uapi/linux/dm-ioctl.h
@@ -267,9 +267,9 @@ enum {
 #define DM_DEV_SET_GEOMETRY     _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 
 #define DM_VERSION_MAJOR        4
-#define DM_VERSION_MINOR        30
+#define DM_VERSION_MINOR        31
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2014-12-22)"
+#define DM_VERSION_EXTRA        "-ioctl (2015-3-12)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
diff --git a/include/uapi/linux/filter.h b/include/uapi/linux/filter.h
index 47785d5ecf17..c97340e43dd6 100644
--- a/include/uapi/linux/filter.h
+++ b/include/uapi/linux/filter.h
@@ -77,9 +77,13 @@ struct sock_fprog {	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_VLAN_TAG_PRESENT 48
 #define SKF_AD_PAY_OFFSET       52
 #define SKF_AD_RANDOM   56
-#define SKF_AD_MAX      60
-#define SKF_NET_OFF   (-0x100000)
-#define SKF_LL_OFF    (-0x200000)
+#define SKF_AD_VLAN_TPID        60
+#define SKF_AD_MAX      64
 
+#define SKF_NET_OFF     (-0x100000)
+#define SKF_LL_OFF      (-0x200000)
+
+#define BPF_NET_OFF     SKF_NET_OFF
+#define BPF_LL_OFF      SKF_LL_OFF
 
 #endif /* _UAPI__LINUX_FILTER_H__ */
diff --git a/include/uapi/linux/fou.h b/include/uapi/linux/fou.h
index c303588bb767..d2947c52dc67 100644
--- a/include/uapi/linux/fou.h
+++ b/include/uapi/linux/fou.h
@@ -25,6 +25,7 @@ enum {
         FOU_CMD_UNSPEC,
         FOU_CMD_ADD,
         FOU_CMD_DEL,
+        FOU_CMD_GET,
 
         __FOU_CMD_MAX,
 };
diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild
index 30ab3cd3b8a5..a16a00544258 100644
--- a/include/uapi/linux/hsi/Kbuild
+++ b/include/uapi/linux/hsi/Kbuild
@@ -1,2 +1,2 @@
 # UAPI Header export list
-header-y += hsi_char.h
+header-y += hsi_char.h cs-protocol.h
diff --git a/include/uapi/linux/hsi/cs-protocol.h b/include/uapi/linux/hsi/cs-protocol.h
new file mode 100644
index 000000000000..4957bba57cbe
--- /dev/null
+++ b/include/uapi/linux/hsi/cs-protocol.h
@@ -0,0 +1,113 @@
+/*
+ * cmt-speech interface definitions
+ *
+ * Copyright (C) 2008,2009,2010 Nokia Corporation. All rights reserved.
+ *
+ * Contact: Kai Vehmanen <kai.vehmanen@nokia.com>
+ * Original author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT 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 _CS_PROTOCOL_H
+#define _CS_PROTOCOL_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+/* chardev parameters */
+#define CS_DEV_FILE_NAME                "/dev/cmt_speech"
+
+/* user-space API versioning */
+#define CS_IF_VERSION                   2
+
+/* APE kernel <-> user space messages */
+#define CS_CMD_SHIFT                    28
+#define CS_DOMAIN_SHIFT                 24
+
+#define CS_CMD_MASK                     0xff000000
+#define CS_PARAM_MASK                   0xffffff
+
+#define CS_CMD(id, dom) \
+        (((id) << CS_CMD_SHIFT) | ((dom) << CS_DOMAIN_SHIFT))
+
+#define CS_ERROR                        CS_CMD(1, 0)
+#define CS_RX_DATA_RECEIVED             CS_CMD(2, 0)
+#define CS_TX_DATA_READY                CS_CMD(3, 0)
+#define CS_TX_DATA_SENT                 CS_CMD(4, 0)
+
+/* params to CS_ERROR indication */
+#define CS_ERR_PEER_RESET               0
+
+/* ioctl interface */
+
+/* parameters to CS_CONFIG_BUFS ioctl */
+#define CS_FEAT_TSTAMP_RX_CTRL          (1 << 0)
+#define CS_FEAT_ROLLING_RX_COUNTER      (2 << 0)
+
+/* parameters to CS_GET_STATE ioctl */
+#define CS_STATE_CLOSED                 0
+#define CS_STATE_OPENED                 1 /* resource allocated */
+#define CS_STATE_CONFIGURED             2 /* data path active */
+
+/* maximum number of TX/RX buffers */
+#define CS_MAX_BUFFERS_SHIFT            4
+#define CS_MAX_BUFFERS                  (1 << CS_MAX_BUFFERS_SHIFT)
+
+/* Parameters for setting up the data buffers */
+struct cs_buffer_config {
+        __u32 rx_bufs;  /* number of RX buffer slots */
+        __u32 tx_bufs;  /* number of TX buffer slots */
+        __u32 buf_size; /* bytes */
+        __u32 flags;    /* see CS_FEAT_* */
+        __u32 reserved[4];
+};
+
+/*
+ * Struct describing the layout and contents of the driver mmap area.
+ * This information is meant as read-only information for the application.
+ */
+struct cs_mmap_config_block {
+        __u32 reserved1;
+        __u32 buf_size;         /* 0=disabled, otherwise the transfer size */
+        __u32 rx_bufs;          /* # of RX buffers */
+        __u32 tx_bufs;          /* # of TX buffers */
+        __u32 reserved2;
+        /* array of offsets within the mmap area for each RX and TX buffer */
+        __u32 rx_offsets[CS_MAX_BUFFERS];
+        __u32 tx_offsets[CS_MAX_BUFFERS];
+        __u32 rx_ptr;
+        __u32 rx_ptr_boundary;
+        __u32 reserved3[2];
+        /*
+         * if enabled with CS_FEAT_TSTAMP_RX_CTRL, monotonic
+         * timestamp taken when the last control command was received
+         */
+        struct timespec tstamp_rx_ctrl;
+};
+
+#define CS_IO_MAGIC             'C'
+
+#define CS_IOW(num, dtype)      _IOW(CS_IO_MAGIC, num, dtype)
+#define CS_IOR(num, dtype)      _IOR(CS_IO_MAGIC, num, dtype)
+#define CS_IOWR(num, dtype)     _IOWR(CS_IO_MAGIC, num, dtype)
+#define CS_IO(num)              _IO(CS_IO_MAGIC, num)
+
+#define CS_GET_STATE            CS_IOR(21, unsigned int)
+#define CS_SET_WAKELINE         CS_IOW(23, unsigned int)
+#define CS_GET_IF_VERSION       CS_IOR(30, unsigned int)
+#define CS_CONFIG_BUFS          CS_IOW(31, struct cs_buffer_config)
+
+#endif /* _CS_PROTOCOL_H */
diff --git a/include/uapi/linux/if_addr.h b/include/uapi/linux/if_addr.h
index dea10a87dfd1..4318ab1635ce 100644
--- a/include/uapi/linux/if_addr.h
+++ b/include/uapi/linux/if_addr.h
@@ -50,6 +50,8 @@ enum {
 #define IFA_F_PERMANENT         0x80
 #define IFA_F_MANAGETEMPADDR    0x100
 #define IFA_F_NOPREFIXROUTE     0x200
+#define IFA_F_MCAUTOJOIN        0x400
+#define IFA_F_STABLE_PRIVACY    0x800
 
 struct ifa_cacheinfo {
         __u32   ifa_prefered;
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index dfd0bb22e554..d9cd19214b98 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -147,6 +147,7 @@ enum {
         IFLA_CARRIER_CHANGES,
         IFLA_PHYS_SWITCH_ID,
         IFLA_LINK_NETNSID,
+        IFLA_PHYS_PORT_NAME,
         __IFLA_MAX
 };
 
@@ -215,6 +216,7 @@ enum {
 enum in6_addr_gen_mode {
         IN6_ADDR_GEN_MODE_EUI64,
         IN6_ADDR_GEN_MODE_NONE,
+        IN6_ADDR_GEN_MODE_STABLE_PRIVACY,
 };
 
 /* Bridge section */
@@ -224,6 +226,9 @@ enum {
         IFLA_BR_FORWARD_DELAY,
         IFLA_BR_HELLO_TIME,
         IFLA_BR_MAX_AGE,
+        IFLA_BR_AGEING_TIME,
+        IFLA_BR_STP_STATE,
+        IFLA_BR_PRIORITY,
         __IFLA_BR_MAX,
 };
 
@@ -247,6 +252,7 @@ enum {
         IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
         IFLA_BRPORT_PROXYARP,   /* proxy ARP */
         IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */
+        IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */
         __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -459,6 +465,9 @@ enum {
         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_RSS_QUERY_EN,   /* RSS Redirection Table and Hash Key query
+                                 * on/off switch
+                                 */
         __IFLA_VF_MAX,
 };
 
@@ -503,6 +512,11 @@ struct ifla_vf_link_state {
         __u32 link_state;
 };
 
+struct ifla_vf_rss_query_en {
+        __u32 vf;
+        __u32 setting;
+};
+
 /* VF ports management section
  *
  *      Nested layout of set/get msg is:
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h
index da2d668b8cf1..053bd102fbe0 100644
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
@@ -99,6 +99,7 @@ struct tpacket_auxdata {
 #define TP_STATUS_VLAN_VALID            (1 << 4) /* auxdata has valid tp_vlan_tci */
 #define TP_STATUS_BLK_TMO               (1 << 5)
 #define TP_STATUS_VLAN_TPID_VALID       (1 << 6) /* auxdata has valid tp_vlan_tpid */
+#define TP_STATUS_CSUM_VALID            (1 << 7)
 
 /* Tx ring - header status */
 #define TP_STATUS_AVAILABLE           0
diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild
new file mode 100644
index 000000000000..86f76d84c44f
--- /dev/null
+++ b/include/uapi/linux/iio/Kbuild
@@ -0,0 +1,3 @@
+# UAPI Header export list
+header-y += events.h
+header-y += types.h
diff --git a/include/uapi/linux/iio/events.h b/include/uapi/linux/iio/events.h
new file mode 100644
index 000000000000..00bbdaed2f97
--- /dev/null
+++ b/include/uapi/linux/iio/events.h
@@ -0,0 +1,42 @@
+/* The industrial I/O - event passing to userspace
+ *
+ * Copyright (c) 2008-2011 Jonathan Cameron
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef _UAPI_IIO_EVENTS_H_
+#define _UAPI_IIO_EVENTS_H_
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/**
+ * struct iio_event_data - The actual event being pushed to userspace
+ * @id:         event identifier
+ * @timestamp:  best estimate of time of event occurrence (often from
+ *              the interrupt handler)
+ */
+struct iio_event_data {
+        __u64   id;
+        __s64   timestamp;
+};
+
+#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)
+
+#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
+
+#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0x7F)
+
+#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
+
+/* Event code number extraction depends on which type of event we have.
+ * Perhaps review this function in the future*/
+#define IIO_EVENT_CODE_EXTRACT_CHAN(mask) ((__s16)(mask & 0xFFFF))
+#define IIO_EVENT_CODE_EXTRACT_CHAN2(mask) ((__s16)(((mask) >> 16) & 0xFFFF))
+
+#define IIO_EVENT_CODE_EXTRACT_MODIFIER(mask) ((mask >> 40) & 0xFF)
+#define IIO_EVENT_CODE_EXTRACT_DIFF(mask) (((mask) >> 55) & 0x1)
+
+#endif /* _UAPI_IIO_EVENTS_H_ */
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
new file mode 100644
index 000000000000..5c4601935005
--- /dev/null
+++ b/include/uapi/linux/iio/types.h
@@ -0,0 +1,92 @@
+/* industrial I/O data types needed both in and out of kernel
+ *
+ * Copyright (c) 2008 Jonathan Cameron
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#ifndef _UAPI_IIO_TYPES_H_
+#define _UAPI_IIO_TYPES_H_
+
+enum iio_chan_type {
+        IIO_VOLTAGE,
+        IIO_CURRENT,
+        IIO_POWER,
+        IIO_ACCEL,
+        IIO_ANGL_VEL,
+        IIO_MAGN,
+        IIO_LIGHT,
+        IIO_INTENSITY,
+        IIO_PROXIMITY,
+        IIO_TEMP,
+        IIO_INCLI,
+        IIO_ROT,
+        IIO_ANGL,
+        IIO_TIMESTAMP,
+        IIO_CAPACITANCE,
+        IIO_ALTVOLTAGE,
+        IIO_CCT,
+        IIO_PRESSURE,
+        IIO_HUMIDITYRELATIVE,
+        IIO_ACTIVITY,
+        IIO_STEPS,
+        IIO_ENERGY,
+        IIO_DISTANCE,
+        IIO_VELOCITY,
+};
+
+enum iio_modifier {
+        IIO_NO_MOD,
+        IIO_MOD_X,
+        IIO_MOD_Y,
+        IIO_MOD_Z,
+        IIO_MOD_X_AND_Y,
+        IIO_MOD_X_AND_Z,
+        IIO_MOD_Y_AND_Z,
+        IIO_MOD_X_AND_Y_AND_Z,
+        IIO_MOD_X_OR_Y,
+        IIO_MOD_X_OR_Z,
+        IIO_MOD_Y_OR_Z,
+        IIO_MOD_X_OR_Y_OR_Z,
+        IIO_MOD_LIGHT_BOTH,
+        IIO_MOD_LIGHT_IR,
+        IIO_MOD_ROOT_SUM_SQUARED_X_Y,
+        IIO_MOD_SUM_SQUARED_X_Y_Z,
+        IIO_MOD_LIGHT_CLEAR,
+        IIO_MOD_LIGHT_RED,
+        IIO_MOD_LIGHT_GREEN,
+        IIO_MOD_LIGHT_BLUE,
+        IIO_MOD_QUATERNION,
+        IIO_MOD_TEMP_AMBIENT,
+        IIO_MOD_TEMP_OBJECT,
+        IIO_MOD_NORTH_MAGN,
+        IIO_MOD_NORTH_TRUE,
+        IIO_MOD_NORTH_MAGN_TILT_COMP,
+        IIO_MOD_NORTH_TRUE_TILT_COMP,
+        IIO_MOD_RUNNING,
+        IIO_MOD_JOGGING,
+        IIO_MOD_WALKING,
+        IIO_MOD_STILL,
+        IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z,
+};
+
+enum iio_event_type {
+        IIO_EV_TYPE_THRESH,
+        IIO_EV_TYPE_MAG,
+        IIO_EV_TYPE_ROC,
+        IIO_EV_TYPE_THRESH_ADAPTIVE,
+        IIO_EV_TYPE_MAG_ADAPTIVE,
+        IIO_EV_TYPE_CHANGE,
+};
+
+enum iio_event_direction {
+        IIO_EV_DIR_EITHER,
+        IIO_EV_DIR_RISING,
+        IIO_EV_DIR_FALLING,
+        IIO_EV_DIR_NONE,
+};
+
+#endif /* _UAPI_IIO_TYPES_H_ */
+
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index 2f62ab2d7bf9..731417c025f6 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -369,7 +369,8 @@ struct input_keymap_entry {
 #define KEY_MSDOS               151
 #define KEY_COFFEE              152     /* AL Terminal Lock/Screensaver */
 #define KEY_SCREENLOCK          KEY_COFFEE
-#define KEY_DIRECTION           153
+#define KEY_ROTATE_DISPLAY      153     /* Display orientation for e.g. tablets */
+#define KEY_DIRECTION           KEY_ROTATE_DISPLAY
 #define KEY_CYCLEWINDOWS        154
 #define KEY_MAIL                155
 #define KEY_BOOKMARKS           156     /* AC Bookmarks */
@@ -702,6 +703,10 @@ struct input_keymap_entry {
 #define KEY_NUMERIC_9           0x209
 #define KEY_NUMERIC_STAR        0x20a
 #define KEY_NUMERIC_POUND       0x20b
+#define KEY_NUMERIC_A           0x20c   /* Phone key A - HUT Telephony 0xb9 */
+#define KEY_NUMERIC_B           0x20d
+#define KEY_NUMERIC_C           0x20e
+#define KEY_NUMERIC_D           0x20f
 
 #define KEY_CAMERA_FOCUS        0x210
 #define KEY_WPS_BUTTON          0x211   /* WiFi Protected Setup key */
diff --git a/include/uapi/linux/ip_vs.h b/include/uapi/linux/ip_vs.h
index cabe95d5b461..3199243f2028 100644
--- a/include/uapi/linux/ip_vs.h
+++ b/include/uapi/linux/ip_vs.h
@@ -358,6 +358,8 @@ enum {
 
         IPVS_SVC_ATTR_PE_NAME,          /* name of ct retriever */
 
+        IPVS_SVC_ATTR_STATS64,          /* nested attribute for service stats */
+
         __IPVS_SVC_ATTR_MAX,
 };
 
@@ -387,6 +389,8 @@ enum {
 
         IPVS_DEST_ATTR_ADDR_FAMILY,     /* Address family of address */
 
+        IPVS_DEST_ATTR_STATS64,         /* nested attribute for dest stats */
+
         __IPVS_DEST_ATTR_MAX,
 };
 
@@ -410,7 +414,8 @@ enum {
 /*
  * Attributes used to describe service or destination entry statistics
  *
- * Used inside nested attributes IPVS_SVC_ATTR_STATS and IPVS_DEST_ATTR_STATS
+ * Used inside nested attributes IPVS_SVC_ATTR_STATS, IPVS_DEST_ATTR_STATS,
+ * IPVS_SVC_ATTR_STATS64 and IPVS_DEST_ATTR_STATS64.
  */
 enum {
         IPVS_STATS_ATTR_UNSPEC = 0,
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 437a6a4b125a..5efa54ae567c 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -170,6 +170,7 @@ enum {
         DEVCONF_ACCEPT_RA_FROM_LOCAL,
         DEVCONF_USE_OPTIMISTIC,
         DEVCONF_ACCEPT_RA_MTU,
+        DEVCONF_STABLE_SECRET,
         DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 805570650062..f574d7be7631 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -147,6 +147,16 @@ struct kvm_pit_config {
 
 #define KVM_PIT_SPEAKER_DUMMY     1
 
+struct kvm_s390_skeys {
+        __u64 start_gfn;
+        __u64 count;
+        __u64 skeydata_addr;
+        __u32 flags;
+        __u32 reserved[9];
+};
+#define KVM_S390_GET_SKEYS_NONE   1
+#define KVM_S390_SKEYS_MAX        1048576
+
 #define KVM_EXIT_UNKNOWN          0
 #define KVM_EXIT_EXCEPTION        1
 #define KVM_EXIT_IO               2
@@ -172,6 +182,7 @@ struct kvm_pit_config {
 #define KVM_EXIT_S390_TSCH        22
 #define KVM_EXIT_EPR              23
 #define KVM_EXIT_SYSTEM_EVENT     24
+#define KVM_EXIT_S390_STSI        25
 
 /* For KVM_EXIT_INTERNAL_ERROR */
 /* Emulate instruction failed. */
@@ -309,6 +320,15 @@ struct kvm_run {
                         __u32 type;
                         __u64 flags;
                 } system_event;
+                /* KVM_EXIT_S390_STSI */
+                struct {
+                        __u64 addr;
+                        __u8 ar;
+                        __u8 reserved;
+                        __u8 fc;
+                        __u8 sel1;
+                        __u16 sel2;
+                } s390_stsi;
                 /* Fix the size of the union. */
                 char padding[256];
         };
@@ -324,7 +344,7 @@ struct kvm_run {
         __u64 kvm_dirty_regs;
         union {
                 struct kvm_sync_regs regs;
-                char padding[1024];
+                char padding[2048];
         } s;
 };
 
@@ -365,6 +385,24 @@ struct kvm_translation {
         __u8  pad[5];
 };
 
+/* for KVM_S390_MEM_OP */
+struct kvm_s390_mem_op {
+        /* in */
+        __u64 gaddr;            /* the guest address */
+        __u64 flags;            /* flags */
+        __u32 size;             /* amount of bytes */
+        __u32 op;               /* type of operation */
+        __u64 buf;              /* buffer in userspace */
+        __u8 ar;                /* the access register number */
+        __u8 reserved[31];      /* should be set to 0 */
+};
+/* types for kvm_s390_mem_op->op */
+#define KVM_S390_MEMOP_LOGICAL_READ     0
+#define KVM_S390_MEMOP_LOGICAL_WRITE    1
+/* flags for kvm_s390_mem_op->flags */
+#define KVM_S390_MEMOP_F_CHECK_ONLY             (1ULL << 0)
+#define KVM_S390_MEMOP_F_INJECT_EXCEPTION       (1ULL << 1)
+
 /* for KVM_INTERRUPT */
 struct kvm_interrupt {
         /* in */
@@ -520,6 +558,13 @@ struct kvm_s390_irq {
         } u;
 };
 
+struct kvm_s390_irq_state {
+        __u64 buf;
+        __u32 flags;
+        __u32 len;
+        __u32 reserved[4];
+};
+
 /* for KVM_SET_GUEST_DEBUG */
 
 #define KVM_GUESTDBG_ENABLE             0x00000001
@@ -760,6 +805,14 @@ struct kvm_ppc_smmu_info {
 #define KVM_CAP_PPC_ENABLE_HCALL 104
 #define KVM_CAP_CHECK_EXTENSION_VM 105
 #define KVM_CAP_S390_USER_SIGP 106
+#define KVM_CAP_S390_VECTOR_REGISTERS 107
+#define KVM_CAP_S390_MEM_OP 108
+#define KVM_CAP_S390_USER_STSI 109
+#define KVM_CAP_S390_SKEYS 110
+#define KVM_CAP_MIPS_FPU 111
+#define KVM_CAP_MIPS_MSA 112
+#define KVM_CAP_S390_INJECT_IRQ 113
+#define KVM_CAP_S390_IRQ_STATE 114
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
@@ -1135,6 +1188,16 @@ struct kvm_s390_ucas_mapping {
 #define KVM_ARM_VCPU_INIT         _IOW(KVMIO,  0xae, struct kvm_vcpu_init)
 #define KVM_ARM_PREFERRED_TARGET  _IOR(KVMIO,  0xaf, struct kvm_vcpu_init)
 #define KVM_GET_REG_LIST          _IOWR(KVMIO, 0xb0, struct kvm_reg_list)
+/* Available with KVM_CAP_S390_MEM_OP */
+#define KVM_S390_MEM_OP           _IOW(KVMIO,  0xb1, struct kvm_s390_mem_op)
+/* Available with KVM_CAP_S390_SKEYS */
+#define KVM_S390_GET_SKEYS      _IOW(KVMIO, 0xb2, struct kvm_s390_skeys)
+#define KVM_S390_SET_SKEYS      _IOW(KVMIO, 0xb3, struct kvm_s390_skeys)
+/* Available with KVM_CAP_S390_INJECT_IRQ */
+#define KVM_S390_IRQ              _IOW(KVMIO,  0xb4, struct kvm_s390_irq)
+/* Available with KVM_CAP_S390_IRQ_STATE */
+#define KVM_S390_SET_IRQ_STATE    _IOW(KVMIO, 0xb5, struct kvm_s390_irq_state)
+#define KVM_S390_GET_IRQ_STATE    _IOW(KVMIO, 0xb6, struct kvm_s390_irq_state)
 
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU     (1 << 0)
 #define KVM_DEV_ASSIGN_PCI_2_3          (1 << 1)
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 7d664ea85ebd..7b1425a6b370 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -58,6 +58,8 @@
 
 #define STACK_END_MAGIC         0x57AC6E9D
 
+#define TRACEFS_MAGIC          0x74726163
+
 #define V9FS_MAGIC              0x01021997
 
 #define BDEVFS_MAGIC            0x62646576
diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h
index 3873a35509aa..2e35c61bbdd1 100644
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
@@ -126,6 +126,7 @@ enum {
         NDTPA_PROXY_QLEN,               /* u32 */
         NDTPA_LOCKTIME,                 /* u64, msecs */
         NDTPA_QUEUE_LENBYTES,           /* u32 */
+        NDTPA_MCAST_REPROBES,           /* u32 */
         __NDTPA_MAX
 };
 #define NDTPA_MAX (__NDTPA_MAX - 1)
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index 832bc46db78b..5fa1cd04762e 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -1,19 +1,49 @@
 #ifndef _LINUX_NF_TABLES_H
 #define _LINUX_NF_TABLES_H
 
+#define NFT_TABLE_MAXNAMELEN    32
 #define NFT_CHAIN_MAXNAMELEN    32
 #define NFT_USERDATA_MAXLEN     256
 
+/**
+ * enum nft_registers - nf_tables registers
+ *
+ * nf_tables used to have five registers: a verdict register and four data
+ * registers of size 16. The data registers have been changed to 16 registers
+ * of size 4. For compatibility reasons, the NFT_REG_[1-4] registers still
+ * map to areas of size 16, the 4 byte registers are addressed using
+ * NFT_REG32_00 - NFT_REG32_15.
+ */
 enum nft_registers {
         NFT_REG_VERDICT,
         NFT_REG_1,
         NFT_REG_2,
         NFT_REG_3,
         NFT_REG_4,
-        __NFT_REG_MAX
+        __NFT_REG_MAX,
+
+        NFT_REG32_00    = 8,
+        MFT_REG32_01,
+        NFT_REG32_02,
+        NFT_REG32_03,
+        NFT_REG32_04,
+        NFT_REG32_05,
+        NFT_REG32_06,
+        NFT_REG32_07,
+        NFT_REG32_08,
+        NFT_REG32_09,
+        NFT_REG32_10,
+        NFT_REG32_11,
+        NFT_REG32_12,
+        NFT_REG32_13,
+        NFT_REG32_14,
+        NFT_REG32_15,
 };
 #define NFT_REG_MAX     (__NFT_REG_MAX - 1)
 
+#define NFT_REG_SIZE    16
+#define NFT_REG32_SIZE  4
+
 /**
  * enum nft_verdicts - nf_tables internal verdicts
  *
@@ -207,12 +237,16 @@ enum nft_rule_compat_attributes {
  * @NFT_SET_CONSTANT: set contents may not change while bound
  * @NFT_SET_INTERVAL: set contains intervals
  * @NFT_SET_MAP: set is used as a dictionary
+ * @NFT_SET_TIMEOUT: set uses timeouts
+ * @NFT_SET_EVAL: set contains expressions for evaluation
  */
 enum nft_set_flags {
         NFT_SET_ANONYMOUS               = 0x1,
         NFT_SET_CONSTANT                = 0x2,
         NFT_SET_INTERVAL                = 0x4,
         NFT_SET_MAP                     = 0x8,
+        NFT_SET_TIMEOUT                 = 0x10,
+        NFT_SET_EVAL                    = 0x20,
 };
 
 /**
@@ -251,6 +285,8 @@ enum nft_set_desc_attributes {
  * @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)
+ * @NFTA_SET_TIMEOUT: default timeout value (NLA_U64)
+ * @NFTA_SET_GC_INTERVAL: garbage collection interval (NLA_U32)
  */
 enum nft_set_attributes {
         NFTA_SET_UNSPEC,
@@ -264,6 +300,8 @@ enum nft_set_attributes {
         NFTA_SET_POLICY,
         NFTA_SET_DESC,
         NFTA_SET_ID,
+        NFTA_SET_TIMEOUT,
+        NFTA_SET_GC_INTERVAL,
         __NFTA_SET_MAX
 };
 #define NFTA_SET_MAX            (__NFTA_SET_MAX - 1)
@@ -283,12 +321,20 @@ enum nft_set_elem_flags {
  * @NFTA_SET_ELEM_KEY: key value (NLA_NESTED: nft_data)
  * @NFTA_SET_ELEM_DATA: data value of mapping (NLA_NESTED: nft_data_attributes)
  * @NFTA_SET_ELEM_FLAGS: bitmask of nft_set_elem_flags (NLA_U32)
+ * @NFTA_SET_ELEM_TIMEOUT: timeout value (NLA_U64)
+ * @NFTA_SET_ELEM_EXPIRATION: expiration time (NLA_U64)
+ * @NFTA_SET_ELEM_USERDATA: user data (NLA_BINARY)
+ * @NFTA_SET_ELEM_EXPR: expression (NLA_NESTED: nft_expr_attributes)
  */
 enum nft_set_elem_attributes {
         NFTA_SET_ELEM_UNSPEC,
         NFTA_SET_ELEM_KEY,
         NFTA_SET_ELEM_DATA,
         NFTA_SET_ELEM_FLAGS,
+        NFTA_SET_ELEM_TIMEOUT,
+        NFTA_SET_ELEM_EXPIRATION,
+        NFTA_SET_ELEM_USERDATA,
+        NFTA_SET_ELEM_EXPR,
         __NFTA_SET_ELEM_MAX
 };
 #define NFTA_SET_ELEM_MAX       (__NFTA_SET_ELEM_MAX - 1)
@@ -346,6 +392,9 @@ enum nft_data_attributes {
 };
 #define NFTA_DATA_MAX           (__NFTA_DATA_MAX - 1)
 
+/* Maximum length of a value */
+#define NFT_DATA_VALUE_MAXLEN   64
+
 /**
  * enum nft_verdict_attributes - nf_tables verdict netlink attributes
  *
@@ -504,6 +553,35 @@ enum nft_lookup_attributes {
 };
 #define NFTA_LOOKUP_MAX         (__NFTA_LOOKUP_MAX - 1)
 
+enum nft_dynset_ops {
+        NFT_DYNSET_OP_ADD,
+        NFT_DYNSET_OP_UPDATE,
+};
+
+/**
+ * enum nft_dynset_attributes - dynset expression attributes
+ *
+ * @NFTA_DYNSET_SET_NAME: name of set the to add data to (NLA_STRING)
+ * @NFTA_DYNSET_SET_ID: uniquely identifier of the set in the transaction (NLA_U32)
+ * @NFTA_DYNSET_OP: operation (NLA_U32)
+ * @NFTA_DYNSET_SREG_KEY: source register of the key (NLA_U32)
+ * @NFTA_DYNSET_SREG_DATA: source register of the data (NLA_U32)
+ * @NFTA_DYNSET_TIMEOUT: timeout value for the new element (NLA_U64)
+ * @NFTA_DYNSET_EXPR: expression (NLA_NESTED: nft_expr_attributes)
+ */
+enum nft_dynset_attributes {
+        NFTA_DYNSET_UNSPEC,
+        NFTA_DYNSET_SET_NAME,
+        NFTA_DYNSET_SET_ID,
+        NFTA_DYNSET_OP,
+        NFTA_DYNSET_SREG_KEY,
+        NFTA_DYNSET_SREG_DATA,
+        NFTA_DYNSET_TIMEOUT,
+        NFTA_DYNSET_EXPR,
+        __NFTA_DYNSET_MAX,
+};
+#define NFTA_DYNSET_MAX         (__NFTA_DYNSET_MAX - 1)
+
 /**
  * enum nft_payload_bases - nf_tables payload expression offset bases
  *
diff --git a/include/uapi/linux/netfilter_bridge/ebtables.h b/include/uapi/linux/netfilter_bridge/ebtables.h
index ba993360dbe9..773dfe8924c7 100644
--- a/include/uapi/linux/netfilter_bridge/ebtables.h
+++ b/include/uapi/linux/netfilter_bridge/ebtables.h
@@ -12,9 +12,7 @@
 
 #ifndef _UAPI__LINUX_BRIDGE_EFF_H
 #define _UAPI__LINUX_BRIDGE_EFF_H
-#include <linux/if.h>
 #include <linux/netfilter_bridge.h>
-#include <linux/if_ether.h>
 
 #define EBT_TABLE_MAXNAMELEN 32
 #define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 68b294e83944..241220c43e86 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -25,6 +25,19 @@
  *
  */
 
+/*
+ * This header file defines the userspace API to the wireless stack. Please
+ * be careful not to break things - i.e. don't move anything around or so
+ * unless you can demonstrate that it breaks neither API nor ABI.
+ *
+ * Additions to the API should be accompanied by actual implementations in
+ * an upstream driver, so that example implementations exist in case there
+ * are ever concerns about the precise semantics of the API or changes are
+ * needed, and to ensure that code for dead (no longer implemented) API
+ * can actually be identified and removed.
+ * Nonetheless, semantics should also be documented carefully in this file.
+ */
+
 #include <linux/types.h>
 
 #define NL80211_GENL_NAME "nl80211"
@@ -1684,6 +1697,10 @@ enum nl80211_commands {
  *      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.
+ *      If set during configuration of regulatory indoor operation then the
+ *      regulatory indoor configuration would be owned by the netlink socket
+ *      that configured the indoor setting, and the indoor operation would be
+ *      cleared when the socket is closed.
  *
  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
  *      the TDLS link initiator.
@@ -1737,8 +1754,12 @@ enum nl80211_commands {
  *      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.
+ * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a
+ *      scheduled scan (or a WoWLAN net-detect scan) is started, u32
+ *      in seconds.
+
+ * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
+ *      is operating in an indoor environment.
  *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2107,6 +2128,8 @@ enum nl80211_attrs {
 
         NL80211_ATTR_SCHED_SCAN_DELAY,
 
+        NL80211_ATTR_REG_INDOOR,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -3092,7 +3115,8 @@ enum nl80211_mesh_power_mode {
  *
  * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've
  *      established peering with for longer than this time (in seconds), then
- *      remove it from the STA's list of peers.  Default is 30 minutes.
+ *      remove it from the STA's list of peers. You may set this to 0 to disable
+ *      the removal of the STA. Default is 30 minutes.
  *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
  */
@@ -3694,6 +3718,8 @@ struct nl80211_pattern_support {
  * @NL80211_WOWLAN_TRIG_ANY: wake up on any activity, do not really put
  *      the chip into a special state -- works best with chips that have
  *      support for low-power operation already (flag)
+ *      Note that this mode is incompatible with all of the others, if
+ *      any others are even supported by the device.
  * @NL80211_WOWLAN_TRIG_DISCONNECT: wake up on disconnect, the way disconnect
  *      is detected is implementation-specific (flag)
  * @NL80211_WOWLAN_TRIG_MAGIC_PKT: wake up on magic packet (6x 0xff, followed
@@ -4327,11 +4353,13 @@ enum nl80211_feature_flags {
 
 /**
  * enum nl80211_ext_feature_index - bit index of extended features.
+ * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
  *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
  */
 enum nl80211_ext_feature_index {
+        NL80211_EXT_FEATURE_VHT_IBSS,
 
         /* add new features before the definition below */
         NUM_NL80211_EXT_FEATURES,
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 9b79abbd1ab8..309211b3eb67 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -152,21 +152,42 @@ enum perf_event_sample_format {
  * The branch types can be combined, however BRANCH_ANY covers all types
  * of branches and therefore it supersedes all the other types.
  */
+enum perf_branch_sample_type_shift {
+        PERF_SAMPLE_BRANCH_USER_SHIFT           = 0, /* user branches */
+        PERF_SAMPLE_BRANCH_KERNEL_SHIFT         = 1, /* kernel branches */
+        PERF_SAMPLE_BRANCH_HV_SHIFT             = 2, /* hypervisor branches */
+
+        PERF_SAMPLE_BRANCH_ANY_SHIFT            = 3, /* any branch types */
+        PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT       = 4, /* any call branch */
+        PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT     = 5, /* any return branch */
+        PERF_SAMPLE_BRANCH_IND_CALL_SHIFT       = 6, /* indirect calls */
+        PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT       = 7, /* transaction aborts */
+        PERF_SAMPLE_BRANCH_IN_TX_SHIFT          = 8, /* in transaction */
+        PERF_SAMPLE_BRANCH_NO_TX_SHIFT          = 9, /* not in transaction */
+        PERF_SAMPLE_BRANCH_COND_SHIFT           = 10, /* conditional branches */
+
+        PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT     = 11, /* call/ret stack */
+
+        PERF_SAMPLE_BRANCH_MAX_SHIFT            /* non-ABI */
+};
+
 enum perf_branch_sample_type {
-        PERF_SAMPLE_BRANCH_USER         = 1U << 0, /* user branches */
-        PERF_SAMPLE_BRANCH_KERNEL       = 1U << 1, /* kernel branches */
-        PERF_SAMPLE_BRANCH_HV           = 1U << 2, /* hypervisor branches */
-
-        PERF_SAMPLE_BRANCH_ANY          = 1U << 3, /* any branch types */
-        PERF_SAMPLE_BRANCH_ANY_CALL     = 1U << 4, /* any call branch */
-        PERF_SAMPLE_BRANCH_ANY_RETURN   = 1U << 5, /* any return branch */
-        PERF_SAMPLE_BRANCH_IND_CALL     = 1U << 6, /* indirect calls */
-        PERF_SAMPLE_BRANCH_ABORT_TX     = 1U << 7, /* transaction aborts */
-        PERF_SAMPLE_BRANCH_IN_TX        = 1U << 8, /* in transaction */
-        PERF_SAMPLE_BRANCH_NO_TX        = 1U << 9, /* not in transaction */
-        PERF_SAMPLE_BRANCH_COND         = 1U << 10, /* conditional branches */
-
-        PERF_SAMPLE_BRANCH_MAX          = 1U << 11, /* non-ABI */
+        PERF_SAMPLE_BRANCH_USER         = 1U << PERF_SAMPLE_BRANCH_USER_SHIFT,
+        PERF_SAMPLE_BRANCH_KERNEL       = 1U << PERF_SAMPLE_BRANCH_KERNEL_SHIFT,
+        PERF_SAMPLE_BRANCH_HV           = 1U << PERF_SAMPLE_BRANCH_HV_SHIFT,
+
+        PERF_SAMPLE_BRANCH_ANY          = 1U << PERF_SAMPLE_BRANCH_ANY_SHIFT,
+        PERF_SAMPLE_BRANCH_ANY_CALL     = 1U << PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT,
+        PERF_SAMPLE_BRANCH_ANY_RETURN   = 1U << PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT,
+        PERF_SAMPLE_BRANCH_IND_CALL     = 1U << PERF_SAMPLE_BRANCH_IND_CALL_SHIFT,
+        PERF_SAMPLE_BRANCH_ABORT_TX     = 1U << PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT,
+        PERF_SAMPLE_BRANCH_IN_TX        = 1U << PERF_SAMPLE_BRANCH_IN_TX_SHIFT,
+        PERF_SAMPLE_BRANCH_NO_TX        = 1U << PERF_SAMPLE_BRANCH_NO_TX_SHIFT,
+        PERF_SAMPLE_BRANCH_COND         = 1U << PERF_SAMPLE_BRANCH_COND_SHIFT,
+
+        PERF_SAMPLE_BRANCH_CALL_STACK   = 1U << PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT,
+
+        PERF_SAMPLE_BRANCH_MAX          = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
 };
 
 #define PERF_SAMPLE_BRANCH_PLM_ALL \
@@ -240,6 +261,7 @@ enum perf_event_read_format {
 #define PERF_ATTR_SIZE_VER3     96      /* add: sample_regs_user */
                                         /* add: sample_stack_user */
 #define PERF_ATTR_SIZE_VER4     104     /* add: sample_regs_intr */
+#define PERF_ATTR_SIZE_VER5     112     /* add: aux_watermark */
 
 /*
  * Hardware event_id to monitor via a performance monitoring event:
@@ -305,7 +327,8 @@ struct perf_event_attr {
                                 exclude_callchain_user   : 1, /* exclude user callchains */
                                 mmap2          :  1, /* include mmap with inode data     */
                                 comm_exec      :  1, /* flag comm events that are due to an exec */
-                                __reserved_1   : 39;
+                                use_clockid    :  1, /* use @clockid for time fields */
+                                __reserved_1   : 38;
 
         union {
                 __u32           wakeup_events;    /* wakeup every n events */
@@ -334,8 +357,7 @@ struct perf_event_attr {
          */
         __u32   sample_stack_user;
 
-        /* Align to u64. */
-        __u32   __reserved_2;
+        __s32   clockid;
         /*
          * Defines set of regs to dump for each sample
          * state captured on:
@@ -345,6 +367,12 @@ struct perf_event_attr {
          * See asm/perf_regs.h for details.
          */
         __u64   sample_regs_intr;
+
+        /*
+         * Wakeup watermark for AUX area
+         */
+        __u32   aux_watermark;
+        __u32   __reserved_2;   /* align to __u64 */
 };
 
 #define perf_flags(attr)        (*(&(attr)->read_format + 1))
@@ -360,6 +388,7 @@ struct perf_event_attr {
 #define PERF_EVENT_IOC_SET_OUTPUT       _IO ('$', 5)
 #define PERF_EVENT_IOC_SET_FILTER       _IOW('$', 6, char *)
 #define PERF_EVENT_IOC_ID               _IOR('$', 7, __u64 *)
+#define PERF_EVENT_IOC_SET_BPF          _IOW('$', 8, __u32)
 
 enum perf_event_ioc_flags {
         PERF_IOC_FLAG_GROUP             = 1U << 0,
@@ -500,9 +529,30 @@ struct perf_event_mmap_page {
          * In this case the kernel will not over-write unread data.
          *
          * See perf_output_put_handle() for the data ordering.
+         *
+         * data_{offset,size} indicate the location and size of the perf record
+         * buffer within the mmapped area.
          */
         __u64   data_head;              /* head in the data section */
         __u64   data_tail;              /* user-space written tail */
+        __u64   data_offset;            /* where the buffer starts */
+        __u64   data_size;              /* data buffer size */
+
+        /*
+         * AUX area is defined by aux_{offset,size} fields that should be set
+         * by the userspace, so that
+         *
+         *   aux_offset >= data_offset + data_size
+         *
+         * prior to mmap()ing it. Size of the mmap()ed area should be aux_size.
+         *
+         * Ring buffer pointers aux_{head,tail} have the same semantics as
+         * data_{head,tail} and same ordering rules apply.
+         */
+        __u64   aux_head;
+        __u64   aux_tail;
+        __u64   aux_offset;
+        __u64   aux_size;
 };
 
 #define PERF_RECORD_MISC_CPUMODE_MASK           (7 << 0)
@@ -725,6 +775,31 @@ enum perf_event_type {
          */
         PERF_RECORD_MMAP2                       = 10,
 
+        /*
+         * Records that new data landed in the AUX buffer part.
+         *
+         * struct {
+         *      struct perf_event_header        header;
+         *
+         *      u64                             aux_offset;
+         *      u64                             aux_size;
+         *      u64                             flags;
+         *      struct sample_id                sample_id;
+         * };
+         */
+        PERF_RECORD_AUX                         = 11,
+
+        /*
+         * Indicates that instruction trace has started
+         *
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             pid;
+         *      u32                             tid;
+         * };
+         */
+        PERF_RECORD_ITRACE_START                = 12,
+
         PERF_RECORD_MAX,                        /* non-ABI */
 };
 
@@ -742,6 +817,12 @@ enum perf_callchain_context {
         PERF_CONTEXT_MAX                = (__u64)-4095,
 };
 
+/**
+ * PERF_RECORD_AUX::flags bits
+ */
+#define PERF_AUX_FLAG_TRUNCATED         0x01    /* record was truncated to fit */
+#define PERF_AUX_FLAG_OVERWRITE         0x02    /* snapshot from overwrite mode */
+
 #define PERF_FLAG_FD_NO_GROUP           (1UL << 0)
 #define PERF_FLAG_FD_OUTPUT             (1UL << 1)
 #define PERF_FLAG_PID_CGROUP            (1UL << 2) /* pid=cgroup id, per-cpu mode only */
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 25731dfb3fcc..bf08e76bf505 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -397,6 +397,8 @@ enum {
         TCA_BPF_CLASSID,
         TCA_BPF_OPS_LEN,
         TCA_BPF_OPS,
+        TCA_BPF_FD,
+        TCA_BPF_NAME,
         __TCA_BPF_MAX,
 };
 
diff --git a/include/uapi/linux/quota.h b/include/uapi/linux/quota.h
index 1f49b8341c99..9c95b2c1c88a 100644
--- a/include/uapi/linux/quota.h
+++ b/include/uapi/linux/quota.h
@@ -36,11 +36,12 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 
-#define __DQUOT_VERSION__       "dquot_6.5.2"
+#define __DQUOT_VERSION__       "dquot_6.6.0"
 
-#define MAXQUOTAS 2
+#define MAXQUOTAS 3
 #define USRQUOTA  0             /* element used for user quotas */
 #define GRPQUOTA  1             /* element used for group quotas */
+#define PRJQUOTA  2             /* element used for project quotas */
 
 /*
  * Definitions for the default names of the quotas files.
@@ -48,6 +49,7 @@
 #define INITQFNAMES { \
         "user",    /* USRQUOTA */ \
         "group",   /* GRPQUOTA */ \
+        "project", /* PRJQUOTA */ \
         "undefined", \
 };
 
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 5cc5d66bf519..974db03f7b1a 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -134,6 +134,8 @@ enum {
 
         RTM_NEWNSID = 88,
 #define RTM_NEWNSID RTM_NEWNSID
+        RTM_DELNSID = 89,
+#define RTM_DELNSID RTM_DELNSID
         RTM_GETNSID = 90,
 #define RTM_GETNSID RTM_GETNSID
 
@@ -303,6 +305,9 @@ enum rtattr_type_t {
         RTA_TABLE,
         RTA_MARK,
         RTA_MFC_STATS,
+        RTA_VIA,
+        RTA_NEWDST,
+        RTA_PREF,
         __RTA_MAX
 };
 
@@ -332,6 +337,7 @@ struct rtnexthop {
 #define RTNH_F_DEAD             1       /* Nexthop is dead (used by multipath)  */
 #define RTNH_F_PERVASIVE        2       /* Do recursive gateway lookup  */
 #define RTNH_F_ONLINK           4       /* Gateway is forced on link    */
+#define RTNH_F_EXTERNAL         8       /* Route installed externally   */
 
 /* Macros to handle hexthops */
 
@@ -344,6 +350,12 @@ struct rtnexthop {
 #define RTNH_SPACE(len) RTNH_ALIGN(RTNH_LENGTH(len))
 #define RTNH_DATA(rtnh)   ((struct rtattr*)(((char*)(rtnh)) + RTNH_LENGTH(0)))
 
+/* RTA_VIA */
+struct rtvia {
+        __kernel_sa_family_t    rtvia_family;
+        __u8                    rtvia_addr[0];
+};
+
 /* RTM_CACHEINFO */
 
 struct rta_cacheinfo {
@@ -623,6 +635,10 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV6_NETCONF    RTNLGRP_IPV6_NETCONF
         RTNLGRP_MDB,
 #define RTNLGRP_MDB             RTNLGRP_MDB
+        RTNLGRP_MPLS_ROUTE,
+#define RTNLGRP_MPLS_ROUTE      RTNLGRP_MPLS_ROUTE
+        RTNLGRP_NSID,
+#define RTNLGRP_NSID            RTNLGRP_NSID
         __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
diff --git a/include/uapi/linux/tc_act/tc_bpf.h b/include/uapi/linux/tc_act/tc_bpf.h
index 5288bd77e63b..07f17cc70bb3 100644
--- a/include/uapi/linux/tc_act/tc_bpf.h
+++ b/include/uapi/linux/tc_act/tc_bpf.h
@@ -24,6 +24,8 @@ enum {
         TCA_ACT_BPF_PARMS,
         TCA_ACT_BPF_OPS_LEN,
         TCA_ACT_BPF_OPS,
+        TCA_ACT_BPF_FD,
+        TCA_ACT_BPF_NAME,
         __TCA_ACT_BPF_MAX,
 };
 #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
diff --git a/include/uapi/linux/tipc_netlink.h b/include/uapi/linux/tipc_netlink.h
index 8d723824ad69..d4c8f142ba63 100644
--- a/include/uapi/linux/tipc_netlink.h
+++ b/include/uapi/linux/tipc_netlink.h
@@ -83,11 +83,20 @@ enum {
         TIPC_NLA_BEARER_NAME,           /* string */
         TIPC_NLA_BEARER_PROP,           /* nest */
         TIPC_NLA_BEARER_DOMAIN,         /* u32 */
+        TIPC_NLA_BEARER_UDP_OPTS,       /* nest */
 
         __TIPC_NLA_BEARER_MAX,
         TIPC_NLA_BEARER_MAX = __TIPC_NLA_BEARER_MAX - 1
 };
 
+enum {
+        TIPC_NLA_UDP_UNSPEC,
+        TIPC_NLA_UDP_LOCAL,             /* sockaddr_storage */
+        TIPC_NLA_UDP_REMOTE,            /* sockaddr_storage */
+
+        __TIPC_NLA_UDP_MAX,
+        TIPC_NLA_UDP_MAX = __TIPC_NLA_UDP_MAX - 1
+};
 /* Socket info */
 enum {
         TIPC_NLA_SOCK_UNSPEC,
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index 82889c30f4f5..b57b750c222f 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -160,6 +160,8 @@ struct vfio_device_info {
         __u32   flags;
 #define VFIO_DEVICE_FLAGS_RESET (1 << 0)        /* Device supports reset */
 #define VFIO_DEVICE_FLAGS_PCI   (1 << 1)        /* vfio-pci device */
+#define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2)     /* vfio-platform device */
+#define VFIO_DEVICE_FLAGS_AMBA  (1 << 3)        /* vfio-amba device */
         __u32   num_regions;    /* Max region index + 1 */
         __u32   num_irqs;       /* Max IRQ index + 1 */
 };
diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 02d5125a5ee8..2cd9e608d0d1 100644
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_XFRM_H
 #define _LINUX_XFRM_H
 
+#include <linux/in6.h>
 #include <linux/types.h>
 
 /* All of the structures in this file may not change size as they are
@@ -13,6 +14,7 @@
 typedef union {
         __be32          a4;
         __be32          a6[4];
+        struct in6_addr in6;
 } xfrm_address_t;
 
 /* Ident of a specific xfrm_state. It is used on input to lookup