Merge tag 'v4.3-rc2' into topic/drm-misc

Backmerge Linux 4.3-rc2 because of conflicts in the dp helper code
between bugfixes and new code. Just adjacent lines really.

On top of that there's a silent conflict in the new fsl-dcu driver
merged into 4.3 and

commit 844f9111f6f54f88eb2f0fac121b82ce77193866
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date:   Wed Sep 2 10:42:40 2015 +0200

    drm/atomic: Make prepare_fb/cleanup_fb only take state, v3.

which Thierry Reding spotted and provided a fixup for.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

59 files changed, 1345 insertions, 30 deletions

diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index e016bd9b1a04..8da542a2874d 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -709,9 +709,11 @@ __SYSCALL(__NR_memfd_create, sys_memfd_create)
 __SYSCALL(__NR_bpf, sys_bpf)
 #define __NR_execveat 281
 __SC_COMP(__NR_execveat, sys_execveat, compat_sys_execveat)
+#define __NR_membarrier 282
+__SYSCALL(__NR_membarrier, sys_membarrier)
 
 #undef __NR_syscalls
-#define __NR_syscalls 282
+#define __NR_syscalls 283
 
 /*
  * All syscalls below here should go away really,
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index dbd16a2d37db..fd5aa47bd689 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -358,7 +358,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_RESOURCE_STREAMER 36
 
 typedef struct drm_i915_getparam {
-        s32 param;
+        __s32 param;
         /*
          * WARNING: Using pointers instead of fixed-size u64 means we need to write
          * compat32 code. Don't repeat this mistake.
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 1ff9942718fe..f7b2db44eb4b 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -243,6 +243,7 @@ header-y += limits.h
 header-y += llc.h
 header-y += loop.h
 header-y += lp.h
+header-y += lwtunnel.h
 header-y += magic.h
 header-y += major.h
 header-y += map_to_7segment.h
@@ -251,6 +252,7 @@ header-y += mdio.h
 header-y += media.h
 header-y += media-bus-format.h
 header-y += mei.h
+header-y += membarrier.h
 header-y += memfd.h
 header-y += mempolicy.h
 header-y += meye.h
@@ -455,3 +457,4 @@ header-y += xfrm.h
 header-y += xilinx-v4l2-controls.h
 header-y += zorro.h
 header-y += zorro_ids.h
+header-y += userfaultfd.h
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index d3475e1f15ec..843540c398eb 100644
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -266,6 +266,7 @@
 #define AUDIT_OBJ_UID   109
 #define AUDIT_OBJ_GID   110
 #define AUDIT_FIELD_COMPARE     111
+#define AUDIT_EXE       112
 
 #define AUDIT_ARG0      200
 #define AUDIT_ARG1      (AUDIT_ARG0+1)
@@ -324,8 +325,10 @@ enum {
 
 #define AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT      0x00000001
 #define AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME  0x00000002
+#define AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH    0x00000004
 #define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \
-                                  AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME)
+                                  AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME | \
+                                  AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH)
 
 /* deprecated: AUDIT_VERSION_* */
 #define AUDIT_VERSION_LATEST            AUDIT_FEATURE_BITMAP_ALL
@@ -382,6 +385,9 @@ enum {
 #define AUDIT_ARCH_SHEL64       (EM_SH|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_SPARC        (EM_SPARC)
 #define AUDIT_ARCH_SPARC64      (EM_SPARCV9|__AUDIT_ARCH_64BIT)
+#define AUDIT_ARCH_TILEGX       (EM_TILEGX|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_TILEGX32     (EM_TILEGX|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_TILEPRO      (EM_TILEPRO|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_X86_64       (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
 
 #define AUDIT_PERM_EXEC         1
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 29ef6f99e43d..92a48e2d5461 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -114,6 +114,7 @@ enum bpf_map_type {
         BPF_MAP_TYPE_HASH,
         BPF_MAP_TYPE_ARRAY,
         BPF_MAP_TYPE_PROG_ARRAY,
+        BPF_MAP_TYPE_PERF_EVENT_ARRAY,
 };
 
 enum bpf_prog_type {
@@ -249,6 +250,28 @@ enum bpf_func_id {
          * Return: 0 on success
          */
         BPF_FUNC_get_current_comm,
+
+        /**
+         * bpf_get_cgroup_classid(skb) - retrieve a proc's classid
+         * @skb: pointer to skb
+         * Return: classid if != 0
+         */
+        BPF_FUNC_get_cgroup_classid,
+        BPF_FUNC_skb_vlan_push, /* bpf_skb_vlan_push(skb, vlan_proto, vlan_tci) */
+        BPF_FUNC_skb_vlan_pop,  /* bpf_skb_vlan_pop(skb) */
+
+        /**
+         * bpf_skb_[gs]et_tunnel_key(skb, key, size, flags)
+         * retrieve or populate tunnel metadata
+         * @skb: pointer to skb
+         * @key: pointer to 'struct bpf_tunnel_key'
+         * @size: size of 'struct bpf_tunnel_key'
+         * @flags: room for future extensions
+         * Retrun: 0 on success
+         */
+        BPF_FUNC_skb_get_tunnel_key,
+        BPF_FUNC_skb_set_tunnel_key,
+        BPF_FUNC_perf_event_read,       /* u64 bpf_perf_event_read(&map, index) */
         __BPF_FUNC_MAX_ID,
 };
 
@@ -269,6 +292,12 @@ struct __sk_buff {
         __u32 ifindex;
         __u32 tc_index;
         __u32 cb[5];
+        __u32 hash;
+};
+
+struct bpf_tunnel_key {
+        __u32 tunnel_id;
+        __u32 remote_ipv4;
 };
 
 #endif /* _UAPI__LINUX_BPF_H__ */
diff --git a/include/uapi/linux/dlm_device.h b/include/uapi/linux/dlm_device.h
index 3060783c4191..df56c8ff0769 100644
--- a/include/uapi/linux/dlm_device.h
+++ b/include/uapi/linux/dlm_device.h
@@ -26,7 +26,7 @@
 /* Version of the device interface */
 #define DLM_DEVICE_VERSION_MAJOR 6
 #define DLM_DEVICE_VERSION_MINOR 0
-#define DLM_DEVICE_VERSION_PATCH 1
+#define DLM_DEVICE_VERSION_PATCH 2
 
 /* struct passed to the lock write */
 struct dlm_lock_params {
diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h
index 061aca3a962d..d34611e35a30 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        32
+#define DM_VERSION_MINOR        33
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2015-6-26)"
+#define DM_VERSION_EXTRA        "-ioctl (2015-8-18)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
index b08829667ed7..b56dfcfe922a 100644
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
@@ -38,6 +38,9 @@
 #define EM_ALTERA_NIOS2 113     /* Altera Nios II soft-core processor */
 #define EM_TI_C6000     140     /* TI C6X DSPs */
 #define EM_AARCH64      183     /* ARM 64 bit */
+#define EM_TILEPRO      188     /* Tilera TILEPro */
+#define EM_MICROBLAZE   189     /* Xilinx MicroBlaze */
+#define EM_TILEGX       191     /* Tilera TILE-Gx */
 #define EM_FRV          0x5441  /* Fujitsu FR-V */
 #define EM_AVR32        0x18ad  /* Atmel AVR32 */
 
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index cd67aec187d9..cd1629170103 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1093,6 +1093,11 @@ struct ethtool_sfeatures {
  * the 'hwtstamp_tx_types' and 'hwtstamp_rx_filters' enumeration values,
  * respectively.  For example, if the device supports HWTSTAMP_TX_ON,
  * then (1 << HWTSTAMP_TX_ON) in 'tx_types' will be set.
+ *
+ * Drivers should only report the filters they actually support without
+ * upscaling in the SIOCSHWTSTAMP ioctl. If the SIOCSHWSTAMP request for
+ * HWTSTAMP_FILTER_V1_SYNC is supported by HWTSTAMP_FILTER_V1_EVENT, then the
+ * driver should only report HWTSTAMP_FILTER_V1_EVENT in this op.
  */
 struct ethtool_ts_info {
         __u32   cmd;
diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h
index 2b82d7e30974..96161b8202b5 100644
--- a/include/uapi/linux/fib_rules.h
+++ b/include/uapi/linux/fib_rules.h
@@ -43,7 +43,7 @@ enum {
         FRA_UNUSED5,
         FRA_FWMARK,     /* mark */
         FRA_FLOW,       /* flow/class id */
-        FRA_UNUSED6,
+        FRA_TUN_ID,
         FRA_SUPPRESS_IFGROUP,
         FRA_SUPPRESS_PREFIXLEN,
         FRA_TABLE,      /* Extended table id */
diff --git a/include/uapi/linux/gsmmux.h b/include/uapi/linux/gsmmux.h
index c06742d52856..ab055d8cddef 100644
--- a/include/uapi/linux/gsmmux.h
+++ b/include/uapi/linux/gsmmux.h
@@ -3,6 +3,7 @@
 
 #include <linux/if.h>
 #include <linux/ioctl.h>
+#include <linux/types.h>
 
 struct gsm_config
 {
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index eaaea6208b42..3635b7797508 100644
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -182,6 +182,7 @@ struct br_mdb_entry {
 #define MDB_TEMPORARY 0
 #define MDB_PERMANENT 1
         __u8 state;
+        __u16 vid;
         struct {
                 union {
                         __be32  ip4;
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
index aa63ed023c2b..ea9221b0331a 100644
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
@@ -42,6 +42,7 @@
 #define ETH_P_LOOP      0x0060          /* Ethernet Loopback packet     */
 #define ETH_P_PUP       0x0200          /* Xerox PUP packet             */
 #define ETH_P_PUPAT     0x0201          /* Xerox PUP Addr Trans packet  */
+#define ETH_P_TSN       0x22F0          /* TSN (IEEE 1722) packet       */
 #define ETH_P_IP        0x0800          /* Internet Protocol packet     */
 #define ETH_P_X25       0x0805          /* CCITT X.25                   */
 #define ETH_P_ARP       0x0806          /* Address Resolution packet    */
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 2c7e8e3d3981..3a5f263cfc2f 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -148,6 +148,7 @@ enum {
         IFLA_PHYS_SWITCH_ID,
         IFLA_LINK_NETNSID,
         IFLA_PHYS_PORT_NAME,
+        IFLA_PROTO_DOWN,
         __IFLA_MAX
 };
 
@@ -229,6 +230,8 @@ enum {
         IFLA_BR_AGEING_TIME,
         IFLA_BR_STP_STATE,
         IFLA_BR_PRIORITY,
+        IFLA_BR_VLAN_FILTERING,
+        IFLA_BR_VLAN_PROTOCOL,
         __IFLA_BR_MAX,
 };
 
@@ -339,6 +342,15 @@ enum macvlan_macaddr_mode {
 
 #define MACVLAN_FLAG_NOPROMISC  1
 
+/* VRF section */
+enum {
+        IFLA_VRF_UNSPEC,
+        IFLA_VRF_TABLE,
+        __IFLA_VRF_MAX
+};
+
+#define IFLA_VRF_MAX (__IFLA_VRF_MAX - 1)
+
 /* IPVLAN section */
 enum {
         IFLA_IPVLAN_UNSPEC,
@@ -381,6 +393,7 @@ enum {
         IFLA_VXLAN_REMCSUM_RX,
         IFLA_VXLAN_GBP,
         IFLA_VXLAN_REMCSUM_NOPARTIAL,
+        IFLA_VXLAN_COLLECT_METADATA,
         __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX  (__IFLA_VXLAN_MAX - 1)
@@ -397,6 +410,8 @@ enum {
         IFLA_GENEVE_REMOTE,
         IFLA_GENEVE_TTL,
         IFLA_GENEVE_TOS,
+        IFLA_GENEVE_PORT,       /* destination port */
+        IFLA_GENEVE_COLLECT_METADATA,
         __IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
@@ -431,6 +446,7 @@ enum {
         IFLA_BOND_AD_ACTOR_SYS_PRIO,
         IFLA_BOND_AD_USER_PORT_KEY,
         IFLA_BOND_AD_ACTOR_SYSTEM,
+        IFLA_BOND_TLB_DYNAMIC_LB,
         __IFLA_BOND_MAX,
 };
 
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h
index d3d715f8c88f..9e7edfd8141e 100644
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
@@ -55,6 +55,7 @@ struct sockaddr_ll {
 #define PACKET_TX_HAS_OFF               19
 #define PACKET_QDISC_BYPASS             20
 #define PACKET_ROLLOVER_STATS           21
+#define PACKET_FANOUT_DATA              22
 
 #define PACKET_FANOUT_HASH              0
 #define PACKET_FANOUT_LB                1
@@ -62,6 +63,8 @@ struct sockaddr_ll {
 #define PACKET_FANOUT_ROLLOVER          3
 #define PACKET_FANOUT_RND               4
 #define PACKET_FANOUT_QM                5
+#define PACKET_FANOUT_CBPF              6
+#define PACKET_FANOUT_EBPF              7
 #define PACKET_FANOUT_FLAG_ROLLOVER     0x1000
 #define PACKET_FANOUT_FLAG_DEFRAG       0x8000
 
diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
index bd3cc11a431f..af4de90ba27d 100644
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -112,6 +112,7 @@ enum {
         IFLA_GRE_ENCAP_FLAGS,
         IFLA_GRE_ENCAP_SPORT,
         IFLA_GRE_ENCAP_DPORT,
+        IFLA_GRE_COLLECT_METADATA,
         __IFLA_GRE_MAX,
 };
 
diff --git a/include/uapi/linux/ila.h b/include/uapi/linux/ila.h
new file mode 100644
index 000000000000..7ed9e670814e
--- /dev/null
+++ b/include/uapi/linux/ila.h
@@ -0,0 +1,15 @@
+/* ila.h - ILA Interface */
+
+#ifndef _UAPI_LINUX_ILA_H
+#define _UAPI_LINUX_ILA_H
+
+enum {
+        ILA_ATTR_UNSPEC,
+        ILA_ATTR_LOCATOR,                       /* u64 */
+
+        __ILA_ATTR_MAX,
+};
+
+#define ILA_ATTR_MAX            (__ILA_ATTR_MAX - 1)
+
+#endif /* _UAPI_LINUX_ILA_H */
diff --git a/include/uapi/linux/ip_vs.h b/include/uapi/linux/ip_vs.h
index 3199243f2028..391395c06c7e 100644
--- a/include/uapi/linux/ip_vs.h
+++ b/include/uapi/linux/ip_vs.h
@@ -406,6 +406,11 @@ enum {
         IPVS_DAEMON_ATTR_STATE,         /* sync daemon state (master/backup) */
         IPVS_DAEMON_ATTR_MCAST_IFN,     /* multicast interface name */
         IPVS_DAEMON_ATTR_SYNC_ID,       /* SyncID we belong to */
+        IPVS_DAEMON_ATTR_SYNC_MAXLEN,   /* UDP Payload Size */
+        IPVS_DAEMON_ATTR_MCAST_GROUP,   /* IPv4 Multicast Address */
+        IPVS_DAEMON_ATTR_MCAST_GROUP6,  /* IPv6 Multicast Address */
+        IPVS_DAEMON_ATTR_MCAST_PORT,    /* Multicast Port (base) */
+        IPVS_DAEMON_ATTR_MCAST_TTL,     /* Multicast TTL */
         __IPVS_DAEMON_ATTR_MAX,
 };
 
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 5efa54ae567c..38b4fef20219 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -171,6 +171,9 @@ enum {
         DEVCONF_USE_OPTIMISTIC,
         DEVCONF_ACCEPT_RA_MTU,
         DEVCONF_STABLE_SECRET,
+        DEVCONF_USE_OIF_ADDRS_ONLY,
+        DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT,
+        DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN,
         DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/kernel-page-flags.h b/include/uapi/linux/kernel-page-flags.h
index a6c4962e5d46..5da5f8751ce7 100644
--- a/include/uapi/linux/kernel-page-flags.h
+++ b/include/uapi/linux/kernel-page-flags.h
@@ -33,6 +33,7 @@
 #define KPF_THP                 22
 #define KPF_BALLOON             23
 #define KPF_ZERO_PAGE           24
+#define KPF_IDLE                25
 
 
 #endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 716ad4ae4d4b..a9256f0331ae 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -237,6 +237,7 @@ struct kvm_run {
                         __u32 count;
                         __u64 data_offset; /* relative to kvm_run start */
                 } io;
+                /* KVM_EXIT_DEBUG */
                 struct {
                         struct kvm_debug_exit_arch arch;
                 } debug;
@@ -285,6 +286,7 @@ struct kvm_run {
                         __u32 data;
                         __u8  is_write;
                 } dcr;
+                /* KVM_EXIT_INTERNAL_ERROR */
                 struct {
                         __u32 suberror;
                         /* Available with KVM_CAP_INTERNAL_ERROR_DATA: */
@@ -295,6 +297,7 @@ struct kvm_run {
                 struct {
                         __u64 gprs[32];
                 } osi;
+                /* KVM_EXIT_PAPR_HCALL */
                 struct {
                         __u64 nr;
                         __u64 ret;
@@ -317,6 +320,7 @@ struct kvm_run {
                 struct {
 #define KVM_SYSTEM_EVENT_SHUTDOWN       1
 #define KVM_SYSTEM_EVENT_RESET          2
+#define KVM_SYSTEM_EVENT_CRASH          3
                         __u32 type;
                         __u64 flags;
                 } system_event;
@@ -481,6 +485,7 @@ struct kvm_s390_psw {
          ((ai) << 26))
 #define KVM_S390_INT_IO_MIN             0x00000000u
 #define KVM_S390_INT_IO_MAX             0xfffdffffu
+#define KVM_S390_INT_IO_AI_MASK         0x04000000u
 
 
 struct kvm_s390_interrupt {
@@ -817,6 +822,8 @@ struct kvm_ppc_smmu_info {
 #define KVM_CAP_DISABLE_QUIRKS 116
 #define KVM_CAP_X86_SMM 117
 #define KVM_CAP_MULTI_ADDRESS_SPACE 118
+#define KVM_CAP_GUEST_DEBUG_HW_BPS 119
+#define KVM_CAP_GUEST_DEBUG_HW_WPS 120
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
diff --git a/include/uapi/linux/lwtunnel.h b/include/uapi/linux/lwtunnel.h
new file mode 100644
index 000000000000..34141a5dfe74
--- /dev/null
+++ b/include/uapi/linux/lwtunnel.h
@@ -0,0 +1,47 @@
+#ifndef _UAPI_LWTUNNEL_H_
+#define _UAPI_LWTUNNEL_H_
+
+#include <linux/types.h>
+
+enum lwtunnel_encap_types {
+        LWTUNNEL_ENCAP_NONE,
+        LWTUNNEL_ENCAP_MPLS,
+        LWTUNNEL_ENCAP_IP,
+        LWTUNNEL_ENCAP_ILA,
+        LWTUNNEL_ENCAP_IP6,
+        __LWTUNNEL_ENCAP_MAX,
+};
+
+#define LWTUNNEL_ENCAP_MAX (__LWTUNNEL_ENCAP_MAX - 1)
+
+enum lwtunnel_ip_t {
+        LWTUNNEL_IP_UNSPEC,
+        LWTUNNEL_IP_ID,
+        LWTUNNEL_IP_DST,
+        LWTUNNEL_IP_SRC,
+        LWTUNNEL_IP_TTL,
+        LWTUNNEL_IP_TOS,
+        LWTUNNEL_IP_SPORT,
+        LWTUNNEL_IP_DPORT,
+        LWTUNNEL_IP_FLAGS,
+        __LWTUNNEL_IP_MAX,
+};
+
+#define LWTUNNEL_IP_MAX (__LWTUNNEL_IP_MAX - 1)
+
+enum lwtunnel_ip6_t {
+        LWTUNNEL_IP6_UNSPEC,
+        LWTUNNEL_IP6_ID,
+        LWTUNNEL_IP6_DST,
+        LWTUNNEL_IP6_SRC,
+        LWTUNNEL_IP6_HOPLIMIT,
+        LWTUNNEL_IP6_TC,
+        LWTUNNEL_IP6_SPORT,
+        LWTUNNEL_IP6_DPORT,
+        LWTUNNEL_IP6_FLAGS,
+        __LWTUNNEL_IP6_MAX,
+};
+
+#define LWTUNNEL_IP6_MAX (__LWTUNNEL_IP6_MAX - 1)
+
+#endif /* _UAPI_LWTUNNEL_H_ */
diff --git a/include/uapi/linux/mei.h b/include/uapi/linux/mei.h
index bc0d8b69c49e..7c3b64f6a215 100644
--- a/include/uapi/linux/mei.h
+++ b/include/uapi/linux/mei.h
@@ -107,4 +107,23 @@ struct mei_connect_client_data {
         };
 };
 
+/**
+ * DOC: set and unset event notification for a connected client
+ *
+ * The IOCTL argument is 1 for enabling event notification and 0 for
+ * disabling the service
+ * Return:  -EOPNOTSUPP if the devices doesn't support the feature
+ */
+#define IOCTL_MEI_NOTIFY_SET _IOW('H', 0x02, __u32)
+
+/**
+ * DOC: retrieve notification
+ *
+ * The IOCTL output argument is 1 if an event was is pending and 0 otherwise
+ * the ioctl has to be called in order to acknowledge pending event
+ *
+ * Return:  -EOPNOTSUPP if the devices doesn't support the feature
+ */
+#define IOCTL_MEI_NOTIFY_GET _IOR('H', 0x03, __u32)
+
 #endif /* _LINUX_MEI_H  */
diff --git a/include/uapi/linux/membarrier.h b/include/uapi/linux/membarrier.h
new file mode 100644
index 000000000000..e0b108bd2624
--- /dev/null
+++ b/include/uapi/linux/membarrier.h
@@ -0,0 +1,53 @@
+#ifndef _UAPI_LINUX_MEMBARRIER_H
+#define _UAPI_LINUX_MEMBARRIER_H
+
+/*
+ * linux/membarrier.h
+ *
+ * membarrier system call API
+ *
+ * Copyright (c) 2010, 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * enum membarrier_cmd - membarrier system call command
+ * @MEMBARRIER_CMD_QUERY:   Query the set of supported commands. It returns
+ *                          a bitmask of valid commands.
+ * @MEMBARRIER_CMD_SHARED:  Execute a memory barrier on all running threads.
+ *                          Upon return from system call, the caller thread
+ *                          is ensured that all running threads have passed
+ *                          through a state where all memory accesses to
+ *                          user-space addresses match program order between
+ *                          entry to and return from the system call
+ *                          (non-running threads are de facto in such a
+ *                          state). This covers threads from all processes
+ *                          running on the system. This command returns 0.
+ *
+ * Command to be passed to the membarrier system call. The commands need to
+ * be a single bit each, except for MEMBARRIER_CMD_QUERY which is assigned to
+ * the value 0.
+ */
+enum membarrier_cmd {
+        MEMBARRIER_CMD_QUERY = 0,
+        MEMBARRIER_CMD_SHARED = (1 << 0),
+};
+
+#endif /* _UAPI_LINUX_MEMBARRIER_H */
diff --git a/include/uapi/linux/mpls.h b/include/uapi/linux/mpls.h
index 139d4dd1cab8..24a6cb1aec86 100644
--- a/include/uapi/linux/mpls.h
+++ b/include/uapi/linux/mpls.h
@@ -41,4 +41,6 @@ struct mpls_label {
 #define MPLS_LABEL_OAMALERT             14 /* RFC3429 */
 #define MPLS_LABEL_EXTENSION            15 /* RFC7274 */
 
+#define MPLS_LABEL_FIRST_UNRESERVED     16 /* RFC3032 */
+
 #endif /* _UAPI_MPLS_H */
diff --git a/include/uapi/linux/mpls_iptunnel.h b/include/uapi/linux/mpls_iptunnel.h
new file mode 100644
index 000000000000..d80a0498f77e
--- /dev/null
+++ b/include/uapi/linux/mpls_iptunnel.h
@@ -0,0 +1,28 @@
+/*
+ *      mpls tunnel api
+ *
+ *      Authors:
+ *              Roopa Prabhu <roopa@cumulusnetworks.com>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPI_LINUX_MPLS_IPTUNNEL_H
+#define _UAPI_LINUX_MPLS_IPTUNNEL_H
+
+/* MPLS tunnel attributes
+ * [RTA_ENCAP] = {
+ *     [MPLS_IPTUNNEL_DST]
+ * }
+ */
+enum {
+        MPLS_IPTUNNEL_UNSPEC,
+        MPLS_IPTUNNEL_DST,
+        __MPLS_IPTUNNEL_MAX,
+};
+#define MPLS_IPTUNNEL_MAX (__MPLS_IPTUNNEL_MAX - 1)
+
+#endif /* _UAPI_LINUX_MPLS_IPTUNNEL_H */
diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
index 2b94ea2287bb..5b4a4be06e2b 100644
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -87,7 +87,7 @@ struct nd_cmd_ars_status {
                 __u32 handle;
                 __u32 flags;
                 __u64 err_address;
-                __u64 mask;
+                __u64 length;
         } __packed records[0];
 } __packed;
 
@@ -111,6 +111,11 @@ enum {
         ND_CMD_VENDOR = 9,
 };
 
+enum {
+        ND_ARS_VOLATILE = 1,
+        ND_ARS_PERSISTENT = 2,
+};
+
 static inline const char *nvdimm_bus_cmd_name(unsigned cmd)
 {
         static const char * const names[] = {
@@ -194,4 +199,9 @@ enum nd_driver_flags {
 enum {
         ND_MIN_NAMESPACE_SIZE = 0x00400000,
 };
+
+enum ars_masks {
+        ARS_STATUS_MASK = 0x0000FFFF,
+        ARS_EXT_STATUS_SHIFT = 16,
+};
 #endif /* __NDCTL_H__ */
diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h
index 2e35c61bbdd1..788655bfa0f3 100644
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
@@ -106,6 +106,7 @@ struct ndt_stats {
         __u64           ndts_rcv_probes_ucast;
         __u64           ndts_periodic_gc_runs;
         __u64           ndts_forced_gc_runs;
+        __u64           ndts_table_fulls;
 };
 
 enum {
diff --git a/include/uapi/linux/netfilter/nf_conntrack_sctp.h b/include/uapi/linux/netfilter/nf_conntrack_sctp.h
index ceeefe6681b5..ed4e776e1242 100644
--- a/include/uapi/linux/netfilter/nf_conntrack_sctp.h
+++ b/include/uapi/linux/netfilter/nf_conntrack_sctp.h
@@ -13,6 +13,8 @@ enum sctp_conntrack {
         SCTP_CONNTRACK_SHUTDOWN_SENT,
         SCTP_CONNTRACK_SHUTDOWN_RECD,
         SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
+        SCTP_CONNTRACK_HEARTBEAT_SENT,
+        SCTP_CONNTRACK_HEARTBEAT_ACKED,
         SCTP_CONNTRACK_MAX
 };
 
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index a99e6a997140..d8c8a7c9d88a 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -756,16 +756,25 @@ enum nft_ct_attributes {
 };
 #define NFTA_CT_MAX             (__NFTA_CT_MAX - 1)
 
+enum nft_limit_type {
+        NFT_LIMIT_PKTS,
+        NFT_LIMIT_PKT_BYTES
+};
+
 /**
  * enum nft_limit_attributes - nf_tables limit expression netlink attributes
  *
  * @NFTA_LIMIT_RATE: refill rate (NLA_U64)
  * @NFTA_LIMIT_UNIT: refill unit (NLA_U64)
+ * @NFTA_LIMIT_BURST: burst (NLA_U32)
+ * @NFTA_LIMIT_TYPE: type of limit (NLA_U32: enum nft_limit_type)
  */
 enum nft_limit_attributes {
         NFTA_LIMIT_UNSPEC,
         NFTA_LIMIT_RATE,
         NFTA_LIMIT_UNIT,
+        NFTA_LIMIT_BURST,
+        NFTA_LIMIT_TYPE,
         __NFTA_LIMIT_MAX
 };
 #define NFTA_LIMIT_MAX          (__NFTA_LIMIT_MAX - 1)
@@ -936,6 +945,20 @@ enum nft_redir_attributes {
 #define NFTA_REDIR_MAX          (__NFTA_REDIR_MAX - 1)
 
 /**
+ * enum nft_dup_attributes - nf_tables dup expression netlink attributes
+ *
+ * @NFTA_DUP_SREG_ADDR: source register of address (NLA_U32: nft_registers)
+ * @NFTA_DUP_SREG_DEV: source register of output interface (NLA_U32: nft_register)
+ */
+enum nft_dup_attributes {
+        NFTA_DUP_UNSPEC,
+        NFTA_DUP_SREG_ADDR,
+        NFTA_DUP_SREG_DEV,
+        __NFTA_DUP_MAX
+};
+#define NFTA_DUP_MAX            (__NFTA_DUP_MAX - 1)
+
+/**
  * enum nft_gen_attributes - nf_tables ruleset generation attributes
  *
  * @NFTA_GEN_ID: Ruleset generation ID (NLA_U32)
diff --git a/include/uapi/linux/netfilter/nfnetlink_conntrack.h b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
index acad6c52a652..c1a4e1441a25 100644
--- a/include/uapi/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
@@ -61,6 +61,7 @@ enum ctattr_tuple {
         CTA_TUPLE_UNSPEC,
         CTA_TUPLE_IP,
         CTA_TUPLE_PROTO,
+        CTA_TUPLE_ZONE,
         __CTA_TUPLE_MAX
 };
 #define CTA_TUPLE_MAX (__CTA_TUPLE_MAX - 1)
diff --git a/include/uapi/linux/netfilter/nfnetlink_cttimeout.h b/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
index 1ab0b97b3a1e..f2c10dc140d6 100644
--- a/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
+++ b/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
@@ -92,6 +92,8 @@ enum ctattr_timeout_sctp {
         CTA_TIMEOUT_SCTP_SHUTDOWN_SENT,
         CTA_TIMEOUT_SCTP_SHUTDOWN_RECD,
         CTA_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT,
+        CTA_TIMEOUT_SCTP_HEARTBEAT_SENT,
+        CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED,
         __CTA_TIMEOUT_SCTP_MAX
 };
 #define CTA_TIMEOUT_SCTP_MAX (__CTA_TIMEOUT_SCTP_MAX - 1)
diff --git a/include/uapi/linux/netfilter/xt_CT.h b/include/uapi/linux/netfilter/xt_CT.h
index 5a688c1ca4d7..9e520418b858 100644
--- a/include/uapi/linux/netfilter/xt_CT.h
+++ b/include/uapi/linux/netfilter/xt_CT.h
@@ -6,7 +6,13 @@
 enum {
         XT_CT_NOTRACK           = 1 << 0,
         XT_CT_NOTRACK_ALIAS     = 1 << 1,
-        XT_CT_MASK              = XT_CT_NOTRACK | XT_CT_NOTRACK_ALIAS,
+        XT_CT_ZONE_DIR_ORIG     = 1 << 2,
+        XT_CT_ZONE_DIR_REPL     = 1 << 3,
+        XT_CT_ZONE_MARK         = 1 << 4,
+
+        XT_CT_MASK              = XT_CT_NOTRACK | XT_CT_NOTRACK_ALIAS |
+                                  XT_CT_ZONE_DIR_ORIG | XT_CT_ZONE_DIR_REPL |
+                                  XT_CT_ZONE_MARK,
 };
 
 struct xt_ct_target_info {
diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h b/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h
index 205ed62e4605..cd2e940c8bf5 100644
--- a/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h
@@ -10,7 +10,9 @@ enum ip6t_reject_with {
         IP6T_ICMP6_ADDR_UNREACH,
         IP6T_ICMP6_PORT_UNREACH,
         IP6T_ICMP6_ECHOREPLY,
-        IP6T_TCP_RESET
+        IP6T_TCP_RESET,
+        IP6T_ICMP6_POLICY_FAIL,
+        IP6T_ICMP6_REJECT_ROUTE
 };
 
 struct ip6t_reject_info {
diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index cf6a65cccbdf..6f3fe16cd22a 100644
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -110,6 +110,7 @@ struct nlmsgerr {
 #define NETLINK_TX_RING                 7
 #define NETLINK_LISTEN_ALL_NSID         8
 #define NETLINK_LIST_MEMBERSHIPS        9
+#define NETLINK_CAP_ACK                 10
 
 struct nl_pktinfo {
         __u32   group;
diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h
index 2119c7c274d7..2b871e0858d9 100644
--- a/include/uapi/linux/nfs4.h
+++ b/include/uapi/linux/nfs4.h
@@ -15,7 +15,7 @@
 
 #include <linux/types.h>
 
-#define NFS4_BITMAP_SIZE        2
+#define NFS4_BITMAP_SIZE        3
 #define NFS4_VERIFIER_SIZE      8
 #define NFS4_STATEID_SEQID_SIZE 4
 #define NFS4_STATEID_OTHER_SIZE 12
diff --git a/include/uapi/linux/nfsacl.h b/include/uapi/linux/nfsacl.h
index 9bb9771a107f..552726631162 100644
--- a/include/uapi/linux/nfsacl.h
+++ b/include/uapi/linux/nfsacl.h
@@ -22,6 +22,7 @@
 #define NFS_ACLCNT              0x0002
 #define NFS_DFACL               0x0004
 #define NFS_DFACLCNT            0x0008
+#define NFS_ACL_MASK            0x000f
 
 /* Flag for Default ACL entries */
 #define NFS_ACL_DEFAULT         0x1000
diff --git a/include/uapi/linux/nvme.h b/include/uapi/linux/nvme.h
index 732b32e92b02..8864194a4151 100644
--- a/include/uapi/linux/nvme.h
+++ b/include/uapi/linux/nvme.h
@@ -584,5 +584,6 @@ struct nvme_passthru_cmd {
 #define NVME_IOCTL_SUBMIT_IO    _IOW('N', 0x42, struct nvme_user_io)
 #define NVME_IOCTL_IO_CMD       _IOWR('N', 0x43, struct nvme_passthru_cmd)
 #define NVME_IOCTL_RESET        _IO('N', 0x44)
+#define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45)
 
 #endif /* _UAPI_LINUX_NVME_H */
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index 1dab77601c21..32e07d8cbaf4 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -164,6 +164,9 @@ enum ovs_packet_cmd {
  * %OVS_USERSPACE_ATTR_EGRESS_TUN_PORT attribute, which is sent only if the
  * output port is actually a tunnel port. Contains the output tunnel key
  * extracted from the packet as nested %OVS_TUNNEL_KEY_ATTR_* attributes.
+ * @OVS_PACKET_ATTR_MRU: Present for an %OVS_PACKET_CMD_ACTION and
+ * %OVS_PACKET_ATTR_USERSPACE action specify the Maximum received fragment
+ * size.
  *
  * These attributes follow the &struct ovs_header within the Generic Netlink
  * payload for %OVS_PACKET_* commands.
@@ -180,6 +183,7 @@ enum ovs_packet_attr {
         OVS_PACKET_ATTR_UNUSED2,
         OVS_PACKET_ATTR_PROBE,      /* Packet operation is a feature probe,
                                        error logging should be suppressed. */
+        OVS_PACKET_ATTR_MRU,        /* Maximum received IP fragment size. */
         __OVS_PACKET_ATTR_MAX
 };
 
@@ -319,9 +323,13 @@ enum ovs_key_attr {
         OVS_KEY_ATTR_MPLS,      /* array of struct ovs_key_mpls.
                                  * The implementation may restrict
                                  * the accepted length of the array. */
+        OVS_KEY_ATTR_CT_STATE,  /* u8 bitmask of OVS_CS_F_* */
+        OVS_KEY_ATTR_CT_ZONE,   /* u16 connection tracking zone. */
+        OVS_KEY_ATTR_CT_MARK,   /* u32 connection tracking mark */
+        OVS_KEY_ATTR_CT_LABEL,  /* 16-octet connection tracking label */
 
 #ifdef __KERNEL__
-        OVS_KEY_ATTR_TUNNEL_INFO,  /* struct ovs_tunnel_info */
+        OVS_KEY_ATTR_TUNNEL_INFO,  /* struct ip_tunnel_info */
 #endif
         __OVS_KEY_ATTR_MAX
 };
@@ -431,6 +439,20 @@ struct ovs_key_nd {
         __u8    nd_tll[ETH_ALEN];
 };
 
+#define OVS_CT_LABEL_LEN        16
+struct ovs_key_ct_label {
+        __u8    ct_label[OVS_CT_LABEL_LEN];
+};
+
+/* OVS_KEY_ATTR_CT_STATE flags */
+#define OVS_CS_F_NEW               0x01 /* Beginning of a new connection. */
+#define OVS_CS_F_ESTABLISHED       0x02 /* Part of an existing connection. */
+#define OVS_CS_F_RELATED           0x04 /* Related to an established
+                                         * connection. */
+#define OVS_CS_F_INVALID           0x20 /* Could not track connection. */
+#define OVS_CS_F_REPLY_DIR         0x40 /* Flow is in the reply direction. */
+#define OVS_CS_F_TRACKED           0x80 /* Conntrack has occurred. */
+
 /**
  * enum ovs_flow_attr - attributes for %OVS_FLOW_* commands.
  * @OVS_FLOW_ATTR_KEY: Nested %OVS_KEY_ATTR_* attributes specifying the flow
@@ -595,6 +617,39 @@ struct ovs_action_hash {
 };
 
 /**
+ * enum ovs_ct_attr - Attributes for %OVS_ACTION_ATTR_CT action.
+ * @OVS_CT_ATTR_FLAGS: u32 connection tracking flags.
+ * @OVS_CT_ATTR_ZONE: u16 connection tracking zone.
+ * @OVS_CT_ATTR_MARK: u32 value followed by u32 mask. For each bit set in the
+ * mask, the corresponding bit in the value is copied to the connection
+ * tracking mark field in the connection.
+ * @OVS_CT_ATTR_LABEL: %OVS_CT_LABEL_LEN value followed by %OVS_CT_LABEL_LEN
+ * mask. For each bit set in the mask, the corresponding bit in the value is
+ * copied to the connection tracking label field in the connection.
+ * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG.
+ */
+enum ovs_ct_attr {
+        OVS_CT_ATTR_UNSPEC,
+        OVS_CT_ATTR_FLAGS,      /* u8 bitmask of OVS_CT_F_*. */
+        OVS_CT_ATTR_ZONE,       /* u16 zone id. */
+        OVS_CT_ATTR_MARK,       /* mark to associate with this connection. */
+        OVS_CT_ATTR_LABEL,      /* label to associate with this connection. */
+        OVS_CT_ATTR_HELPER,     /* netlink helper to assist detection of
+                                   related connections. */
+        __OVS_CT_ATTR_MAX
+};
+
+#define OVS_CT_ATTR_MAX (__OVS_CT_ATTR_MAX - 1)
+
+/*
+ * OVS_CT_ATTR_FLAGS flags - bitmask of %OVS_CT_F_*
+ * @OVS_CT_F_COMMIT: Commits the flow to the conntrack table. This allows
+ * future packets for the same connection to be identified as 'established'
+ * or 'related'.
+ */
+#define OVS_CT_F_COMMIT         0x01
+
+/**
  * enum ovs_action_attr - Action types.
  *
  * @OVS_ACTION_ATTR_OUTPUT: Output packet to port.
@@ -623,6 +678,8 @@ struct ovs_action_hash {
  * indicate the new packet contents. This could potentially still be
  * %ETH_P_MPLS if the resulting MPLS label stack is not empty.  If there
  * is no MPLS label stack, as determined by ethertype, no action is taken.
+ * @OVS_ACTION_ATTR_CT: Track the connection. Populate the conntrack-related
+ * entries in the flow key.
  *
  * 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
@@ -648,6 +705,7 @@ enum ovs_action_attr {
                                        * data immediately followed by a mask.
                                        * The data must be zero for the unmasked
                                        * bits. */
+        OVS_ACTION_ATTR_CT,           /* One nested OVS_CT_ATTR_* . */
 
         __OVS_ACTION_ATTR_MAX,        /* Nothing past this will be accepted
                                        * from userspace. */
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index d97f84c080da..2881145cda86 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -330,7 +330,8 @@ struct perf_event_attr {
                                 mmap2          :  1, /* include mmap with inode data     */
                                 comm_exec      :  1, /* flag comm events that are due to an exec */
                                 use_clockid    :  1, /* use @clockid for time fields */
-                                __reserved_1   : 38;
+                                context_switch :  1, /* context switch data */
+                                __reserved_1   : 37;
 
         union {
                 __u32           wakeup_events;    /* wakeup every n events */
@@ -572,9 +573,11 @@ struct perf_event_mmap_page {
 /*
  * PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on
  * different events so can reuse the same bit position.
+ * Ditto PERF_RECORD_MISC_SWITCH_OUT.
  */
 #define PERF_RECORD_MISC_MMAP_DATA              (1 << 13)
 #define PERF_RECORD_MISC_COMM_EXEC              (1 << 13)
+#define PERF_RECORD_MISC_SWITCH_OUT             (1 << 13)
 /*
  * Indicates that the content of PERF_SAMPLE_IP points to
  * the actual instruction that triggered the event. See also
@@ -818,6 +821,32 @@ enum perf_event_type {
          */
         PERF_RECORD_LOST_SAMPLES                = 13,
 
+        /*
+         * Records a context switch in or out (flagged by
+         * PERF_RECORD_MISC_SWITCH_OUT). See also
+         * PERF_RECORD_SWITCH_CPU_WIDE.
+         *
+         * struct {
+         *      struct perf_event_header        header;
+         *      struct sample_id                sample_id;
+         * };
+         */
+        PERF_RECORD_SWITCH                      = 14,
+
+        /*
+         * CPU-wide version of PERF_RECORD_SWITCH with next_prev_pid and
+         * next_prev_tid that are the next (switching out) or previous
+         * (switching in) pid/tid.
+         *
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             next_prev_pid;
+         *      u32                             next_prev_tid;
+         *      struct sample_id                sample_id;
+         * };
+         */
+        PERF_RECORD_SWITCH_CPU_WIDE             = 15,
+
         PERF_RECORD_MAX,                        /* non-ABI */
 };
 
@@ -922,6 +951,7 @@ union perf_mem_data_src {
  *
  *     in_tx: running in a hardware transaction
  *     abort: aborting a hardware transaction
+ *    cycles: cycles from last branch (or 0 if not supported)
  */
 struct perf_branch_entry {
         __u64   from;
@@ -930,7 +960,8 @@ struct perf_branch_entry {
                 predicted:1,/* target predicted */
                 in_tx:1,    /* in transaction */
                 abort:1,    /* transaction abort */
-                reserved:60;
+                cycles:16,  /* cycle count to last branch */
+                reserved:44;
 };
 
 #endif /* _UAPI_LINUX_PERF_EVENT_H */
diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h
index 31891d9535e2..a8d0759a9e40 100644
--- a/include/uapi/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
@@ -190,4 +190,11 @@ struct prctl_mm_map {
 # define PR_FP_MODE_FR          (1 << 0)        /* 64b FP registers */
 # define PR_FP_MODE_FRE         (1 << 1)        /* 32b compatibility */
 
+/* Control the ambient capability set */
+#define PR_CAP_AMBIENT                  47
+# define PR_CAP_AMBIENT_IS_SET          1
+# define PR_CAP_AMBIENT_RAISE           2
+# define PR_CAP_AMBIENT_LOWER           3
+# define PR_CAP_AMBIENT_CLEAR_ALL       4
+
 #endif /* _LINUX_PRCTL_H */
diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h
index cf1019e15f5b..a7a697986614 100644
--- a/include/uapi/linux/ptrace.h
+++ b/include/uapi/linux/ptrace.h
@@ -89,9 +89,11 @@ struct ptrace_peeksiginfo_args {
 #define PTRACE_O_TRACESECCOMP   (1 << PTRACE_EVENT_SECCOMP)
 
 /* eventless options */
-#define PTRACE_O_EXITKILL       (1 << 20)
+#define PTRACE_O_EXITKILL               (1 << 20)
+#define PTRACE_O_SUSPEND_SECCOMP        (1 << 21)
 
-#define PTRACE_O_MASK           (0x000000ff | PTRACE_O_EXITKILL)
+#define PTRACE_O_MASK           (\
+        0x000000ff | PTRACE_O_EXITKILL | PTRACE_O_SUSPEND_SECCOMP)
 
 #include <asm/ptrace.h>
 
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index fdd8f07f1d34..702024769c74 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -308,6 +308,8 @@ enum rtattr_type_t {
         RTA_VIA,
         RTA_NEWDST,
         RTA_PREF,
+        RTA_ENCAP_TYPE,
+        RTA_ENCAP,
         __RTA_MAX
 };
 
@@ -416,10 +418,13 @@ enum {
 
 #define RTAX_MAX (__RTAX_MAX - 1)
 
-#define RTAX_FEATURE_ECN        0x00000001
-#define RTAX_FEATURE_SACK       0x00000002
-#define RTAX_FEATURE_TIMESTAMP  0x00000004
-#define RTAX_FEATURE_ALLFRAG    0x00000008
+#define RTAX_FEATURE_ECN        (1 << 0)
+#define RTAX_FEATURE_SACK       (1 << 1)
+#define RTAX_FEATURE_TIMESTAMP  (1 << 2)
+#define RTAX_FEATURE_ALLFRAG    (1 << 3)
+
+#define RTAX_FEATURE_MASK       (RTAX_FEATURE_ECN | RTAX_FEATURE_SACK | \
+                                 RTAX_FEATURE_TIMESTAMP | RTAX_FEATURE_ALLFRAG)
 
 struct rta_session {
         __u8    proto;
diff --git a/include/uapi/linux/securebits.h b/include/uapi/linux/securebits.h
index 985aac9e6bf8..35ac35cef217 100644
--- a/include/uapi/linux/securebits.h
+++ b/include/uapi/linux/securebits.h
@@ -43,9 +43,18 @@
 #define SECBIT_KEEP_CAPS        (issecure_mask(SECURE_KEEP_CAPS))
 #define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
 
+/* When set, a process cannot add new capabilities to its ambient set. */
+#define SECURE_NO_CAP_AMBIENT_RAISE             6
+#define SECURE_NO_CAP_AMBIENT_RAISE_LOCKED      7  /* make bit-6 immutable */
+
+#define SECBIT_NO_CAP_AMBIENT_RAISE (issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE))
+#define SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED \
+                        (issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE_LOCKED))
+
 #define SECURE_ALL_BITS         (issecure_mask(SECURE_NOROOT) | \
                                  issecure_mask(SECURE_NO_SETUID_FIXUP) | \
-                                 issecure_mask(SECURE_KEEP_CAPS))
+                                 issecure_mask(SECURE_KEEP_CAPS) | \
+                                 issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE))
 #define SECURE_ALL_LOCKS        (SECURE_ALL_BITS << 1)
 
 #endif /* _UAPI_LINUX_SECUREBITS_H */
diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index eee8968407f0..25a9ad8bcef1 100644
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -278,6 +278,8 @@ enum
         LINUX_MIB_TCPACKSKIPPEDCHALLENGE,       /* TCPACKSkippedChallenge */
         LINUX_MIB_TCPWINPROBE,                  /* TCPWinProbe */
         LINUX_MIB_TCPKEEPALIVE,                 /* TCPKeepAlive */
+        LINUX_MIB_TCPMTUPFAIL,                  /* TCPMTUPFail */
+        LINUX_MIB_TCPMTUPSUCCESS,               /* TCPMTUPSuccess */
         __LINUX_MIB_MAX
 };
 
diff --git a/include/uapi/linux/target_core_user.h b/include/uapi/linux/target_core_user.h
index b67f99d3c520..95c6521d8a95 100644
--- a/include/uapi/linux/target_core_user.h
+++ b/include/uapi/linux/target_core_user.h
@@ -42,10 +42,6 @@
 #define TCMU_MAILBOX_VERSION 2
 #define ALIGN_SIZE 64 /* Should be enough for most CPUs */
 
-/* See https://gcc.gnu.org/onlinedocs/cpp/Stringification.html */
-#define xstr(s) str(s)
-#define str(s) #s
-
 struct tcmu_mailbox {
         __u16 version;
         __u16 flags;
diff --git a/include/uapi/linux/toshiba.h b/include/uapi/linux/toshiba.h
index e9bef5b2f91e..c58bf4b5bb26 100644
--- a/include/uapi/linux/toshiba.h
+++ b/include/uapi/linux/toshiba.h
@@ -1,6 +1,7 @@
 /* toshiba.h -- Linux driver for accessing the SMM on Toshiba laptops 
  *
  * Copyright (c) 1996-2000  Jonathan A. Buzzard (jonathan@buzzard.org.uk)
+ * Copyright (c) 2015  Azael Avalos <coproscefalo@gmail.com>
  *
  * Thanks to Juergen Heinzl <juergen@monocerus.demon.co.uk> for the pointers
  * on making sure the structure is aligned and packed.
@@ -20,9 +21,18 @@
 #ifndef _UAPI_LINUX_TOSHIBA_H
 #define _UAPI_LINUX_TOSHIBA_H
 
-#define TOSH_PROC "/proc/toshiba"
-#define TOSH_DEVICE "/dev/toshiba"
-#define TOSH_SMM _IOWR('t', 0x90, int)  /* broken: meant 24 bytes */
+/*
+ * Toshiba modules paths
+ */
+
+#define TOSH_PROC               "/proc/toshiba"
+#define TOSH_DEVICE             "/dev/toshiba"
+#define TOSHIBA_ACPI_PROC       "/proc/acpi/toshiba"
+#define TOSHIBA_ACPI_DEVICE     "/dev/toshiba_acpi"
+
+/*
+ * Toshiba SMM structure
+ */
 
 typedef struct {
         unsigned int eax;
@@ -33,5 +43,21 @@ typedef struct {
         unsigned int edi __attribute__ ((packed));
 } SMMRegisters;
 
+/*
+ * IOCTLs (0x90 - 0x91)
+ */
+
+#define TOSH_SMM                _IOWR('t', 0x90, SMMRegisters)
+/*
+ * Convenience toshiba_acpi command.
+ *
+ * The System Configuration Interface (SCI) is opened/closed internally
+ * to avoid userspace of buggy BIOSes.
+ *
+ * The toshiba_acpi module checks whether the eax register is set with
+ * SCI_GET (0xf300) or SCI_SET (0xf400), returning -EINVAL if not.
+ */
+#define TOSHIBA_ACPI_SCI        _IOWR('t', 0x91, SMMRegisters)
+
 
 #endif /* _UAPI_LINUX_TOSHIBA_H */
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index aa33fd1b2d4f..f7adc6e01f9e 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -674,9 +674,21 @@ struct usb_otg_descriptor {
         __u8  bmAttributes;     /* support for HNP, SRP, etc */
 } __attribute__ ((packed));
 
+/* USB_DT_OTG (from OTG 2.0 supplement) */
+struct usb_otg20_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  bmAttributes;     /* support for HNP, SRP and ADP, etc */
+        __le16 bcdOTG;          /* OTG and EH supplement release number
+                                 * in binary-coded decimal(i.e. 2.0 is 0200H)
+                                 */
+} __attribute__ ((packed));
+
 /* from usb_otg_descriptor.bmAttributes */
 #define USB_OTG_SRP             (1 << 0)
 #define USB_OTG_HNP             (1 << 1)        /* swap host/device roles */
+#define USB_OTG_ADP             (1 << 2)        /* support ADP */
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h
new file mode 100644
index 000000000000..df0e09bb7dd5
--- /dev/null
+++ b/include/uapi/linux/userfaultfd.h
@@ -0,0 +1,169 @@
+/*
+ *  include/linux/userfaultfd.h
+ *
+ *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>
+ *  Copyright (C) 2015  Red Hat, Inc.
+ *
+ */
+
+#ifndef _LINUX_USERFAULTFD_H
+#define _LINUX_USERFAULTFD_H
+
+#include <linux/types.h>
+
+#include <linux/compiler.h>
+
+#define UFFD_API ((__u64)0xAA)
+/*
+ * After implementing the respective features it will become:
+ * #define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | \
+ *                            UFFD_FEATURE_EVENT_FORK)
+ */
+#define UFFD_API_FEATURES (0)
+#define UFFD_API_IOCTLS                         \
+        ((__u64)1 << _UFFDIO_REGISTER |         \
+         (__u64)1 << _UFFDIO_UNREGISTER |       \
+         (__u64)1 << _UFFDIO_API)
+#define UFFD_API_RANGE_IOCTLS                   \
+        ((__u64)1 << _UFFDIO_WAKE |             \
+         (__u64)1 << _UFFDIO_COPY |             \
+         (__u64)1 << _UFFDIO_ZEROPAGE)
+
+/*
+ * Valid ioctl command number range with this API is from 0x00 to
+ * 0x3F.  UFFDIO_API is the fixed number, everything else can be
+ * changed by implementing a different UFFD_API. If sticking to the
+ * same UFFD_API more ioctl can be added and userland will be aware of
+ * which ioctl the running kernel implements through the ioctl command
+ * bitmask written by the UFFDIO_API.
+ */
+#define _UFFDIO_REGISTER                (0x00)
+#define _UFFDIO_UNREGISTER              (0x01)
+#define _UFFDIO_WAKE                    (0x02)
+#define _UFFDIO_COPY                    (0x03)
+#define _UFFDIO_ZEROPAGE                (0x04)
+#define _UFFDIO_API                     (0x3F)
+
+/* userfaultfd ioctl ids */
+#define UFFDIO 0xAA
+#define UFFDIO_API              _IOWR(UFFDIO, _UFFDIO_API,      \
+                                      struct uffdio_api)
+#define UFFDIO_REGISTER         _IOWR(UFFDIO, _UFFDIO_REGISTER, \
+                                      struct uffdio_register)
+#define UFFDIO_UNREGISTER       _IOR(UFFDIO, _UFFDIO_UNREGISTER,        \
+                                     struct uffdio_range)
+#define UFFDIO_WAKE             _IOR(UFFDIO, _UFFDIO_WAKE,      \
+                                     struct uffdio_range)
+#define UFFDIO_COPY             _IOWR(UFFDIO, _UFFDIO_COPY,     \
+                                      struct uffdio_copy)
+#define UFFDIO_ZEROPAGE         _IOWR(UFFDIO, _UFFDIO_ZEROPAGE, \
+                                      struct uffdio_zeropage)
+
+/* read() structure */
+struct uffd_msg {
+        __u8    event;
+
+        __u8    reserved1;
+        __u16   reserved2;
+        __u32   reserved3;
+
+        union {
+                struct {
+                        __u64   flags;
+                        __u64   address;
+                } pagefault;
+
+                struct {
+                        /* unused reserved fields */
+                        __u64   reserved1;
+                        __u64   reserved2;
+                        __u64   reserved3;
+                } reserved;
+        } arg;
+} __packed;
+
+/*
+ * Start at 0x12 and not at 0 to be more strict against bugs.
+ */
+#define UFFD_EVENT_PAGEFAULT    0x12
+#if 0 /* not available yet */
+#define UFFD_EVENT_FORK         0x13
+#endif
+
+/* flags for UFFD_EVENT_PAGEFAULT */
+#define UFFD_PAGEFAULT_FLAG_WRITE       (1<<0)  /* If this was a write fault */
+#define UFFD_PAGEFAULT_FLAG_WP          (1<<1)  /* If reason is VM_UFFD_WP */
+
+struct uffdio_api {
+        /* userland asks for an API number and the features to enable */
+        __u64 api;
+        /*
+         * Kernel answers below with the all available features for
+         * the API, this notifies userland of which events and/or
+         * which flags for each event are enabled in the current
+         * kernel.
+         *
+         * Note: UFFD_EVENT_PAGEFAULT and UFFD_PAGEFAULT_FLAG_WRITE
+         * are to be considered implicitly always enabled in all kernels as
+         * long as the uffdio_api.api requested matches UFFD_API.
+         */
+#if 0 /* not available yet */
+#define UFFD_FEATURE_PAGEFAULT_FLAG_WP          (1<<0)
+#define UFFD_FEATURE_EVENT_FORK                 (1<<1)
+#endif
+        __u64 features;
+
+        __u64 ioctls;
+};
+
+struct uffdio_range {
+        __u64 start;
+        __u64 len;
+};
+
+struct uffdio_register {
+        struct uffdio_range range;
+#define UFFDIO_REGISTER_MODE_MISSING    ((__u64)1<<0)
+#define UFFDIO_REGISTER_MODE_WP         ((__u64)1<<1)
+        __u64 mode;
+
+        /*
+         * kernel answers which ioctl commands are available for the
+         * range, keep at the end as the last 8 bytes aren't read.
+         */
+        __u64 ioctls;
+};
+
+struct uffdio_copy {
+        __u64 dst;
+        __u64 src;
+        __u64 len;
+        /*
+         * There will be a wrprotection flag later that allows to map
+         * pages wrprotected on the fly. And such a flag will be
+         * available if the wrprotection ioctl are implemented for the
+         * range according to the uffdio_register.ioctls.
+         */
+#define UFFDIO_COPY_MODE_DONTWAKE               ((__u64)1<<0)
+        __u64 mode;
+
+        /*
+         * "copy" is written by the ioctl and must be at the end: the
+         * copy_from_user will not read the last 8 bytes.
+         */
+        __s64 copy;
+};
+
+struct uffdio_zeropage {
+        struct uffdio_range range;
+#define UFFDIO_ZEROPAGE_MODE_DONTWAKE           ((__u64)1<<0)
+        __u64 mode;
+
+        /*
+         * "zeropage" is written by the ioctl and must be at the end:
+         * the copy_from_user will not read the last 8 bytes.
+         */
+        __s64 zeropage;
+};
+
+#endif /* _LINUX_USERFAULTFD_H */
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 9f6e108ff4a0..d448c536b49d 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -174,6 +174,10 @@ enum v4l2_colorfx {
  * We reserve 16 controls for this driver. */
 #define V4L2_CID_USER_ADV7180_BASE              (V4L2_CID_USER_BASE + 0x1070)
 
+/* The base for the tc358743 driver controls.
+ * We reserve 16 controls for this driver. */
+#define V4L2_CID_USER_TC358743_BASE             (V4L2_CID_USER_BASE + 0x1080)
+
 /* MPEG-class control IDs */
 /* The MPEG controls are applicable to all codec controls
  * and the 'MPEG' part of the define is historical */
diff --git a/include/uapi/linux/vsp1.h b/include/uapi/linux/vsp1.h
index e18858f6e865..9a823696d816 100644
--- a/include/uapi/linux/vsp1.h
+++ b/include/uapi/linux/vsp1.h
@@ -28,7 +28,7 @@
         _IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct vsp1_lut_config)
 
 struct vsp1_lut_config {
-        u32 lut[256];
+        __u32 lut[256];
 };
 
 #endif  /* __VSP1_USER_H__ */
diff --git a/include/uapi/misc/cxl.h b/include/uapi/misc/cxl.h
index 99a8ca15fe64..1e889aa8a36e 100644
--- a/include/uapi/misc/cxl.h
+++ b/include/uapi/misc/cxl.h
@@ -29,8 +29,10 @@ struct cxl_ioctl_start_work {
 
 #define CXL_START_WORK_AMR              0x0000000000000001ULL
 #define CXL_START_WORK_NUM_IRQS         0x0000000000000002ULL
+#define CXL_START_WORK_ERR_FF           0x0000000000000004ULL
 #define CXL_START_WORK_ALL              (CXL_START_WORK_AMR |\
-                                         CXL_START_WORK_NUM_IRQS)
+                                         CXL_START_WORK_NUM_IRQS |\
+                                         CXL_START_WORK_ERR_FF)
 
 
 /* Possible modes that an afu can be in */
diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild
index 687ae332200f..231901b08f6c 100644
--- a/include/uapi/rdma/Kbuild
+++ b/include/uapi/rdma/Kbuild
@@ -5,3 +5,4 @@ header-y += ib_user_sa.h
 header-y += ib_user_verbs.h
 header-y += rdma_netlink.h
 header-y += rdma_user_cm.h
+header-y += hfi/
diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild
new file mode 100644
index 000000000000..ef23c294fc71
--- /dev/null
+++ b/include/uapi/rdma/hfi/Kbuild
@@ -0,0 +1,2 @@
+# UAPI Header export list
+header-y += hfi1_user.h
diff --git a/include/uapi/rdma/hfi/hfi1_user.h b/include/uapi/rdma/hfi/hfi1_user.h
new file mode 100644
index 000000000000..78c442fbf263
--- /dev/null
+++ b/include/uapi/rdma/hfi/hfi1_user.h
@@ -0,0 +1,427 @@
+/*
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2015 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License 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.
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2015 Intel Corporation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  - Neither the name of Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * This file contains defines, structures, etc. that are used
+ * to communicate between kernel and user code.
+ */
+
+#ifndef _LINUX__HFI1_USER_H
+#define _LINUX__HFI1_USER_H
+
+#include <linux/types.h>
+
+/*
+ * This version number is given to the driver by the user code during
+ * initialization in the spu_userversion field of hfi1_user_info, so
+ * the driver can check for compatibility with user code.
+ *
+ * The major version changes when data structures change in an incompatible
+ * way. The driver must be the same for initialization to succeed.
+ */
+#define HFI1_USER_SWMAJOR 4
+
+/*
+ * Minor version differences are always compatible
+ * a within a major version, however if user software is larger
+ * than driver software, some new features and/or structure fields
+ * may not be implemented; the user code must deal with this if it
+ * cares, or it must abort after initialization reports the difference.
+ */
+#define HFI1_USER_SWMINOR 0
+
+/*
+ * Set of HW and driver capability/feature bits.
+ * These bit values are used to configure enabled/disabled HW and
+ * driver features. The same set of bits are communicated to user
+ * space.
+ */
+#define HFI1_CAP_DMA_RTAIL        (1UL <<  0) /* Use DMA'ed RTail value */
+#define HFI1_CAP_SDMA             (1UL <<  1) /* Enable SDMA support */
+#define HFI1_CAP_SDMA_AHG         (1UL <<  2) /* Enable SDMA AHG support */
+#define HFI1_CAP_EXTENDED_PSN     (1UL <<  3) /* Enable Extended PSN support */
+#define HFI1_CAP_HDRSUPP          (1UL <<  4) /* Enable Header Suppression */
+/* 1UL << 5 reserved */
+#define HFI1_CAP_USE_SDMA_HEAD    (1UL <<  6) /* DMA Hdr Q tail vs. use CSR */
+#define HFI1_CAP_MULTI_PKT_EGR    (1UL <<  7) /* Enable multi-packet Egr buffs*/
+#define HFI1_CAP_NODROP_RHQ_FULL  (1UL <<  8) /* Don't drop on Hdr Q full */
+#define HFI1_CAP_NODROP_EGR_FULL  (1UL <<  9) /* Don't drop on EGR buffs full */
+#define HFI1_CAP_TID_UNMAP        (1UL << 10) /* Enable Expected TID caching */
+#define HFI1_CAP_PRINT_UNIMPL     (1UL << 11) /* Show for unimplemented feats */
+#define HFI1_CAP_ALLOW_PERM_JKEY  (1UL << 12) /* Allow use of permissive JKEY */
+#define HFI1_CAP_NO_INTEGRITY     (1UL << 13) /* Enable ctxt integrity checks */
+#define HFI1_CAP_PKEY_CHECK       (1UL << 14) /* Enable ctxt PKey checking */
+#define HFI1_CAP_STATIC_RATE_CTRL (1UL << 15) /* Allow PBC.StaticRateControl */
+#define HFI1_CAP_QSFP_ENABLED     (1UL << 16) /* Enable QSFP check during LNI */
+#define HFI1_CAP_SDMA_HEAD_CHECK  (1UL << 17) /* SDMA head checking */
+#define HFI1_CAP_EARLY_CREDIT_RETURN (1UL << 18) /* early credit return */
+
+#define HFI1_RCVHDR_ENTSIZE_2    (1UL << 0)
+#define HFI1_RCVHDR_ENTSIZE_16   (1UL << 1)
+#define HFI1_RCVDHR_ENTSIZE_32   (1UL << 2)
+
+/*
+ * If the unit is specified via open, HFI choice is fixed.  If port is
+ * specified, it's also fixed.  Otherwise we try to spread contexts
+ * across ports and HFIs, using different algorithms.  WITHIN is
+ * the old default, prior to this mechanism.
+ */
+#define HFI1_ALG_ACROSS 0 /* round robin contexts across HFIs, then
+                          * ports; this is the default */
+#define HFI1_ALG_WITHIN 1 /* use all contexts on an HFI (round robin
+                          * active ports within), then next HFI */
+#define HFI1_ALG_COUNT  2 /* number of algorithm choices */
+
+
+/* User commands. */
+#define HFI1_CMD_ASSIGN_CTXT     1      /* allocate HFI and context */
+#define HFI1_CMD_CTXT_INFO       2      /* find out what resources we got */
+#define HFI1_CMD_USER_INFO       3      /* set up userspace */
+#define HFI1_CMD_TID_UPDATE      4      /* update expected TID entries */
+#define HFI1_CMD_TID_FREE        5      /* free expected TID entries */
+#define HFI1_CMD_CREDIT_UPD      6      /* force an update of PIO credit */
+#define HFI1_CMD_SDMA_STATUS_UPD 7       /* force update of SDMA status ring */
+
+#define HFI1_CMD_RECV_CTRL       8      /* control receipt of packets */
+#define HFI1_CMD_POLL_TYPE       9      /* set the kind of polling we want */
+#define HFI1_CMD_ACK_EVENT       10     /* ack & clear user status bits */
+#define HFI1_CMD_SET_PKEY        11      /* set context's pkey */
+#define HFI1_CMD_CTXT_RESET      12      /* reset context's HW send context */
+/* separate EPROM commands from normal PSM commands */
+#define HFI1_CMD_EP_INFO         64      /* read EPROM device ID */
+#define HFI1_CMD_EP_ERASE_CHIP   65      /* erase whole EPROM */
+#define HFI1_CMD_EP_ERASE_P0     66      /* erase EPROM partition 0 */
+#define HFI1_CMD_EP_ERASE_P1     67      /* erase EPROM partition 1 */
+#define HFI1_CMD_EP_READ_P0      68      /* read EPROM partition 0 */
+#define HFI1_CMD_EP_READ_P1      69      /* read EPROM partition 1 */
+#define HFI1_CMD_EP_WRITE_P0     70      /* write EPROM partition 0 */
+#define HFI1_CMD_EP_WRITE_P1     71      /* write EPROM partition 1 */
+
+#define _HFI1_EVENT_FROZEN_BIT       0
+#define _HFI1_EVENT_LINKDOWN_BIT     1
+#define _HFI1_EVENT_LID_CHANGE_BIT   2
+#define _HFI1_EVENT_LMC_CHANGE_BIT   3
+#define _HFI1_EVENT_SL2VL_CHANGE_BIT 4
+#define _HFI1_MAX_EVENT_BIT _HFI1_EVENT_SL2VL_CHANGE_BIT
+
+#define HFI1_EVENT_FROZEN                (1UL << _HFI1_EVENT_FROZEN_BIT)
+#define HFI1_EVENT_LINKDOWN_BIT         (1UL << _HFI1_EVENT_LINKDOWN_BIT)
+#define HFI1_EVENT_LID_CHANGE_BIT       (1UL << _HFI1_EVENT_LID_CHANGE_BIT)
+#define HFI1_EVENT_LMC_CHANGE_BIT       (1UL << _HFI1_EVENT_LMC_CHANGE_BIT)
+#define HFI1_EVENT_SL2VL_CHANGE_BIT     (1UL << _HFI1_EVENT_SL2VL_CHANGE_BIT)
+
+/*
+ * These are the status bits readable (in ASCII form, 64bit value)
+ * from the "status" sysfs file.  For binary compatibility, values
+ * must remain as is; removed states can be reused for different
+ * purposes.
+ */
+#define HFI1_STATUS_INITTED       0x1    /* basic initialization done */
+/* Chip has been found and initialized */
+#define HFI1_STATUS_CHIP_PRESENT 0x20
+/* IB link is at ACTIVE, usable for data traffic */
+#define HFI1_STATUS_IB_READY     0x40
+/* link is configured, LID, MTU, etc. have been set */
+#define HFI1_STATUS_IB_CONF      0x80
+/* A Fatal hardware error has occurred. */
+#define HFI1_STATUS_HWERROR     0x200
+
+/*
+ * Number of supported shared contexts.
+ * This is the maximum number of software contexts that can share
+ * a hardware send/receive context.
+ */
+#define HFI1_MAX_SHARED_CTXTS 8
+
+/*
+ * Poll types
+ */
+#define HFI1_POLL_TYPE_ANYRCV     0x0
+#define HFI1_POLL_TYPE_URGENT     0x1
+
+/*
+ * This structure is passed to the driver to tell it where
+ * user code buffers are, sizes, etc.   The offsets and sizes of the
+ * fields must remain unchanged, for binary compatibility.  It can
+ * be extended, if userversion is changed so user code can tell, if needed
+ */
+struct hfi1_user_info {
+        /*
+         * version of user software, to detect compatibility issues.
+         * Should be set to HFI1_USER_SWVERSION.
+         */
+        __u32 userversion;
+        __u16 pad;
+        /* HFI selection algorithm, if unit has not selected */
+        __u16 hfi1_alg;
+        /*
+         * If two or more processes wish to share a context, each process
+         * must set the subcontext_cnt and subcontext_id to the same
+         * values.  The only restriction on the subcontext_id is that
+         * it be unique for a given node.
+         */
+        __u16 subctxt_cnt;
+        __u16 subctxt_id;
+        /* 128bit UUID passed in by PSM. */
+        __u8 uuid[16];
+};
+
+struct hfi1_ctxt_info {
+        __u64 runtime_flags;    /* chip/drv runtime flags (HFI1_CAP_*) */
+        __u32 rcvegr_size;      /* size of each eager buffer */
+        __u16 num_active;       /* number of active units */
+        __u16 unit;             /* unit (chip) assigned to caller */
+        __u16 ctxt;             /* ctxt on unit assigned to caller */
+        __u16 subctxt;          /* subctxt on unit assigned to caller */
+        __u16 rcvtids;          /* number of Rcv TIDs for this context */
+        __u16 credits;          /* number of PIO credits for this context */
+        __u16 numa_node;        /* NUMA node of the assigned device */
+        __u16 rec_cpu;          /* cpu # for affinity (0xffff if none) */
+        __u16 send_ctxt;        /* send context in use by this user context */
+        __u16 egrtids;          /* number of RcvArray entries for Eager Rcvs */
+        __u16 rcvhdrq_cnt;      /* number of RcvHdrQ entries */
+        __u16 rcvhdrq_entsize;  /* size (in bytes) for each RcvHdrQ entry */
+        __u16 sdma_ring_size;   /* number of entries in SDMA request ring */
+};
+
+struct hfi1_tid_info {
+        /* virtual address of first page in transfer */
+        __u64 vaddr;
+        /* pointer to tid array. this array is big enough */
+        __u64 tidlist;
+        /* number of tids programmed by this request */
+        __u32 tidcnt;
+        /* length of transfer buffer programmed by this request */
+        __u32 length;
+        /*
+         * pointer to bitmap of TIDs used for this call;
+         * checked for being large enough at open
+         */
+        __u64 tidmap;
+};
+
+struct hfi1_cmd {
+        __u32 type;        /* command type */
+        __u32 len;         /* length of struct pointed to by add */
+        __u64 addr;        /* pointer to user structure */
+};
+
+enum hfi1_sdma_comp_state {
+        FREE = 0,
+        QUEUED,
+        COMPLETE,
+        ERROR
+};
+
+/*
+ * SDMA completion ring entry
+ */
+struct hfi1_sdma_comp_entry {
+        __u32 status;
+        __u32 errcode;
+};
+
+/*
+ * Device status and notifications from driver to user-space.
+ */
+struct hfi1_status {
+        __u64 dev;      /* device/hw status bits */
+        __u64 port;     /* port state and status bits */
+        char freezemsg[0];
+};
+
+/*
+ * This structure is returned by the driver immediately after
+ * open to get implementation-specific info, and info specific to this
+ * instance.
+ *
+ * This struct must have explicit pad fields where type sizes
+ * may result in different alignments between 32 and 64 bit
+ * programs, since the 64 bit * bit kernel requires the user code
+ * to have matching offsets
+ */
+struct hfi1_base_info {
+        /* version of hardware, for feature checking. */
+        __u32 hw_version;
+        /* version of software, for feature checking. */
+        __u32 sw_version;
+        /* Job key */
+        __u16 jkey;
+        __u16 padding1;
+        /*
+         * The special QP (queue pair) value that identifies PSM
+         * protocol packet from standard IB packets.
+         */
+        __u32 bthqp;
+        /* PIO credit return address, */
+        __u64 sc_credits_addr;
+        /*
+         * Base address of write-only pio buffers for this process.
+         * Each buffer has sendpio_credits*64 bytes.
+         */
+        __u64 pio_bufbase_sop;
+        /*
+         * Base address of write-only pio buffers for this process.
+         * Each buffer has sendpio_credits*64 bytes.
+         */
+        __u64 pio_bufbase;
+        /* address where receive buffer queue is mapped into */
+        __u64 rcvhdr_bufbase;
+        /* base address of Eager receive buffers. */
+        __u64 rcvegr_bufbase;
+        /* base address of SDMA completion ring */
+        __u64 sdma_comp_bufbase;
+        /*
+         * User register base for init code, not to be used directly by
+         * protocol or applications.  Always maps real chip register space.
+         * the register addresses are:
+         * ur_rcvhdrhead, ur_rcvhdrtail, ur_rcvegrhead, ur_rcvegrtail,
+         * ur_rcvtidflow
+         */
+        __u64 user_regbase;
+        /* notification events */
+        __u64 events_bufbase;
+        /* status page */
+        __u64 status_bufbase;
+        /* rcvhdrtail update */
+        __u64 rcvhdrtail_base;
+        /*
+         * shared memory pages for subctxts if ctxt is shared; these cover
+         * all the processes in the group sharing a single context.
+         * all have enough space for the num_subcontexts value on this job.
+         */
+        __u64 subctxt_uregbase;
+        __u64 subctxt_rcvegrbuf;
+        __u64 subctxt_rcvhdrbuf;
+};
+
+enum sdma_req_opcode {
+        EXPECTED = 0,
+        EAGER
+};
+
+#define HFI1_SDMA_REQ_VERSION_MASK 0xF
+#define HFI1_SDMA_REQ_VERSION_SHIFT 0x0
+#define HFI1_SDMA_REQ_OPCODE_MASK 0xF
+#define HFI1_SDMA_REQ_OPCODE_SHIFT 0x4
+#define HFI1_SDMA_REQ_IOVCNT_MASK 0xFF
+#define HFI1_SDMA_REQ_IOVCNT_SHIFT 0x8
+
+struct sdma_req_info {
+        /*
+         * bits 0-3 - version (currently unused)
+         * bits 4-7 - opcode (enum sdma_req_opcode)
+         * bits 8-15 - io vector count
+         */
+        __u16 ctrl;
+        /*
+         * Number of fragments contained in this request.
+         * User-space has already computed how many
+         * fragment-sized packet the user buffer will be
+         * split into.
+         */
+        __u16 npkts;
+        /*
+         * Size of each fragment the user buffer will be
+         * split into.
+         */
+        __u16 fragsize;
+        /*
+         * Index of the slot in the SDMA completion ring
+         * this request should be using. User-space is
+         * in charge of managing its own ring.
+         */
+        __u16 comp_idx;
+} __packed;
+
+/*
+ * SW KDETH header.
+ * swdata is SW defined portion.
+ */
+struct hfi1_kdeth_header {
+        __le32 ver_tid_offset;
+        __le16 jkey;
+        __le16 hcrc;
+        __le32 swdata[7];
+} __packed;
+
+/*
+ * Structure describing the headers that User space uses. The
+ * structure above is a subset of this one.
+ */
+struct hfi1_pkt_header {
+        __le16 pbc[4];
+        __be16 lrh[4];
+        __be32 bth[3];
+        struct hfi1_kdeth_header kdeth;
+} __packed;
+
+
+/*
+ * The list of usermode accessible registers.
+ */
+enum hfi1_ureg {
+        /* (RO)  DMA RcvHdr to be used next. */
+        ur_rcvhdrtail = 0,
+        /* (RW)  RcvHdr entry to be processed next by host. */
+        ur_rcvhdrhead = 1,
+        /* (RO)  Index of next Eager index to use. */
+        ur_rcvegrindextail = 2,
+        /* (RW)  Eager TID to be processed next */
+        ur_rcvegrindexhead = 3,
+        /* (RO)  Receive Eager Offset Tail */
+        ur_rcvegroffsettail = 4,
+        /* For internal use only; max register number. */
+        ur_maxreg,
+        /* (RW)  Receive TID flow table */
+        ur_rcvtidflowtable = 256
+};
+
+#endif /* _LINIUX__HFI1_USER_H */
diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
index 6e4bb4270ca2..c19a5dc1531a 100644
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@ -7,12 +7,14 @@ enum {
         RDMA_NL_RDMA_CM = 1,
         RDMA_NL_NES,
         RDMA_NL_C4IW,
+        RDMA_NL_LS,     /* RDMA Local Services */
         RDMA_NL_NUM_CLIENTS
 };
 
 enum {
         RDMA_NL_GROUP_CM = 1,
         RDMA_NL_GROUP_IWPM,
+        RDMA_NL_GROUP_LS,
         RDMA_NL_NUM_GROUPS
 };
 
@@ -128,5 +130,85 @@ enum {
         IWPM_NLA_ERR_MAX
 };
 
+/*
+ * Local service operations:
+ *   RESOLVE - The client requests the local service to resolve a path.
+ *   SET_TIMEOUT - The local service requests the client to set the timeout.
+ */
+enum {
+        RDMA_NL_LS_OP_RESOLVE = 0,
+        RDMA_NL_LS_OP_SET_TIMEOUT,
+        RDMA_NL_LS_NUM_OPS
+};
+
+/* Local service netlink message flags */
+#define RDMA_NL_LS_F_ERR        0x0100  /* Failed response */
+
+/*
+ * Local service resolve operation family header.
+ * The layout for the resolve operation:
+ *    nlmsg header
+ *    family header
+ *    attributes
+ */
+
+/*
+ * Local service path use:
+ * Specify how the path(s) will be used.
+ *   ALL - For connected CM operation (6 pathrecords)
+ *   UNIDIRECTIONAL - For unidirectional UD (1 pathrecord)
+ *   GMP - For miscellaneous GMP like operation (at least 1 reversible
+ *         pathrecord)
+ */
+enum {
+        LS_RESOLVE_PATH_USE_ALL = 0,
+        LS_RESOLVE_PATH_USE_UNIDIRECTIONAL,
+        LS_RESOLVE_PATH_USE_GMP,
+        LS_RESOLVE_PATH_USE_MAX
+};
+
+#define LS_DEVICE_NAME_MAX 64
+
+struct rdma_ls_resolve_header {
+        __u8 device_name[LS_DEVICE_NAME_MAX];
+        __u8 port_num;
+        __u8 path_use;
+};
+
+/* Local service attribute type */
+#define RDMA_NLA_F_MANDATORY    (1 << 13)
+#define RDMA_NLA_TYPE_MASK      (~(NLA_F_NESTED | NLA_F_NET_BYTEORDER | \
+                                  RDMA_NLA_F_MANDATORY))
+
+/*
+ * Local service attributes:
+ *   Attr Name       Size                       Byte order
+ *   -----------------------------------------------------
+ *   PATH_RECORD     struct ib_path_rec_data
+ *   TIMEOUT         u32                        cpu
+ *   SERVICE_ID      u64                        cpu
+ *   DGID            u8[16]                     BE
+ *   SGID            u8[16]                     BE
+ *   TCLASS          u8
+ *   PKEY            u16                        cpu
+ *   QOS_CLASS       u16                        cpu
+ */
+enum {
+        LS_NLA_TYPE_UNSPEC = 0,
+        LS_NLA_TYPE_PATH_RECORD,
+        LS_NLA_TYPE_TIMEOUT,
+        LS_NLA_TYPE_SERVICE_ID,
+        LS_NLA_TYPE_DGID,
+        LS_NLA_TYPE_SGID,
+        LS_NLA_TYPE_TCLASS,
+        LS_NLA_TYPE_PKEY,
+        LS_NLA_TYPE_QOS_CLASS,
+        LS_NLA_TYPE_MAX
+};
+
+/* Local service DGID/SGID attribute: big endian */
+struct rdma_nla_ls_gid {
+        __u8            gid[16];
+};
 
 #endif /* _UAPI_RDMA_NETLINK_H */
diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild
index 75746d52f208..d791e0ad509d 100644
--- a/include/uapi/scsi/Kbuild
+++ b/include/uapi/scsi/Kbuild
@@ -3,3 +3,4 @@ header-y += fc/
 header-y += scsi_bsg_fc.h
 header-y += scsi_netlink.h
 header-y += scsi_netlink_fc.h
+header-y += cxlflash_ioctl.h
diff --git a/include/uapi/scsi/cxlflash_ioctl.h b/include/uapi/scsi/cxlflash_ioctl.h
new file mode 100644
index 000000000000..831351b2e660
--- /dev/null
+++ b/include/uapi/scsi/cxlflash_ioctl.h
@@ -0,0 +1,174 @@
+/*
+ * CXL Flash Device Driver
+ *
+ * Written by: Manoj N. Kumar <manoj@linux.vnet.ibm.com>, IBM Corporation
+ *             Matthew R. Ochs <mrochs@linux.vnet.ibm.com>, IBM Corporation
+ *
+ * Copyright (C) 2015 IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _CXLFLASH_IOCTL_H
+#define _CXLFLASH_IOCTL_H
+
+#include <linux/types.h>
+
+/*
+ * Structure and flag definitions CXL Flash superpipe ioctls
+ */
+
+#define DK_CXLFLASH_VERSION_0   0
+
+struct dk_cxlflash_hdr {
+        __u16 version;                  /* Version data */
+        __u16 rsvd[3];                  /* Reserved for future use */
+        __u64 flags;                    /* Input flags */
+        __u64 return_flags;             /* Returned flags */
+};
+
+/*
+ * Notes:
+ * -----
+ * The 'context_id' field of all ioctl structures contains the context
+ * identifier for a context in the lower 32-bits (upper 32-bits are not
+ * to be used when identifying a context to the AFU). That said, the value
+ * in its entirety (all 64-bits) is to be treated as an opaque cookie and
+ * should be presented as such when issuing ioctls.
+ *
+ * For DK_CXLFLASH_ATTACH ioctl, user specifies read/write access
+ * permissions via the O_RDONLY, O_WRONLY, and O_RDWR flags defined in
+ * the fcntl.h header file.
+ */
+#define DK_CXLFLASH_ATTACH_REUSE_CONTEXT        0x8000000000000000ULL
+
+struct dk_cxlflash_attach {
+        struct dk_cxlflash_hdr hdr;     /* Common fields */
+        __u64 num_interrupts;           /* Requested number of interrupts */
+        __u64 context_id;               /* Returned context */
+        __u64 mmio_size;                /* Returned size of MMIO area */
+        __u64 block_size;               /* Returned block size, in bytes */
+        __u64 adap_fd;                  /* Returned adapter file descriptor */
+        __u64 last_lba;                 /* Returned last LBA on the device */
+        __u64 max_xfer;                 /* Returned max transfer size, blocks */
+        __u64 reserved[8];              /* Reserved for future use */
+};
+
+struct dk_cxlflash_detach {
+        struct dk_cxlflash_hdr hdr;     /* Common fields */
+        __u64 context_id;               /* Context to detach */
+        __u64 reserved[8];              /* Reserved for future use */
+};
+
+struct dk_cxlflash_udirect {
+        struct dk_cxlflash_hdr hdr;     /* Common fields */
+        __u64 context_id;               /* Context to own physical resources */
+        __u64 rsrc_handle;              /* Returned resource handle */
+        __u64 last_lba;                 /* Returned last LBA on the device */
+        __u64 reserved[8];              /* Reserved for future use */
+};
+
+#define DK_CXLFLASH_UVIRTUAL_NEED_WRITE_SAME    0x8000000000000000ULL
+
+struct dk_cxlflash_uvirtual {
+        struct dk_cxlflash_hdr hdr;     /* Common fields */
+        __u64 context_id;               /* Context to own virtual resources */
+        __u64 lun_size;                 /* Requested size, in 4K blocks */
+        __u64 rsrc_handle;              /* Returned resource handle */
+        __u64 last_lba;                 /* Returned last LBA of LUN */
+        __u64 reserved[8];              /* Reserved for future use */
+};
+
+struct dk_cxlflash_release {
+        struct dk_cxlflash_hdr hdr;     /* Common fields */
+        __u64 context_id;               /* Context owning resources */
+        __u64 rsrc_handle;              /* Resource handle to release */
+        __u64 reserved[8];              /* Reserved for future use */
+};
+
+struct dk_cxlflash_resize {
+        struct dk_cxlflash_hdr hdr;     /* Common fields */
+        __u64 context_id;               /* Context owning resources */
+        __u64 rsrc_handle;              /* Resource handle of LUN to resize */
+        __u64 req_size;                 /* New requested size, in 4K blocks */
+        __u64 last_lba;                 /* Returned last LBA of LUN */
+        __u64 reserved[8];              /* Reserved for future use */
+};
+
+struct dk_cxlflash_clone {
+        struct dk_cxlflash_hdr hdr;     /* Common fields */
+        __u64 context_id_src;           /* Context to clone from */
+        __u64 context_id_dst;           /* Context to clone to */
+        __u64 adap_fd_src;              /* Source context adapter fd */
+        __u64 reserved[8];              /* Reserved for future use */
+};
+
+#define DK_CXLFLASH_VERIFY_SENSE_LEN    18
+#define DK_CXLFLASH_VERIFY_HINT_SENSE   0x8000000000000000ULL
+
+struct dk_cxlflash_verify {
+        struct dk_cxlflash_hdr hdr;     /* Common fields */
+        __u64 context_id;               /* Context owning resources to verify */
+        __u64 rsrc_handle;              /* Resource handle of LUN */
+        __u64 hint;                     /* Reasons for verify */
+        __u64 last_lba;                 /* Returned last LBA of device */
+        __u8 sense_data[DK_CXLFLASH_VERIFY_SENSE_LEN]; /* SCSI sense data */
+        __u8 pad[6];                    /* Pad to next 8-byte boundary */
+        __u64 reserved[8];              /* Reserved for future use */
+};
+
+#define DK_CXLFLASH_RECOVER_AFU_CONTEXT_RESET   0x8000000000000000ULL
+
+struct dk_cxlflash_recover_afu {
+        struct dk_cxlflash_hdr hdr;     /* Common fields */
+        __u64 reason;                   /* Reason for recovery request */
+        __u64 context_id;               /* Context to recover / updated ID */
+        __u64 mmio_size;                /* Returned size of MMIO area */
+        __u64 adap_fd;                  /* Returned adapter file descriptor */
+        __u64 reserved[8];              /* Reserved for future use */
+};
+
+#define DK_CXLFLASH_MANAGE_LUN_WWID_LEN                 16
+#define DK_CXLFLASH_MANAGE_LUN_ENABLE_SUPERPIPE         0x8000000000000000ULL
+#define DK_CXLFLASH_MANAGE_LUN_DISABLE_SUPERPIPE        0x4000000000000000ULL
+#define DK_CXLFLASH_MANAGE_LUN_ALL_PORTS_ACCESSIBLE     0x2000000000000000ULL
+
+struct dk_cxlflash_manage_lun {
+        struct dk_cxlflash_hdr hdr;                     /* Common fields */
+        __u8 wwid[DK_CXLFLASH_MANAGE_LUN_WWID_LEN];     /* Page83 WWID, NAA-6 */
+        __u64 reserved[8];                              /* Rsvd, future use */
+};
+
+union cxlflash_ioctls {
+        struct dk_cxlflash_attach attach;
+        struct dk_cxlflash_detach detach;
+        struct dk_cxlflash_udirect udirect;
+        struct dk_cxlflash_uvirtual uvirtual;
+        struct dk_cxlflash_release release;
+        struct dk_cxlflash_resize resize;
+        struct dk_cxlflash_clone clone;
+        struct dk_cxlflash_verify verify;
+        struct dk_cxlflash_recover_afu recover_afu;
+        struct dk_cxlflash_manage_lun manage_lun;
+};
+
+#define MAX_CXLFLASH_IOCTL_SZ   (sizeof(union cxlflash_ioctls))
+
+#define CXL_MAGIC 0xCA
+#define CXL_IOWR(_n, _s)        _IOWR(CXL_MAGIC, _n, struct _s)
+
+#define DK_CXLFLASH_ATTACH              CXL_IOWR(0x80, dk_cxlflash_attach)
+#define DK_CXLFLASH_USER_DIRECT         CXL_IOWR(0x81, dk_cxlflash_udirect)
+#define DK_CXLFLASH_RELEASE             CXL_IOWR(0x82, dk_cxlflash_release)
+#define DK_CXLFLASH_DETACH              CXL_IOWR(0x83, dk_cxlflash_detach)
+#define DK_CXLFLASH_VERIFY              CXL_IOWR(0x84, dk_cxlflash_verify)
+#define DK_CXLFLASH_RECOVER_AFU         CXL_IOWR(0x85, dk_cxlflash_recover_afu)
+#define DK_CXLFLASH_MANAGE_LUN          CXL_IOWR(0x86, dk_cxlflash_manage_lun)
+#define DK_CXLFLASH_USER_VIRTUAL        CXL_IOWR(0x87, dk_cxlflash_uvirtual)
+#define DK_CXLFLASH_VLUN_RESIZE         CXL_IOWR(0x88, dk_cxlflash_resize)
+#define DK_CXLFLASH_VLUN_CLONE          CXL_IOWR(0x89, dk_cxlflash_clone)
+
+#endif /* ifndef _CXLFLASH_IOCTL_H */
diff --git a/include/uapi/xen/privcmd.h b/include/uapi/xen/privcmd.h
index a85316811d79..7ddeeda93809 100644
--- a/include/uapi/xen/privcmd.h
+++ b/include/uapi/xen/privcmd.h
@@ -44,6 +44,10 @@ struct privcmd_hypercall {
 
 struct privcmd_mmap_entry {
         __u64 va;
+        /*
+         * This should be a GFN. It's not possible to change the name because
+         * it's exposed to the user-space.
+         */
         __u64 mfn;
         __u64 npages;
 };