Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

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

72 files changed, 2236 insertions, 1623 deletions

diff --git a/include/uapi/asm-generic/mman-common.h b/include/uapi/asm-generic/mman-common.h
index ddc3b36f1046..a74dd84bbb6d 100644
--- a/include/uapi/asm-generic/mman-common.h
+++ b/include/uapi/asm-generic/mman-common.h
@@ -25,6 +25,11 @@
 # define MAP_UNINITIALIZED 0x0          /* Don't support this flag */
 #endif
 
+/*
+ * Flags for mlock
+ */
+#define MLOCK_ONFAULT   0x01            /* Lock pages in range after they are faulted in, do not prefault */
+
 #define MS_ASYNC        1               /* sync memory asynchronously */
 #define MS_INVALIDATE   2               /* invalidate the caches */
 #define MS_SYNC         4               /* synchronous memory sync */
diff --git a/include/uapi/asm-generic/mman.h b/include/uapi/asm-generic/mman.h
index e9fe6fd2a074..7162cd4cca73 100644
--- a/include/uapi/asm-generic/mman.h
+++ b/include/uapi/asm-generic/mman.h
@@ -17,5 +17,6 @@
 
 #define MCL_CURRENT     1               /* lock all current mappings */
 #define MCL_FUTURE      2               /* lock all future mappings */
+#define MCL_ONFAULT     4               /* lock all pages that are faulted in */
 
 #endif /* __ASM_GENERIC_MMAN_H */
diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h
index 9df61f1edb0f..3094618d382f 100644
--- a/include/uapi/asm-generic/signal.h
+++ b/include/uapi/asm-generic/signal.h
@@ -80,8 +80,10 @@
  *      SA_RESTORER     0x04000000
  */
 
+#if !defined MINSIGSTKSZ || !defined SIGSTKSZ
 #define MINSIGSTKSZ     2048
 #define SIGSTKSZ        8192
+#endif
 
 #ifndef __ASSEMBLY__
 typedef struct {
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index ee124009e12a..1324b0292ec2 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -713,9 +713,11 @@ __SC_COMP(__NR_execveat, sys_execveat, compat_sys_execveat)
 __SYSCALL(__NR_userfaultfd, sys_userfaultfd)
 #define __NR_membarrier 283
 __SYSCALL(__NR_membarrier, sys_membarrier)
+#define __NR_mlock2 284
+__SYSCALL(__NR_mlock2, sys_mlock2)
 
 #undef __NR_syscalls
-#define __NR_syscalls 284
+#define __NR_syscalls 285
 
 /*
  * All syscalls below here should go away really,
diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild
index 2d9a25daab05..38d437096c35 100644
--- a/include/uapi/drm/Kbuild
+++ b/include/uapi/drm/Kbuild
@@ -17,3 +17,4 @@ header-y += tegra_drm.h
 header-y += via_drm.h
 header-y += vmwgfx_drm.h
 header-y += msm_drm.h
+header-y += virtgpu_drm.h
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index fbdd11851725..e52933a73580 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -640,6 +640,6 @@ struct drm_amdgpu_info_hw_ip {
 #define AMDGPU_FAMILY_CI                        120 /* Bonaire, Hawaii */
 #define AMDGPU_FAMILY_KV                        125 /* Kaveri, Kabini, Mullins */
 #define AMDGPU_FAMILY_VI                        130 /* Iceland, Tonga */
-#define AMDGPU_FAMILY_CZ                        135 /* Carrizo */
+#define AMDGPU_FAMILY_CZ                        135 /* Carrizo, Stoney */
 
 #endif
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index 8c5e8b91a3cb..0b69a7753558 100644
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -158,7 +158,7 @@
 /* add more to the end as needed */
 
 #define fourcc_mod_code(vendor, val) \
-        ((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
+        ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
 
 /*
  * Format Modifier tokens:
diff --git a/include/uapi/drm/i810_drm.h b/include/uapi/drm/i810_drm.h
index 7a10bb6f2c0f..34736efd5824 100644
--- a/include/uapi/drm/i810_drm.h
+++ b/include/uapi/drm/i810_drm.h
@@ -1,6 +1,8 @@
 #ifndef _I810_DRM_H_
 #define _I810_DRM_H_
 
+#include <drm/drm.h>
+
 /* WARNING: These defines must be the same as what the Xserver uses.
  * if you change them, you must change the defines in the Xserver.
  */
diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h
index 5507eead5863..fd594cc73cc0 100644
--- a/include/uapi/drm/nouveau_drm.h
+++ b/include/uapi/drm/nouveau_drm.h
@@ -27,14 +27,6 @@
 
 #define DRM_NOUVEAU_EVENT_NVIF                                       0x80000000
 
-/* reserved object handles when using deprecated object APIs - these
- * are here so that libdrm can allow interoperability with the new
- * object APIs
- */
-#define NOUVEAU_ABI16_CLIENT   0xffffffff
-#define NOUVEAU_ABI16_DEVICE   0xdddddddd
-#define NOUVEAU_ABI16_CHAN(n) (0xcccc0000 | (n))
-
 #define NOUVEAU_GEM_DOMAIN_CPU       (1 << 0)
 #define NOUVEAU_GEM_DOMAIN_VRAM      (1 << 1)
 #define NOUVEAU_GEM_DOMAIN_GART      (1 << 2)
diff --git a/include/uapi/drm/r128_drm.h b/include/uapi/drm/r128_drm.h
index 8d8878b55f55..76b0aa3e8210 100644
--- a/include/uapi/drm/r128_drm.h
+++ b/include/uapi/drm/r128_drm.h
@@ -33,6 +33,8 @@
 #ifndef __R128_DRM_H__
 #define __R128_DRM_H__
 
+#include <drm/drm.h>
+
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the X server file (r128_sarea.h)
  */
diff --git a/include/uapi/drm/savage_drm.h b/include/uapi/drm/savage_drm.h
index 818d49be2e6e..9dc9dc1a7753 100644
--- a/include/uapi/drm/savage_drm.h
+++ b/include/uapi/drm/savage_drm.h
@@ -26,6 +26,8 @@
 #ifndef __SAVAGE_DRM_H__
 #define __SAVAGE_DRM_H__
 
+#include <drm/drm.h>
+
 #ifndef __SAVAGE_SAREA_DEFINES__
 #define __SAVAGE_SAREA_DEFINES__
 
diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h
index df3763222d73..374858cdcdaa 100644
--- a/include/uapi/drm/sis_drm.h
+++ b/include/uapi/drm/sis_drm.h
@@ -64,8 +64,4 @@ typedef struct {
         unsigned long offset, size;
 } drm_sis_fb_t;
 
-struct sis_file_private {
-        struct list_head obj_list;
-};
-
 #endif                          /* __SIS_DRM_H__ */
diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h
index 8b0533ccbd5a..45bc80c3714b 100644
--- a/include/uapi/drm/via_drm.h
+++ b/include/uapi/drm/via_drm.h
@@ -274,8 +274,4 @@ typedef struct drm_via_dmablit {
         drm_via_blitsync_t sync;
 } drm_via_dmablit_t;
 
-struct via_file_private {
-        struct list_head obj_list;
-};
-
 #endif                          /* _VIA_DRM_H_ */
diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h
new file mode 100644
index 000000000000..fc9e2d6e5e2f
--- /dev/null
+++ b/include/uapi/drm/virtgpu_drm.h
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2013 Red Hat
+ * All Rights Reserved.
+ *
+ * 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 (including the next
+ * paragraph) 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 AND/OR ITS SUPPLIERS 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.
+ */
+#ifndef VIRTGPU_DRM_H
+#define VIRTGPU_DRM_H
+
+#include <stddef.h>
+#include "drm/drm.h"
+
+/* Please note that modifications to all structs defined here are
+ * subject to backwards-compatibility constraints.
+ *
+ * Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel
+ * compatibility Keep fields aligned to their size
+ */
+
+#define DRM_VIRTGPU_MAP         0x01
+#define DRM_VIRTGPU_EXECBUFFER  0x02
+#define DRM_VIRTGPU_GETPARAM    0x03
+#define DRM_VIRTGPU_RESOURCE_CREATE 0x04
+#define DRM_VIRTGPU_RESOURCE_INFO     0x05
+#define DRM_VIRTGPU_TRANSFER_FROM_HOST 0x06
+#define DRM_VIRTGPU_TRANSFER_TO_HOST 0x07
+#define DRM_VIRTGPU_WAIT     0x08
+#define DRM_VIRTGPU_GET_CAPS  0x09
+
+struct drm_virtgpu_map {
+        uint64_t offset; /* use for mmap system call */
+        uint32_t handle;
+        uint32_t pad;
+};
+
+struct drm_virtgpu_execbuffer {
+        uint32_t                flags;          /* for future use */
+        uint32_t size;
+        uint64_t command; /* void* */
+        uint64_t bo_handles;
+        uint32_t num_bo_handles;
+        uint32_t pad;
+};
+
+#define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */
+
+struct drm_virtgpu_getparam {
+        uint64_t param;
+        uint64_t value;
+};
+
+/* NO_BO flags? NO resource flag? */
+/* resource flag for y_0_top */
+struct drm_virtgpu_resource_create {
+        uint32_t target;
+        uint32_t format;
+        uint32_t bind;
+        uint32_t width;
+        uint32_t height;
+        uint32_t depth;
+        uint32_t array_size;
+        uint32_t last_level;
+        uint32_t nr_samples;
+        uint32_t flags;
+        uint32_t bo_handle; /* if this is set - recreate a new resource attached to this bo ? */
+        uint32_t res_handle;  /* returned by kernel */
+        uint32_t size;        /* validate transfer in the host */
+        uint32_t stride;      /* validate transfer in the host */
+};
+
+struct drm_virtgpu_resource_info {
+        uint32_t bo_handle;
+        uint32_t res_handle;
+        uint32_t size;
+        uint32_t stride;
+};
+
+struct drm_virtgpu_3d_box {
+        uint32_t x;
+        uint32_t y;
+        uint32_t z;
+        uint32_t w;
+        uint32_t h;
+        uint32_t d;
+};
+
+struct drm_virtgpu_3d_transfer_to_host {
+        uint32_t bo_handle;
+        struct drm_virtgpu_3d_box box;
+        uint32_t level;
+        uint32_t offset;
+};
+
+struct drm_virtgpu_3d_transfer_from_host {
+        uint32_t bo_handle;
+        struct drm_virtgpu_3d_box box;
+        uint32_t level;
+        uint32_t offset;
+};
+
+#define VIRTGPU_WAIT_NOWAIT 1 /* like it */
+struct drm_virtgpu_3d_wait {
+        uint32_t handle; /* 0 is an invalid handle */
+        uint32_t flags;
+};
+
+struct drm_virtgpu_get_caps {
+        uint32_t cap_set_id;
+        uint32_t cap_set_ver;
+        uint64_t addr;
+        uint32_t size;
+        uint32_t pad;
+};
+
+#define DRM_IOCTL_VIRTGPU_MAP \
+        DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_MAP, struct drm_virtgpu_map)
+
+#define DRM_IOCTL_VIRTGPU_EXECBUFFER \
+        DRM_IOW(DRM_COMMAND_BASE + DRM_VIRTGPU_EXECBUFFER,\
+                struct drm_virtgpu_execbuffer)
+
+#define DRM_IOCTL_VIRTGPU_GETPARAM \
+        DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_GETPARAM,\
+                struct drm_virtgpu_getparam)
+
+#define DRM_IOCTL_VIRTGPU_RESOURCE_CREATE                       \
+        DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_RESOURCE_CREATE,        \
+                struct drm_virtgpu_resource_create)
+
+#define DRM_IOCTL_VIRTGPU_RESOURCE_INFO \
+        DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_RESOURCE_INFO, \
+                 struct drm_virtgpu_resource_info)
+
+#define DRM_IOCTL_VIRTGPU_TRANSFER_FROM_HOST \
+        DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_TRANSFER_FROM_HOST,     \
+                struct drm_virtgpu_3d_transfer_from_host)
+
+#define DRM_IOCTL_VIRTGPU_TRANSFER_TO_HOST \
+        DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_TRANSFER_TO_HOST,       \
+                struct drm_virtgpu_3d_transfer_to_host)
+
+#define DRM_IOCTL_VIRTGPU_WAIT                          \
+        DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_WAIT,   \
+                struct drm_virtgpu_3d_wait)
+
+#define DRM_IOCTL_VIRTGPU_GET_CAPS \
+        DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_GET_CAPS, \
+        struct drm_virtgpu_get_caps)
+
+#endif
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index f7b2db44eb4b..628e6e64c2fb 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -191,6 +191,7 @@ header-y += inet_diag.h
 header-y += in.h
 header-y += inotify.h
 header-y += input.h
+header-y += input-event-codes.h
 header-y += in_route.h
 header-y += ioctl.h
 header-y += ip6_tunnel.h
@@ -263,6 +264,7 @@ header-y += minix_fs.h
 header-y += mman.h
 header-y += mmtimer.h
 header-y += mpls.h
+header-y += mpls_iptunnel.h
 header-y += mqueue.h
 header-y += mroute6.h
 header-y += mroute.h
diff --git a/include/uapi/linux/atm_zatm.h b/include/uapi/linux/atm_zatm.h
index 10f0fa29454f..9c9c6ad55f14 100644
--- a/include/uapi/linux/atm_zatm.h
+++ b/include/uapi/linux/atm_zatm.h
@@ -35,12 +35,6 @@ struct zatm_pool_req {
         struct zatm_pool_info info;     /* actual information */
 };
 
-struct zatm_t_hist {
-        struct timeval real;            /* real (wall-clock) time */
-        struct timeval expected;        /* expected real time */
-};
-
-
 #define ZATM_OAM_POOL           0       /* free buffer pool for OAM cells */
 #define ZATM_AAL0_POOL          1       /* free buffer pool for AAL0 cells */
 #define ZATM_AAL5_POOL_BASE     2       /* first AAL5 free buffer pool */
diff --git a/include/uapi/linux/blkpg.h b/include/uapi/linux/blkpg.h
index a8519446c111..63739a035085 100644
--- a/include/uapi/linux/blkpg.h
+++ b/include/uapi/linux/blkpg.h
@@ -1,5 +1,5 @@
-#ifndef _LINUX_BLKPG_H
-#define _LINUX_BLKPG_H
+#ifndef _UAPI__LINUX_BLKPG_H
+#define _UAPI__LINUX_BLKPG_H
 
 /*
  * Partition table and disk geometry handling
@@ -56,4 +56,4 @@ struct blkpg_partition {
         char volname[BLKPG_VOLNAMELTH]; /* volume label */
 };
 
-#endif /* _LINUX_BLKPG_H */
+#endif /* _UAPI__LINUX_BLKPG_H */
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 92a48e2d5461..9ea2d22fa2cb 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -63,50 +63,16 @@ struct bpf_insn {
         __s32   imm;            /* signed immediate constant */
 };
 
-/* BPF syscall commands */
+/* BPF syscall commands, see bpf(2) man-page for details. */
 enum bpf_cmd {
-        /* create a map with given type and attributes
-         * fd = bpf(BPF_MAP_CREATE, union bpf_attr *, u32 size)
-         * returns fd or negative error
-         * map is deleted when fd is closed
-         */
         BPF_MAP_CREATE,
-
-        /* lookup key in a given map
-         * err = bpf(BPF_MAP_LOOKUP_ELEM, union bpf_attr *attr, u32 size)
-         * Using attr->map_fd, attr->key, attr->value
-         * returns zero and stores found elem into value
-         * or negative error
-         */
         BPF_MAP_LOOKUP_ELEM,
-
-        /* create or update key/value pair in a given map
-         * err = bpf(BPF_MAP_UPDATE_ELEM, union bpf_attr *attr, u32 size)
-         * Using attr->map_fd, attr->key, attr->value, attr->flags
-         * returns zero or negative error
-         */
         BPF_MAP_UPDATE_ELEM,
-
-        /* find and delete elem by key in a given map
-         * err = bpf(BPF_MAP_DELETE_ELEM, union bpf_attr *attr, u32 size)
-         * Using attr->map_fd, attr->key
-         * returns zero or negative error
-         */
         BPF_MAP_DELETE_ELEM,
-
-        /* lookup key in a given map and return next key
-         * err = bpf(BPF_MAP_GET_NEXT_KEY, union bpf_attr *attr, u32 size)
-         * Using attr->map_fd, attr->key, attr->next_key
-         * returns zero and stores next key or negative error
-         */
         BPF_MAP_GET_NEXT_KEY,
-
-        /* verify and load eBPF program
-         * prog_fd = bpf(BPF_PROG_LOAD, union bpf_attr *attr, u32 size)
-         * Using attr->prog_type, attr->insns, attr->license
-         * returns fd or negative error
-         */
         BPF_PROG_LOAD,
+        BPF_OBJ_PIN,
+        BPF_OBJ_GET,
 };
 
 enum bpf_map_type {
@@ -160,6 +126,11 @@ union bpf_attr {
                 __aligned_u64   log_buf;        /* user supplied buffer */
                 __u32           kern_version;   /* checked when prog_type=kprobe */
         };
+
+        struct { /* anonymous struct used by BPF_OBJ_* commands */
+                __aligned_u64   pathname;
+                __u32           bpf_fd;
+        };
 } __attribute__((aligned(8)));
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
@@ -272,6 +243,32 @@ enum bpf_func_id {
         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_redirect(ifindex, flags) - redirect to another netdev
+         * @ifindex: ifindex of the net device
+         * @flags: bit 0 - if set, redirect to ingress instead of egress
+         *         other bits - reserved
+         * Return: TC_ACT_REDIRECT
+         */
+        BPF_FUNC_redirect,
+
+        /**
+         * bpf_get_route_realm(skb) - retrieve a dst's tclassid
+         * @skb: pointer to skb
+         * Return: realm if != 0
+         */
+        BPF_FUNC_get_route_realm,
+
+        /**
+         * bpf_perf_event_output(ctx, map, index, data, size) - output perf raw sample
+         * @ctx: struct pt_regs*
+         * @map: pointer to perf_event_array map
+         * @index: index of event in the map
+         * @data: data on stack to be output as raw data
+         * @size: size of data
+         * Return: 0 on success
+         */
+        BPF_FUNC_perf_event_output,
         __BPF_FUNC_MAX_ID,
 };
 
@@ -293,6 +290,7 @@ struct __sk_buff {
         __u32 tc_index;
         __u32 cb[5];
         __u32 hash;
+        __u32 tc_classid;
 };
 
 struct bpf_tunnel_key {
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index b6dec05c7196..dea893199257 100644
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -206,7 +206,13 @@ struct btrfs_ioctl_feature_flags {
  */
 struct btrfs_balance_args {
         __u64 profiles;
-        __u64 usage;
+        union {
+                __le64 usage;
+                struct {
+                        __le32 usage_min;
+                        __le32 usage_max;
+                };
+        };
         __u64 devid;
         __u64 pstart;
         __u64 pend;
@@ -217,8 +223,27 @@ struct btrfs_balance_args {
 
         __u64 flags;
 
-        __u64 limit;            /* limit number of processed chunks */
-        __u64 unused[7];
+        /*
+         * BTRFS_BALANCE_ARGS_LIMIT with value 'limit'
+         * BTRFS_BALANCE_ARGS_LIMIT_RANGE - the extend version can use minimum
+         * and maximum
+         */
+        union {
+                __u64 limit;            /* limit number of processed chunks */
+                struct {
+                        __u32 limit_min;
+                        __u32 limit_max;
+                };
+        };
+
+        /*
+         * Process chunks that cross stripes_min..stripes_max devices,
+         * BTRFS_BALANCE_ARGS_STRIPES_RANGE
+         */
+        __le32 stripes_min;
+        __le32 stripes_max;
+
+        __u64 unused[6];
 } __attribute__ ((__packed__));
 
 /* report balance progress to userspace */
diff --git a/include/uapi/linux/can/bcm.h b/include/uapi/linux/can/bcm.h
index 89ddb9dc9bdf..7a291dc1ff15 100644
--- a/include/uapi/linux/can/bcm.h
+++ b/include/uapi/linux/can/bcm.h
@@ -47,6 +47,11 @@
 #include <linux/types.h>
 #include <linux/can.h>
 
+struct bcm_timeval {
+        long tv_sec;
+        long tv_usec;
+};
+
 /**
  * struct bcm_msg_head - head of messages to/from the broadcast manager
  * @opcode:    opcode, see enum below.
@@ -62,7 +67,7 @@ struct bcm_msg_head {
         __u32 opcode;
         __u32 flags;
         __u32 count;
-        struct timeval ival1, ival2;
+        struct bcm_timeval ival1, ival2;
         canid_t can_id;
         __u32 nframes;
         struct can_frame frames[0];
diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h
index d34611e35a30..30afd0a23c4b 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        33
+#define DM_VERSION_MINOR        34
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2015-8-18)"
+#define DM_VERSION_EXTRA        "-ioctl (2015-10-28)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index 9b964a5920af..f15d980249b5 100644
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -197,6 +197,7 @@ struct inodes_stat_t {
 #define FS_EXTENT_FL                    0x00080000 /* Extents */
 #define FS_DIRECTIO_FL                  0x00100000 /* Use direct i/o */
 #define FS_NOCOW_FL                     0x00800000 /* Do not cow file */
+#define FS_PROJINHERIT_FL               0x20000000 /* Create with parents projid */
 #define FS_RESERVED_FL                  0x80000000 /* reserved for ext2 lib */
 
 #define FS_FL_USER_VISIBLE              0x0003DFFF /* User visible flags */
diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h
index 3f311551795d..2f05e66de01e 100644
--- a/include/uapi/linux/i2c-dev.h
+++ b/include/uapi/linux/i2c-dev.h
@@ -66,7 +66,9 @@ struct i2c_rdwr_ioctl_data {
         __u32 nmsgs;                    /* number of i2c_msgs */
 };
 
-#define  I2C_RDRW_IOCTL_MAX_MSGS        42
+#define  I2C_RDWR_IOCTL_MAX_MSGS        42
+/* Originally defined with a typo, keep it for compatibility */
+#define  I2C_RDRW_IOCTL_MAX_MSGS        I2C_RDWR_IOCTL_MAX_MSGS
 
 
 #endif /* _UAPI_LINUX_I2C_DEV_H */
diff --git a/include/uapi/linux/if_arcnet.h b/include/uapi/linux/if_arcnet.h
index 46e34bd0e783..cfb642f8e7bd 100644
--- a/include/uapi/linux/if_arcnet.h
+++ b/include/uapi/linux/if_arcnet.h
@@ -19,7 +19,6 @@
 #include <linux/types.h>
 #include <linux/if_ether.h>
 
-
 /*
  *    These are the defined ARCnet Protocol ID's.
  */
@@ -57,42 +56,40 @@
  * The RFC1201-specific components of an arcnet packet header.
  */
 struct arc_rfc1201 {
-    __u8  proto;                /* protocol ID field - varies           */
-    __u8  split_flag;   /* for use with split packets           */
-    __be16   sequence;          /* sequence number                      */
-    __u8  payload[0];   /* space remaining in packet (504 bytes)*/
+        __u8  proto;            /* protocol ID field - varies           */
+        __u8  split_flag;       /* for use with split packets           */
+        __be16   sequence;      /* sequence number                      */
+        __u8  payload[0];       /* space remaining in packet (504 bytes)*/
 };
 #define RFC1201_HDR_SIZE 4
 
-
 /*
  * The RFC1051-specific components.
  */
 struct arc_rfc1051 {
-    __u8 proto;         /* ARC_P_RFC1051_ARP/RFC1051_IP */
-    __u8 payload[0];            /* 507 bytes                    */
+        __u8 proto;             /* ARC_P_RFC1051_ARP/RFC1051_IP */
+        __u8 payload[0];        /* 507 bytes                    */
 };
 #define RFC1051_HDR_SIZE 1
 
-
 /*
  * The ethernet-encap-specific components.  We have a real ethernet header
  * and some data.
  */
 struct arc_eth_encap {
-    __u8 proto;         /* Always ARC_P_ETHER                   */
-    struct ethhdr eth;          /* standard ethernet header (yuck!)     */
-    __u8 payload[0];            /* 493 bytes                            */
+        __u8 proto;             /* Always ARC_P_ETHER                   */
+        struct ethhdr eth;      /* standard ethernet header (yuck!)     */
+        __u8 payload[0];        /* 493 bytes                            */
 };
 #define ETH_ENCAP_HDR_SIZE 14
 
-
 struct arc_cap {
         __u8 proto;
-        __u8 cookie[sizeof(int)];   /* Actually NOT sent over the network */
+        __u8 cookie[sizeof(int)];
+                                /* Actually NOT sent over the network */
         union {
                 __u8 ack;
-                __u8 raw[0];            /* 507 bytes */
+                __u8 raw[0];    /* 507 bytes */
         } mes;
 };
 
@@ -105,9 +102,9 @@ struct arc_cap {
  * driver.
  */
 struct arc_hardware {
-    __u8  source,               /* source ARCnet - filled in automagically */
-             dest,              /* destination ARCnet - 0 for broadcast    */
-             offset[2];         /* offset bytes (some weird semantics)     */
+        __u8 source;            /* source ARCnet - filled in automagically */
+        __u8 dest;              /* destination ARCnet - 0 for broadcast    */
+        __u8 offset[2];         /* offset bytes (some weird semantics)     */
 };
 #define ARC_HDR_SIZE 4
 
@@ -116,17 +113,17 @@ struct arc_hardware {
  * when you do a raw packet capture).
  */
 struct archdr {
-    /* hardware requirements */
-    struct arc_hardware hard;
-     
-    /* arcnet encapsulation-specific bits */
-    union {
-        struct arc_rfc1201   rfc1201;
-        struct arc_rfc1051   rfc1051;
-        struct arc_eth_encap eth_encap;
-        struct arc_cap       cap;
-        __u8 raw[0];            /* 508 bytes                            */
-    } soft;
+        /* hardware requirements */
+        struct arc_hardware hard;
+
+        /* arcnet encapsulation-specific bits */
+        union {
+                struct arc_rfc1201   rfc1201;
+                struct arc_rfc1051   rfc1051;
+                struct arc_eth_encap eth_encap;
+                struct arc_cap       cap;
+                __u8 raw[0];    /* 508 bytes                            */
+        } soft;
 };
 
 #endif                          /* _LINUX_IF_ARCNET_H */
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 3635b7797508..18db14477bdd 100644
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -127,6 +127,7 @@ enum {
 #define BRIDGE_VLAN_INFO_UNTAGGED       (1<<2)  /* VLAN egresses untagged */
 #define BRIDGE_VLAN_INFO_RANGE_BEGIN    (1<<3) /* VLAN is start of vlan range */
 #define BRIDGE_VLAN_INFO_RANGE_END      (1<<4) /* VLAN is end of vlan range */
+#define BRIDGE_VLAN_INFO_BRENTRY        (1<<5) /* Global bridge VLAN entry */
 
 struct bridge_vlan_info {
         __u16 flags;
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 3a5f263cfc2f..5ad57375a99f 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -232,11 +232,47 @@ enum {
         IFLA_BR_PRIORITY,
         IFLA_BR_VLAN_FILTERING,
         IFLA_BR_VLAN_PROTOCOL,
+        IFLA_BR_GROUP_FWD_MASK,
+        IFLA_BR_ROOT_ID,
+        IFLA_BR_BRIDGE_ID,
+        IFLA_BR_ROOT_PORT,
+        IFLA_BR_ROOT_PATH_COST,
+        IFLA_BR_TOPOLOGY_CHANGE,
+        IFLA_BR_TOPOLOGY_CHANGE_DETECTED,
+        IFLA_BR_HELLO_TIMER,
+        IFLA_BR_TCN_TIMER,
+        IFLA_BR_TOPOLOGY_CHANGE_TIMER,
+        IFLA_BR_GC_TIMER,
+        IFLA_BR_GROUP_ADDR,
+        IFLA_BR_FDB_FLUSH,
+        IFLA_BR_MCAST_ROUTER,
+        IFLA_BR_MCAST_SNOOPING,
+        IFLA_BR_MCAST_QUERY_USE_IFADDR,
+        IFLA_BR_MCAST_QUERIER,
+        IFLA_BR_MCAST_HASH_ELASTICITY,
+        IFLA_BR_MCAST_HASH_MAX,
+        IFLA_BR_MCAST_LAST_MEMBER_CNT,
+        IFLA_BR_MCAST_STARTUP_QUERY_CNT,
+        IFLA_BR_MCAST_LAST_MEMBER_INTVL,
+        IFLA_BR_MCAST_MEMBERSHIP_INTVL,
+        IFLA_BR_MCAST_QUERIER_INTVL,
+        IFLA_BR_MCAST_QUERY_INTVL,
+        IFLA_BR_MCAST_QUERY_RESPONSE_INTVL,
+        IFLA_BR_MCAST_STARTUP_QUERY_INTVL,
+        IFLA_BR_NF_CALL_IPTABLES,
+        IFLA_BR_NF_CALL_IP6TABLES,
+        IFLA_BR_NF_CALL_ARPTABLES,
+        IFLA_BR_VLAN_DEFAULT_PVID,
         __IFLA_BR_MAX,
 };
 
 #define IFLA_BR_MAX     (__IFLA_BR_MAX - 1)
 
+struct ifla_bridge_id {
+        __u8    prio[2];
+        __u8    addr[6]; /* ETH_ALEN */
+};
+
 enum {
         BRIDGE_MODE_UNSPEC,
         BRIDGE_MODE_HAIRPIN,
@@ -256,6 +292,19 @@ enum {
         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_ROOT_ID,    /* designated root */
+        IFLA_BRPORT_BRIDGE_ID,  /* designated bridge */
+        IFLA_BRPORT_DESIGNATED_PORT,
+        IFLA_BRPORT_DESIGNATED_COST,
+        IFLA_BRPORT_ID,
+        IFLA_BRPORT_NO,
+        IFLA_BRPORT_TOPOLOGY_CHANGE_ACK,
+        IFLA_BRPORT_CONFIG_PENDING,
+        IFLA_BRPORT_MESSAGE_AGE_TIMER,
+        IFLA_BRPORT_FORWARD_DELAY_TIMER,
+        IFLA_BRPORT_HOLD_TIMER,
+        IFLA_BRPORT_FLUSH,
+        IFLA_BRPORT_MULTICAST_ROUTER,
         __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -412,6 +461,7 @@ enum {
         IFLA_GENEVE_TOS,
         IFLA_GENEVE_PORT,       /* destination port */
         IFLA_GENEVE_COLLECT_METADATA,
+        IFLA_GENEVE_REMOTE6,
         __IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
@@ -501,6 +551,7 @@ enum {
                                  * on/off switch
                                  */
         IFLA_VF_STATS,          /* network device statistics */
+        IFLA_VF_TRUST,          /* Trust VF */
         __IFLA_VF_MAX,
 };
 
@@ -562,6 +613,11 @@ enum {
 
 #define IFLA_VF_STATS_MAX (__IFLA_VF_STATS_MAX - 1)
 
+struct ifla_vf_trust {
+        __u32 vf;
+        __u32 setting;
+};
+
 /* VF ports management section
  *
  *      Nested layout of set/get msg is:
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
index 2f8b11722204..7c63bd67c36e 100644
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@ -35,6 +35,8 @@ enum iio_chan_type {
         IIO_ENERGY,
         IIO_DISTANCE,
         IIO_VELOCITY,
+        IIO_CONCENTRATION,
+        IIO_RESISTANCE,
 };
 
 enum iio_modifier {
@@ -72,6 +74,8 @@ enum iio_modifier {
         IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z,
         IIO_MOD_I,
         IIO_MOD_Q,
+        IIO_MOD_CO2,
+        IIO_MOD_VOC,
 };
 
 enum iio_event_type {
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
new file mode 100644
index 000000000000..87cf351bab03
--- /dev/null
+++ b/include/uapi/linux/input-event-codes.h
@@ -0,0 +1,805 @@
+/*
+ * Input event codes
+ *
+ *    *** IMPORTANT ***
+ * This file is not only included from C-code but also from devicetree source
+ * files. As such this file MUST only contain comments and defines.
+ *
+ * Copyright (c) 1999-2002 Vojtech Pavlik
+ * Copyright (c) 2015 Hans de Goede <hdegoede@redhat.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.
+ */
+#ifndef _UAPI_INPUT_EVENT_CODES_H
+#define _UAPI_INPUT_EVENT_CODES_H
+
+/*
+ * Device properties and quirks
+ */
+
+#define INPUT_PROP_POINTER              0x00    /* needs a pointer */
+#define INPUT_PROP_DIRECT               0x01    /* direct input devices */
+#define INPUT_PROP_BUTTONPAD            0x02    /* has button(s) under pad */
+#define INPUT_PROP_SEMI_MT              0x03    /* touch rectangle only */
+#define INPUT_PROP_TOPBUTTONPAD         0x04    /* softbuttons at top of pad */
+#define INPUT_PROP_POINTING_STICK       0x05    /* is a pointing stick */
+#define INPUT_PROP_ACCELEROMETER        0x06    /* has accelerometer */
+
+#define INPUT_PROP_MAX                  0x1f
+#define INPUT_PROP_CNT                  (INPUT_PROP_MAX + 1)
+
+/*
+ * Event types
+ */
+
+#define EV_SYN                  0x00
+#define EV_KEY                  0x01
+#define EV_REL                  0x02
+#define EV_ABS                  0x03
+#define EV_MSC                  0x04
+#define EV_SW                   0x05
+#define EV_LED                  0x11
+#define EV_SND                  0x12
+#define EV_REP                  0x14
+#define EV_FF                   0x15
+#define EV_PWR                  0x16
+#define EV_FF_STATUS            0x17
+#define EV_MAX                  0x1f
+#define EV_CNT                  (EV_MAX+1)
+
+/*
+ * Synchronization events.
+ */
+
+#define SYN_REPORT              0
+#define SYN_CONFIG              1
+#define SYN_MT_REPORT           2
+#define SYN_DROPPED             3
+#define SYN_MAX                 0xf
+#define SYN_CNT                 (SYN_MAX+1)
+
+/*
+ * Keys and buttons
+ *
+ * Most of the keys/buttons are modeled after USB HUT 1.12
+ * (see http://www.usb.org/developers/hidpage).
+ * Abbreviations in the comments:
+ * AC - Application Control
+ * AL - Application Launch Button
+ * SC - System Control
+ */
+
+#define KEY_RESERVED            0
+#define KEY_ESC                 1
+#define KEY_1                   2
+#define KEY_2                   3
+#define KEY_3                   4
+#define KEY_4                   5
+#define KEY_5                   6
+#define KEY_6                   7
+#define KEY_7                   8
+#define KEY_8                   9
+#define KEY_9                   10
+#define KEY_0                   11
+#define KEY_MINUS               12
+#define KEY_EQUAL               13
+#define KEY_BACKSPACE           14
+#define KEY_TAB                 15
+#define KEY_Q                   16
+#define KEY_W                   17
+#define KEY_E                   18
+#define KEY_R                   19
+#define KEY_T                   20
+#define KEY_Y                   21
+#define KEY_U                   22
+#define KEY_I                   23
+#define KEY_O                   24
+#define KEY_P                   25
+#define KEY_LEFTBRACE           26
+#define KEY_RIGHTBRACE          27
+#define KEY_ENTER               28
+#define KEY_LEFTCTRL            29
+#define KEY_A                   30
+#define KEY_S                   31
+#define KEY_D                   32
+#define KEY_F                   33
+#define KEY_G                   34
+#define KEY_H                   35
+#define KEY_J                   36
+#define KEY_K                   37
+#define KEY_L                   38
+#define KEY_SEMICOLON           39
+#define KEY_APOSTROPHE          40
+#define KEY_GRAVE               41
+#define KEY_LEFTSHIFT           42
+#define KEY_BACKSLASH           43
+#define KEY_Z                   44
+#define KEY_X                   45
+#define KEY_C                   46
+#define KEY_V                   47
+#define KEY_B                   48
+#define KEY_N                   49
+#define KEY_M                   50
+#define KEY_COMMA               51
+#define KEY_DOT                 52
+#define KEY_SLASH               53
+#define KEY_RIGHTSHIFT          54
+#define KEY_KPASTERISK          55
+#define KEY_LEFTALT             56
+#define KEY_SPACE               57
+#define KEY_CAPSLOCK            58
+#define KEY_F1                  59
+#define KEY_F2                  60
+#define KEY_F3                  61
+#define KEY_F4                  62
+#define KEY_F5                  63
+#define KEY_F6                  64
+#define KEY_F7                  65
+#define KEY_F8                  66
+#define KEY_F9                  67
+#define KEY_F10                 68
+#define KEY_NUMLOCK             69
+#define KEY_SCROLLLOCK          70
+#define KEY_KP7                 71
+#define KEY_KP8                 72
+#define KEY_KP9                 73
+#define KEY_KPMINUS             74
+#define KEY_KP4                 75
+#define KEY_KP5                 76
+#define KEY_KP6                 77
+#define KEY_KPPLUS              78
+#define KEY_KP1                 79
+#define KEY_KP2                 80
+#define KEY_KP3                 81
+#define KEY_KP0                 82
+#define KEY_KPDOT               83
+
+#define KEY_ZENKAKUHANKAKU      85
+#define KEY_102ND               86
+#define KEY_F11                 87
+#define KEY_F12                 88
+#define KEY_RO                  89
+#define KEY_KATAKANA            90
+#define KEY_HIRAGANA            91
+#define KEY_HENKAN              92
+#define KEY_KATAKANAHIRAGANA    93
+#define KEY_MUHENKAN            94
+#define KEY_KPJPCOMMA           95
+#define KEY_KPENTER             96
+#define KEY_RIGHTCTRL           97
+#define KEY_KPSLASH             98
+#define KEY_SYSRQ               99
+#define KEY_RIGHTALT            100
+#define KEY_LINEFEED            101
+#define KEY_HOME                102
+#define KEY_UP                  103
+#define KEY_PAGEUP              104
+#define KEY_LEFT                105
+#define KEY_RIGHT               106
+#define KEY_END                 107
+#define KEY_DOWN                108
+#define KEY_PAGEDOWN            109
+#define KEY_INSERT              110
+#define KEY_DELETE              111
+#define KEY_MACRO               112
+#define KEY_MUTE                113
+#define KEY_VOLUMEDOWN          114
+#define KEY_VOLUMEUP            115
+#define KEY_POWER               116     /* SC System Power Down */
+#define KEY_KPEQUAL             117
+#define KEY_KPPLUSMINUS         118
+#define KEY_PAUSE               119
+#define KEY_SCALE               120     /* AL Compiz Scale (Expose) */
+
+#define KEY_KPCOMMA             121
+#define KEY_HANGEUL             122
+#define KEY_HANGUEL             KEY_HANGEUL
+#define KEY_HANJA               123
+#define KEY_YEN                 124
+#define KEY_LEFTMETA            125
+#define KEY_RIGHTMETA           126
+#define KEY_COMPOSE             127
+
+#define KEY_STOP                128     /* AC Stop */
+#define KEY_AGAIN               129
+#define KEY_PROPS               130     /* AC Properties */
+#define KEY_UNDO                131     /* AC Undo */
+#define KEY_FRONT               132
+#define KEY_COPY                133     /* AC Copy */
+#define KEY_OPEN                134     /* AC Open */
+#define KEY_PASTE               135     /* AC Paste */
+#define KEY_FIND                136     /* AC Search */
+#define KEY_CUT                 137     /* AC Cut */
+#define KEY_HELP                138     /* AL Integrated Help Center */
+#define KEY_MENU                139     /* Menu (show menu) */
+#define KEY_CALC                140     /* AL Calculator */
+#define KEY_SETUP               141
+#define KEY_SLEEP               142     /* SC System Sleep */
+#define KEY_WAKEUP              143     /* System Wake Up */
+#define KEY_FILE                144     /* AL Local Machine Browser */
+#define KEY_SENDFILE            145
+#define KEY_DELETEFILE          146
+#define KEY_XFER                147
+#define KEY_PROG1               148
+#define KEY_PROG2               149
+#define KEY_WWW                 150     /* AL Internet Browser */
+#define KEY_MSDOS               151
+#define KEY_COFFEE              152     /* AL Terminal Lock/Screensaver */
+#define KEY_SCREENLOCK          KEY_COFFEE
+#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 */
+#define KEY_COMPUTER            157
+#define KEY_BACK                158     /* AC Back */
+#define KEY_FORWARD             159     /* AC Forward */
+#define KEY_CLOSECD             160
+#define KEY_EJECTCD             161
+#define KEY_EJECTCLOSECD        162
+#define KEY_NEXTSONG            163
+#define KEY_PLAYPAUSE           164
+#define KEY_PREVIOUSSONG        165
+#define KEY_STOPCD              166
+#define KEY_RECORD              167
+#define KEY_REWIND              168
+#define KEY_PHONE               169     /* Media Select Telephone */
+#define KEY_ISO                 170
+#define KEY_CONFIG              171     /* AL Consumer Control Configuration */
+#define KEY_HOMEPAGE            172     /* AC Home */
+#define KEY_REFRESH             173     /* AC Refresh */
+#define KEY_EXIT                174     /* AC Exit */
+#define KEY_MOVE                175
+#define KEY_EDIT                176
+#define KEY_SCROLLUP            177
+#define KEY_SCROLLDOWN          178
+#define KEY_KPLEFTPAREN         179
+#define KEY_KPRIGHTPAREN        180
+#define KEY_NEW                 181     /* AC New */
+#define KEY_REDO                182     /* AC Redo/Repeat */
+
+#define KEY_F13                 183
+#define KEY_F14                 184
+#define KEY_F15                 185
+#define KEY_F16                 186
+#define KEY_F17                 187
+#define KEY_F18                 188
+#define KEY_F19                 189
+#define KEY_F20                 190
+#define KEY_F21                 191
+#define KEY_F22                 192
+#define KEY_F23                 193
+#define KEY_F24                 194
+
+#define KEY_PLAYCD              200
+#define KEY_PAUSECD             201
+#define KEY_PROG3               202
+#define KEY_PROG4               203
+#define KEY_DASHBOARD           204     /* AL Dashboard */
+#define KEY_SUSPEND             205
+#define KEY_CLOSE               206     /* AC Close */
+#define KEY_PLAY                207
+#define KEY_FASTFORWARD         208
+#define KEY_BASSBOOST           209
+#define KEY_PRINT               210     /* AC Print */
+#define KEY_HP                  211
+#define KEY_CAMERA              212
+#define KEY_SOUND               213
+#define KEY_QUESTION            214
+#define KEY_EMAIL               215
+#define KEY_CHAT                216
+#define KEY_SEARCH              217
+#define KEY_CONNECT             218
+#define KEY_FINANCE             219     /* AL Checkbook/Finance */
+#define KEY_SPORT               220
+#define KEY_SHOP                221
+#define KEY_ALTERASE            222
+#define KEY_CANCEL              223     /* AC Cancel */
+#define KEY_BRIGHTNESSDOWN      224
+#define KEY_BRIGHTNESSUP        225
+#define KEY_MEDIA               226
+
+#define KEY_SWITCHVIDEOMODE     227     /* Cycle between available video
+                                           outputs (Monitor/LCD/TV-out/etc) */
+#define KEY_KBDILLUMTOGGLE      228
+#define KEY_KBDILLUMDOWN        229
+#define KEY_KBDILLUMUP          230
+
+#define KEY_SEND                231     /* AC Send */
+#define KEY_REPLY               232     /* AC Reply */
+#define KEY_FORWARDMAIL         233     /* AC Forward Msg */
+#define KEY_SAVE                234     /* AC Save */
+#define KEY_DOCUMENTS           235
+
+#define KEY_BATTERY             236
+
+#define KEY_BLUETOOTH           237
+#define KEY_WLAN                238
+#define KEY_UWB                 239
+
+#define KEY_UNKNOWN             240
+
+#define KEY_VIDEO_NEXT          241     /* drive next video source */
+#define KEY_VIDEO_PREV          242     /* drive previous video source */
+#define KEY_BRIGHTNESS_CYCLE    243     /* brightness up, after max is min */
+#define KEY_BRIGHTNESS_AUTO     244     /* Set Auto Brightness: manual
+                                          brightness control is off,
+                                          rely on ambient */
+#define KEY_BRIGHTNESS_ZERO     KEY_BRIGHTNESS_AUTO
+#define KEY_DISPLAY_OFF         245     /* display device to off state */
+
+#define KEY_WWAN                246     /* Wireless WAN (LTE, UMTS, GSM, etc.) */
+#define KEY_WIMAX               KEY_WWAN
+#define KEY_RFKILL              247     /* Key that controls all radios */
+
+#define KEY_MICMUTE             248     /* Mute / unmute the microphone */
+
+/* Code 255 is reserved for special needs of AT keyboard driver */
+
+#define BTN_MISC                0x100
+#define BTN_0                   0x100
+#define BTN_1                   0x101
+#define BTN_2                   0x102
+#define BTN_3                   0x103
+#define BTN_4                   0x104
+#define BTN_5                   0x105
+#define BTN_6                   0x106
+#define BTN_7                   0x107
+#define BTN_8                   0x108
+#define BTN_9                   0x109
+
+#define BTN_MOUSE               0x110
+#define BTN_LEFT                0x110
+#define BTN_RIGHT               0x111
+#define BTN_MIDDLE              0x112
+#define BTN_SIDE                0x113
+#define BTN_EXTRA               0x114
+#define BTN_FORWARD             0x115
+#define BTN_BACK                0x116
+#define BTN_TASK                0x117
+
+#define BTN_JOYSTICK            0x120
+#define BTN_TRIGGER             0x120
+#define BTN_THUMB               0x121
+#define BTN_THUMB2              0x122
+#define BTN_TOP                 0x123
+#define BTN_TOP2                0x124
+#define BTN_PINKIE              0x125
+#define BTN_BASE                0x126
+#define BTN_BASE2               0x127
+#define BTN_BASE3               0x128
+#define BTN_BASE4               0x129
+#define BTN_BASE5               0x12a
+#define BTN_BASE6               0x12b
+#define BTN_DEAD                0x12f
+
+#define BTN_GAMEPAD             0x130
+#define BTN_SOUTH               0x130
+#define BTN_A                   BTN_SOUTH
+#define BTN_EAST                0x131
+#define BTN_B                   BTN_EAST
+#define BTN_C                   0x132
+#define BTN_NORTH               0x133
+#define BTN_X                   BTN_NORTH
+#define BTN_WEST                0x134
+#define BTN_Y                   BTN_WEST
+#define BTN_Z                   0x135
+#define BTN_TL                  0x136
+#define BTN_TR                  0x137
+#define BTN_TL2                 0x138
+#define BTN_TR2                 0x139
+#define BTN_SELECT              0x13a
+#define BTN_START               0x13b
+#define BTN_MODE                0x13c
+#define BTN_THUMBL              0x13d
+#define BTN_THUMBR              0x13e
+
+#define BTN_DIGI                0x140
+#define BTN_TOOL_PEN            0x140
+#define BTN_TOOL_RUBBER         0x141
+#define BTN_TOOL_BRUSH          0x142
+#define BTN_TOOL_PENCIL         0x143
+#define BTN_TOOL_AIRBRUSH       0x144
+#define BTN_TOOL_FINGER         0x145
+#define BTN_TOOL_MOUSE          0x146
+#define BTN_TOOL_LENS           0x147
+#define BTN_TOOL_QUINTTAP       0x148   /* Five fingers on trackpad */
+#define BTN_TOUCH               0x14a
+#define BTN_STYLUS              0x14b
+#define BTN_STYLUS2             0x14c
+#define BTN_TOOL_DOUBLETAP      0x14d
+#define BTN_TOOL_TRIPLETAP      0x14e
+#define BTN_TOOL_QUADTAP        0x14f   /* Four fingers on trackpad */
+
+#define BTN_WHEEL               0x150
+#define BTN_GEAR_DOWN           0x150
+#define BTN_GEAR_UP             0x151
+
+#define KEY_OK                  0x160
+#define KEY_SELECT              0x161
+#define KEY_GOTO                0x162
+#define KEY_CLEAR               0x163
+#define KEY_POWER2              0x164
+#define KEY_OPTION              0x165
+#define KEY_INFO                0x166   /* AL OEM Features/Tips/Tutorial */
+#define KEY_TIME                0x167
+#define KEY_VENDOR              0x168
+#define KEY_ARCHIVE             0x169
+#define KEY_PROGRAM             0x16a   /* Media Select Program Guide */
+#define KEY_CHANNEL             0x16b
+#define KEY_FAVORITES           0x16c
+#define KEY_EPG                 0x16d
+#define KEY_PVR                 0x16e   /* Media Select Home */
+#define KEY_MHP                 0x16f
+#define KEY_LANGUAGE            0x170
+#define KEY_TITLE               0x171
+#define KEY_SUBTITLE            0x172
+#define KEY_ANGLE               0x173
+#define KEY_ZOOM                0x174
+#define KEY_MODE                0x175
+#define KEY_KEYBOARD            0x176
+#define KEY_SCREEN              0x177
+#define KEY_PC                  0x178   /* Media Select Computer */
+#define KEY_TV                  0x179   /* Media Select TV */
+#define KEY_TV2                 0x17a   /* Media Select Cable */
+#define KEY_VCR                 0x17b   /* Media Select VCR */
+#define KEY_VCR2                0x17c   /* VCR Plus */
+#define KEY_SAT                 0x17d   /* Media Select Satellite */
+#define KEY_SAT2                0x17e
+#define KEY_CD                  0x17f   /* Media Select CD */
+#define KEY_TAPE                0x180   /* Media Select Tape */
+#define KEY_RADIO               0x181
+#define KEY_TUNER               0x182   /* Media Select Tuner */
+#define KEY_PLAYER              0x183
+#define KEY_TEXT                0x184
+#define KEY_DVD                 0x185   /* Media Select DVD */
+#define KEY_AUX                 0x186
+#define KEY_MP3                 0x187
+#define KEY_AUDIO               0x188   /* AL Audio Browser */
+#define KEY_VIDEO               0x189   /* AL Movie Browser */
+#define KEY_DIRECTORY           0x18a
+#define KEY_LIST                0x18b
+#define KEY_MEMO                0x18c   /* Media Select Messages */
+#define KEY_CALENDAR            0x18d
+#define KEY_RED                 0x18e
+#define KEY_GREEN               0x18f
+#define KEY_YELLOW              0x190
+#define KEY_BLUE                0x191
+#define KEY_CHANNELUP           0x192   /* Channel Increment */
+#define KEY_CHANNELDOWN         0x193   /* Channel Decrement */
+#define KEY_FIRST               0x194
+#define KEY_LAST                0x195   /* Recall Last */
+#define KEY_AB                  0x196
+#define KEY_NEXT                0x197
+#define KEY_RESTART             0x198
+#define KEY_SLOW                0x199
+#define KEY_SHUFFLE             0x19a
+#define KEY_BREAK               0x19b
+#define KEY_PREVIOUS            0x19c
+#define KEY_DIGITS              0x19d
+#define KEY_TEEN                0x19e
+#define KEY_TWEN                0x19f
+#define KEY_VIDEOPHONE          0x1a0   /* Media Select Video Phone */
+#define KEY_GAMES               0x1a1   /* Media Select Games */
+#define KEY_ZOOMIN              0x1a2   /* AC Zoom In */
+#define KEY_ZOOMOUT             0x1a3   /* AC Zoom Out */
+#define KEY_ZOOMRESET           0x1a4   /* AC Zoom */
+#define KEY_WORDPROCESSOR       0x1a5   /* AL Word Processor */
+#define KEY_EDITOR              0x1a6   /* AL Text Editor */
+#define KEY_SPREADSHEET         0x1a7   /* AL Spreadsheet */
+#define KEY_GRAPHICSEDITOR      0x1a8   /* AL Graphics Editor */
+#define KEY_PRESENTATION        0x1a9   /* AL Presentation App */
+#define KEY_DATABASE            0x1aa   /* AL Database App */
+#define KEY_NEWS                0x1ab   /* AL Newsreader */
+#define KEY_VOICEMAIL           0x1ac   /* AL Voicemail */
+#define KEY_ADDRESSBOOK         0x1ad   /* AL Contacts/Address Book */
+#define KEY_MESSENGER           0x1ae   /* AL Instant Messaging */
+#define KEY_DISPLAYTOGGLE       0x1af   /* Turn display (LCD) on and off */
+#define KEY_BRIGHTNESS_TOGGLE   KEY_DISPLAYTOGGLE
+#define KEY_SPELLCHECK          0x1b0   /* AL Spell Check */
+#define KEY_LOGOFF              0x1b1   /* AL Logoff */
+
+#define KEY_DOLLAR              0x1b2
+#define KEY_EURO                0x1b3
+
+#define KEY_FRAMEBACK           0x1b4   /* Consumer - transport controls */
+#define KEY_FRAMEFORWARD        0x1b5
+#define KEY_CONTEXT_MENU        0x1b6   /* GenDesc - system context menu */
+#define KEY_MEDIA_REPEAT        0x1b7   /* Consumer - transport control */
+#define KEY_10CHANNELSUP        0x1b8   /* 10 channels up (10+) */
+#define KEY_10CHANNELSDOWN      0x1b9   /* 10 channels down (10-) */
+#define KEY_IMAGES              0x1ba   /* AL Image Browser */
+
+#define KEY_DEL_EOL             0x1c0
+#define KEY_DEL_EOS             0x1c1
+#define KEY_INS_LINE            0x1c2
+#define KEY_DEL_LINE            0x1c3
+
+#define KEY_FN                  0x1d0
+#define KEY_FN_ESC              0x1d1
+#define KEY_FN_F1               0x1d2
+#define KEY_FN_F2               0x1d3
+#define KEY_FN_F3               0x1d4
+#define KEY_FN_F4               0x1d5
+#define KEY_FN_F5               0x1d6
+#define KEY_FN_F6               0x1d7
+#define KEY_FN_F7               0x1d8
+#define KEY_FN_F8               0x1d9
+#define KEY_FN_F9               0x1da
+#define KEY_FN_F10              0x1db
+#define KEY_FN_F11              0x1dc
+#define KEY_FN_F12              0x1dd
+#define KEY_FN_1                0x1de
+#define KEY_FN_2                0x1df
+#define KEY_FN_D                0x1e0
+#define KEY_FN_E                0x1e1
+#define KEY_FN_F                0x1e2
+#define KEY_FN_S                0x1e3
+#define KEY_FN_B                0x1e4
+
+#define KEY_BRL_DOT1            0x1f1
+#define KEY_BRL_DOT2            0x1f2
+#define KEY_BRL_DOT3            0x1f3
+#define KEY_BRL_DOT4            0x1f4
+#define KEY_BRL_DOT5            0x1f5
+#define KEY_BRL_DOT6            0x1f6
+#define KEY_BRL_DOT7            0x1f7
+#define KEY_BRL_DOT8            0x1f8
+#define KEY_BRL_DOT9            0x1f9
+#define KEY_BRL_DOT10           0x1fa
+
+#define KEY_NUMERIC_0           0x200   /* used by phones, remote controls, */
+#define KEY_NUMERIC_1           0x201   /* and other keypads */
+#define KEY_NUMERIC_2           0x202
+#define KEY_NUMERIC_3           0x203
+#define KEY_NUMERIC_4           0x204
+#define KEY_NUMERIC_5           0x205
+#define KEY_NUMERIC_6           0x206
+#define KEY_NUMERIC_7           0x207
+#define KEY_NUMERIC_8           0x208
+#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 */
+
+#define KEY_TOUCHPAD_TOGGLE     0x212   /* Request switch touchpad on or off */
+#define KEY_TOUCHPAD_ON         0x213
+#define KEY_TOUCHPAD_OFF        0x214
+
+#define KEY_CAMERA_ZOOMIN       0x215
+#define KEY_CAMERA_ZOOMOUT      0x216
+#define KEY_CAMERA_UP           0x217
+#define KEY_CAMERA_DOWN         0x218
+#define KEY_CAMERA_LEFT         0x219
+#define KEY_CAMERA_RIGHT        0x21a
+
+#define KEY_ATTENDANT_ON        0x21b
+#define KEY_ATTENDANT_OFF       0x21c
+#define KEY_ATTENDANT_TOGGLE    0x21d   /* Attendant call on or off */
+#define KEY_LIGHTS_TOGGLE       0x21e   /* Reading light on or off */
+
+#define BTN_DPAD_UP             0x220
+#define BTN_DPAD_DOWN           0x221
+#define BTN_DPAD_LEFT           0x222
+#define BTN_DPAD_RIGHT          0x223
+
+#define KEY_ALS_TOGGLE          0x230   /* Ambient light sensor */
+
+#define KEY_BUTTONCONFIG                0x240   /* AL Button Configuration */
+#define KEY_TASKMANAGER         0x241   /* AL Task/Project Manager */
+#define KEY_JOURNAL             0x242   /* AL Log/Journal/Timecard */
+#define KEY_CONTROLPANEL                0x243   /* AL Control Panel */
+#define KEY_APPSELECT           0x244   /* AL Select Task/Application */
+#define KEY_SCREENSAVER         0x245   /* AL Screen Saver */
+#define KEY_VOICECOMMAND                0x246   /* Listening Voice Command */
+
+#define KEY_BRIGHTNESS_MIN              0x250   /* Set Brightness to Minimum */
+#define KEY_BRIGHTNESS_MAX              0x251   /* Set Brightness to Maximum */
+
+#define KEY_KBDINPUTASSIST_PREV         0x260
+#define KEY_KBDINPUTASSIST_NEXT         0x261
+#define KEY_KBDINPUTASSIST_PREVGROUP            0x262
+#define KEY_KBDINPUTASSIST_NEXTGROUP            0x263
+#define KEY_KBDINPUTASSIST_ACCEPT               0x264
+#define KEY_KBDINPUTASSIST_CANCEL               0x265
+
+#define BTN_TRIGGER_HAPPY               0x2c0
+#define BTN_TRIGGER_HAPPY1              0x2c0
+#define BTN_TRIGGER_HAPPY2              0x2c1
+#define BTN_TRIGGER_HAPPY3              0x2c2
+#define BTN_TRIGGER_HAPPY4              0x2c3
+#define BTN_TRIGGER_HAPPY5              0x2c4
+#define BTN_TRIGGER_HAPPY6              0x2c5
+#define BTN_TRIGGER_HAPPY7              0x2c6
+#define BTN_TRIGGER_HAPPY8              0x2c7
+#define BTN_TRIGGER_HAPPY9              0x2c8
+#define BTN_TRIGGER_HAPPY10             0x2c9
+#define BTN_TRIGGER_HAPPY11             0x2ca
+#define BTN_TRIGGER_HAPPY12             0x2cb
+#define BTN_TRIGGER_HAPPY13             0x2cc
+#define BTN_TRIGGER_HAPPY14             0x2cd
+#define BTN_TRIGGER_HAPPY15             0x2ce
+#define BTN_TRIGGER_HAPPY16             0x2cf
+#define BTN_TRIGGER_HAPPY17             0x2d0
+#define BTN_TRIGGER_HAPPY18             0x2d1
+#define BTN_TRIGGER_HAPPY19             0x2d2
+#define BTN_TRIGGER_HAPPY20             0x2d3
+#define BTN_TRIGGER_HAPPY21             0x2d4
+#define BTN_TRIGGER_HAPPY22             0x2d5
+#define BTN_TRIGGER_HAPPY23             0x2d6
+#define BTN_TRIGGER_HAPPY24             0x2d7
+#define BTN_TRIGGER_HAPPY25             0x2d8
+#define BTN_TRIGGER_HAPPY26             0x2d9
+#define BTN_TRIGGER_HAPPY27             0x2da
+#define BTN_TRIGGER_HAPPY28             0x2db
+#define BTN_TRIGGER_HAPPY29             0x2dc
+#define BTN_TRIGGER_HAPPY30             0x2dd
+#define BTN_TRIGGER_HAPPY31             0x2de
+#define BTN_TRIGGER_HAPPY32             0x2df
+#define BTN_TRIGGER_HAPPY33             0x2e0
+#define BTN_TRIGGER_HAPPY34             0x2e1
+#define BTN_TRIGGER_HAPPY35             0x2e2
+#define BTN_TRIGGER_HAPPY36             0x2e3
+#define BTN_TRIGGER_HAPPY37             0x2e4
+#define BTN_TRIGGER_HAPPY38             0x2e5
+#define BTN_TRIGGER_HAPPY39             0x2e6
+#define BTN_TRIGGER_HAPPY40             0x2e7
+
+/* We avoid low common keys in module aliases so they don't get huge. */
+#define KEY_MIN_INTERESTING     KEY_MUTE
+#define KEY_MAX                 0x2ff
+#define KEY_CNT                 (KEY_MAX+1)
+
+/*
+ * Relative axes
+ */
+
+#define REL_X                   0x00
+#define REL_Y                   0x01
+#define REL_Z                   0x02
+#define REL_RX                  0x03
+#define REL_RY                  0x04
+#define REL_RZ                  0x05
+#define REL_HWHEEL              0x06
+#define REL_DIAL                0x07
+#define REL_WHEEL               0x08
+#define REL_MISC                0x09
+#define REL_MAX                 0x0f
+#define REL_CNT                 (REL_MAX+1)
+
+/*
+ * Absolute axes
+ */
+
+#define ABS_X                   0x00
+#define ABS_Y                   0x01
+#define ABS_Z                   0x02
+#define ABS_RX                  0x03
+#define ABS_RY                  0x04
+#define ABS_RZ                  0x05
+#define ABS_THROTTLE            0x06
+#define ABS_RUDDER              0x07
+#define ABS_WHEEL               0x08
+#define ABS_GAS                 0x09
+#define ABS_BRAKE               0x0a
+#define ABS_HAT0X               0x10
+#define ABS_HAT0Y               0x11
+#define ABS_HAT1X               0x12
+#define ABS_HAT1Y               0x13
+#define ABS_HAT2X               0x14
+#define ABS_HAT2Y               0x15
+#define ABS_HAT3X               0x16
+#define ABS_HAT3Y               0x17
+#define ABS_PRESSURE            0x18
+#define ABS_DISTANCE            0x19
+#define ABS_TILT_X              0x1a
+#define ABS_TILT_Y              0x1b
+#define ABS_TOOL_WIDTH          0x1c
+
+#define ABS_VOLUME              0x20
+
+#define ABS_MISC                0x28
+
+#define ABS_MT_SLOT             0x2f    /* MT slot being modified */
+#define ABS_MT_TOUCH_MAJOR      0x30    /* Major axis of touching ellipse */
+#define ABS_MT_TOUCH_MINOR      0x31    /* Minor axis (omit if circular) */
+#define ABS_MT_WIDTH_MAJOR      0x32    /* Major axis of approaching ellipse */
+#define ABS_MT_WIDTH_MINOR      0x33    /* Minor axis (omit if circular) */
+#define ABS_MT_ORIENTATION      0x34    /* Ellipse orientation */
+#define ABS_MT_POSITION_X       0x35    /* Center X touch position */
+#define ABS_MT_POSITION_Y       0x36    /* Center Y touch position */
+#define ABS_MT_TOOL_TYPE        0x37    /* Type of touching device */
+#define ABS_MT_BLOB_ID          0x38    /* Group a set of packets as a blob */
+#define ABS_MT_TRACKING_ID      0x39    /* Unique ID of initiated contact */
+#define ABS_MT_PRESSURE         0x3a    /* Pressure on contact area */
+#define ABS_MT_DISTANCE         0x3b    /* Contact hover distance */
+#define ABS_MT_TOOL_X           0x3c    /* Center X tool position */
+#define ABS_MT_TOOL_Y           0x3d    /* Center Y tool position */
+
+
+#define ABS_MAX                 0x3f
+#define ABS_CNT                 (ABS_MAX+1)
+
+/*
+ * Switch events
+ */
+
+#define SW_LID                  0x00  /* set = lid shut */
+#define SW_TABLET_MODE          0x01  /* set = tablet mode */
+#define SW_HEADPHONE_INSERT     0x02  /* set = inserted */
+#define SW_RFKILL_ALL           0x03  /* rfkill master switch, type "any"
+                                         set = radio enabled */
+#define SW_RADIO                SW_RFKILL_ALL   /* deprecated */
+#define SW_MICROPHONE_INSERT    0x04  /* set = inserted */
+#define SW_DOCK                 0x05  /* set = plugged into dock */
+#define SW_LINEOUT_INSERT       0x06  /* set = inserted */
+#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
+#define SW_VIDEOOUT_INSERT      0x08  /* set = inserted */
+#define SW_CAMERA_LENS_COVER    0x09  /* set = lens covered */
+#define SW_KEYPAD_SLIDE         0x0a  /* set = keypad slide out */
+#define SW_FRONT_PROXIMITY      0x0b  /* set = front proximity sensor active */
+#define SW_ROTATE_LOCK          0x0c  /* set = rotate locked/disabled */
+#define SW_LINEIN_INSERT        0x0d  /* set = inserted */
+#define SW_MUTE_DEVICE          0x0e  /* set = device disabled */
+#define SW_MAX                  0x0f
+#define SW_CNT                  (SW_MAX+1)
+
+/*
+ * Misc events
+ */
+
+#define MSC_SERIAL              0x00
+#define MSC_PULSELED            0x01
+#define MSC_GESTURE             0x02
+#define MSC_RAW                 0x03
+#define MSC_SCAN                0x04
+#define MSC_TIMESTAMP           0x05
+#define MSC_MAX                 0x07
+#define MSC_CNT                 (MSC_MAX+1)
+
+/*
+ * LEDs
+ */
+
+#define LED_NUML                0x00
+#define LED_CAPSL               0x01
+#define LED_SCROLLL             0x02
+#define LED_COMPOSE             0x03
+#define LED_KANA                0x04
+#define LED_SLEEP               0x05
+#define LED_SUSPEND             0x06
+#define LED_MUTE                0x07
+#define LED_MISC                0x08
+#define LED_MAIL                0x09
+#define LED_CHARGING            0x0a
+#define LED_MAX                 0x0f
+#define LED_CNT                 (LED_MAX+1)
+
+/*
+ * Autorepeat values
+ */
+
+#define REP_DELAY               0x00
+#define REP_PERIOD              0x01
+#define REP_MAX                 0x01
+#define REP_CNT                 (REP_MAX+1)
+
+/*
+ * Sounds
+ */
+
+#define SND_CLICK               0x00
+#define SND_BELL                0x01
+#define SND_TONE                0x02
+#define SND_MAX                 0x07
+#define SND_CNT                 (SND_MAX+1)
+
+#endif
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index 731417c025f6..2758687300b4 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -16,6 +16,7 @@
 #include <linux/types.h>
 #endif
 
+#include "input-event-codes.h"
 
 /*
  * The event structure itself
@@ -97,6 +98,12 @@ struct input_keymap_entry {
         __u8  scancode[32];
 };
 
+struct input_mask {
+        __u32 type;
+        __u32 codes_size;
+        __u64 codes_ptr;
+};
+
 #define EVIOCGVERSION           _IOR('E', 0x01, int)                    /* get driver version */
 #define EVIOCGID                _IOR('E', 0x02, struct input_id)        /* get device ID */
 #define EVIOCGREP               _IOR('E', 0x03, unsigned int[2])        /* get repeat settings */
@@ -147,801 +154,68 @@ struct input_keymap_entry {
 #define EVIOCGABS(abs)          _IOR('E', 0x40 + (abs), struct input_absinfo)   /* get abs value/limits */
 #define EVIOCSABS(abs)          _IOW('E', 0xc0 + (abs), struct input_absinfo)   /* set abs value/limits */
 
-#define EVIOCSFF                _IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect))   /* send a force effect to a force feedback device */
+#define EVIOCSFF                _IOW('E', 0x80, struct ff_effect)       /* send a force effect to a force feedback device */
 #define EVIOCRMFF               _IOW('E', 0x81, int)                    /* Erase a force effect */
 #define EVIOCGEFFECTS           _IOR('E', 0x84, int)                    /* Report number of effects playable at the same time */
 
 #define EVIOCGRAB               _IOW('E', 0x90, int)                    /* Grab/Release device */
 #define EVIOCREVOKE             _IOW('E', 0x91, int)                    /* Revoke device access */
 
-#define EVIOCSCLOCKID           _IOW('E', 0xa0, int)                    /* Set clockid to be used for timestamps */
-
-/*
- * Device properties and quirks
- */
-
-#define INPUT_PROP_POINTER              0x00    /* needs a pointer */
-#define INPUT_PROP_DIRECT               0x01    /* direct input devices */
-#define INPUT_PROP_BUTTONPAD            0x02    /* has button(s) under pad */
-#define INPUT_PROP_SEMI_MT              0x03    /* touch rectangle only */
-#define INPUT_PROP_TOPBUTTONPAD         0x04    /* softbuttons at top of pad */
-#define INPUT_PROP_POINTING_STICK       0x05    /* is a pointing stick */
-#define INPUT_PROP_ACCELEROMETER        0x06    /* has accelerometer */
-
-#define INPUT_PROP_MAX                  0x1f
-#define INPUT_PROP_CNT                  (INPUT_PROP_MAX + 1)
-
-/*
- * Event types
- */
-
-#define EV_SYN                  0x00
-#define EV_KEY                  0x01
-#define EV_REL                  0x02
-#define EV_ABS                  0x03
-#define EV_MSC                  0x04
-#define EV_SW                   0x05
-#define EV_LED                  0x11
-#define EV_SND                  0x12
-#define EV_REP                  0x14
-#define EV_FF                   0x15
-#define EV_PWR                  0x16
-#define EV_FF_STATUS            0x17
-#define EV_MAX                  0x1f
-#define EV_CNT                  (EV_MAX+1)
-
-/*
- * Synchronization events.
- */
-
-#define SYN_REPORT              0
-#define SYN_CONFIG              1
-#define SYN_MT_REPORT           2
-#define SYN_DROPPED             3
-#define SYN_MAX                 0xf
-#define SYN_CNT                 (SYN_MAX+1)
-
-/*
- * Keys and buttons
+/**
+ * EVIOCGMASK - Retrieve current event mask
  *
- * Most of the keys/buttons are modeled after USB HUT 1.12
- * (see http://www.usb.org/developers/hidpage).
- * Abbreviations in the comments:
- * AC - Application Control
- * AL - Application Launch Button
- * SC - System Control
- */
-
-#define KEY_RESERVED            0
-#define KEY_ESC                 1
-#define KEY_1                   2
-#define KEY_2                   3
-#define KEY_3                   4
-#define KEY_4                   5
-#define KEY_5                   6
-#define KEY_6                   7
-#define KEY_7                   8
-#define KEY_8                   9
-#define KEY_9                   10
-#define KEY_0                   11
-#define KEY_MINUS               12
-#define KEY_EQUAL               13
-#define KEY_BACKSPACE           14
-#define KEY_TAB                 15
-#define KEY_Q                   16
-#define KEY_W                   17
-#define KEY_E                   18
-#define KEY_R                   19
-#define KEY_T                   20
-#define KEY_Y                   21
-#define KEY_U                   22
-#define KEY_I                   23
-#define KEY_O                   24
-#define KEY_P                   25
-#define KEY_LEFTBRACE           26
-#define KEY_RIGHTBRACE          27
-#define KEY_ENTER               28
-#define KEY_LEFTCTRL            29
-#define KEY_A                   30
-#define KEY_S                   31
-#define KEY_D                   32
-#define KEY_F                   33
-#define KEY_G                   34
-#define KEY_H                   35
-#define KEY_J                   36
-#define KEY_K                   37
-#define KEY_L                   38
-#define KEY_SEMICOLON           39
-#define KEY_APOSTROPHE          40
-#define KEY_GRAVE               41
-#define KEY_LEFTSHIFT           42
-#define KEY_BACKSLASH           43
-#define KEY_Z                   44
-#define KEY_X                   45
-#define KEY_C                   46
-#define KEY_V                   47
-#define KEY_B                   48
-#define KEY_N                   49
-#define KEY_M                   50
-#define KEY_COMMA               51
-#define KEY_DOT                 52
-#define KEY_SLASH               53
-#define KEY_RIGHTSHIFT          54
-#define KEY_KPASTERISK          55
-#define KEY_LEFTALT             56
-#define KEY_SPACE               57
-#define KEY_CAPSLOCK            58
-#define KEY_F1                  59
-#define KEY_F2                  60
-#define KEY_F3                  61
-#define KEY_F4                  62
-#define KEY_F5                  63
-#define KEY_F6                  64
-#define KEY_F7                  65
-#define KEY_F8                  66
-#define KEY_F9                  67
-#define KEY_F10                 68
-#define KEY_NUMLOCK             69
-#define KEY_SCROLLLOCK          70
-#define KEY_KP7                 71
-#define KEY_KP8                 72
-#define KEY_KP9                 73
-#define KEY_KPMINUS             74
-#define KEY_KP4                 75
-#define KEY_KP5                 76
-#define KEY_KP6                 77
-#define KEY_KPPLUS              78
-#define KEY_KP1                 79
-#define KEY_KP2                 80
-#define KEY_KP3                 81
-#define KEY_KP0                 82
-#define KEY_KPDOT               83
-
-#define KEY_ZENKAKUHANKAKU      85
-#define KEY_102ND               86
-#define KEY_F11                 87
-#define KEY_F12                 88
-#define KEY_RO                  89
-#define KEY_KATAKANA            90
-#define KEY_HIRAGANA            91
-#define KEY_HENKAN              92
-#define KEY_KATAKANAHIRAGANA    93
-#define KEY_MUHENKAN            94
-#define KEY_KPJPCOMMA           95
-#define KEY_KPENTER             96
-#define KEY_RIGHTCTRL           97
-#define KEY_KPSLASH             98
-#define KEY_SYSRQ               99
-#define KEY_RIGHTALT            100
-#define KEY_LINEFEED            101
-#define KEY_HOME                102
-#define KEY_UP                  103
-#define KEY_PAGEUP              104
-#define KEY_LEFT                105
-#define KEY_RIGHT               106
-#define KEY_END                 107
-#define KEY_DOWN                108
-#define KEY_PAGEDOWN            109
-#define KEY_INSERT              110
-#define KEY_DELETE              111
-#define KEY_MACRO               112
-#define KEY_MUTE                113
-#define KEY_VOLUMEDOWN          114
-#define KEY_VOLUMEUP            115
-#define KEY_POWER               116     /* SC System Power Down */
-#define KEY_KPEQUAL             117
-#define KEY_KPPLUSMINUS         118
-#define KEY_PAUSE               119
-#define KEY_SCALE               120     /* AL Compiz Scale (Expose) */
-
-#define KEY_KPCOMMA             121
-#define KEY_HANGEUL             122
-#define KEY_HANGUEL             KEY_HANGEUL
-#define KEY_HANJA               123
-#define KEY_YEN                 124
-#define KEY_LEFTMETA            125
-#define KEY_RIGHTMETA           126
-#define KEY_COMPOSE             127
-
-#define KEY_STOP                128     /* AC Stop */
-#define KEY_AGAIN               129
-#define KEY_PROPS               130     /* AC Properties */
-#define KEY_UNDO                131     /* AC Undo */
-#define KEY_FRONT               132
-#define KEY_COPY                133     /* AC Copy */
-#define KEY_OPEN                134     /* AC Open */
-#define KEY_PASTE               135     /* AC Paste */
-#define KEY_FIND                136     /* AC Search */
-#define KEY_CUT                 137     /* AC Cut */
-#define KEY_HELP                138     /* AL Integrated Help Center */
-#define KEY_MENU                139     /* Menu (show menu) */
-#define KEY_CALC                140     /* AL Calculator */
-#define KEY_SETUP               141
-#define KEY_SLEEP               142     /* SC System Sleep */
-#define KEY_WAKEUP              143     /* System Wake Up */
-#define KEY_FILE                144     /* AL Local Machine Browser */
-#define KEY_SENDFILE            145
-#define KEY_DELETEFILE          146
-#define KEY_XFER                147
-#define KEY_PROG1               148
-#define KEY_PROG2               149
-#define KEY_WWW                 150     /* AL Internet Browser */
-#define KEY_MSDOS               151
-#define KEY_COFFEE              152     /* AL Terminal Lock/Screensaver */
-#define KEY_SCREENLOCK          KEY_COFFEE
-#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 */
-#define KEY_COMPUTER            157
-#define KEY_BACK                158     /* AC Back */
-#define KEY_FORWARD             159     /* AC Forward */
-#define KEY_CLOSECD             160
-#define KEY_EJECTCD             161
-#define KEY_EJECTCLOSECD        162
-#define KEY_NEXTSONG            163
-#define KEY_PLAYPAUSE           164
-#define KEY_PREVIOUSSONG        165
-#define KEY_STOPCD              166
-#define KEY_RECORD              167
-#define KEY_REWIND              168
-#define KEY_PHONE               169     /* Media Select Telephone */
-#define KEY_ISO                 170
-#define KEY_CONFIG              171     /* AL Consumer Control Configuration */
-#define KEY_HOMEPAGE            172     /* AC Home */
-#define KEY_REFRESH             173     /* AC Refresh */
-#define KEY_EXIT                174     /* AC Exit */
-#define KEY_MOVE                175
-#define KEY_EDIT                176
-#define KEY_SCROLLUP            177
-#define KEY_SCROLLDOWN          178
-#define KEY_KPLEFTPAREN         179
-#define KEY_KPRIGHTPAREN        180
-#define KEY_NEW                 181     /* AC New */
-#define KEY_REDO                182     /* AC Redo/Repeat */
-
-#define KEY_F13                 183
-#define KEY_F14                 184
-#define KEY_F15                 185
-#define KEY_F16                 186
-#define KEY_F17                 187
-#define KEY_F18                 188
-#define KEY_F19                 189
-#define KEY_F20                 190
-#define KEY_F21                 191
-#define KEY_F22                 192
-#define KEY_F23                 193
-#define KEY_F24                 194
-
-#define KEY_PLAYCD              200
-#define KEY_PAUSECD             201
-#define KEY_PROG3               202
-#define KEY_PROG4               203
-#define KEY_DASHBOARD           204     /* AL Dashboard */
-#define KEY_SUSPEND             205
-#define KEY_CLOSE               206     /* AC Close */
-#define KEY_PLAY                207
-#define KEY_FASTFORWARD         208
-#define KEY_BASSBOOST           209
-#define KEY_PRINT               210     /* AC Print */
-#define KEY_HP                  211
-#define KEY_CAMERA              212
-#define KEY_SOUND               213
-#define KEY_QUESTION            214
-#define KEY_EMAIL               215
-#define KEY_CHAT                216
-#define KEY_SEARCH              217
-#define KEY_CONNECT             218
-#define KEY_FINANCE             219     /* AL Checkbook/Finance */
-#define KEY_SPORT               220
-#define KEY_SHOP                221
-#define KEY_ALTERASE            222
-#define KEY_CANCEL              223     /* AC Cancel */
-#define KEY_BRIGHTNESSDOWN      224
-#define KEY_BRIGHTNESSUP        225
-#define KEY_MEDIA               226
-
-#define KEY_SWITCHVIDEOMODE     227     /* Cycle between available video
-                                           outputs (Monitor/LCD/TV-out/etc) */
-#define KEY_KBDILLUMTOGGLE      228
-#define KEY_KBDILLUMDOWN        229
-#define KEY_KBDILLUMUP          230
-
-#define KEY_SEND                231     /* AC Send */
-#define KEY_REPLY               232     /* AC Reply */
-#define KEY_FORWARDMAIL         233     /* AC Forward Msg */
-#define KEY_SAVE                234     /* AC Save */
-#define KEY_DOCUMENTS           235
-
-#define KEY_BATTERY             236
-
-#define KEY_BLUETOOTH           237
-#define KEY_WLAN                238
-#define KEY_UWB                 239
-
-#define KEY_UNKNOWN             240
-
-#define KEY_VIDEO_NEXT          241     /* drive next video source */
-#define KEY_VIDEO_PREV          242     /* drive previous video source */
-#define KEY_BRIGHTNESS_CYCLE    243     /* brightness up, after max is min */
-#define KEY_BRIGHTNESS_AUTO     244     /* Set Auto Brightness: manual
-                                          brightness control is off,
-                                          rely on ambient */
-#define KEY_BRIGHTNESS_ZERO     KEY_BRIGHTNESS_AUTO
-#define KEY_DISPLAY_OFF         245     /* display device to off state */
-
-#define KEY_WWAN                246     /* Wireless WAN (LTE, UMTS, GSM, etc.) */
-#define KEY_WIMAX               KEY_WWAN
-#define KEY_RFKILL              247     /* Key that controls all radios */
-
-#define KEY_MICMUTE             248     /* Mute / unmute the microphone */
-
-/* Code 255 is reserved for special needs of AT keyboard driver */
-
-#define BTN_MISC                0x100
-#define BTN_0                   0x100
-#define BTN_1                   0x101
-#define BTN_2                   0x102
-#define BTN_3                   0x103
-#define BTN_4                   0x104
-#define BTN_5                   0x105
-#define BTN_6                   0x106
-#define BTN_7                   0x107
-#define BTN_8                   0x108
-#define BTN_9                   0x109
-
-#define BTN_MOUSE               0x110
-#define BTN_LEFT                0x110
-#define BTN_RIGHT               0x111
-#define BTN_MIDDLE              0x112
-#define BTN_SIDE                0x113
-#define BTN_EXTRA               0x114
-#define BTN_FORWARD             0x115
-#define BTN_BACK                0x116
-#define BTN_TASK                0x117
-
-#define BTN_JOYSTICK            0x120
-#define BTN_TRIGGER             0x120
-#define BTN_THUMB               0x121
-#define BTN_THUMB2              0x122
-#define BTN_TOP                 0x123
-#define BTN_TOP2                0x124
-#define BTN_PINKIE              0x125
-#define BTN_BASE                0x126
-#define BTN_BASE2               0x127
-#define BTN_BASE3               0x128
-#define BTN_BASE4               0x129
-#define BTN_BASE5               0x12a
-#define BTN_BASE6               0x12b
-#define BTN_DEAD                0x12f
-
-#define BTN_GAMEPAD             0x130
-#define BTN_SOUTH               0x130
-#define BTN_A                   BTN_SOUTH
-#define BTN_EAST                0x131
-#define BTN_B                   BTN_EAST
-#define BTN_C                   0x132
-#define BTN_NORTH               0x133
-#define BTN_X                   BTN_NORTH
-#define BTN_WEST                0x134
-#define BTN_Y                   BTN_WEST
-#define BTN_Z                   0x135
-#define BTN_TL                  0x136
-#define BTN_TR                  0x137
-#define BTN_TL2                 0x138
-#define BTN_TR2                 0x139
-#define BTN_SELECT              0x13a
-#define BTN_START               0x13b
-#define BTN_MODE                0x13c
-#define BTN_THUMBL              0x13d
-#define BTN_THUMBR              0x13e
-
-#define BTN_DIGI                0x140
-#define BTN_TOOL_PEN            0x140
-#define BTN_TOOL_RUBBER         0x141
-#define BTN_TOOL_BRUSH          0x142
-#define BTN_TOOL_PENCIL         0x143
-#define BTN_TOOL_AIRBRUSH       0x144
-#define BTN_TOOL_FINGER         0x145
-#define BTN_TOOL_MOUSE          0x146
-#define BTN_TOOL_LENS           0x147
-#define BTN_TOOL_QUINTTAP       0x148   /* Five fingers on trackpad */
-#define BTN_TOUCH               0x14a
-#define BTN_STYLUS              0x14b
-#define BTN_STYLUS2             0x14c
-#define BTN_TOOL_DOUBLETAP      0x14d
-#define BTN_TOOL_TRIPLETAP      0x14e
-#define BTN_TOOL_QUADTAP        0x14f   /* Four fingers on trackpad */
-
-#define BTN_WHEEL               0x150
-#define BTN_GEAR_DOWN           0x150
-#define BTN_GEAR_UP             0x151
-
-#define KEY_OK                  0x160
-#define KEY_SELECT              0x161
-#define KEY_GOTO                0x162
-#define KEY_CLEAR               0x163
-#define KEY_POWER2              0x164
-#define KEY_OPTION              0x165
-#define KEY_INFO                0x166   /* AL OEM Features/Tips/Tutorial */
-#define KEY_TIME                0x167
-#define KEY_VENDOR              0x168
-#define KEY_ARCHIVE             0x169
-#define KEY_PROGRAM             0x16a   /* Media Select Program Guide */
-#define KEY_CHANNEL             0x16b
-#define KEY_FAVORITES           0x16c
-#define KEY_EPG                 0x16d
-#define KEY_PVR                 0x16e   /* Media Select Home */
-#define KEY_MHP                 0x16f
-#define KEY_LANGUAGE            0x170
-#define KEY_TITLE               0x171
-#define KEY_SUBTITLE            0x172
-#define KEY_ANGLE               0x173
-#define KEY_ZOOM                0x174
-#define KEY_MODE                0x175
-#define KEY_KEYBOARD            0x176
-#define KEY_SCREEN              0x177
-#define KEY_PC                  0x178   /* Media Select Computer */
-#define KEY_TV                  0x179   /* Media Select TV */
-#define KEY_TV2                 0x17a   /* Media Select Cable */
-#define KEY_VCR                 0x17b   /* Media Select VCR */
-#define KEY_VCR2                0x17c   /* VCR Plus */
-#define KEY_SAT                 0x17d   /* Media Select Satellite */
-#define KEY_SAT2                0x17e
-#define KEY_CD                  0x17f   /* Media Select CD */
-#define KEY_TAPE                0x180   /* Media Select Tape */
-#define KEY_RADIO               0x181
-#define KEY_TUNER               0x182   /* Media Select Tuner */
-#define KEY_PLAYER              0x183
-#define KEY_TEXT                0x184
-#define KEY_DVD                 0x185   /* Media Select DVD */
-#define KEY_AUX                 0x186
-#define KEY_MP3                 0x187
-#define KEY_AUDIO               0x188   /* AL Audio Browser */
-#define KEY_VIDEO               0x189   /* AL Movie Browser */
-#define KEY_DIRECTORY           0x18a
-#define KEY_LIST                0x18b
-#define KEY_MEMO                0x18c   /* Media Select Messages */
-#define KEY_CALENDAR            0x18d
-#define KEY_RED                 0x18e
-#define KEY_GREEN               0x18f
-#define KEY_YELLOW              0x190
-#define KEY_BLUE                0x191
-#define KEY_CHANNELUP           0x192   /* Channel Increment */
-#define KEY_CHANNELDOWN         0x193   /* Channel Decrement */
-#define KEY_FIRST               0x194
-#define KEY_LAST                0x195   /* Recall Last */
-#define KEY_AB                  0x196
-#define KEY_NEXT                0x197
-#define KEY_RESTART             0x198
-#define KEY_SLOW                0x199
-#define KEY_SHUFFLE             0x19a
-#define KEY_BREAK               0x19b
-#define KEY_PREVIOUS            0x19c
-#define KEY_DIGITS              0x19d
-#define KEY_TEEN                0x19e
-#define KEY_TWEN                0x19f
-#define KEY_VIDEOPHONE          0x1a0   /* Media Select Video Phone */
-#define KEY_GAMES               0x1a1   /* Media Select Games */
-#define KEY_ZOOMIN              0x1a2   /* AC Zoom In */
-#define KEY_ZOOMOUT             0x1a3   /* AC Zoom Out */
-#define KEY_ZOOMRESET           0x1a4   /* AC Zoom */
-#define KEY_WORDPROCESSOR       0x1a5   /* AL Word Processor */
-#define KEY_EDITOR              0x1a6   /* AL Text Editor */
-#define KEY_SPREADSHEET         0x1a7   /* AL Spreadsheet */
-#define KEY_GRAPHICSEDITOR      0x1a8   /* AL Graphics Editor */
-#define KEY_PRESENTATION        0x1a9   /* AL Presentation App */
-#define KEY_DATABASE            0x1aa   /* AL Database App */
-#define KEY_NEWS                0x1ab   /* AL Newsreader */
-#define KEY_VOICEMAIL           0x1ac   /* AL Voicemail */
-#define KEY_ADDRESSBOOK         0x1ad   /* AL Contacts/Address Book */
-#define KEY_MESSENGER           0x1ae   /* AL Instant Messaging */
-#define KEY_DISPLAYTOGGLE       0x1af   /* Turn display (LCD) on and off */
-#define KEY_BRIGHTNESS_TOGGLE   KEY_DISPLAYTOGGLE
-#define KEY_SPELLCHECK          0x1b0   /* AL Spell Check */
-#define KEY_LOGOFF              0x1b1   /* AL Logoff */
-
-#define KEY_DOLLAR              0x1b2
-#define KEY_EURO                0x1b3
-
-#define KEY_FRAMEBACK           0x1b4   /* Consumer - transport controls */
-#define KEY_FRAMEFORWARD        0x1b5
-#define KEY_CONTEXT_MENU        0x1b6   /* GenDesc - system context menu */
-#define KEY_MEDIA_REPEAT        0x1b7   /* Consumer - transport control */
-#define KEY_10CHANNELSUP        0x1b8   /* 10 channels up (10+) */
-#define KEY_10CHANNELSDOWN      0x1b9   /* 10 channels down (10-) */
-#define KEY_IMAGES              0x1ba   /* AL Image Browser */
-
-#define KEY_DEL_EOL             0x1c0
-#define KEY_DEL_EOS             0x1c1
-#define KEY_INS_LINE            0x1c2
-#define KEY_DEL_LINE            0x1c3
-
-#define KEY_FN                  0x1d0
-#define KEY_FN_ESC              0x1d1
-#define KEY_FN_F1               0x1d2
-#define KEY_FN_F2               0x1d3
-#define KEY_FN_F3               0x1d4
-#define KEY_FN_F4               0x1d5
-#define KEY_FN_F5               0x1d6
-#define KEY_FN_F6               0x1d7
-#define KEY_FN_F7               0x1d8
-#define KEY_FN_F8               0x1d9
-#define KEY_FN_F9               0x1da
-#define KEY_FN_F10              0x1db
-#define KEY_FN_F11              0x1dc
-#define KEY_FN_F12              0x1dd
-#define KEY_FN_1                0x1de
-#define KEY_FN_2                0x1df
-#define KEY_FN_D                0x1e0
-#define KEY_FN_E                0x1e1
-#define KEY_FN_F                0x1e2
-#define KEY_FN_S                0x1e3
-#define KEY_FN_B                0x1e4
-
-#define KEY_BRL_DOT1            0x1f1
-#define KEY_BRL_DOT2            0x1f2
-#define KEY_BRL_DOT3            0x1f3
-#define KEY_BRL_DOT4            0x1f4
-#define KEY_BRL_DOT5            0x1f5
-#define KEY_BRL_DOT6            0x1f6
-#define KEY_BRL_DOT7            0x1f7
-#define KEY_BRL_DOT8            0x1f8
-#define KEY_BRL_DOT9            0x1f9
-#define KEY_BRL_DOT10           0x1fa
-
-#define KEY_NUMERIC_0           0x200   /* used by phones, remote controls, */
-#define KEY_NUMERIC_1           0x201   /* and other keypads */
-#define KEY_NUMERIC_2           0x202
-#define KEY_NUMERIC_3           0x203
-#define KEY_NUMERIC_4           0x204
-#define KEY_NUMERIC_5           0x205
-#define KEY_NUMERIC_6           0x206
-#define KEY_NUMERIC_7           0x207
-#define KEY_NUMERIC_8           0x208
-#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 */
-
-#define KEY_TOUCHPAD_TOGGLE     0x212   /* Request switch touchpad on or off */
-#define KEY_TOUCHPAD_ON         0x213
-#define KEY_TOUCHPAD_OFF        0x214
-
-#define KEY_CAMERA_ZOOMIN       0x215
-#define KEY_CAMERA_ZOOMOUT      0x216
-#define KEY_CAMERA_UP           0x217
-#define KEY_CAMERA_DOWN         0x218
-#define KEY_CAMERA_LEFT         0x219
-#define KEY_CAMERA_RIGHT        0x21a
-
-#define KEY_ATTENDANT_ON        0x21b
-#define KEY_ATTENDANT_OFF       0x21c
-#define KEY_ATTENDANT_TOGGLE    0x21d   /* Attendant call on or off */
-#define KEY_LIGHTS_TOGGLE       0x21e   /* Reading light on or off */
-
-#define BTN_DPAD_UP             0x220
-#define BTN_DPAD_DOWN           0x221
-#define BTN_DPAD_LEFT           0x222
-#define BTN_DPAD_RIGHT          0x223
-
-#define KEY_ALS_TOGGLE          0x230   /* Ambient light sensor */
-
-#define KEY_BUTTONCONFIG                0x240   /* AL Button Configuration */
-#define KEY_TASKMANAGER         0x241   /* AL Task/Project Manager */
-#define KEY_JOURNAL             0x242   /* AL Log/Journal/Timecard */
-#define KEY_CONTROLPANEL                0x243   /* AL Control Panel */
-#define KEY_APPSELECT           0x244   /* AL Select Task/Application */
-#define KEY_SCREENSAVER         0x245   /* AL Screen Saver */
-#define KEY_VOICECOMMAND                0x246   /* Listening Voice Command */
-
-#define KEY_BRIGHTNESS_MIN              0x250   /* Set Brightness to Minimum */
-#define KEY_BRIGHTNESS_MAX              0x251   /* Set Brightness to Maximum */
-
-#define KEY_KBDINPUTASSIST_PREV         0x260
-#define KEY_KBDINPUTASSIST_NEXT         0x261
-#define KEY_KBDINPUTASSIST_PREVGROUP            0x262
-#define KEY_KBDINPUTASSIST_NEXTGROUP            0x263
-#define KEY_KBDINPUTASSIST_ACCEPT               0x264
-#define KEY_KBDINPUTASSIST_CANCEL               0x265
-
-#define BTN_TRIGGER_HAPPY               0x2c0
-#define BTN_TRIGGER_HAPPY1              0x2c0
-#define BTN_TRIGGER_HAPPY2              0x2c1
-#define BTN_TRIGGER_HAPPY3              0x2c2
-#define BTN_TRIGGER_HAPPY4              0x2c3
-#define BTN_TRIGGER_HAPPY5              0x2c4
-#define BTN_TRIGGER_HAPPY6              0x2c5
-#define BTN_TRIGGER_HAPPY7              0x2c6
-#define BTN_TRIGGER_HAPPY8              0x2c7
-#define BTN_TRIGGER_HAPPY9              0x2c8
-#define BTN_TRIGGER_HAPPY10             0x2c9
-#define BTN_TRIGGER_HAPPY11             0x2ca
-#define BTN_TRIGGER_HAPPY12             0x2cb
-#define BTN_TRIGGER_HAPPY13             0x2cc
-#define BTN_TRIGGER_HAPPY14             0x2cd
-#define BTN_TRIGGER_HAPPY15             0x2ce
-#define BTN_TRIGGER_HAPPY16             0x2cf
-#define BTN_TRIGGER_HAPPY17             0x2d0
-#define BTN_TRIGGER_HAPPY18             0x2d1
-#define BTN_TRIGGER_HAPPY19             0x2d2
-#define BTN_TRIGGER_HAPPY20             0x2d3
-#define BTN_TRIGGER_HAPPY21             0x2d4
-#define BTN_TRIGGER_HAPPY22             0x2d5
-#define BTN_TRIGGER_HAPPY23             0x2d6
-#define BTN_TRIGGER_HAPPY24             0x2d7
-#define BTN_TRIGGER_HAPPY25             0x2d8
-#define BTN_TRIGGER_HAPPY26             0x2d9
-#define BTN_TRIGGER_HAPPY27             0x2da
-#define BTN_TRIGGER_HAPPY28             0x2db
-#define BTN_TRIGGER_HAPPY29             0x2dc
-#define BTN_TRIGGER_HAPPY30             0x2dd
-#define BTN_TRIGGER_HAPPY31             0x2de
-#define BTN_TRIGGER_HAPPY32             0x2df
-#define BTN_TRIGGER_HAPPY33             0x2e0
-#define BTN_TRIGGER_HAPPY34             0x2e1
-#define BTN_TRIGGER_HAPPY35             0x2e2
-#define BTN_TRIGGER_HAPPY36             0x2e3
-#define BTN_TRIGGER_HAPPY37             0x2e4
-#define BTN_TRIGGER_HAPPY38             0x2e5
-#define BTN_TRIGGER_HAPPY39             0x2e6
-#define BTN_TRIGGER_HAPPY40             0x2e7
-
-/* We avoid low common keys in module aliases so they don't get huge. */
-#define KEY_MIN_INTERESTING     KEY_MUTE
-#define KEY_MAX                 0x2ff
-#define KEY_CNT                 (KEY_MAX+1)
-
-/*
- * Relative axes
- */
-
-#define REL_X                   0x00
-#define REL_Y                   0x01
-#define REL_Z                   0x02
-#define REL_RX                  0x03
-#define REL_RY                  0x04
-#define REL_RZ                  0x05
-#define REL_HWHEEL              0x06
-#define REL_DIAL                0x07
-#define REL_WHEEL               0x08
-#define REL_MISC                0x09
-#define REL_MAX                 0x0f
-#define REL_CNT                 (REL_MAX+1)
-
-/*
- * Absolute axes
- */
-
-#define ABS_X                   0x00
-#define ABS_Y                   0x01
-#define ABS_Z                   0x02
-#define ABS_RX                  0x03
-#define ABS_RY                  0x04
-#define ABS_RZ                  0x05
-#define ABS_THROTTLE            0x06
-#define ABS_RUDDER              0x07
-#define ABS_WHEEL               0x08
-#define ABS_GAS                 0x09
-#define ABS_BRAKE               0x0a
-#define ABS_HAT0X               0x10
-#define ABS_HAT0Y               0x11
-#define ABS_HAT1X               0x12
-#define ABS_HAT1Y               0x13
-#define ABS_HAT2X               0x14
-#define ABS_HAT2Y               0x15
-#define ABS_HAT3X               0x16
-#define ABS_HAT3Y               0x17
-#define ABS_PRESSURE            0x18
-#define ABS_DISTANCE            0x19
-#define ABS_TILT_X              0x1a
-#define ABS_TILT_Y              0x1b
-#define ABS_TOOL_WIDTH          0x1c
-
-#define ABS_VOLUME              0x20
-
-#define ABS_MISC                0x28
-
-#define ABS_MT_SLOT             0x2f    /* MT slot being modified */
-#define ABS_MT_TOUCH_MAJOR      0x30    /* Major axis of touching ellipse */
-#define ABS_MT_TOUCH_MINOR      0x31    /* Minor axis (omit if circular) */
-#define ABS_MT_WIDTH_MAJOR      0x32    /* Major axis of approaching ellipse */
-#define ABS_MT_WIDTH_MINOR      0x33    /* Minor axis (omit if circular) */
-#define ABS_MT_ORIENTATION      0x34    /* Ellipse orientation */
-#define ABS_MT_POSITION_X       0x35    /* Center X touch position */
-#define ABS_MT_POSITION_Y       0x36    /* Center Y touch position */
-#define ABS_MT_TOOL_TYPE        0x37    /* Type of touching device */
-#define ABS_MT_BLOB_ID          0x38    /* Group a set of packets as a blob */
-#define ABS_MT_TRACKING_ID      0x39    /* Unique ID of initiated contact */
-#define ABS_MT_PRESSURE         0x3a    /* Pressure on contact area */
-#define ABS_MT_DISTANCE         0x3b    /* Contact hover distance */
-#define ABS_MT_TOOL_X           0x3c    /* Center X tool position */
-#define ABS_MT_TOOL_Y           0x3d    /* Center Y tool position */
-
-
-#define ABS_MAX                 0x3f
-#define ABS_CNT                 (ABS_MAX+1)
-
-/*
- * Switch events
- */
-
-#define SW_LID                  0x00  /* set = lid shut */
-#define SW_TABLET_MODE          0x01  /* set = tablet mode */
-#define SW_HEADPHONE_INSERT     0x02  /* set = inserted */
-#define SW_RFKILL_ALL           0x03  /* rfkill master switch, type "any"
-                                         set = radio enabled */
-#define SW_RADIO                SW_RFKILL_ALL   /* deprecated */
-#define SW_MICROPHONE_INSERT    0x04  /* set = inserted */
-#define SW_DOCK                 0x05  /* set = plugged into dock */
-#define SW_LINEOUT_INSERT       0x06  /* set = inserted */
-#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
-#define SW_VIDEOOUT_INSERT      0x08  /* set = inserted */
-#define SW_CAMERA_LENS_COVER    0x09  /* set = lens covered */
-#define SW_KEYPAD_SLIDE         0x0a  /* set = keypad slide out */
-#define SW_FRONT_PROXIMITY      0x0b  /* set = front proximity sensor active */
-#define SW_ROTATE_LOCK          0x0c  /* set = rotate locked/disabled */
-#define SW_LINEIN_INSERT        0x0d  /* set = inserted */
-#define SW_MUTE_DEVICE          0x0e  /* set = device disabled */
-#define SW_MAX                  0x0f
-#define SW_CNT                  (SW_MAX+1)
-
-/*
- * Misc events
- */
-
-#define MSC_SERIAL              0x00
-#define MSC_PULSELED            0x01
-#define MSC_GESTURE             0x02
-#define MSC_RAW                 0x03
-#define MSC_SCAN                0x04
-#define MSC_TIMESTAMP           0x05
-#define MSC_MAX                 0x07
-#define MSC_CNT                 (MSC_MAX+1)
-
-/*
- * LEDs
- */
-
-#define LED_NUML                0x00
-#define LED_CAPSL               0x01
-#define LED_SCROLLL             0x02
-#define LED_COMPOSE             0x03
-#define LED_KANA                0x04
-#define LED_SLEEP               0x05
-#define LED_SUSPEND             0x06
-#define LED_MUTE                0x07
-#define LED_MISC                0x08
-#define LED_MAIL                0x09
-#define LED_CHARGING            0x0a
-#define LED_MAX                 0x0f
-#define LED_CNT                 (LED_MAX+1)
-
-/*
- * Autorepeat values
+ * This ioctl allows user to retrieve the current event mask for specific
+ * event type. The argument must be of type "struct input_mask" and
+ * specifies the event type to query, the address of the receive buffer and
+ * the size of the receive buffer.
+ *
+ * The event mask is a per-client mask that specifies which events are
+ * forwarded to the client. Each event code is represented by a single bit
+ * in the event mask. If the bit is set, the event is passed to the client
+ * normally. Otherwise, the event is filtered and will never be queued on
+ * the client's receive buffer.
+ *
+ * Event masks do not affect global state of the input device. They only
+ * affect the file descriptor they are applied to.
+ *
+ * The default event mask for a client has all bits set, i.e. all events
+ * are forwarded to the client. If the kernel is queried for an unknown
+ * event type or if the receive buffer is larger than the number of
+ * event codes known to the kernel, the kernel returns all zeroes for those
+ * codes.
+ *
+ * At maximum, codes_size bytes are copied.
+ *
+ * This ioctl may fail with ENODEV in case the file is revoked, EFAULT
+ * if the receive-buffer points to invalid memory, or EINVAL if the kernel
+ * does not implement the ioctl.
  */
+#define EVIOCGMASK              _IOR('E', 0x92, struct input_mask)      /* Get event-masks */
 
-#define REP_DELAY               0x00
-#define REP_PERIOD              0x01
-#define REP_MAX                 0x01
-#define REP_CNT                 (REP_MAX+1)
-
-/*
- * Sounds
+/**
+ * EVIOCSMASK - Set event mask
+ *
+ * This ioctl is the counterpart to EVIOCGMASK. Instead of receiving the
+ * current event mask, this changes the client's event mask for a specific
+ * type.  See EVIOCGMASK for a description of event-masks and the
+ * argument-type.
+ *
+ * This ioctl provides full forward compatibility. If the passed event type
+ * is unknown to the kernel, or if the number of event codes specified in
+ * the mask is bigger than what is known to the kernel, the ioctl is still
+ * accepted and applied. However, any unknown codes are left untouched and
+ * stay cleared. That means, the kernel always filters unknown codes
+ * regardless of what the client requests.  If the new mask doesn't cover
+ * all known event-codes, all remaining codes are automatically cleared and
+ * thus filtered.
+ *
+ * This ioctl may fail with ENODEV in case the file is revoked. EFAULT is
+ * returned if the receive-buffer points to invalid memory. EINVAL is returned
+ * if the kernel does not implement the ioctl.
  */
+#define EVIOCSMASK              _IOW('E', 0x93, struct input_mask)      /* Set event-masks */
 
-#define SND_CLICK               0x00
-#define SND_BELL                0x01
-#define SND_TONE                0x02
-#define SND_MAX                 0x07
-#define SND_CNT                 (SND_MAX+1)
+#define EVIOCSCLOCKID           _IOW('E', 0xa0, int)                    /* Set clockid to be used for timestamps */
 
 /*
  * IDs.
@@ -1200,6 +474,14 @@ struct ff_effect {
 #define FF_GAIN         0x60
 #define FF_AUTOCENTER   0x61
 
+/*
+ * ff->playback(effect_id = FF_GAIN) is the first effect_id to
+ * cause a collision with another ff method, in this case ff->set_gain().
+ * Therefore the greatest safe value for effect_id is FF_GAIN - 1,
+ * and thus the total number of effects should never exceed FF_GAIN.
+ */
+#define FF_MAX_EFFECTS  FF_GAIN
+
 #define FF_MAX          0x7f
 #define FF_CNT          (FF_MAX+1)
 
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index a9256f0331ae..03f3618612aa 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -183,6 +183,7 @@ struct kvm_s390_skeys {
 #define KVM_EXIT_EPR              23
 #define KVM_EXIT_SYSTEM_EVENT     24
 #define KVM_EXIT_S390_STSI        25
+#define KVM_EXIT_IOAPIC_EOI       26
 
 /* For KVM_EXIT_INTERNAL_ERROR */
 /* Emulate instruction failed. */
@@ -333,6 +334,10 @@ struct kvm_run {
                         __u8 sel1;
                         __u16 sel2;
                 } s390_stsi;
+                /* KVM_EXIT_IOAPIC_EOI */
+                struct {
+                        __u8 vector;
+                } eoi;
                 /* Fix the size of the union. */
                 char padding[256];
         };
@@ -824,6 +829,8 @@ struct kvm_ppc_smmu_info {
 #define KVM_CAP_MULTI_ADDRESS_SPACE 118
 #define KVM_CAP_GUEST_DEBUG_HW_BPS 119
 #define KVM_CAP_GUEST_DEBUG_HW_WPS 120
+#define KVM_CAP_SPLIT_IRQCHIP 121
+#define KVM_CAP_IOEVENTFD_ANY_LENGTH 122
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
diff --git a/include/uapi/linux/lightnvm.h b/include/uapi/linux/lightnvm.h
new file mode 100644
index 000000000000..928f98997d8a
--- /dev/null
+++ b/include/uapi/linux/lightnvm.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2015 CNEX Labs.  All rights reserved.
+ *
+ * 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; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
+ * USA.
+ */
+
+#ifndef _UAPI_LINUX_LIGHTNVM_H
+#define _UAPI_LINUX_LIGHTNVM_H
+
+#ifdef __KERNEL__
+#include <linux/kernel.h>
+#include <linux/ioctl.h>
+#else /* __KERNEL__ */
+#include <stdio.h>
+#include <sys/ioctl.h>
+#define DISK_NAME_LEN 32
+#endif /* __KERNEL__ */
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#define NVM_TTYPE_NAME_MAX 48
+#define NVM_TTYPE_MAX 63
+
+#define NVM_CTRL_FILE "/dev/lightnvm/control"
+
+struct nvm_ioctl_info_tgt {
+        __u32 version[3];
+        __u32 reserved;
+        char tgtname[NVM_TTYPE_NAME_MAX];
+};
+
+struct nvm_ioctl_info {
+        __u32 version[3];       /* in/out - major, minor, patch */
+        __u16 tgtsize;          /* number of targets */
+        __u16 reserved16;       /* pad to 4K page */
+        __u32 reserved[12];
+        struct nvm_ioctl_info_tgt tgts[NVM_TTYPE_MAX];
+};
+
+enum {
+        NVM_DEVICE_ACTIVE = 1 << 0,
+};
+
+struct nvm_ioctl_device_info {
+        char devname[DISK_NAME_LEN];
+        char bmname[NVM_TTYPE_NAME_MAX];
+        __u32 bmversion[3];
+        __u32 flags;
+        __u32 reserved[8];
+};
+
+struct nvm_ioctl_get_devices {
+        __u32 nr_devices;
+        __u32 reserved[31];
+        struct nvm_ioctl_device_info info[31];
+};
+
+struct nvm_ioctl_create_simple {
+        __u32 lun_begin;
+        __u32 lun_end;
+};
+
+enum {
+        NVM_CONFIG_TYPE_SIMPLE = 0,
+};
+
+struct nvm_ioctl_create_conf {
+        __u32 type;
+        union {
+                struct nvm_ioctl_create_simple s;
+        };
+};
+
+struct nvm_ioctl_create {
+        char dev[DISK_NAME_LEN];                /* open-channel SSD device */
+        char tgttype[NVM_TTYPE_NAME_MAX];       /* target type name */
+        char tgtname[DISK_NAME_LEN];            /* dev to expose target as */
+
+        __u32 flags;
+
+        struct nvm_ioctl_create_conf conf;
+};
+
+struct nvm_ioctl_remove {
+        char tgtname[DISK_NAME_LEN];
+
+        __u32 flags;
+};
+
+
+/* The ioctl type, 'L', 0x20 - 0x2F documented in ioctl-number.txt */
+enum {
+        /* top level cmds */
+        NVM_INFO_CMD = 0x20,
+        NVM_GET_DEVICES_CMD,
+
+        /* device level cmds */
+        NVM_DEV_CREATE_CMD,
+        NVM_DEV_REMOVE_CMD,
+};
+
+#define NVM_IOCTL 'L' /* 0x4c */
+
+#define NVM_INFO                _IOWR(NVM_IOCTL, NVM_INFO_CMD, \
+                                                struct nvm_ioctl_info)
+#define NVM_GET_DEVICES         _IOR(NVM_IOCTL, NVM_GET_DEVICES_CMD, \
+                                                struct nvm_ioctl_get_devices)
+#define NVM_DEV_CREATE          _IOW(NVM_IOCTL, NVM_DEV_CREATE_CMD, \
+                                                struct nvm_ioctl_create)
+#define NVM_DEV_REMOVE          _IOW(NVM_IOCTL, NVM_DEV_REMOVE_CMD, \
+                                                struct nvm_ioctl_remove)
+
+#define NVM_VERSION_MAJOR       1
+#define NVM_VERSION_MINOR       0
+#define NVM_VERSION_PATCHLEVEL  0
+
+#endif
diff --git a/include/uapi/linux/loop.h b/include/uapi/linux/loop.h
index e0cecd2eabdc..c8125ec1f4f2 100644
--- a/include/uapi/linux/loop.h
+++ b/include/uapi/linux/loop.h
@@ -21,6 +21,7 @@ enum {
         LO_FLAGS_READ_ONLY      = 1,
         LO_FLAGS_AUTOCLEAR      = 4,
         LO_FLAGS_PARTSCAN       = 8,
+        LO_FLAGS_DIRECT_IO      = 16,
 };
 
 #include <asm/posix_types.h>    /* for __kernel_old_dev_t */
@@ -86,6 +87,7 @@ struct loop_info64 {
 #define LOOP_GET_STATUS64       0x4C05
 #define LOOP_CHANGE_FD          0x4C06
 #define LOOP_SET_CAPACITY       0x4C07
+#define LOOP_SET_DIRECT_IO      0x4C08
 
 /* /dev/loop-control interface */
 #define LOOP_CTL_ADD            0x4C80
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 7b1425a6b370..accb036bbc9c 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -75,5 +75,6 @@
 #define ANON_INODE_FS_MAGIC     0x09041934
 #define BTRFS_TEST_MAGIC        0x73727279
 #define NSFS_MAGIC              0x6e736673
+#define BPF_FS_MAGIC            0xcafe4a11
 
 #endif /* __LINUX_MAGIC_H__ */
diff --git a/include/uapi/linux/mic_common.h b/include/uapi/linux/mic_common.h
index 302a2ced373c..e9686372029d 100644
--- a/include/uapi/linux/mic_common.h
+++ b/include/uapi/linux/mic_common.h
@@ -75,12 +75,7 @@ struct mic_device_ctrl {
  * struct mic_bootparam: Virtio device independent information in device page
  *
  * @magic: A magic value used by the card to ensure it can see the host
- * @c2h_shutdown_db: Card to Host shutdown doorbell set by host
- * @h2c_shutdown_db: Host to Card shutdown doorbell set by card
  * @h2c_config_db: Host to Card Virtio config doorbell set by card
- * @shutdown_status: Card shutdown status set by card
- * @shutdown_card: Set to 1 by the host when a card shutdown is initiated
- * @tot_nodes: Total number of nodes in the SCIF network
  * @node_id: Unique id of the node
  * @h2c_scif_db - Host to card SCIF doorbell set by card
  * @c2h_scif_db - Card to host SCIF doorbell set by host
@@ -89,12 +84,7 @@ struct mic_device_ctrl {
  */
 struct mic_bootparam {
         __le32 magic;
-        __s8 c2h_shutdown_db;
-        __s8 h2c_shutdown_db;
         __s8 h2c_config_db;
-        __u8 shutdown_status;
-        __u8 shutdown_card;
-        __u8 tot_nodes;
         __u8 node_id;
         __u8 h2c_scif_db;
         __u8 c2h_scif_db;
@@ -219,12 +209,12 @@ static inline unsigned mic_total_desc_size(struct mic_device_desc *desc)
  * enum mic_states - MIC states.
  */
 enum mic_states {
-        MIC_OFFLINE = 0,
+        MIC_READY = 0,
+        MIC_BOOTING,
         MIC_ONLINE,
         MIC_SHUTTING_DOWN,
+        MIC_RESETTING,
         MIC_RESET_FAILED,
-        MIC_SUSPENDING,
-        MIC_SUSPENDED,
         MIC_LAST
 };
 
diff --git a/include/uapi/linux/mmc/ioctl.h b/include/uapi/linux/mmc/ioctl.h
index 1f5e68923929..7e385b83b9d8 100644
--- a/include/uapi/linux/mmc/ioctl.h
+++ b/include/uapi/linux/mmc/ioctl.h
@@ -45,8 +45,24 @@ struct mmc_ioc_cmd {
 };
 #define mmc_ioc_cmd_set_data(ic, ptr) ic.data_ptr = (__u64)(unsigned long) ptr
 
-#define MMC_IOC_CMD _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd)
+/**
+ * struct mmc_ioc_multi_cmd - multi command information
+ * @num_of_cmds: Number of commands to send. Must be equal to or less than
+ *      MMC_IOC_MAX_CMDS.
+ * @cmds: Array of commands with length equal to 'num_of_cmds'
+ */
+struct mmc_ioc_multi_cmd {
+        __u64 num_of_cmds;
+        struct mmc_ioc_cmd cmds[0];
+};
 
+#define MMC_IOC_CMD _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd)
+/*
+ * MMC_IOC_MULTI_CMD: Used to send an array of MMC commands described by
+ *      the structure mmc_ioc_multi_cmd. The MMC driver will issue all
+ *      commands in array in sequence to card.
+ */
+#define MMC_IOC_MULTI_CMD _IOWR(MMC_BLOCK_MAJOR, 1, struct mmc_ioc_multi_cmd)
 /*
  * Since this ioctl is only meant to enhance (and not replace) normal access
  * to the mmc bus device, an upper data transfer limit of MMC_IOC_MAX_BYTES
@@ -54,4 +70,5 @@ struct mmc_ioc_cmd {
  * block device operations.
  */
 #define MMC_IOC_MAX_BYTES  (512L * 256)
+#define MMC_IOC_MAX_CMDS    255
 #endif /* LINUX_MMC_IOCTL_H */
diff --git a/include/uapi/linux/netfilter/nfnetlink_log.h b/include/uapi/linux/netfilter/nfnetlink_log.h
index 90c2c9575bac..fb21f0c717a1 100644
--- a/include/uapi/linux/netfilter/nfnetlink_log.h
+++ b/include/uapi/linux/netfilter/nfnetlink_log.h
@@ -51,6 +51,8 @@ enum nfulnl_attr_type {
         NFULA_HWTYPE,                   /* hardware type */
         NFULA_HWHEADER,                 /* hardware header */
         NFULA_HWLEN,                    /* hardware header length */
+        NFULA_CT,                       /* nf_conntrack_netlink.h */
+        NFULA_CT_INFO,                  /* enum ip_conntrack_info */
 
         __NFULA_MAX
 };
@@ -93,5 +95,6 @@ enum nfulnl_attr_config {
 
 #define NFULNL_CFG_F_SEQ        0x0001
 #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
+#define NFULNL_CFG_F_CONNTRACK  0x0004
 
 #endif /* _NFNETLINK_LOG_H */
diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index 6f3fe16cd22a..f095155d8749 100644
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -54,6 +54,7 @@ struct nlmsghdr {
 #define NLM_F_ACK               4       /* Reply with ack, with zero or error code */
 #define NLM_F_ECHO              8       /* Echo this request            */
 #define NLM_F_DUMP_INTR         16      /* Dump was inconsistent due to sequence change */
+#define NLM_F_DUMP_FILTERED     32      /* Dump was filtered as requested */
 
 /* Modifiers to GET request */
 #define NLM_F_ROOT      0x100   /* specify tree root    */
diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h
index dd3f75389076..399f39ff8048 100644
--- a/include/uapi/linux/nfc.h
+++ b/include/uapi/linux/nfc.h
@@ -86,6 +86,7 @@
  *      for this event is the application ID (AID).
  * @NFC_CMD_GET_SE: Dump all discovered secure elements from an NFC controller.
  * @NFC_CMD_SE_IO: Send/Receive APDUs to/from the selected secure element.
+ * @NFC_CMD_ACTIVATE_TARGET: Request NFC controller to reactivate target.
  * @NFC_CMD_VENDOR: Vendor specific command, to be implemented directly
  *      from the driver in order to support hardware specific operations.
  */
@@ -156,6 +157,7 @@ enum nfc_commands {
  * @NFC_ATTR_APDU: Secure element APDU
  * @NFC_ATTR_TARGET_ISO15693_DSFID: ISO 15693 Data Storage Format Identifier
  * @NFC_ATTR_TARGET_ISO15693_UID: ISO 15693 Unique Identifier
+ * @NFC_ATTR_SE_PARAMS: Parameters data from an evt_transaction
  * @NFC_ATTR_VENDOR_ID: NFC manufacturer unique ID, typically an OUI
  * @NFC_ATTR_VENDOR_SUBCMD: Vendor specific sub command
  * @NFC_ATTR_VENDOR_DATA: Vendor specific data, to be optionally passed
diff --git a/include/uapi/linux/nfs.h b/include/uapi/linux/nfs.h
index 5199a36dd574..654bae3f1a38 100644
--- a/include/uapi/linux/nfs.h
+++ b/include/uapi/linux/nfs.h
@@ -7,6 +7,8 @@
 #ifndef _UAPI_LINUX_NFS_H
 #define _UAPI_LINUX_NFS_H
 
+#include <linux/types.h>
+
 #define NFS_PROGRAM     100003
 #define NFS_PORT        2049
 #define NFS_MAXDATA     8192
@@ -31,6 +33,17 @@
 
 #define NFS_PIPE_DIRNAME "nfs"
 
+/* NFS ioctls */
+/* Let's follow btrfs lead on CLONE to avoid messing userspace */
+#define NFS_IOC_CLONE           _IOW(0x94, 9, int)
+#define NFS_IOC_CLONE_RANGE     _IOW(0x94, 13, int)
+
+struct nfs_ioctl_clone_range_args {
+        __s64 src_fd;
+        __u64 src_off, count;
+        __u64 dst_off;
+};
+
 /*
  * NFS stats. The good thing with these values is that NFSv3 errors are
  * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index c0ab6b0a3919..1f0b4cf5dd03 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -10,6 +10,7 @@
  * Copyright 2008, 2009 Luis R. Rodriguez <lrodriguez@atheros.com>
  * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
  * Copyright 2008 Colin McCabe <colin@cozybit.com>
+ * Copyright 2015       Intel Deutschland GmbH
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -328,7 +329,15 @@
  *      partial scan results may be available
  *
  * @NL80211_CMD_START_SCHED_SCAN: start a scheduled scan at certain
- *      intervals, as specified by %NL80211_ATTR_SCHED_SCAN_INTERVAL.
+ *      intervals and certain number of cycles, as specified by
+ *      %NL80211_ATTR_SCHED_SCAN_PLANS. If %NL80211_ATTR_SCHED_SCAN_PLANS is
+ *      not specified and only %NL80211_ATTR_SCHED_SCAN_INTERVAL is specified,
+ *      scheduled scan will run in an infinite loop with the specified interval.
+ *      These attributes are mutually exculsive,
+ *      i.e. NL80211_ATTR_SCHED_SCAN_INTERVAL must not be passed if
+ *      NL80211_ATTR_SCHED_SCAN_PLANS is defined.
+ *      If for some reason scheduled scan is aborted by the driver, all scan
+ *      plans are canceled (including scan plans that did not start yet).
  *      Like with normal scans, if SSIDs (%NL80211_ATTR_SCAN_SSIDS)
  *      are passed, they are used in the probe requests.  For
  *      broadcast, a broadcast SSID must be passed (ie. an empty
@@ -1761,6 +1770,19 @@ enum nl80211_commands {
  * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
  *      is operating in an indoor environment.
  *
+ * @NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS: maximum number of scan plans for
+ *      scheduled scan supported by the device (u32), a wiphy attribute.
+ * @NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL: maximum interval (in seconds) for
+ *      a scan plan (u32), a wiphy attribute.
+ * @NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS: maximum number of iterations in
+ *      a scan plan (u32), a wiphy attribute.
+ * @NL80211_ATTR_SCHED_SCAN_PLANS: a list of scan plans for scheduled scan.
+ *      Each scan plan defines the number of scan iterations and the interval
+ *      between scans. The last scan plan will always run infinitely,
+ *      thus it must not specify the number of iterations, only the interval
+ *      between scans. The scan plans are executed sequentially.
+ *      Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2130,6 +2152,11 @@ enum nl80211_attrs {
 
         NL80211_ATTR_REG_INDOOR,
 
+        NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS,
+        NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL,
+        NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
+        NL80211_ATTR_SCHED_SCAN_PLANS,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -3364,6 +3391,9 @@ enum nl80211_bss_scan_width {
  *      (not present if no beacon frame has been received yet)
  * @NL80211_BSS_PRESP_DATA: the data in @NL80211_BSS_INFORMATION_ELEMENTS and
  *      @NL80211_BSS_TSF is known to be from a probe response (flag attribute)
+ * @NL80211_BSS_LAST_SEEN_BOOTTIME: CLOCK_BOOTTIME timestamp when this entry
+ *      was last updated by a received frame. The value is expected to be
+ *      accurate to about 10ms. (u64, nanoseconds)
  * @__NL80211_BSS_AFTER_LAST: internal
  * @NL80211_BSS_MAX: highest BSS attribute
  */
@@ -3383,6 +3413,7 @@ enum nl80211_bss {
         NL80211_BSS_CHAN_WIDTH,
         NL80211_BSS_BEACON_TSF,
         NL80211_BSS_PRESP_DATA,
+        NL80211_BSS_LAST_SEEN_BOOTTIME,
 
         /* keep last */
         __NL80211_BSS_AFTER_LAST,
@@ -4589,4 +4620,28 @@ enum nl80211_tdls_peer_capability {
         NL80211_TDLS_PEER_WMM = 1<<2,
 };
 
+/**
+ * enum nl80211_sched_scan_plan - scanning plan for scheduled scan
+ * @__NL80211_SCHED_SCAN_PLAN_INVALID: attribute number 0 is reserved
+ * @NL80211_SCHED_SCAN_PLAN_INTERVAL: interval between scan iterations. In
+ *      seconds (u32).
+ * @NL80211_SCHED_SCAN_PLAN_ITERATIONS: number of scan iterations in this
+ *      scan plan (u32). The last scan plan must not specify this attribute
+ *      because it will run infinitely. A value of zero is invalid as it will
+ *      make the scan plan meaningless.
+ * @NL80211_SCHED_SCAN_PLAN_MAX: highest scheduled scan plan attribute number
+ *      currently defined
+ * @__NL80211_SCHED_SCAN_PLAN_AFTER_LAST: internal use
+ */
+enum nl80211_sched_scan_plan {
+        __NL80211_SCHED_SCAN_PLAN_INVALID,
+        NL80211_SCHED_SCAN_PLAN_INTERVAL,
+        NL80211_SCHED_SCAN_PLAN_ITERATIONS,
+
+        /* keep last */
+        __NL80211_SCHED_SCAN_PLAN_AFTER_LAST,
+        NL80211_SCHED_SCAN_PLAN_MAX =
+                __NL80211_SCHED_SCAN_PLAN_AFTER_LAST - 1
+};
+
 #endif /* __LINUX_NL80211_H */
diff --git a/include/uapi/linux/nvme.h b/include/uapi/linux/nvme.h
deleted file mode 100644
index 8864194a4151..000000000000
--- a/include/uapi/linux/nvme.h
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * Definitions for the NVM Express interface
- * Copyright (c) 2011-2014, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- */
-
-#ifndef _UAPI_LINUX_NVME_H
-#define _UAPI_LINUX_NVME_H
-
-#include <linux/types.h>
-
-struct nvme_id_power_state {
-        __le16                  max_power;      /* centiwatts */
-        __u8                    rsvd2;
-        __u8                    flags;
-        __le32                  entry_lat;      /* microseconds */
-        __le32                  exit_lat;       /* microseconds */
-        __u8                    read_tput;
-        __u8                    read_lat;
-        __u8                    write_tput;
-        __u8                    write_lat;
-        __le16                  idle_power;
-        __u8                    idle_scale;
-        __u8                    rsvd19;
-        __le16                  active_power;
-        __u8                    active_work_scale;
-        __u8                    rsvd23[9];
-};
-
-enum {
-        NVME_PS_FLAGS_MAX_POWER_SCALE   = 1 << 0,
-        NVME_PS_FLAGS_NON_OP_STATE      = 1 << 1,
-};
-
-struct nvme_id_ctrl {
-        __le16                  vid;
-        __le16                  ssvid;
-        char                    sn[20];
-        char                    mn[40];
-        char                    fr[8];
-        __u8                    rab;
-        __u8                    ieee[3];
-        __u8                    mic;
-        __u8                    mdts;
-        __u16                   cntlid;
-        __u32                   ver;
-        __u8                    rsvd84[172];
-        __le16                  oacs;
-        __u8                    acl;
-        __u8                    aerl;
-        __u8                    frmw;
-        __u8                    lpa;
-        __u8                    elpe;
-        __u8                    npss;
-        __u8                    avscc;
-        __u8                    apsta;
-        __le16                  wctemp;
-        __le16                  cctemp;
-        __u8                    rsvd270[242];
-        __u8                    sqes;
-        __u8                    cqes;
-        __u8                    rsvd514[2];
-        __le32                  nn;
-        __le16                  oncs;
-        __le16                  fuses;
-        __u8                    fna;
-        __u8                    vwc;
-        __le16                  awun;
-        __le16                  awupf;
-        __u8                    nvscc;
-        __u8                    rsvd531;
-        __le16                  acwu;
-        __u8                    rsvd534[2];
-        __le32                  sgls;
-        __u8                    rsvd540[1508];
-        struct nvme_id_power_state      psd[32];
-        __u8                    vs[1024];
-};
-
-enum {
-        NVME_CTRL_ONCS_COMPARE                  = 1 << 0,
-        NVME_CTRL_ONCS_WRITE_UNCORRECTABLE      = 1 << 1,
-        NVME_CTRL_ONCS_DSM                      = 1 << 2,
-        NVME_CTRL_VWC_PRESENT                   = 1 << 0,
-};
-
-struct nvme_lbaf {
-        __le16                  ms;
-        __u8                    ds;
-        __u8                    rp;
-};
-
-struct nvme_id_ns {
-        __le64                  nsze;
-        __le64                  ncap;
-        __le64                  nuse;
-        __u8                    nsfeat;
-        __u8                    nlbaf;
-        __u8                    flbas;
-        __u8                    mc;
-        __u8                    dpc;
-        __u8                    dps;
-        __u8                    nmic;
-        __u8                    rescap;
-        __u8                    fpi;
-        __u8                    rsvd33;
-        __le16                  nawun;
-        __le16                  nawupf;
-        __le16                  nacwu;
-        __le16                  nabsn;
-        __le16                  nabo;
-        __le16                  nabspf;
-        __u16                   rsvd46;
-        __le64                  nvmcap[2];
-        __u8                    rsvd64[40];
-        __u8                    nguid[16];
-        __u8                    eui64[8];
-        struct nvme_lbaf        lbaf[16];
-        __u8                    rsvd192[192];
-        __u8                    vs[3712];
-};
-
-enum {
-        NVME_NS_FEAT_THIN       = 1 << 0,
-        NVME_NS_FLBAS_LBA_MASK  = 0xf,
-        NVME_NS_FLBAS_META_EXT  = 0x10,
-        NVME_LBAF_RP_BEST       = 0,
-        NVME_LBAF_RP_BETTER     = 1,
-        NVME_LBAF_RP_GOOD       = 2,
-        NVME_LBAF_RP_DEGRADED   = 3,
-        NVME_NS_DPC_PI_LAST     = 1 << 4,
-        NVME_NS_DPC_PI_FIRST    = 1 << 3,
-        NVME_NS_DPC_PI_TYPE3    = 1 << 2,
-        NVME_NS_DPC_PI_TYPE2    = 1 << 1,
-        NVME_NS_DPC_PI_TYPE1    = 1 << 0,
-        NVME_NS_DPS_PI_FIRST    = 1 << 3,
-        NVME_NS_DPS_PI_MASK     = 0x7,
-        NVME_NS_DPS_PI_TYPE1    = 1,
-        NVME_NS_DPS_PI_TYPE2    = 2,
-        NVME_NS_DPS_PI_TYPE3    = 3,
-};
-
-struct nvme_smart_log {
-        __u8                    critical_warning;
-        __u8                    temperature[2];
-        __u8                    avail_spare;
-        __u8                    spare_thresh;
-        __u8                    percent_used;
-        __u8                    rsvd6[26];
-        __u8                    data_units_read[16];
-        __u8                    data_units_written[16];
-        __u8                    host_reads[16];
-        __u8                    host_writes[16];
-        __u8                    ctrl_busy_time[16];
-        __u8                    power_cycles[16];
-        __u8                    power_on_hours[16];
-        __u8                    unsafe_shutdowns[16];
-        __u8                    media_errors[16];
-        __u8                    num_err_log_entries[16];
-        __le32                  warning_temp_time;
-        __le32                  critical_comp_time;
-        __le16                  temp_sensor[8];
-        __u8                    rsvd216[296];
-};
-
-enum {
-        NVME_SMART_CRIT_SPARE           = 1 << 0,
-        NVME_SMART_CRIT_TEMPERATURE     = 1 << 1,
-        NVME_SMART_CRIT_RELIABILITY     = 1 << 2,
-        NVME_SMART_CRIT_MEDIA           = 1 << 3,
-        NVME_SMART_CRIT_VOLATILE_MEMORY = 1 << 4,
-};
-
-enum {
-        NVME_AER_NOTICE_NS_CHANGED      = 0x0002,
-};
-
-struct nvme_lba_range_type {
-        __u8                    type;
-        __u8                    attributes;
-        __u8                    rsvd2[14];
-        __u64                   slba;
-        __u64                   nlb;
-        __u8                    guid[16];
-        __u8                    rsvd48[16];
-};
-
-enum {
-        NVME_LBART_TYPE_FS      = 0x01,
-        NVME_LBART_TYPE_RAID    = 0x02,
-        NVME_LBART_TYPE_CACHE   = 0x03,
-        NVME_LBART_TYPE_SWAP    = 0x04,
-
-        NVME_LBART_ATTRIB_TEMP  = 1 << 0,
-        NVME_LBART_ATTRIB_HIDE  = 1 << 1,
-};
-
-struct nvme_reservation_status {
-        __le32  gen;
-        __u8    rtype;
-        __u8    regctl[2];
-        __u8    resv5[2];
-        __u8    ptpls;
-        __u8    resv10[13];
-        struct {
-                __le16  cntlid;
-                __u8    rcsts;
-                __u8    resv3[5];
-                __le64  hostid;
-                __le64  rkey;
-        } regctl_ds[];
-};
-
-/* I/O commands */
-
-enum nvme_opcode {
-        nvme_cmd_flush          = 0x00,
-        nvme_cmd_write          = 0x01,
-        nvme_cmd_read           = 0x02,
-        nvme_cmd_write_uncor    = 0x04,
-        nvme_cmd_compare        = 0x05,
-        nvme_cmd_write_zeroes   = 0x08,
-        nvme_cmd_dsm            = 0x09,
-        nvme_cmd_resv_register  = 0x0d,
-        nvme_cmd_resv_report    = 0x0e,
-        nvme_cmd_resv_acquire   = 0x11,
-        nvme_cmd_resv_release   = 0x15,
-};
-
-struct nvme_common_command {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __le32                  cdw2[2];
-        __le64                  metadata;
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  cdw10[6];
-};
-
-struct nvme_rw_command {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2;
-        __le64                  metadata;
-        __le64                  prp1;
-        __le64                  prp2;
-        __le64                  slba;
-        __le16                  length;
-        __le16                  control;
-        __le32                  dsmgmt;
-        __le32                  reftag;
-        __le16                  apptag;
-        __le16                  appmask;
-};
-
-enum {
-        NVME_RW_LR                      = 1 << 15,
-        NVME_RW_FUA                     = 1 << 14,
-        NVME_RW_DSM_FREQ_UNSPEC         = 0,
-        NVME_RW_DSM_FREQ_TYPICAL        = 1,
-        NVME_RW_DSM_FREQ_RARE           = 2,
-        NVME_RW_DSM_FREQ_READS          = 3,
-        NVME_RW_DSM_FREQ_WRITES         = 4,
-        NVME_RW_DSM_FREQ_RW             = 5,
-        NVME_RW_DSM_FREQ_ONCE           = 6,
-        NVME_RW_DSM_FREQ_PREFETCH       = 7,
-        NVME_RW_DSM_FREQ_TEMP           = 8,
-        NVME_RW_DSM_LATENCY_NONE        = 0 << 4,
-        NVME_RW_DSM_LATENCY_IDLE        = 1 << 4,
-        NVME_RW_DSM_LATENCY_NORM        = 2 << 4,
-        NVME_RW_DSM_LATENCY_LOW         = 3 << 4,
-        NVME_RW_DSM_SEQ_REQ             = 1 << 6,
-        NVME_RW_DSM_COMPRESSED          = 1 << 7,
-        NVME_RW_PRINFO_PRCHK_REF        = 1 << 10,
-        NVME_RW_PRINFO_PRCHK_APP        = 1 << 11,
-        NVME_RW_PRINFO_PRCHK_GUARD      = 1 << 12,
-        NVME_RW_PRINFO_PRACT            = 1 << 13,
-};
-
-struct nvme_dsm_cmd {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2[2];
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  nr;
-        __le32                  attributes;
-        __u32                   rsvd12[4];
-};
-
-enum {
-        NVME_DSMGMT_IDR         = 1 << 0,
-        NVME_DSMGMT_IDW         = 1 << 1,
-        NVME_DSMGMT_AD          = 1 << 2,
-};
-
-struct nvme_dsm_range {
-        __le32                  cattr;
-        __le32                  nlb;
-        __le64                  slba;
-};
-
-/* Admin commands */
-
-enum nvme_admin_opcode {
-        nvme_admin_delete_sq            = 0x00,
-        nvme_admin_create_sq            = 0x01,
-        nvme_admin_get_log_page         = 0x02,
-        nvme_admin_delete_cq            = 0x04,
-        nvme_admin_create_cq            = 0x05,
-        nvme_admin_identify             = 0x06,
-        nvme_admin_abort_cmd            = 0x08,
-        nvme_admin_set_features         = 0x09,
-        nvme_admin_get_features         = 0x0a,
-        nvme_admin_async_event          = 0x0c,
-        nvme_admin_activate_fw          = 0x10,
-        nvme_admin_download_fw          = 0x11,
-        nvme_admin_format_nvm           = 0x80,
-        nvme_admin_security_send        = 0x81,
-        nvme_admin_security_recv        = 0x82,
-};
-
-enum {
-        NVME_QUEUE_PHYS_CONTIG  = (1 << 0),
-        NVME_CQ_IRQ_ENABLED     = (1 << 1),
-        NVME_SQ_PRIO_URGENT     = (0 << 1),
-        NVME_SQ_PRIO_HIGH       = (1 << 1),
-        NVME_SQ_PRIO_MEDIUM     = (2 << 1),
-        NVME_SQ_PRIO_LOW        = (3 << 1),
-        NVME_FEAT_ARBITRATION   = 0x01,
-        NVME_FEAT_POWER_MGMT    = 0x02,
-        NVME_FEAT_LBA_RANGE     = 0x03,
-        NVME_FEAT_TEMP_THRESH   = 0x04,
-        NVME_FEAT_ERR_RECOVERY  = 0x05,
-        NVME_FEAT_VOLATILE_WC   = 0x06,
-        NVME_FEAT_NUM_QUEUES    = 0x07,
-        NVME_FEAT_IRQ_COALESCE  = 0x08,
-        NVME_FEAT_IRQ_CONFIG    = 0x09,
-        NVME_FEAT_WRITE_ATOMIC  = 0x0a,
-        NVME_FEAT_ASYNC_EVENT   = 0x0b,
-        NVME_FEAT_AUTO_PST      = 0x0c,
-        NVME_FEAT_SW_PROGRESS   = 0x80,
-        NVME_FEAT_HOST_ID       = 0x81,
-        NVME_FEAT_RESV_MASK     = 0x82,
-        NVME_FEAT_RESV_PERSIST  = 0x83,
-        NVME_LOG_ERROR          = 0x01,
-        NVME_LOG_SMART          = 0x02,
-        NVME_LOG_FW_SLOT        = 0x03,
-        NVME_LOG_RESERVATION    = 0x80,
-        NVME_FWACT_REPL         = (0 << 3),
-        NVME_FWACT_REPL_ACTV    = (1 << 3),
-        NVME_FWACT_ACTV         = (2 << 3),
-};
-
-struct nvme_identify {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2[2];
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  cns;
-        __u32                   rsvd11[5];
-};
-
-struct nvme_features {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2[2];
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  fid;
-        __le32                  dword11;
-        __u32                   rsvd12[4];
-};
-
-struct nvme_create_cq {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __u32                   rsvd1[5];
-        __le64                  prp1;
-        __u64                   rsvd8;
-        __le16                  cqid;
-        __le16                  qsize;
-        __le16                  cq_flags;
-        __le16                  irq_vector;
-        __u32                   rsvd12[4];
-};
-
-struct nvme_create_sq {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __u32                   rsvd1[5];
-        __le64                  prp1;
-        __u64                   rsvd8;
-        __le16                  sqid;
-        __le16                  qsize;
-        __le16                  sq_flags;
-        __le16                  cqid;
-        __u32                   rsvd12[4];
-};
-
-struct nvme_delete_queue {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __u32                   rsvd1[9];
-        __le16                  qid;
-        __u16                   rsvd10;
-        __u32                   rsvd11[5];
-};
-
-struct nvme_abort_cmd {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __u32                   rsvd1[9];
-        __le16                  sqid;
-        __u16                   cid;
-        __u32                   rsvd11[5];
-};
-
-struct nvme_download_firmware {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __u32                   rsvd1[5];
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  numd;
-        __le32                  offset;
-        __u32                   rsvd12[4];
-};
-
-struct nvme_format_cmd {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2[4];
-        __le32                  cdw10;
-        __u32                   rsvd11[5];
-};
-
-struct nvme_command {
-        union {
-                struct nvme_common_command common;
-                struct nvme_rw_command rw;
-                struct nvme_identify identify;
-                struct nvme_features features;
-                struct nvme_create_cq create_cq;
-                struct nvme_create_sq create_sq;
-                struct nvme_delete_queue delete_queue;
-                struct nvme_download_firmware dlfw;
-                struct nvme_format_cmd format;
-                struct nvme_dsm_cmd dsm;
-                struct nvme_abort_cmd abort;
-        };
-};
-
-enum {
-        NVME_SC_SUCCESS                 = 0x0,
-        NVME_SC_INVALID_OPCODE          = 0x1,
-        NVME_SC_INVALID_FIELD           = 0x2,
-        NVME_SC_CMDID_CONFLICT          = 0x3,
-        NVME_SC_DATA_XFER_ERROR         = 0x4,
-        NVME_SC_POWER_LOSS              = 0x5,
-        NVME_SC_INTERNAL                = 0x6,
-        NVME_SC_ABORT_REQ               = 0x7,
-        NVME_SC_ABORT_QUEUE             = 0x8,
-        NVME_SC_FUSED_FAIL              = 0x9,
-        NVME_SC_FUSED_MISSING           = 0xa,
-        NVME_SC_INVALID_NS              = 0xb,
-        NVME_SC_CMD_SEQ_ERROR           = 0xc,
-        NVME_SC_SGL_INVALID_LAST        = 0xd,
-        NVME_SC_SGL_INVALID_COUNT       = 0xe,
-        NVME_SC_SGL_INVALID_DATA        = 0xf,
-        NVME_SC_SGL_INVALID_METADATA    = 0x10,
-        NVME_SC_SGL_INVALID_TYPE        = 0x11,
-        NVME_SC_LBA_RANGE               = 0x80,
-        NVME_SC_CAP_EXCEEDED            = 0x81,
-        NVME_SC_NS_NOT_READY            = 0x82,
-        NVME_SC_RESERVATION_CONFLICT    = 0x83,
-        NVME_SC_CQ_INVALID              = 0x100,
-        NVME_SC_QID_INVALID             = 0x101,
-        NVME_SC_QUEUE_SIZE              = 0x102,
-        NVME_SC_ABORT_LIMIT             = 0x103,
-        NVME_SC_ABORT_MISSING           = 0x104,
-        NVME_SC_ASYNC_LIMIT             = 0x105,
-        NVME_SC_FIRMWARE_SLOT           = 0x106,
-        NVME_SC_FIRMWARE_IMAGE          = 0x107,
-        NVME_SC_INVALID_VECTOR          = 0x108,
-        NVME_SC_INVALID_LOG_PAGE        = 0x109,
-        NVME_SC_INVALID_FORMAT          = 0x10a,
-        NVME_SC_FIRMWARE_NEEDS_RESET    = 0x10b,
-        NVME_SC_INVALID_QUEUE           = 0x10c,
-        NVME_SC_FEATURE_NOT_SAVEABLE    = 0x10d,
-        NVME_SC_FEATURE_NOT_CHANGEABLE  = 0x10e,
-        NVME_SC_FEATURE_NOT_PER_NS      = 0x10f,
-        NVME_SC_FW_NEEDS_RESET_SUBSYS   = 0x110,
-        NVME_SC_BAD_ATTRIBUTES          = 0x180,
-        NVME_SC_INVALID_PI              = 0x181,
-        NVME_SC_READ_ONLY               = 0x182,
-        NVME_SC_WRITE_FAULT             = 0x280,
-        NVME_SC_READ_ERROR              = 0x281,
-        NVME_SC_GUARD_CHECK             = 0x282,
-        NVME_SC_APPTAG_CHECK            = 0x283,
-        NVME_SC_REFTAG_CHECK            = 0x284,
-        NVME_SC_COMPARE_FAILED          = 0x285,
-        NVME_SC_ACCESS_DENIED           = 0x286,
-        NVME_SC_DNR                     = 0x4000,
-};
-
-struct nvme_completion {
-        __le32  result;         /* Used by admin commands to return data */
-        __u32   rsvd;
-        __le16  sq_head;        /* how much of this queue may be reclaimed */
-        __le16  sq_id;          /* submission queue that generated this entry */
-        __u16   command_id;     /* of the command which completed */
-        __le16  status;         /* did the command fail, and if so, why? */
-};
-
-struct nvme_user_io {
-        __u8    opcode;
-        __u8    flags;
-        __u16   control;
-        __u16   nblocks;
-        __u16   rsvd;
-        __u64   metadata;
-        __u64   addr;
-        __u64   slba;
-        __u32   dsmgmt;
-        __u32   reftag;
-        __u16   apptag;
-        __u16   appmask;
-};
-
-struct nvme_passthru_cmd {
-        __u8    opcode;
-        __u8    flags;
-        __u16   rsvd1;
-        __u32   nsid;
-        __u32   cdw2;
-        __u32   cdw3;
-        __u64   metadata;
-        __u64   addr;
-        __u32   metadata_len;
-        __u32   data_len;
-        __u32   cdw10;
-        __u32   cdw11;
-        __u32   cdw12;
-        __u32   cdw13;
-        __u32   cdw14;
-        __u32   cdw15;
-        __u32   timeout_ms;
-        __u32   result;
-};
-
-#define NVME_VS(major, minor) (((major) << 16) | ((minor) << 8))
-
-#define nvme_admin_cmd nvme_passthru_cmd
-
-#define NVME_IOCTL_ID           _IO('N', 0x40)
-#define NVME_IOCTL_ADMIN_CMD    _IOWR('N', 0x41, struct nvme_admin_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/nvme_ioctl.h b/include/uapi/linux/nvme_ioctl.h
new file mode 100644
index 000000000000..c4b2a3f90829
--- /dev/null
+++ b/include/uapi/linux/nvme_ioctl.h
@@ -0,0 +1,65 @@
+/*
+ * Definitions for the NVM Express ioctl interface
+ * Copyright (c) 2011-2014, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ */
+
+#ifndef _UAPI_LINUX_NVME_IOCTL_H
+#define _UAPI_LINUX_NVME_IOCTL_H
+
+#include <linux/types.h>
+
+struct nvme_user_io {
+        __u8    opcode;
+        __u8    flags;
+        __u16   control;
+        __u16   nblocks;
+        __u16   rsvd;
+        __u64   metadata;
+        __u64   addr;
+        __u64   slba;
+        __u32   dsmgmt;
+        __u32   reftag;
+        __u16   apptag;
+        __u16   appmask;
+};
+
+struct nvme_passthru_cmd {
+        __u8    opcode;
+        __u8    flags;
+        __u16   rsvd1;
+        __u32   nsid;
+        __u32   cdw2;
+        __u32   cdw3;
+        __u64   metadata;
+        __u64   addr;
+        __u32   metadata_len;
+        __u32   data_len;
+        __u32   cdw10;
+        __u32   cdw11;
+        __u32   cdw12;
+        __u32   cdw13;
+        __u32   cdw14;
+        __u32   cdw15;
+        __u32   timeout_ms;
+        __u32   result;
+};
+
+#define nvme_admin_cmd nvme_passthru_cmd
+
+#define NVME_IOCTL_ID           _IO('N', 0x40)
+#define NVME_IOCTL_ADMIN_CMD    _IOWR('N', 0x41, struct nvme_admin_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_IOCTL_H */
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index 32e07d8cbaf4..28ccedd000f5 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -323,10 +323,10 @@ 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_STATE,  /* u32 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 */
+        OVS_KEY_ATTR_CT_LABELS, /* 16-octet connection tracking label */
 
 #ifdef __KERNEL__
         OVS_KEY_ATTR_TUNNEL_INFO,  /* struct ip_tunnel_info */
@@ -349,6 +349,8 @@ enum ovs_tunnel_key_attr {
         OVS_TUNNEL_KEY_ATTR_TP_SRC,             /* be16 src Transport Port. */
         OVS_TUNNEL_KEY_ATTR_TP_DST,             /* be16 dst Transport Port. */
         OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS,         /* Nested OVS_VXLAN_EXT_* */
+        OVS_TUNNEL_KEY_ATTR_IPV6_SRC,           /* struct in6_addr src IPv6 address. */
+        OVS_TUNNEL_KEY_ATTR_IPV6_DST,           /* struct in6_addr dst IPv6 address. */
         __OVS_TUNNEL_KEY_ATTR_MAX
 };
 
@@ -439,9 +441,9 @@ 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];
+#define OVS_CT_LABELS_LEN       16
+struct ovs_key_ct_labels {
+        __u8    ct_labels[OVS_CT_LABELS_LEN];
 };
 
 /* OVS_KEY_ATTR_CT_STATE flags */
@@ -449,9 +451,9 @@ struct ovs_key_ct_label {
 #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. */
+#define OVS_CS_F_REPLY_DIR         0x08 /* Flow is in the reply direction. */
+#define OVS_CS_F_INVALID           0x10 /* Could not track connection. */
+#define OVS_CS_F_TRACKED           0x20 /* Conntrack has occurred. */
 
 /**
  * enum ovs_flow_attr - attributes for %OVS_FLOW_* commands.
@@ -618,22 +620,25 @@ 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_COMMIT: If present, commits the connection to the conntrack
+ * table. This allows future packets for the same connection to be identified
+ * as 'established' or 'related'. The flow key for the current packet will
+ * retain the pre-commit connection state.
  * @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
+ * @OVS_CT_ATTR_LABEL: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_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_COMMIT,     /* No argument, commits connection. */
         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_LABELS,     /* labels to associate with this connection. */
         OVS_CT_ATTR_HELPER,     /* netlink helper to assist detection of
                                    related connections. */
         __OVS_CT_ATTR_MAX
@@ -641,14 +646,6 @@ enum ovs_ct_attr {
 
 #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.
  *
@@ -705,7 +702,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_CT,           /* Nested OVS_CT_ATTR_* . */
 
         __OVS_ACTION_ATTR_MAX,        /* Nothing past this will be accepted
                                        * from userspace. */
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index 413417f3707b..1becea86c73c 100644
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -216,7 +216,8 @@
 #define  PCI_CAP_ID_MSIX        0x11    /* MSI-X */
 #define  PCI_CAP_ID_SATA        0x12    /* SATA Data/Index Conf. */
 #define  PCI_CAP_ID_AF          0x13    /* PCI Advanced Features */
-#define  PCI_CAP_ID_MAX         PCI_CAP_ID_AF
+#define  PCI_CAP_ID_EA          0x14    /* PCI Enhanced Allocation */
+#define  PCI_CAP_ID_MAX         PCI_CAP_ID_EA
 #define PCI_CAP_LIST_NEXT       1       /* Next capability in the list */
 #define PCI_CAP_FLAGS           2       /* Capability defined flags (16 bits) */
 #define PCI_CAP_SIZEOF          4
@@ -353,6 +354,46 @@
 #define  PCI_AF_STATUS_TP       0x01
 #define PCI_CAP_AF_SIZEOF       6       /* size of AF registers */
 
+/* PCI Enhanced Allocation registers */
+
+#define PCI_EA_NUM_ENT          2       /* Number of Capability Entries */
+#define  PCI_EA_NUM_ENT_MASK    0x3f    /* Num Entries Mask */
+#define PCI_EA_FIRST_ENT        4       /* First EA Entry in List */
+#define PCI_EA_FIRST_ENT_BRIDGE 8       /* First EA Entry for Bridges */
+#define  PCI_EA_ES              0x00000007 /* Entry Size */
+#define  PCI_EA_BEI             0x000000f0 /* BAR Equivalent Indicator */
+/* 0-5 map to BARs 0-5 respectively */
+#define   PCI_EA_BEI_BAR0               0
+#define   PCI_EA_BEI_BAR5               5
+#define   PCI_EA_BEI_BRIDGE             6       /* Resource behind bridge */
+#define   PCI_EA_BEI_ENI                7       /* Equivalent Not Indicated */
+#define   PCI_EA_BEI_ROM                8       /* Expansion ROM */
+/* 9-14 map to VF BARs 0-5 respectively */
+#define   PCI_EA_BEI_VF_BAR0            9
+#define   PCI_EA_BEI_VF_BAR5            14
+#define   PCI_EA_BEI_RESERVED           15      /* Reserved - Treat like ENI */
+#define  PCI_EA_PP              0x0000ff00      /* Primary Properties */
+#define  PCI_EA_SP              0x00ff0000      /* Secondary Properties */
+#define   PCI_EA_P_MEM                  0x00    /* Non-Prefetch Memory */
+#define   PCI_EA_P_MEM_PREFETCH         0x01    /* Prefetchable Memory */
+#define   PCI_EA_P_IO                   0x02    /* I/O Space */
+#define   PCI_EA_P_VF_MEM_PREFETCH      0x03    /* VF Prefetchable Memory */
+#define   PCI_EA_P_VF_MEM               0x04    /* VF Non-Prefetch Memory */
+#define   PCI_EA_P_BRIDGE_MEM           0x05    /* Bridge Non-Prefetch Memory */
+#define   PCI_EA_P_BRIDGE_MEM_PREFETCH  0x06    /* Bridge Prefetchable Memory */
+#define   PCI_EA_P_BRIDGE_IO            0x07    /* Bridge I/O Space */
+/* 0x08-0xfc reserved */
+#define   PCI_EA_P_MEM_RESERVED         0xfd    /* Reserved Memory */
+#define   PCI_EA_P_IO_RESERVED          0xfe    /* Reserved I/O Space */
+#define   PCI_EA_P_UNAVAILABLE          0xff    /* Entry Unavailable */
+#define  PCI_EA_WRITABLE        0x40000000      /* Writable: 1 = RW, 0 = HwInit */
+#define  PCI_EA_ENABLE          0x80000000      /* Enable for this entry */
+#define PCI_EA_BASE             4               /* Base Address Offset */
+#define PCI_EA_MAX_OFFSET       8               /* MaxOffset (resource length) */
+/* bit 0 is reserved */
+#define  PCI_EA_IS_64           0x00000002      /* 64-bit field flag */
+#define  PCI_EA_FIELD_MASK      0xfffffffc      /* For Base & Max Offset */
+
 /* PCI-X registers (Type 0 (non-bridge) devices) */
 
 #define PCI_X_CMD               2       /* Modes & Features */
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 2881145cda86..d801bb0d9f6d 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -110,6 +110,7 @@ enum perf_sw_ids {
         PERF_COUNT_SW_ALIGNMENT_FAULTS          = 7,
         PERF_COUNT_SW_EMULATION_FAULTS          = 8,
         PERF_COUNT_SW_DUMMY                     = 9,
+        PERF_COUNT_SW_BPF_OUTPUT                = 10,
 
         PERF_COUNT_SW_MAX,                      /* non-ABI */
 };
@@ -168,6 +169,7 @@ enum perf_branch_sample_type_shift {
 
         PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT     = 11, /* call/ret stack */
         PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT       = 12, /* indirect jumps */
+        PERF_SAMPLE_BRANCH_CALL_SHIFT           = 13, /* direct call */
 
         PERF_SAMPLE_BRANCH_MAX_SHIFT            /* non-ABI */
 };
@@ -188,6 +190,7 @@ enum perf_branch_sample_type {
 
         PERF_SAMPLE_BRANCH_CALL_STACK   = 1U << PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT,
         PERF_SAMPLE_BRANCH_IND_JUMP     = 1U << PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT,
+        PERF_SAMPLE_BRANCH_CALL         = 1U << PERF_SAMPLE_BRANCH_CALL_SHIFT,
 
         PERF_SAMPLE_BRANCH_MAX          = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
 };
@@ -476,7 +479,7 @@ struct perf_event_mmap_page {
          *   u64 delta;
          *
          *   quot = (cyc >> time_shift);
-         *   rem = cyc & ((1 << time_shift) - 1);
+         *   rem = cyc & (((u64)1 << time_shift) - 1);
          *   delta = time_offset + quot * time_mult +
          *              ((rem * time_mult) >> time_shift);
          *
@@ -507,7 +510,7 @@ struct perf_event_mmap_page {
          * And vice versa:
          *
          *   quot = cyc >> time_shift;
-         *   rem  = cyc & ((1 << time_shift) - 1);
+         *   rem  = cyc & (((u64)1 << time_shift) - 1);
          *   timestamp = time_zero + quot * time_mult +
          *               ((rem * time_mult) >> time_shift);
          */
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 4f0d1bc3647d..439873775d49 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -87,6 +87,7 @@ enum {
 #define TC_ACT_STOLEN           4
 #define TC_ACT_QUEUED           5
 #define TC_ACT_REPEAT           6
+#define TC_ACT_REDIRECT         7
 #define TC_ACT_JUMP             0x10000000
 
 /* Action type identifiers*/
@@ -373,6 +374,8 @@ enum {
 
 /* BPF classifier */
 
+#define TCA_BPF_FLAG_ACT_DIRECT         (1 << 0)
+
 enum {
         TCA_BPF_UNSPEC,
         TCA_BPF_ACT,
@@ -382,6 +385,7 @@ enum {
         TCA_BPF_OPS,
         TCA_BPF_FD,
         TCA_BPF_NAME,
+        TCA_BPF_FLAGS,
         __TCA_BPF_MAX,
 };
 
diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h
new file mode 100644
index 000000000000..57d7c0f916b6
--- /dev/null
+++ b/include/uapi/linux/pr.h
@@ -0,0 +1,48 @@
+#ifndef _UAPI_PR_H
+#define _UAPI_PR_H
+
+enum pr_type {
+        PR_WRITE_EXCLUSIVE              = 1,
+        PR_EXCLUSIVE_ACCESS             = 2,
+        PR_WRITE_EXCLUSIVE_REG_ONLY     = 3,
+        PR_EXCLUSIVE_ACCESS_REG_ONLY    = 4,
+        PR_WRITE_EXCLUSIVE_ALL_REGS     = 5,
+        PR_EXCLUSIVE_ACCESS_ALL_REGS    = 6,
+};
+
+struct pr_reservation {
+        __u64   key;
+        __u32   type;
+        __u32   flags;
+};
+
+struct pr_registration {
+        __u64   old_key;
+        __u64   new_key;
+        __u32   flags;
+        __u32   __pad;
+};
+
+struct pr_preempt {
+        __u64   old_key;
+        __u64   new_key;
+        __u32   type;
+        __u32   flags;
+};
+
+struct pr_clear {
+        __u64   key;
+        __u32   flags;
+        __u32   __pad;
+};
+
+#define PR_FL_IGNORE_KEY        (1 << 0)        /* ignore existing key */
+
+#define IOC_PR_REGISTER         _IOW('p', 200, struct pr_registration)
+#define IOC_PR_RESERVE          _IOW('p', 201, struct pr_reservation)
+#define IOC_PR_RELEASE          _IOW('p', 202, struct pr_reservation)
+#define IOC_PR_PREEMPT          _IOW('p', 203, struct pr_preempt)
+#define IOC_PR_PREEMPT_ABORT    _IOW('p', 204, struct pr_preempt)
+#define IOC_PR_CLEAR            _IOW('p', 205, struct pr_clear)
+
+#endif /* _UAPI_PR_H */
diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
index 310d83e0a91b..3d7a0fc021a7 100644
--- a/include/uapi/linux/psci.h
+++ b/include/uapi/linux/psci.h
@@ -46,6 +46,11 @@
 #define PSCI_0_2_FN64_MIGRATE                   PSCI_0_2_FN64(5)
 #define PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU       PSCI_0_2_FN64(7)
 
+#define PSCI_1_0_FN_PSCI_FEATURES               PSCI_0_2_FN(10)
+#define PSCI_1_0_FN_SYSTEM_SUSPEND              PSCI_0_2_FN(14)
+
+#define PSCI_1_0_FN64_SYSTEM_SUSPEND            PSCI_0_2_FN64(14)
+
 /* PSCI v0.2 power state encoding for CPU_SUSPEND function */
 #define PSCI_0_2_POWER_STATE_ID_MASK            0xffff
 #define PSCI_0_2_POWER_STATE_ID_SHIFT           0
@@ -56,6 +61,13 @@
 #define PSCI_0_2_POWER_STATE_AFFL_MASK          \
                                 (0x3 << PSCI_0_2_POWER_STATE_AFFL_SHIFT)
 
+/* PSCI extended power state encoding for CPU_SUSPEND function */
+#define PSCI_1_0_EXT_POWER_STATE_ID_MASK        0xfffffff
+#define PSCI_1_0_EXT_POWER_STATE_ID_SHIFT       0
+#define PSCI_1_0_EXT_POWER_STATE_TYPE_SHIFT     30
+#define PSCI_1_0_EXT_POWER_STATE_TYPE_MASK      \
+                                (0x1 << PSCI_1_0_EXT_POWER_STATE_TYPE_SHIFT)
+
 /* PSCI v0.2 affinity level state returned by AFFINITY_INFO */
 #define PSCI_0_2_AFFINITY_LEVEL_ON              0
 #define PSCI_0_2_AFFINITY_LEVEL_OFF             1
@@ -76,6 +88,11 @@
 #define PSCI_VERSION_MINOR(ver)                 \
                 ((ver) & PSCI_VERSION_MINOR_MASK)
 
+/* PSCI features decoding (>=1.0) */
+#define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT  1
+#define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK   \
+                        (0x1 << PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT)
+
 /* PSCI return values (inclusive of all PSCI versions) */
 #define PSCI_RET_SUCCESS                        0
 #define PSCI_RET_NOT_SUPPORTED                  -1
@@ -86,5 +103,6 @@
 #define PSCI_RET_INTERNAL_FAILURE               -6
 #define PSCI_RET_NOT_PRESENT                    -7
 #define PSCI_RET_DISABLED                       -8
+#define PSCI_RET_INVALID_ADDRESS                -9
 
 #endif /* _UAPI_LINUX_PSCI_H */
diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h
index a7a697986614..fb8106509000 100644
--- a/include/uapi/linux/ptrace.h
+++ b/include/uapi/linux/ptrace.h
@@ -64,6 +64,8 @@ struct ptrace_peeksiginfo_args {
 #define PTRACE_GETSIGMASK       0x420a
 #define PTRACE_SETSIGMASK       0x420b
 
+#define PTRACE_SECCOMP_GET_FILTER       0x420c
+
 /* Read signals from a shared (process wide) queue */
 #define PTRACE_PEEKSIGINFO_SHARED       (1 << 0)
 
diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h
index 2ae6131e69a5..c3e654c6d518 100644
--- a/include/uapi/linux/raid/md_p.h
+++ b/include/uapi/linux/raid/md_p.h
@@ -89,6 +89,12 @@
                                    * read requests will only be sent here in
                                    * dire need
                                    */
+#define MD_DISK_JOURNAL         18 /* disk is used as the write journal in RAID-5/6 */
+
+#define MD_DISK_ROLE_SPARE      0xffff
+#define MD_DISK_ROLE_FAULTY     0xfffe
+#define MD_DISK_ROLE_JOURNAL    0xfffd
+#define MD_DISK_ROLE_MAX        0xff00 /* max value of regular disk role */
 
 typedef struct mdp_device_descriptor_s {
         __u32 number;           /* 0 Device number in the entire set          */
@@ -252,7 +258,10 @@ struct mdp_superblock_1 {
         __le64  data_offset;    /* sector start of data, often 0 */
         __le64  data_size;      /* sectors in this device that can be used for data */
         __le64  super_offset;   /* sector start of this superblock */
-        __le64  recovery_offset;/* sectors before this offset (from data_offset) have been recovered */
+        union {
+                __le64  recovery_offset;/* sectors before this offset (from data_offset) have been recovered */
+                __le64  journal_tail;/* journal tail of journal device (from data_offset) */
+        };
         __le32  dev_number;     /* permanent identifier of this  device - not role in raid */
         __le32  cnt_corrected_read; /* number of read errors that were corrected by re-writing */
         __u8    device_uuid[16]; /* user-space setable, ignored by kernel */
@@ -302,6 +311,8 @@ struct mdp_superblock_1 {
 #define MD_FEATURE_RECOVERY_BITMAP      128 /* recovery that is happening
                                              * is guided by bitmap.
                                              */
+#define MD_FEATURE_CLUSTERED            256 /* clustered MD */
+#define MD_FEATURE_JOURNAL              512 /* support write cache */
 #define MD_FEATURE_ALL                  (MD_FEATURE_BITMAP_OFFSET       \
                                         |MD_FEATURE_RECOVERY_OFFSET     \
                                         |MD_FEATURE_RESHAPE_ACTIVE      \
@@ -310,6 +321,66 @@ struct mdp_superblock_1 {
                                         |MD_FEATURE_RESHAPE_BACKWARDS   \
                                         |MD_FEATURE_NEW_OFFSET          \
                                         |MD_FEATURE_RECOVERY_BITMAP     \
+                                        |MD_FEATURE_CLUSTERED           \
+                                        |MD_FEATURE_JOURNAL             \
                                         )
 
+struct r5l_payload_header {
+        __le16 type;
+        __le16 flags;
+} __attribute__ ((__packed__));
+
+enum r5l_payload_type {
+        R5LOG_PAYLOAD_DATA = 0,
+        R5LOG_PAYLOAD_PARITY = 1,
+        R5LOG_PAYLOAD_FLUSH = 2,
+};
+
+struct r5l_payload_data_parity {
+        struct r5l_payload_header header;
+        __le32 size;            /* sector. data/parity size. each 4k
+                                 * has a checksum */
+        __le64 location;        /* sector. For data, it's raid sector. For
+                                 * parity, it's stripe sector */
+        __le32 checksum[];
+} __attribute__ ((__packed__));
+
+enum r5l_payload_data_parity_flag {
+        R5LOG_PAYLOAD_FLAG_DISCARD = 1, /* payload is discard */
+        /*
+         * RESHAPED/RESHAPING is only set when there is reshape activity. Note,
+         * both data/parity of a stripe should have the same flag set
+         *
+         * RESHAPED: reshape is running, and this stripe finished reshape
+         * RESHAPING: reshape is running, and this stripe isn't reshaped
+         */
+        R5LOG_PAYLOAD_FLAG_RESHAPED = 2,
+        R5LOG_PAYLOAD_FLAG_RESHAPING = 3,
+};
+
+struct r5l_payload_flush {
+        struct r5l_payload_header header;
+        __le32 size; /* flush_stripes size, bytes */
+        __le64 flush_stripes[];
+} __attribute__ ((__packed__));
+
+enum r5l_payload_flush_flag {
+        R5LOG_PAYLOAD_FLAG_FLUSH_STRIPE = 1, /* data represents whole stripe */
+};
+
+struct r5l_meta_block {
+        __le32 magic;
+        __le32 checksum;
+        __u8 version;
+        __u8 __zero_pading_1;
+        __le16 __zero_pading_2;
+        __le32 meta_size; /* whole size of the block */
+
+        __le64 seq;
+        __le64 position; /* sector, start from rdev->data_offset, current position */
+        struct r5l_payload_header payloads[];
+} __attribute__ ((__packed__));
+
+#define R5LOG_VERSION 0x1
+#define R5LOG_MAGIC 0x6433c509
 #endif
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 702024769c74..123a5af4e8bb 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -160,7 +160,7 @@ struct rtattr {
 
 /* Macros to handle rtattributes */
 
-#define RTA_ALIGNTO     4
+#define RTA_ALIGNTO     4U
 #define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) )
 #define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && \
                          (rta)->rta_len >= sizeof(struct rtattr) && \
@@ -270,6 +270,7 @@ enum rt_scope_t {
 #define RTM_F_CLONED            0x200   /* This route is cloned         */
 #define RTM_F_EQUALIZE          0x400   /* Multipath equalizer: NI      */
 #define RTM_F_PREFIX            0x800   /* Prefix addresses             */
+#define RTM_F_LOOKUP_TABLE      0x1000  /* set rtm_table to FIB lookup result */
 
 /* Reserved table identifiers */
 
@@ -666,6 +667,7 @@ struct tcamsg {
 #define RTEXT_FILTER_VF         (1 << 0)
 #define RTEXT_FILTER_BRVLAN     (1 << 1)
 #define RTEXT_FILTER_BRVLAN_COMPRESSED  (1 << 2)
+#define RTEXT_FILTER_SKIP_STATS (1 << 3)
 
 /* End of information exported to user level */
 
diff --git a/include/uapi/linux/scif_ioctl.h b/include/uapi/linux/scif_ioctl.h
index 4a94d917cf99..d9048918be52 100644
--- a/include/uapi/linux/scif_ioctl.h
+++ b/include/uapi/linux/scif_ioctl.h
@@ -107,6 +107,82 @@ struct scifioctl_msg {
 };
 
 /**
+ * struct scifioctl_reg - used for SCIF_REG IOCTL
+ * @addr:       starting virtual address
+ * @len:        length of range
+ * @offset:     offset of window
+ * @prot:       read/write protection
+ * @flags:      flags
+ * @out_offset: offset returned
+ */
+struct scifioctl_reg {
+        __u64           addr;
+        __u64           len;
+        __s64           offset;
+        __s32           prot;
+        __s32           flags;
+        __s64           out_offset;
+};
+
+/**
+ * struct scifioctl_unreg - used for SCIF_UNREG IOCTL
+ * @offset:     start of range to unregister
+ * @len:        length of range to unregister
+ */
+struct scifioctl_unreg {
+        __s64           offset;
+        __u64           len;
+};
+
+/**
+ * struct scifioctl_copy - used for SCIF DMA copy IOCTLs
+ *
+ * @loffset:    offset in local registered address space to/from
+ *              which to copy
+ * @len:        length of range to copy
+ * @roffset:    offset in remote registered address space to/from
+ *              which to copy
+ * @addr:       user virtual address to/from which to copy
+ * @flags:      flags
+ *
+ * This structure is used for SCIF_READFROM, SCIF_WRITETO, SCIF_VREADFROM
+ * and SCIF_VREADFROM IOCTL's.
+ */
+struct scifioctl_copy {
+        __s64           loffset;
+        __u64           len;
+        __s64           roffset;
+        __u64           addr;
+        __s32           flags;
+};
+
+/**
+ * struct scifioctl_fence_mark  - used for SCIF_FENCE_MARK IOCTL
+ * @flags:      flags
+ * @mark:       fence handle which is a pointer to a __s32
+ */
+struct scifioctl_fence_mark {
+        __s32   flags;
+        __u64   mark;
+};
+
+/**
+ * struct scifioctl_fence_signal - used for SCIF_FENCE_SIGNAL IOCTL
+ * @loff:       local offset
+ * @lval:       value to write to loffset
+ * @roff:       remote offset
+ * @rval:       value to write to roffset
+ * @flags:      flags
+ */
+struct scifioctl_fence_signal {
+        __s64           loff;
+        __u64           lval;
+        __s64           roff;
+        __u64           rval;
+        __s32           flags;
+};
+
+/**
  * struct scifioctl_node_ids - used for SCIF_GET_NODEIDS IOCTL
  * @nodes:      pointer to an array of node_ids
  * @self:       ID of the current node
@@ -125,6 +201,15 @@ struct scifioctl_node_ids {
 #define SCIF_ACCEPTREG          _IOWR('s', 5, __u64)
 #define SCIF_SEND               _IOWR('s', 6, struct scifioctl_msg)
 #define SCIF_RECV               _IOWR('s', 7, struct scifioctl_msg)
+#define SCIF_REG                _IOWR('s', 8, struct scifioctl_reg)
+#define SCIF_UNREG              _IOWR('s', 9, struct scifioctl_unreg)
+#define SCIF_READFROM           _IOWR('s', 10, struct scifioctl_copy)
+#define SCIF_WRITETO            _IOWR('s', 11, struct scifioctl_copy)
+#define SCIF_VREADFROM          _IOWR('s', 12, struct scifioctl_copy)
+#define SCIF_VWRITETO           _IOWR('s', 13, struct scifioctl_copy)
 #define SCIF_GET_NODEIDS        _IOWR('s', 14, struct scifioctl_node_ids)
+#define SCIF_FENCE_MARK         _IOWR('s', 15, struct scifioctl_fence_mark)
+#define SCIF_FENCE_WAIT         _IOWR('s', 16, __s32)
+#define SCIF_FENCE_SIGNAL       _IOWR('s', 17, struct scifioctl_fence_signal)
 
 #endif /* SCIF_IOCTL_H */
diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
index 7530e7447620..8b8d39dfb67f 100644
--- a/include/uapi/linux/screen_info.h
+++ b/include/uapi/linux/screen_info.h
@@ -43,7 +43,8 @@ struct screen_info {
         __u16 pages;            /* 0x32 */
         __u16 vesa_attributes;  /* 0x34 */
         __u32 capabilities;     /* 0x36 */
-        __u8  _reserved[6];     /* 0x3a */
+        __u32 ext_lfb_base;     /* 0x3a */
+        __u8  _reserved[2];     /* 0x3e */
 } __attribute__((packed));
 
 #define VIDEO_TYPE_MDA          0x10    /* Monochrome Text Display      */
@@ -69,6 +70,6 @@ struct screen_info {
 #define VIDEO_FLAGS_NOCURSOR    (1 << 0) /* The video mode has no cursor set */
 
 #define VIDEO_CAPABILITY_SKIP_QUIRKS    (1 << 0)
-
+#define VIDEO_CAPABILITY_64BIT_BASE     (1 << 1)        /* Frame buffer base is 64-bit */
 
 #endif /* _UAPI_SCREEN_INFO_H */
diff --git a/include/uapi/linux/stm.h b/include/uapi/linux/stm.h
new file mode 100644
index 000000000000..626a8d3f63b5
--- /dev/null
+++ b/include/uapi/linux/stm.h
@@ -0,0 +1,50 @@
+/*
+ * System Trace Module (STM) userspace interfaces
+ * Copyright (c) 2014, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * STM class implements generic infrastructure for  System Trace Module devices
+ * as defined in MIPI STPv2 specification.
+ */
+
+#ifndef _UAPI_LINUX_STM_H
+#define _UAPI_LINUX_STM_H
+
+#include <linux/types.h>
+
+/**
+ * struct stp_policy_id - identification for the STP policy
+ * @size:       size of the structure including real id[] length
+ * @master:     assigned master
+ * @channel:    first assigned channel
+ * @width:      number of requested channels
+ * @id:         identification string
+ *
+ * User must calculate the total size of the structure and put it into
+ * @size field, fill out the @id and desired @width. In return, kernel
+ * fills out @master, @channel and @width.
+ */
+struct stp_policy_id {
+        __u32           size;
+        __u16           master;
+        __u16           channel;
+        __u16           width;
+        /* padding */
+        __u16           __reserved_0;
+        __u32           __reserved_1;
+        char            id[0];
+};
+
+#define STP_POLICY_ID_SET       _IOWR('%', 0, struct stp_policy_id)
+#define STP_POLICY_ID_GET       _IOR('%', 1, struct stp_policy_id)
+#define STP_SET_OPTIONS         _IOW('%', 2, __u64)
+
+#endif /* _UAPI_LINUX_STM_H */
diff --git a/include/uapi/linux/usb/cdc.h b/include/uapi/linux/usb/cdc.h
index b6a9cdd6e096..e2bc417b243b 100644
--- a/include/uapi/linux/usb/cdc.h
+++ b/include/uapi/linux/usb/cdc.h
@@ -6,8 +6,8 @@
  * firmware based USB peripherals.
  */
 
-#ifndef __LINUX_USB_CDC_H
-#define __LINUX_USB_CDC_H
+#ifndef __UAPI_LINUX_USB_CDC_H
+#define __UAPI_LINUX_USB_CDC_H
 
 #include <linux/types.h>
 
@@ -444,4 +444,4 @@ struct usb_cdc_ncm_ndp_input_size {
 #define USB_CDC_NCM_CRC_NOT_APPENDED                    0x00
 #define USB_CDC_NCM_CRC_APPENDED                        0x01
 
-#endif /* __LINUX_USB_CDC_H */
+#endif /* __UAPI_LINUX_USB_CDC_H */
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index f7adc6e01f9e..4338eb7b09b3 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -866,6 +866,35 @@ struct usb_ss_container_id_descriptor {
 } __attribute__((packed));
 
 #define USB_DT_USB_SS_CONTN_ID_SIZE     20
+
+/*
+ * SuperSpeed Plus USB Capability descriptor: Defines the set of
+ * SuperSpeed Plus USB specific device level capabilities
+ */
+#define USB_SSP_CAP_TYPE        0xa
+struct usb_ssp_cap_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDevCapabilityType;
+        __u8  bReserved;
+        __le32 bmAttributes;
+#define USB_SSP_SUBLINK_SPEED_ATTRIBS   (0x1f << 0) /* sublink speed entries */
+#define USB_SSP_SUBLINK_SPEED_IDS       (0xf << 5)  /* speed ID entries */
+        __u16  wFunctionalitySupport;
+#define USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID  (0xf)
+#define USB_SSP_MIN_RX_LANE_COUNT               (0xf << 8)
+#define USB_SSP_MIN_TX_LANE_COUNT               (0xf << 12)
+        __le16 wReserved;
+        __le32 bmSublinkSpeedAttr[1]; /* list of sublink speed attrib entries */
+#define USB_SSP_SUBLINK_SPEED_SSID      (0xf)           /* sublink speed ID */
+#define USB_SSP_SUBLINK_SPEED_LSE       (0x3 << 4)      /* Lanespeed exponent */
+#define USB_SSP_SUBLINK_SPEED_ST        (0x3 << 6)      /* Sublink type */
+#define USB_SSP_SUBLINK_SPEED_RSVD      (0x3f << 8)     /* Reserved */
+#define USB_SSP_SUBLINK_SPEED_LP        (0x3 << 14)     /* Link protocol */
+#define USB_SSP_SUBLINK_SPEED_LSM       (0xff << 16)    /* Lanespeed mantissa */
+} __attribute__((packed));
+
+
 /*-------------------------------------------------------------------------*/
 
 /* USB_DT_WIRELESS_ENDPOINT_COMP:  companion descriptor associated with
diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h
index df0e09bb7dd5..9057d7af3ae1 100644
--- a/include/uapi/linux/userfaultfd.h
+++ b/include/uapi/linux/userfaultfd.h
@@ -11,8 +11,6 @@
 
 #include <linux/types.h>
 
-#include <linux/compiler.h>
-
 #define UFFD_API ((__u64)0xAA)
 /*
  * After implementing the respective features it will become:
diff --git a/include/uapi/linux/userio.h b/include/uapi/linux/userio.h
new file mode 100644
index 000000000000..37d147f0a13a
--- /dev/null
+++ b/include/uapi/linux/userio.h
@@ -0,0 +1,44 @@
+/*
+ * userio: virtual serio device support
+ * Copyright (C) 2015 Red Hat
+ * Copyright (C) 2015 Lyude (Stephen Chandler Paul) <cpaul@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * 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 Lesser General Public License for more
+ * details.
+ *
+ * This is the public header used for user-space communication with the userio
+ * driver. __attribute__((__packed__)) is used for all structs to keep ABI
+ * compatibility between all architectures.
+ */
+
+#ifndef _USERIO_H
+#define _USERIO_H
+
+#include <linux/types.h>
+
+enum userio_cmd_type {
+        USERIO_CMD_REGISTER = 0,
+        USERIO_CMD_SET_PORT_TYPE = 1,
+        USERIO_CMD_SEND_INTERRUPT = 2
+};
+
+/*
+ * userio Commands
+ * All commands sent to /dev/userio are encoded using this structure. The type
+ * field should contain a USERIO_CMD* value that indicates what kind of command
+ * is being sent to userio. The data field should contain the accompanying
+ * argument for the command, if there is one.
+ */
+struct userio_cmd {
+        __u8 type;
+        __u8 data;
+} __attribute__((__packed__));
+
+#endif /* !_USERIO_H */
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index d448c536b49d..1bdce501ad6b 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -936,6 +936,7 @@ enum v4l2_deemphasis {
 
 #define V4L2_CID_RF_TUNER_BANDWIDTH_AUTO        (V4L2_CID_RF_TUNER_CLASS_BASE + 11)
 #define V4L2_CID_RF_TUNER_BANDWIDTH             (V4L2_CID_RF_TUNER_CLASS_BASE + 12)
+#define V4L2_CID_RF_TUNER_RF_GAIN               (V4L2_CID_RF_TUNER_CLASS_BASE + 32)
 #define V4L2_CID_RF_TUNER_LNA_GAIN_AUTO         (V4L2_CID_RF_TUNER_CLASS_BASE + 41)
 #define V4L2_CID_RF_TUNER_LNA_GAIN              (V4L2_CID_RF_TUNER_CLASS_BASE + 42)
 #define V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO       (V4L2_CID_RF_TUNER_CLASS_BASE + 51)
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index 9fd7b5d8df2f..751b69f858c8 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -39,6 +39,13 @@
 #define VFIO_SPAPR_TCE_v2_IOMMU         7
 
 /*
+ * The No-IOMMU IOMMU offers no translation or isolation for devices and
+ * supports no ioctls outside of VFIO_CHECK_EXTENSION.  Use of VFIO's No-IOMMU
+ * code will taint the host kernel and should be used with extreme caution.
+ */
+#define VFIO_NOIOMMU_IOMMU              8
+
+/*
  * The IOCTL interface is designed for extensibility by embedding the
  * structure length (argsz) and flags into structures passed between
  * kernel and userspace.  We therefore use the _IO() macro for these
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 3228fbebcd63..a0e87d16b726 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -145,6 +145,7 @@ enum v4l2_buf_type {
         V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
         V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE  = 10,
         V4L2_BUF_TYPE_SDR_CAPTURE          = 11,
+        V4L2_BUF_TYPE_SDR_OUTPUT           = 12,
         /* Deprecated, do not use */
         V4L2_BUF_TYPE_PRIVATE              = 0x80,
 };
@@ -159,16 +160,20 @@ enum v4l2_buf_type {
          || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY               \
          || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY        \
          || (type) == V4L2_BUF_TYPE_VBI_OUTPUT                  \
-         || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
+         || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT           \
+         || (type) == V4L2_BUF_TYPE_SDR_OUTPUT)
 
 enum v4l2_tuner_type {
         V4L2_TUNER_RADIO             = 1,
         V4L2_TUNER_ANALOG_TV         = 2,
         V4L2_TUNER_DIGITAL_TV        = 3,
-        V4L2_TUNER_ADC               = 4,
+        V4L2_TUNER_SDR               = 4,
         V4L2_TUNER_RF                = 5,
 };
 
+/* Deprecated, do not use */
+#define V4L2_TUNER_ADC  V4L2_TUNER_SDR
+
 enum v4l2_memory {
         V4L2_MEMORY_MMAP             = 1,
         V4L2_MEMORY_USERPTR          = 2,
@@ -229,6 +234,9 @@ enum v4l2_colorspace {
 
         /* Raw colorspace: for RAW unprocessed images */
         V4L2_COLORSPACE_RAW           = 11,
+
+        /* DCI-P3 colorspace, used by cinema projectors */
+        V4L2_COLORSPACE_DCI_P3        = 12,
 };
 
 /*
@@ -256,6 +264,8 @@ enum v4l2_xfer_func {
          * V4L2_COLORSPACE_SMPTE240M: V4L2_XFER_FUNC_SMPTE240M
          *
          * V4L2_COLORSPACE_RAW: V4L2_XFER_FUNC_NONE
+         *
+         * V4L2_COLORSPACE_DCI_P3: V4L2_XFER_FUNC_DCI_P3
          */
         V4L2_XFER_FUNC_DEFAULT     = 0,
         V4L2_XFER_FUNC_709         = 1,
@@ -263,6 +273,8 @@ enum v4l2_xfer_func {
         V4L2_XFER_FUNC_ADOBERGB    = 3,
         V4L2_XFER_FUNC_SMPTE240M   = 4,
         V4L2_XFER_FUNC_NONE        = 5,
+        V4L2_XFER_FUNC_DCI_P3      = 6,
+        V4L2_XFER_FUNC_SMPTE2084   = 7,
 };
 
 /*
@@ -272,9 +284,10 @@ enum v4l2_xfer_func {
 #define V4L2_MAP_XFER_FUNC_DEFAULT(colsp) \
         ((colsp) == V4L2_COLORSPACE_ADOBERGB ? V4L2_XFER_FUNC_ADOBERGB : \
          ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_XFER_FUNC_SMPTE240M : \
-          ((colsp) == V4L2_COLORSPACE_RAW ? V4L2_XFER_FUNC_NONE : \
-           ((colsp) == V4L2_COLORSPACE_SRGB || (colsp) == V4L2_COLORSPACE_JPEG ? \
-            V4L2_XFER_FUNC_SRGB : V4L2_XFER_FUNC_709))))
+          ((colsp) == V4L2_COLORSPACE_DCI_P3 ? V4L2_XFER_FUNC_DCI_P3 : \
+           ((colsp) == V4L2_COLORSPACE_RAW ? V4L2_XFER_FUNC_NONE : \
+            ((colsp) == V4L2_COLORSPACE_SRGB || (colsp) == V4L2_COLORSPACE_JPEG ? \
+             V4L2_XFER_FUNC_SRGB : V4L2_XFER_FUNC_709)))))
 
 enum v4l2_ycbcr_encoding {
         /*
@@ -285,7 +298,7 @@ enum v4l2_ycbcr_encoding {
          * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_ADOBERGB and
          * V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601
          *
-         * V4L2_COLORSPACE_REC709: V4L2_YCBCR_ENC_709
+         * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709
          *
          * V4L2_COLORSPACE_SRGB: V4L2_YCBCR_ENC_SYCC
          *
@@ -325,7 +338,8 @@ enum v4l2_ycbcr_encoding {
  * This depends on the colorspace.
  */
 #define V4L2_MAP_YCBCR_ENC_DEFAULT(colsp) \
-        ((colsp) == V4L2_COLORSPACE_REC709 ? V4L2_YCBCR_ENC_709 : \
+        (((colsp) == V4L2_COLORSPACE_REC709 || \
+          (colsp) == V4L2_COLORSPACE_DCI_P3) ? V4L2_YCBCR_ENC_709 : \
          ((colsp) == V4L2_COLORSPACE_BT2020 ? V4L2_YCBCR_ENC_BT2020 : \
           ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_YCBCR_ENC_SMPTE240M : \
            V4L2_YCBCR_ENC_601)))
@@ -423,6 +437,7 @@ struct v4l2_capability {
 
 #define V4L2_CAP_SDR_CAPTURE            0x00100000  /* Is a SDR capture device */
 #define V4L2_CAP_EXT_PIX_FORMAT         0x00200000  /* Supports the extended pixel format */
+#define V4L2_CAP_SDR_OUTPUT             0x00400000  /* Is a SDR output device */
 
 #define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
 #define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
@@ -1578,7 +1593,8 @@ struct v4l2_modulator {
         __u32                   rangelow;
         __u32                   rangehigh;
         __u32                   txsubchans;
-        __u32                   reserved[4];
+        __u32                   type;   /* enum v4l2_tuner_type */
+        __u32                   reserved[3];
 };
 
 /*  Flags for the 'capability' field */
@@ -2271,7 +2287,7 @@ struct v4l2_create_buffers {
 #define VIDIOC_QUERY_EXT_CTRL   _IOWR('V', 103, struct v4l2_query_ext_ctrl)
 
 /* Reminder: when adding new ioctls please add support for them to
-   drivers/media/video/v4l2-compat-ioctl32.c as well! */
+   drivers/media/v4l2-core/v4l2-compat-ioctl32.c as well! */
 
 #define BASE_VIDIOC_PRIVATE     192             /* 192-255 are private */
 
diff --git a/include/uapi/linux/virtio_gpu.h b/include/uapi/linux/virtio_gpu.h
index 478be5270e26..7a63faa9065c 100644
--- a/include/uapi/linux/virtio_gpu.h
+++ b/include/uapi/linux/virtio_gpu.h
@@ -40,6 +40,8 @@
 
 #include <linux/types.h>
 
+#define VIRTIO_GPU_F_VIRGL 0
+
 enum virtio_gpu_ctrl_type {
         VIRTIO_GPU_UNDEFINED = 0,
 
@@ -52,6 +54,18 @@ enum virtio_gpu_ctrl_type {
         VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D,
         VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING,
         VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING,
+        VIRTIO_GPU_CMD_GET_CAPSET_INFO,
+        VIRTIO_GPU_CMD_GET_CAPSET,
+
+        /* 3d commands */
+        VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,
+        VIRTIO_GPU_CMD_CTX_DESTROY,
+        VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE,
+        VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE,
+        VIRTIO_GPU_CMD_RESOURCE_CREATE_3D,
+        VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D,
+        VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D,
+        VIRTIO_GPU_CMD_SUBMIT_3D,
 
         /* cursor commands */
         VIRTIO_GPU_CMD_UPDATE_CURSOR = 0x0300,
@@ -60,6 +74,8 @@ enum virtio_gpu_ctrl_type {
         /* success responses */
         VIRTIO_GPU_RESP_OK_NODATA = 0x1100,
         VIRTIO_GPU_RESP_OK_DISPLAY_INFO,
+        VIRTIO_GPU_RESP_OK_CAPSET_INFO,
+        VIRTIO_GPU_RESP_OK_CAPSET,
 
         /* error responses */
         VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,
@@ -180,13 +196,107 @@ struct virtio_gpu_resp_display_info {
         } pmodes[VIRTIO_GPU_MAX_SCANOUTS];
 };
 
+/* data passed in the control vq, 3d related */
+
+struct virtio_gpu_box {
+        __le32 x, y, z;
+        __le32 w, h, d;
+};
+
+/* VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D, VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D */
+struct virtio_gpu_transfer_host_3d {
+        struct virtio_gpu_ctrl_hdr hdr;
+        struct virtio_gpu_box box;
+        __le64 offset;
+        __le32 resource_id;
+        __le32 level;
+        __le32 stride;
+        __le32 layer_stride;
+};
+
+/* VIRTIO_GPU_CMD_RESOURCE_CREATE_3D */
+#define VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP (1 << 0)
+struct virtio_gpu_resource_create_3d {
+        struct virtio_gpu_ctrl_hdr hdr;
+        __le32 resource_id;
+        __le32 target;
+        __le32 format;
+        __le32 bind;
+        __le32 width;
+        __le32 height;
+        __le32 depth;
+        __le32 array_size;
+        __le32 last_level;
+        __le32 nr_samples;
+        __le32 flags;
+        __le32 padding;
+};
+
+/* VIRTIO_GPU_CMD_CTX_CREATE */
+struct virtio_gpu_ctx_create {
+        struct virtio_gpu_ctrl_hdr hdr;
+        __le32 nlen;
+        __le32 padding;
+        char debug_name[64];
+};
+
+/* VIRTIO_GPU_CMD_CTX_DESTROY */
+struct virtio_gpu_ctx_destroy {
+        struct virtio_gpu_ctrl_hdr hdr;
+};
+
+/* VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE, VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE */
+struct virtio_gpu_ctx_resource {
+        struct virtio_gpu_ctrl_hdr hdr;
+        __le32 resource_id;
+        __le32 padding;
+};
+
+/* VIRTIO_GPU_CMD_SUBMIT_3D */
+struct virtio_gpu_cmd_submit {
+        struct virtio_gpu_ctrl_hdr hdr;
+        __le32 size;
+        __le32 padding;
+};
+
+#define VIRTIO_GPU_CAPSET_VIRGL 1
+
+/* VIRTIO_GPU_CMD_GET_CAPSET_INFO */
+struct virtio_gpu_get_capset_info {
+        struct virtio_gpu_ctrl_hdr hdr;
+        __le32 capset_index;
+        __le32 padding;
+};
+
+/* VIRTIO_GPU_RESP_OK_CAPSET_INFO */
+struct virtio_gpu_resp_capset_info {
+        struct virtio_gpu_ctrl_hdr hdr;
+        __le32 capset_id;
+        __le32 capset_max_version;
+        __le32 capset_max_size;
+        __le32 padding;
+};
+
+/* VIRTIO_GPU_CMD_GET_CAPSET */
+struct virtio_gpu_get_capset {
+        struct virtio_gpu_ctrl_hdr hdr;
+        __le32 capset_id;
+        __le32 capset_version;
+};
+
+/* VIRTIO_GPU_RESP_OK_CAPSET */
+struct virtio_gpu_resp_capset {
+        struct virtio_gpu_ctrl_hdr hdr;
+        uint8_t capset_data[];
+};
+
 #define VIRTIO_GPU_EVENT_DISPLAY (1 << 0)
 
 struct virtio_gpu_config {
         __u32 events_read;
         __u32 events_clear;
         __u32 num_scanouts;
-        __u32 reserved;
+        __u32 num_capsets;
 };
 
 /* simple formats for fbcon/X use */
diff --git a/include/uapi/mtd/mtd-user.h b/include/uapi/mtd/mtd-user.h
index 83327c808c86..e71d5558cc23 100644
--- a/include/uapi/mtd/mtd-user.h
+++ b/include/uapi/mtd/mtd-user.h
@@ -20,8 +20,6 @@
 #ifndef __MTD_USER_H__
 #define __MTD_USER_H__
 
-#include <stdint.h>
-
 /* This file is blessed for inclusion by userspace */
 #include <mtd/mtd-abi.h>
 
diff --git a/include/uapi/rdma/hfi/hfi1_user.h b/include/uapi/rdma/hfi/hfi1_user.h
index 78c442fbf263..599562fe5d57 100644
--- a/include/uapi/rdma/hfi/hfi1_user.h
+++ b/include/uapi/rdma/hfi/hfi1_user.h
@@ -88,7 +88,7 @@
 #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 */
+/* 1UL << 5 unused */
 #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 */
@@ -99,7 +99,7 @@
 #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 */
+/* 1UL << 16 unused */
 #define HFI1_CAP_SDMA_HEAD_CHECK  (1UL << 17) /* SDMA head checking */
 #define HFI1_CAP_EARLY_CREDIT_RETURN (1UL << 18) /* early credit return */
 
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index 978841eeaff1..8126c143a519 100644
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -92,6 +92,7 @@ enum {
 enum {
         IB_USER_VERBS_EX_CMD_QUERY_DEVICE = IB_USER_VERBS_CMD_QUERY_DEVICE,
         IB_USER_VERBS_EX_CMD_CREATE_CQ = IB_USER_VERBS_CMD_CREATE_CQ,
+        IB_USER_VERBS_EX_CMD_CREATE_QP = IB_USER_VERBS_CMD_CREATE_QP,
         IB_USER_VERBS_EX_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
         IB_USER_VERBS_EX_CMD_DESTROY_FLOW,
 };
@@ -516,6 +517,25 @@ struct ib_uverbs_create_qp {
         __u64 driver_data[0];
 };
 
+struct ib_uverbs_ex_create_qp {
+        __u64 user_handle;
+        __u32 pd_handle;
+        __u32 send_cq_handle;
+        __u32 recv_cq_handle;
+        __u32 srq_handle;
+        __u32 max_send_wr;
+        __u32 max_recv_wr;
+        __u32 max_send_sge;
+        __u32 max_recv_sge;
+        __u32 max_inline_data;
+        __u8  sq_sig_all;
+        __u8  qp_type;
+        __u8  is_srq;
+        __u8 reserved;
+        __u32 comp_mask;
+        __u32 create_flags;
+};
+
 struct ib_uverbs_open_qp {
         __u64 response;
         __u64 user_handle;
@@ -538,6 +558,12 @@ struct ib_uverbs_create_qp_resp {
         __u32 reserved;
 };
 
+struct ib_uverbs_ex_create_qp_resp {
+        struct ib_uverbs_create_qp_resp base;
+        __u32 comp_mask;
+        __u32 response_length;
+};
+
 /*
  * This struct needs to remain a multiple of 8 bytes to keep the
  * alignment of the modify QP parameters.
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h
index 247c50bd60f0..26539a7e4880 100644
--- a/include/uapi/sound/asoc.h
+++ b/include/uapi/sound/asoc.h
@@ -83,7 +83,7 @@
 #define SND_SOC_TPLG_NUM_TEXTS          16
 
 /* ABI version */
-#define SND_SOC_TPLG_ABI_VERSION        0x3
+#define SND_SOC_TPLG_ABI_VERSION        0x4
 
 /* Max size of TLV data */
 #define SND_SOC_TPLG_TLV_SIZE           32
@@ -103,7 +103,8 @@
 #define SND_SOC_TPLG_TYPE_PCM           7
 #define SND_SOC_TPLG_TYPE_MANIFEST      8
 #define SND_SOC_TPLG_TYPE_CODEC_LINK    9
-#define SND_SOC_TPLG_TYPE_PDATA         10
+#define SND_SOC_TPLG_TYPE_BACKEND_LINK  10
+#define SND_SOC_TPLG_TYPE_PDATA         11
 #define SND_SOC_TPLG_TYPE_MAX   SND_SOC_TPLG_TYPE_PDATA
 
 /* vendor block IDs - please add new vendor types to end */
@@ -198,7 +199,7 @@ struct snd_soc_tplg_ctl_hdr {
 struct snd_soc_tplg_stream_caps {
         __le32 size;            /* in bytes of this structure */
         char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        __le64 formats[SND_SOC_TPLG_MAX_FORMATS];       /* supported formats SNDRV_PCM_FMTBIT_* */
+        __le64 formats; /* supported formats SNDRV_PCM_FMTBIT_* */
         __le32 rates;           /* supported rates SNDRV_PCM_RATE_* */
         __le32 rate_min;        /* min rate */
         __le32 rate_max;        /* max rate */
@@ -217,23 +218,12 @@ struct snd_soc_tplg_stream_caps {
  */
 struct snd_soc_tplg_stream {
         __le32 size;            /* in bytes of this structure */
+        char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* Name of the stream */
         __le64 format;          /* SNDRV_PCM_FMTBIT_* */
         __le32 rate;            /* SNDRV_PCM_RATE_* */
         __le32 period_bytes;    /* size of period in bytes */
         __le32 buffer_bytes;    /* size of buffer in bytes */
         __le32 channels;        /* channels */
-        __le32 tdm_slot;        /* optional BE bitmask of supported TDM slots */
-        __le32 dai_fmt;         /* SND_SOC_DAIFMT_  */
-} __attribute__((packed));
-
-/*
- * Duplex stream configuration supported by SW/FW.
- */
-struct snd_soc_tplg_stream_config {
-        __le32 size;            /* in bytes of this structure */
-        char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        struct snd_soc_tplg_stream playback;
-        struct snd_soc_tplg_stream capture;
 } __attribute__((packed));
 
 /*
@@ -366,11 +356,11 @@ struct snd_soc_tplg_dapm_widget {
         __le32 shift;           /* bits to shift */
         __le32 mask;            /* non-shifted mask */
         __le32 subseq;          /* sort within widget type */
-        __u32 invert;           /* invert the power bit */
-        __u32 ignore_suspend;   /* kept enabled over suspend */
-        __u16 event_flags;
-        __u16 event_type;
-        __u16 num_kcontrols;
+        __le32 invert;          /* invert the power bit */
+        __le32 ignore_suspend;  /* kept enabled over suspend */
+        __le16 event_flags;
+        __le16 event_type;
+        __le32 num_kcontrols;
         struct snd_soc_tplg_private priv;
         /*
          * kcontrols that relate to this widget
@@ -378,30 +368,46 @@ struct snd_soc_tplg_dapm_widget {
          */
 } __attribute__((packed));
 
-struct snd_soc_tplg_pcm_cfg_caps {
-        struct snd_soc_tplg_stream_caps caps;
-        struct snd_soc_tplg_stream_config configs[SND_SOC_TPLG_STREAM_CONFIG_MAX];
-        __le32 num_configs;     /* number of configs */
-} __attribute__((packed));
 
 /*
- * Describes SW/FW specific features of PCM or DAI link.
+ * Describes SW/FW specific features of PCM (FE DAI & DAI link).
  *
- * File block representation for PCM/DAI-Link :-
+ * File block representation for PCM :-
  * +-----------------------------------+-----+
  * | struct snd_soc_tplg_hdr           |  1  |
  * +-----------------------------------+-----+
- * | struct snd_soc_tplg_dapm_pcm_dai  |  N  |
+ * | struct snd_soc_tplg_pcm           |  N  |
  * +-----------------------------------+-----+
  */
-struct snd_soc_tplg_pcm_dai {
+struct snd_soc_tplg_pcm {
         __le32 size;            /* in bytes of this structure */
-        char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        __le32 id;                      /* unique ID - used to match */
-        __le32 playback;                /* supports playback mode */
-        __le32 capture;                 /* supports capture mode */
-        __le32 compress;                /* 1 = compressed; 0 = PCM */
-        struct snd_soc_tplg_pcm_cfg_caps capconf[2];    /* capabilities and configs */
+        char pcm_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+        char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+        __le32 pcm_id;          /* unique ID - used to match */
+        __le32 dai_id;          /* unique ID - used to match */
+        __le32 playback;        /* supports playback mode */
+        __le32 capture;         /* supports capture mode */
+        __le32 compress;        /* 1 = compressed; 0 = PCM */
+        struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* for DAI link */
+        __le32 num_streams;     /* number of streams */
+        struct snd_soc_tplg_stream_caps caps[2]; /* playback and capture for DAI */
 } __attribute__((packed));
 
+
+/*
+ * Describes the BE or CC link runtime supported configs or params
+ *
+ * File block representation for BE/CC link config :-
+ * +-----------------------------------+-----+
+ * | struct snd_soc_tplg_hdr           |  1  |
+ * +-----------------------------------+-----+
+ * | struct snd_soc_tplg_link_config   |  N  |
+ * +-----------------------------------+-----+
+ */
+struct snd_soc_tplg_link_config {
+        __le32 size;            /* in bytes of this structure */
+        __le32 id;              /* unique ID - used to match */
+        struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* supported configs playback and captrure */
+        __le32 num_streams;     /* number of streams */
+} __attribute__((packed));
 #endif
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
index a45be6bdcf5b..a82108e5d1c0 100644
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
@@ -100,9 +100,11 @@ enum {
         SNDRV_HWDEP_IFACE_FW_FIREWORKS, /* Echo Audio Fireworks based device */
         SNDRV_HWDEP_IFACE_FW_BEBOB,     /* BridgeCo BeBoB based device */
         SNDRV_HWDEP_IFACE_FW_OXFW,      /* Oxford OXFW970/971 based device */
+        SNDRV_HWDEP_IFACE_FW_DIGI00X,   /* Digidesign Digi 002/003 family */
+        SNDRV_HWDEP_IFACE_FW_TASCAM,    /* TASCAM FireWire series */
 
         /* Don't forget to change the following: */
-        SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_OXFW
+        SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_TASCAM
 };
 
 struct snd_hwdep_info {
diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h
index ec1535bb6aed..5175e166987d 100644
--- a/include/uapi/sound/emu10k1.h
+++ b/include/uapi/sound/emu10k1.h
@@ -34,6 +34,14 @@
 
 #define EMU10K1_FX8010_PCM_COUNT                8
 
+/*
+ * Following definition is copied from linux/types.h to support compiling
+ * this header file in userspace since they are not generally available for
+ * uapi headers.
+ */
+#define __EMU10K1_DECLARE_BITMAP(name,bits) \
+        unsigned long name[(bits) / (sizeof(unsigned long) * 8)]
+
 /* instruction set */
 #define iMAC0    0x00   /* R = A + (X * Y >> 31)   ; saturation */
 #define iMAC1    0x01   /* R = A + (-X * Y >> 31)  ; saturation */
@@ -300,7 +308,7 @@ struct snd_emu10k1_fx8010_control_old_gpr {
 struct snd_emu10k1_fx8010_code {
         char name[128];
 
-        DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
+        __EMU10K1_DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
         __u32 __user *gpr_map;          /* initializers */
 
         unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */
@@ -313,11 +321,11 @@ struct snd_emu10k1_fx8010_code {
         unsigned int gpr_list_control_total; /* total count of GPR controls */
         struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */
 
-        DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */
+        __EMU10K1_DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */
         __u32 __user *tram_data_map;      /* data initializers */
         __u32 __user *tram_addr_map;      /* map initializers */
 
-        DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */
+        __EMU10K1_DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */
         __u32 __user *code;               /* one instruction - 64 bits */
 };
 
diff --git a/include/uapi/sound/firewire.h b/include/uapi/sound/firewire.h
index 49122df3b56b..db79a12fcc78 100644
--- a/include/uapi/sound/firewire.h
+++ b/include/uapi/sound/firewire.h
@@ -9,6 +9,7 @@
 #define SNDRV_FIREWIRE_EVENT_LOCK_STATUS        0x000010cc
 #define SNDRV_FIREWIRE_EVENT_DICE_NOTIFICATION  0xd1ce004e
 #define SNDRV_FIREWIRE_EVENT_EFW_RESPONSE       0x4e617475
+#define SNDRV_FIREWIRE_EVENT_DIGI00X_MESSAGE    0x746e736c
 
 struct snd_firewire_event_common {
         unsigned int type; /* SNDRV_FIREWIRE_EVENT_xxx */
@@ -40,11 +41,17 @@ struct snd_firewire_event_efw_response {
         __be32 response[0];     /* some responses */
 };
 
+struct snd_firewire_event_digi00x_message {
+        unsigned int type;
+        __u32 message;  /* Digi00x-specific message */
+};
+
 union snd_firewire_event {
         struct snd_firewire_event_common            common;
         struct snd_firewire_event_lock_status       lock_status;
         struct snd_firewire_event_dice_notification dice_notification;
         struct snd_firewire_event_efw_response      efw_response;
+        struct snd_firewire_event_digi00x_message   digi00x_message;
 };
 
 
@@ -56,6 +63,8 @@ union snd_firewire_event {
 #define SNDRV_FIREWIRE_TYPE_FIREWORKS   2
 #define SNDRV_FIREWIRE_TYPE_BEBOB       3
 #define SNDRV_FIREWIRE_TYPE_OXFW        4
+#define SNDRV_FIREWIRE_TYPE_DIGI00X     5
+#define SNDRV_FIREWIRE_TYPE_TASCAM      6
 /* RME, MOTU, ... */
 
 struct snd_firewire_get_info {
diff --git a/include/uapi/sound/hdspm.h b/include/uapi/sound/hdspm.h
index 5737332d38f2..c4db6f5b306e 100644
--- a/include/uapi/sound/hdspm.h
+++ b/include/uapi/sound/hdspm.h
@@ -20,11 +20,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifdef __KERNEL__
 #include <linux/types.h>
-#else
-#include <stdint.h>
-#endif
 
 /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
 #define HDSPM_MAX_CHANNELS      64
@@ -46,15 +42,15 @@ enum hdspm_speed {
 /* -------------------- IOCTL Peak/RMS Meters -------------------- */
 
 struct hdspm_peak_rms {
-        uint32_t input_peaks[64];
-        uint32_t playback_peaks[64];
-        uint32_t output_peaks[64];
+        __u32 input_peaks[64];
+        __u32 playback_peaks[64];
+        __u32 output_peaks[64];
 
-        uint64_t input_rms[64];
-        uint64_t playback_rms[64];
-        uint64_t output_rms[64];
+        __u64 input_rms[64];
+        __u64 playback_rms[64];
+        __u64 output_rms[64];
 
-        uint8_t speed; /* enum {ss, ds, qs} */
+        __u8 speed; /* enum {ss, ds, qs} */
         int status2;
 };
 
@@ -155,21 +151,21 @@ enum hdspm_syncsource {
 };
 
 struct hdspm_status {
-        uint8_t card_type; /* enum hdspm_io_type */
+        __u8 card_type; /* enum hdspm_io_type */
         enum hdspm_syncsource autosync_source;
 
-        uint64_t card_clock;
-        uint32_t master_period;
+        __u64 card_clock;
+        __u32 master_period;
 
         union {
                 struct {
-                        uint8_t sync_wc; /* enum hdspm_sync */
-                        uint8_t sync_madi; /* enum hdspm_sync */
-                        uint8_t sync_tco; /* enum hdspm_sync */
-                        uint8_t sync_in; /* enum hdspm_sync */
-                        uint8_t madi_input; /* enum hdspm_madi_input */
-                        uint8_t channel_format; /* enum hdspm_madi_channel_format */
-                        uint8_t frame_format; /* enum hdspm_madi_frame_format */
+                        __u8 sync_wc; /* enum hdspm_sync */
+                        __u8 sync_madi; /* enum hdspm_sync */
+                        __u8 sync_tco; /* enum hdspm_sync */
+                        __u8 sync_in; /* enum hdspm_sync */
+                        __u8 madi_input; /* enum hdspm_madi_input */
+                        __u8 channel_format; /* enum hdspm_madi_channel_format */
+                        __u8 frame_format; /* enum hdspm_madi_frame_format */
                 } madi;
         } card_specific;
 };
@@ -184,7 +180,7 @@ struct hdspm_status {
 #define HDSPM_ADDON_TCO 1
 
 struct hdspm_version {
-        uint8_t card_type; /* enum hdspm_io_type */
+        __u8 card_type; /* enum hdspm_io_type */
         char cardname[20];
         unsigned int serial;
         unsigned short firmware_rev;
diff --git a/include/uapi/xen/gntalloc.h b/include/uapi/xen/gntalloc.h
index 76bd58065f4f..48d2790ef928 100644
--- a/include/uapi/xen/gntalloc.h
+++ b/include/uapi/xen/gntalloc.h
@@ -11,6 +11,8 @@
 #ifndef __LINUX_PUBLIC_GNTALLOC_H__
 #define __LINUX_PUBLIC_GNTALLOC_H__
 
+#include <linux/types.h>
+
 /*
  * Allocates a new page and creates a new grant reference.
  */
@@ -19,17 +21,17 @@ _IOC(_IOC_NONE, 'G', 5, sizeof(struct ioctl_gntalloc_alloc_gref))
 struct ioctl_gntalloc_alloc_gref {
         /* IN parameters */
         /* The ID of the domain to be given access to the grants. */
-        uint16_t domid;
+        __u16 domid;
         /* Flags for this mapping */
-        uint16_t flags;
+        __u16 flags;
         /* Number of pages to map */
-        uint32_t count;
+        __u32 count;
         /* OUT parameters */
         /* The offset to be used on a subsequent call to mmap(). */
-        uint64_t index;
+        __u64 index;
         /* The grant references of the newly created grant, one per page */
         /* Variable size, depending on count */
-        uint32_t gref_ids[1];
+        __u32 gref_ids[1];
 };
 
 #define GNTALLOC_FLAG_WRITABLE 1
@@ -43,9 +45,9 @@ _IOC(_IOC_NONE, 'G', 6, sizeof(struct ioctl_gntalloc_dealloc_gref))
 struct ioctl_gntalloc_dealloc_gref {
         /* IN parameters */
         /* The offset returned in the map operation */
-        uint64_t index;
+        __u64 index;
         /* Number of references to unmap */
-        uint32_t count;
+        __u32 count;
 };
 
 /*
@@ -67,11 +69,11 @@ struct ioctl_gntalloc_unmap_notify {
          * be cleared. Otherwise, it can be any byte in the page whose
          * notification we are adjusting.
          */
-        uint64_t index;
+        __u64 index;
         /* Action(s) to take on unmap */
-        uint32_t action;
+        __u32 action;
         /* Event channel to notify */
-        uint32_t event_channel_port;
+        __u32 event_channel_port;
 };
 
 /* Clear (set to zero) the byte specified by index */
diff --git a/include/uapi/xen/gntdev.h b/include/uapi/xen/gntdev.h
index 5304bd3c84c5..aa7610a9b867 100644
--- a/include/uapi/xen/gntdev.h
+++ b/include/uapi/xen/gntdev.h
@@ -33,11 +33,13 @@
 #ifndef __LINUX_PUBLIC_GNTDEV_H__
 #define __LINUX_PUBLIC_GNTDEV_H__
 
+#include <linux/types.h>
+
 struct ioctl_gntdev_grant_ref {
         /* The domain ID of the grant to be mapped. */
-        uint32_t domid;
+        __u32 domid;
         /* The grant reference of the grant to be mapped. */
-        uint32_t ref;
+        __u32 ref;
 };
 
 /*
@@ -50,11 +52,11 @@ _IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))
 struct ioctl_gntdev_map_grant_ref {
         /* IN parameters */
         /* The number of grants to be mapped. */
-        uint32_t count;
-        uint32_t pad;
+        __u32 count;
+        __u32 pad;
         /* OUT parameters */
         /* The offset to be used on a subsequent call to mmap(). */
-        uint64_t index;
+        __u64 index;
         /* Variable IN parameter. */
         /* Array of grant references, of size @count. */
         struct ioctl_gntdev_grant_ref refs[1];
@@ -70,10 +72,10 @@ _IOC(_IOC_NONE, 'G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref))
 struct ioctl_gntdev_unmap_grant_ref {
         /* IN parameters */
         /* The offset was returned by the corresponding map operation. */
-        uint64_t index;
+        __u64 index;
         /* The number of pages to be unmapped. */
-        uint32_t count;
-        uint32_t pad;
+        __u32 count;
+        __u32 pad;
 };
 
 /*
@@ -93,13 +95,13 @@ _IOC(_IOC_NONE, 'G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr))
 struct ioctl_gntdev_get_offset_for_vaddr {
         /* IN parameters */
         /* The virtual address of the first mapped page in a range. */
-        uint64_t vaddr;
+        __u64 vaddr;
         /* OUT parameters */
         /* The offset that was used in the initial mmap() operation. */
-        uint64_t offset;
+        __u64 offset;
         /* The number of pages mapped in the VM area that begins at @vaddr. */
-        uint32_t count;
-        uint32_t pad;
+        __u32 count;
+        __u32 pad;
 };
 
 /*
@@ -113,7 +115,7 @@ _IOC(_IOC_NONE, 'G', 3, sizeof(struct ioctl_gntdev_set_max_grants))
 struct ioctl_gntdev_set_max_grants {
         /* IN parameter */
         /* The maximum number of grants that may be mapped at once. */
-        uint32_t count;
+        __u32 count;
 };
 
 /*
@@ -135,11 +137,11 @@ struct ioctl_gntdev_unmap_notify {
          * be cleared. Otherwise, it can be any byte in the page whose
          * notification we are adjusting.
          */
-        uint64_t index;
+        __u64 index;
         /* Action(s) to take on unmap */
-        uint32_t action;
+        __u32 action;
         /* Event channel to notify */
-        uint32_t event_channel_port;
+        __u32 event_channel_port;
 };
 
 /* Clear (set to zero) the byte specified by index */