605 files changed, 14305 insertions, 5357 deletions

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 61e32ec1fc4d..8de4fa90e8c4 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -252,6 +252,7 @@ struct acpi_device_pnp {
 #define acpi_device_bid(d)      ((d)->pnp.bus_id)
 #define acpi_device_adr(d)      ((d)->pnp.bus_address)
 const char *acpi_device_hid(struct acpi_device *device);
+#define acpi_device_uid(d)      ((d)->pnp.unique_id)
 #define acpi_device_name(d)     ((d)->pnp.device_name)
 #define acpi_device_class(d)    ((d)->pnp.device_class)
 
@@ -386,7 +387,8 @@ static inline bool is_acpi_node(struct fwnode_handle *fwnode)
 
 static inline struct acpi_device *acpi_node(struct fwnode_handle *fwnode)
 {
-        return fwnode ? container_of(fwnode, struct acpi_device, fwnode) : NULL;
+        return is_acpi_node(fwnode) ?
+                container_of(fwnode, struct acpi_device, fwnode) : NULL;
 }
 
 static inline struct fwnode_handle *acpi_fwnode_handle(struct acpi_device *adev)
diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h
index 444671e9c65d..dd86c5fc102d 100644
--- a/include/acpi/acpi_io.h
+++ b/include/acpi/acpi_io.h
@@ -3,11 +3,15 @@
 
 #include <linux/io.h>
 
+#include <asm/acpi.h>
+
+#ifndef acpi_os_ioremap
 static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
                                             acpi_size size)
 {
        return ioremap_cache(phys, size);
 }
+#endif
 
 void __iomem *__init_refok
 acpi_os_map_iomem(acpi_physical_address phys, acpi_size size);
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index d56f5d722138..08ef57bc8d63 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -46,7 +46,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20150204
+#define ACPI_CA_VERSION                 0x20150410
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
@@ -431,13 +431,13 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_load_tables(void))
 ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_reallocate_root_table(void))
 
 ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init
-                            acpi_find_root_pointer(acpi_size * rsdp_address))
-
+                            acpi_find_root_pointer(acpi_physical_address *
+                                                   rsdp_address))
 ACPI_EXTERNAL_RETURN_STATUS(acpi_status
-                            acpi_get_table_header(acpi_string signature,
-                                                  u32 instance,
-                                                  struct acpi_table_header
-                                                  *out_table_header))
+                             acpi_get_table_header(acpi_string signature,
+                                                   u32 instance,
+                                                   struct acpi_table_header
+                                                   *out_table_header))
 ACPI_EXTERNAL_RETURN_STATUS(acpi_status
                              acpi_get_table(acpi_string signature, u32 instance,
                                             struct acpi_table_header
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index f06d75e5fa54..cafdeb50fbdf 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -73,6 +73,7 @@
 #define ACPI_SIG_LPIT           "LPIT"  /* Low Power Idle Table */
 #define ACPI_SIG_MCFG           "MCFG"  /* PCI Memory Mapped Configuration table */
 #define ACPI_SIG_MCHI           "MCHI"  /* Management Controller Host Interface table */
+#define ACPI_SIG_MSDM           "MSDM"  /* Microsoft Data Management Table */
 #define ACPI_SIG_MTMR           "MTMR"  /* MID Timer table */
 #define ACPI_SIG_SLIC           "SLIC"  /* Software Licensing Description Table */
 #define ACPI_SIG_SPCR           "SPCR"  /* Serial Port Console Redirection table */
@@ -845,7 +846,8 @@ struct acpi_lpit_header {
 
 enum acpi_lpit_type {
         ACPI_LPIT_TYPE_NATIVE_CSTATE = 0x00,
-        ACPI_LPIT_TYPE_SIMPLE_IO = 0x01
+        ACPI_LPIT_TYPE_SIMPLE_IO = 0x01,
+        ACPI_LPIT_TYPE_RESERVED = 0x02  /* 2 and above are reserved */
 };
 
 /* Masks for Flags field above  */
@@ -935,6 +937,21 @@ struct acpi_table_mchi {
 
 /*******************************************************************************
  *
+ * MSDM - Microsoft Data Management table
+ *
+ * Conforms to "Microsoft Software Licensing Tables (SLIC and MSDM)",
+ * November 29, 2011. Copyright 2011 Microsoft
+ *
+ ******************************************************************************/
+
+/* Basic MSDM table is only the common ACPI header */
+
+struct acpi_table_msdm {
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/*******************************************************************************
+ *
  * MTMR - MID Timer Table
  *        Version 1
  *
@@ -959,10 +976,9 @@ struct acpi_mtmr_entry {
 /*******************************************************************************
  *
  * SLIC - Software Licensing Description Table
- *        Version 1
  *
- * Conforms to "OEM Activation 2.0 for Windows Vista Operating Systems",
- * Copyright 2006
+ * Conforms to "Microsoft Software Licensing Tables (SLIC and MSDM)",
+ * November 29, 2011. Copyright 2011 Microsoft
  *
  ******************************************************************************/
 
@@ -972,52 +988,6 @@ struct acpi_table_slic {
         struct acpi_table_header header;        /* Common ACPI table header */
 };
 
-/* Common SLIC subtable header */
-
-struct acpi_slic_header {
-        u32 type;
-        u32 length;
-};
-
-/* Values for Type field above */
-
-enum acpi_slic_type {
-        ACPI_SLIC_TYPE_PUBLIC_KEY = 0,
-        ACPI_SLIC_TYPE_WINDOWS_MARKER = 1,
-        ACPI_SLIC_TYPE_RESERVED = 2     /* 2 and greater are reserved */
-};
-
-/*
- * SLIC Subtables, correspond to Type in struct acpi_slic_header
- */
-
-/* 0: Public Key Structure */
-
-struct acpi_slic_key {
-        struct acpi_slic_header header;
-        u8 key_type;
-        u8 version;
-        u16 reserved;
-        u32 algorithm;
-        char magic[4];
-        u32 bit_length;
-        u32 exponent;
-        u8 modulus[128];
-};
-
-/* 1: Windows Marker Structure */
-
-struct acpi_slic_marker {
-        struct acpi_slic_header header;
-        u32 version;
-        char oem_id[ACPI_OEM_ID_SIZE];  /* ASCII OEM identification */
-        char oem_table_id[ACPI_OEM_TABLE_ID_SIZE];      /* ASCII OEM table identification */
-        char windows_flag[8];
-        u32 slic_version;
-        u8 reserved[16];
-        u8 signature[128];
-};
-
 /*******************************************************************************
  *
  * SPCR - Serial Port Console Redirection table
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index b034f1068dfe..f5ca0e989bba 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -199,9 +199,29 @@ typedef int s32;
 typedef s32 acpi_native_int;
 
 typedef u32 acpi_size;
+
+#ifdef ACPI_32BIT_PHYSICAL_ADDRESS
+
+/*
+ * OSPMs can define this to shrink the size of the structures for 32-bit
+ * none PAE environment. ASL compiler may always define this to generate
+ * 32-bit OSPM compliant tables.
+ */
 typedef u32 acpi_io_address;
 typedef u32 acpi_physical_address;
 
+#else                           /* ACPI_32BIT_PHYSICAL_ADDRESS */
+
+/*
+ * It is reported that, after some calculations, the physical addresses can
+ * wrap over the 32-bit boundary on 32-bit PAE environment.
+ * https://bugzilla.kernel.org/show_bug.cgi?id=87971
+ */
+typedef u64 acpi_io_address;
+typedef u64 acpi_physical_address;
+
+#endif                          /* ACPI_32BIT_PHYSICAL_ADDRESS */
+
 #define ACPI_MAX_PTR                    ACPI_UINT32_MAX
 #define ACPI_SIZE_MAX                   ACPI_UINT32_MAX
 
@@ -713,33 +733,32 @@ typedef u32 acpi_event_type;
  * The encoding of acpi_event_status is illustrated below.
  * Note that a set bit (1) indicates the property is TRUE
  * (e.g. if bit 0 is set then the event is enabled).
- * +-------------+-+-+-+-+
- * |   Bits 31:4 |3|2|1|0|
- * +-------------+-+-+-+-+
- *          |     | | | |
- *          |     | | | +- Enabled?
- *          |     | | +--- Enabled for wake?
- *          |     | +----- Set?
- *          |     +------- Has a handler?
- *          +------------- <Reserved>
+ * +-------------+-+-+-+-+-+
+ * |   Bits 31:5 |4|3|2|1|0|
+ * +-------------+-+-+-+-+-+
+ *          |     | | | | |
+ *          |     | | | | +- Enabled?
+ *          |     | | | +--- Enabled for wake?
+ *          |     | | +----- Status bit set?
+ *          |     | +------- Enable bit set?
+ *          |     +--------- Has a handler?
+ *          +--------------- <Reserved>
  */
 typedef u32 acpi_event_status;
 
 #define ACPI_EVENT_FLAG_DISABLED        (acpi_event_status) 0x00
 #define ACPI_EVENT_FLAG_ENABLED         (acpi_event_status) 0x01
 #define ACPI_EVENT_FLAG_WAKE_ENABLED    (acpi_event_status) 0x02
-#define ACPI_EVENT_FLAG_SET             (acpi_event_status) 0x04
-#define ACPI_EVENT_FLAG_HAS_HANDLER     (acpi_event_status) 0x08
+#define ACPI_EVENT_FLAG_STATUS_SET      (acpi_event_status) 0x04
+#define ACPI_EVENT_FLAG_ENABLE_SET      (acpi_event_status) 0x08
+#define ACPI_EVENT_FLAG_HAS_HANDLER     (acpi_event_status) 0x10
+#define ACPI_EVENT_FLAG_SET             ACPI_EVENT_FLAG_STATUS_SET
 
 /* Actions for acpi_set_gpe, acpi_gpe_wakeup, acpi_hw_low_set_gpe */
 
 #define ACPI_GPE_ENABLE                 0
 #define ACPI_GPE_DISABLE                1
 #define ACPI_GPE_CONDITIONAL_ENABLE     2
-#define ACPI_GPE_SAVE_MASK              4
-
-#define ACPI_GPE_ENABLE_SAVE            (ACPI_GPE_ENABLE | ACPI_GPE_SAVE_MASK)
-#define ACPI_GPE_DISABLE_SAVE           (ACPI_GPE_DISABLE | ACPI_GPE_SAVE_MASK)
 
 /*
  * GPE info flags - Per GPE
@@ -1251,6 +1270,7 @@ struct acpi_memory_list {
 #define ACPI_OSI_WIN_VISTA_SP2          0x0A
 #define ACPI_OSI_WIN_7                  0x0B
 #define ACPI_OSI_WIN_8                  0x0C
+#define ACPI_OSI_WIN_10                 0x0D
 
 /* Definitions of file IO */
 
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index ad74dc51d5b7..ecdf9405dd3a 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -76,6 +76,7 @@
 #define ACPI_LARGE_NAMESPACE_NODE
 #define ACPI_DATA_TABLE_DISASSEMBLY
 #define ACPI_SINGLE_THREADED
+#define ACPI_32BIT_PHYSICAL_ADDRESS
 #endif
 
 /* acpi_exec configuration. Multithreaded with full AML debugger */
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index b95dc32a6e6b..4188a4d3b597 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -196,7 +196,7 @@ struct acpi_processor_flags {
 struct acpi_processor {
         acpi_handle handle;
         u32 acpi_id;
-        u32 phys_id;    /* CPU hardware ID such as APIC ID for x86 */
+        phys_cpuid_t phys_id;   /* CPU hardware ID such as APIC ID for x86 */
         u32 id;         /* CPU logical ID allocated by OS */
         u32 pblk;
         int performance_platform_limit;
@@ -310,8 +310,8 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
 #endif                          /* CONFIG_CPU_FREQ */
 
 /* in processor_core.c */
-int acpi_get_phys_id(acpi_handle, int type, u32 acpi_id);
-int acpi_map_cpuid(int phys_id, u32 acpi_id);
+phys_cpuid_t acpi_get_phys_id(acpi_handle, int type, u32 acpi_id);
+int acpi_map_cpuid(phys_cpuid_t phys_id, u32 acpi_id);
 int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);
 
 /* in processor_pdc.c */
diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h
index 3378dcf4c31e..940d5ec122c9 100644
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
@@ -39,6 +39,10 @@ static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
         debug_dma_unmap_page(dev, addr, size, dir, true);
 }
 
+/*
+ * dma_maps_sg_attrs returns 0 on error and > 0 on success.
+ * It should never return a value < 0.
+ */
 static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
                                    int nents, enum dma_data_direction dir,
                                    struct dma_attrs *attrs)
@@ -51,6 +55,7 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
                 kmemcheck_mark_initialized(sg_virt(s), s->length);
         BUG_ON(!valid_dma_direction(dir));
         ents = ops->map_sg(dev, sg, nents, dir, attrs);
+        BUG_ON(ents < 0);
         debug_dma_map_sg(dev, sg, nents, ents, dir);
 
         return ents;
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 383ade1a211b..9bb0d11729c9 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -5,7 +5,6 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/of.h>
-#include <linux/pinctrl/pinctrl.h>
 
 #ifdef CONFIG_GPIOLIB
 
@@ -139,53 +138,6 @@ static inline void gpio_unexport(unsigned gpio)
         gpiod_unexport(gpio_to_desc(gpio));
 }
 
-#ifdef CONFIG_PINCTRL
-
-/**
- * struct gpio_pin_range - pin range controlled by a gpio chip
- * @head: list for maintaining set of pin ranges, used internally
- * @pctldev: pinctrl device which handles corresponding pins
- * @range: actual range of pins controlled by a gpio controller
- */
-
-struct gpio_pin_range {
-        struct list_head node;
-        struct pinctrl_dev *pctldev;
-        struct pinctrl_gpio_range range;
-};
-
-int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
-                           unsigned int gpio_offset, unsigned int pin_offset,
-                           unsigned int npins);
-int gpiochip_add_pingroup_range(struct gpio_chip *chip,
-                        struct pinctrl_dev *pctldev,
-                        unsigned int gpio_offset, const char *pin_group);
-void gpiochip_remove_pin_ranges(struct gpio_chip *chip);
-
-#else
-
-static inline int
-gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
-                       unsigned int gpio_offset, unsigned int pin_offset,
-                       unsigned int npins)
-{
-        return 0;
-}
-static inline int
-gpiochip_add_pingroup_range(struct gpio_chip *chip,
-                        struct pinctrl_dev *pctldev,
-                        unsigned int gpio_offset, const char *pin_group)
-{
-        return 0;
-}
-
-static inline void
-gpiochip_remove_pin_ranges(struct gpio_chip *chip)
-{
-}
-
-#endif /* CONFIG_PINCTRL */
-
 #else   /* !CONFIG_GPIOLIB */
 
 static inline bool gpio_is_valid(int number)
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 4d46085c1b90..39f1d6a2b04d 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -6,6 +6,12 @@
 
 #include <linux/mm_types.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
+
+#if 4 - defined(__PAGETABLE_PUD_FOLDED) - defined(__PAGETABLE_PMD_FOLDED) != \
+        CONFIG_PGTABLE_LEVELS
+#error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{PUD,PMD}_FOLDED
+#endif
 
 /*
  * On almost all architectures and configurations, 0 can be used as the
@@ -691,6 +697,30 @@ static inline int pmd_protnone(pmd_t pmd)
 
 #endif /* CONFIG_MMU */
 
+#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
+int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot);
+int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot);
+int pud_clear_huge(pud_t *pud);
+int pmd_clear_huge(pmd_t *pmd);
+#else   /* !CONFIG_HAVE_ARCH_HUGE_VMAP */
+static inline int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot)
+{
+        return 0;
+}
+static inline int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot)
+{
+        return 0;
+}
+static inline int pud_clear_huge(pud_t *pud)
+{
+        return 0;
+}
+static inline int pmd_clear_huge(pmd_t *pmd)
+{
+        return 0;
+}
+#endif  /* CONFIG_HAVE_ARCH_HUGE_VMAP */
+
 #endif /* !__ASSEMBLY__ */
 
 #ifndef io_remap_pfn_range
diff --git a/include/asm-generic/seccomp.h b/include/asm-generic/seccomp.h
index 9fa1f653ed3b..c9ccafa0d99a 100644
--- a/include/asm-generic/seccomp.h
+++ b/include/asm-generic/seccomp.h
@@ -17,7 +17,9 @@
 #define __NR_seccomp_read_32            __NR_read
 #define __NR_seccomp_write_32           __NR_write
 #define __NR_seccomp_exit_32            __NR_exit
+#ifndef __NR_seccomp_sigreturn_32
 #define __NR_seccomp_sigreturn_32       __NR_rt_sigreturn
+#endif
 #endif /* CONFIG_COMPAT && ! already defined */
 
 #define __NR_seccomp_read               __NR_read
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index ac78910d7416..8bd374d3cf21 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -124,7 +124,10 @@
 #define FTRACE_EVENTS() . = ALIGN(8);                                   \
                         VMLINUX_SYMBOL(__start_ftrace_events) = .;      \
                         *(_ftrace_events)                               \
-                        VMLINUX_SYMBOL(__stop_ftrace_events) = .;
+                        VMLINUX_SYMBOL(__stop_ftrace_events) = .;       \
+                        VMLINUX_SYMBOL(__start_ftrace_enum_maps) = .;   \
+                        *(_ftrace_enum_map)                             \
+                        VMLINUX_SYMBOL(__stop_ftrace_enum_maps) = .;
 #else
 #define FTRACE_EVENTS()
 #endif
@@ -150,6 +153,14 @@
 #define TRACE_SYSCALLS()
 #endif
 
+#ifdef CONFIG_SERIAL_EARLYCON
+#define EARLYCON_TABLE() STRUCT_ALIGN();                        \
+                         VMLINUX_SYMBOL(__earlycon_table) = .;  \
+                         *(__earlycon_table)                    \
+                         *(__earlycon_table_end)
+#else
+#define EARLYCON_TABLE()
+#endif
 
 #define ___OF_TABLE(cfg, name)  _OF_TABLE_##cfg(name)
 #define __OF_TABLE(cfg, name)   ___OF_TABLE(cfg, name)
@@ -167,6 +178,7 @@
 #define IOMMU_OF_TABLES()       OF_TABLE(CONFIG_OF_IOMMU, iommu)
 #define RESERVEDMEM_OF_TABLES() OF_TABLE(CONFIG_OF_RESERVED_MEM, reservedmem)
 #define CPU_METHOD_OF_TABLES()  OF_TABLE(CONFIG_SMP, cpu_method)
+#define CPUIDLE_METHOD_OF_TABLES() OF_TABLE(CONFIG_CPU_IDLE, cpuidle_method)
 #define EARLYCON_OF_TABLES()    OF_TABLE(CONFIG_SERIAL_EARLYCON, earlycon)
 
 #define KERNEL_DTB()                                                    \
@@ -401,7 +413,7 @@
 #define TEXT_TEXT                                                       \
                 ALIGN_FUNCTION();                                       \
                 *(.text.hot)                                            \
-                *(.text)                                                \
+                *(.text .text.fixup)                                    \
                 *(.ref.text)                                            \
         MEM_KEEP(init.text)                                             \
         MEM_KEEP(exit.text)                                             \
@@ -501,8 +513,10 @@
         CLKSRC_OF_TABLES()                                              \
         IOMMU_OF_TABLES()                                               \
         CPU_METHOD_OF_TABLES()                                          \
+        CPUIDLE_METHOD_OF_TABLES()                                      \
         KERNEL_DTB()                                                    \
         IRQCHIP_OF_MATCH_TABLE()                                        \
+        EARLYCON_TABLE()                                                \
         EARLYCON_OF_TABLES()
 
 #define INIT_TEXT                                                       \
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 623a59c1ff5a..0ecb7688af71 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -137,7 +137,7 @@ struct crypto_template *crypto_lookup_template(const char *name);
 
 int crypto_register_instance(struct crypto_template *tmpl,
                              struct crypto_instance *inst);
-int crypto_unregister_instance(struct crypto_alg *alg);
+int crypto_unregister_instance(struct crypto_instance *inst);
 
 int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
                       struct crypto_instance *inst, u32 mask);
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index 178525e5f430..018afb264ac2 100644
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -58,8 +58,9 @@ struct af_alg_type {
 };
 
 struct af_alg_sgl {
-        struct scatterlist sg[ALG_MAX_PAGES];
+        struct scatterlist sg[ALG_MAX_PAGES + 1];
         struct page *pages[ALG_MAX_PAGES];
+        unsigned int npages;
 };
 
 int af_alg_register_type(const struct af_alg_type *type);
@@ -70,6 +71,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock);
 
 int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len);
 void af_alg_free_sg(struct af_alg_sgl *sgl);
+void af_alg_link_sg(struct af_alg_sgl *sgl_prev, struct af_alg_sgl *sgl_new);
 
 int af_alg_cmsg_send(struct msghdr *msg, struct af_alg_control *con);
 
diff --git a/include/crypto/rng.h b/include/crypto/rng.h
index a16fb10142bf..6e28ea5be9f1 100644
--- a/include/crypto/rng.h
+++ b/include/crypto/rng.h
@@ -103,8 +103,7 @@ static inline void crypto_free_rng(struct crypto_rng *tfm)
  * This function fills the caller-allocated buffer with random numbers using the
  * random number generator referenced by the cipher handle.
  *
- * Return: > 0 function was successful and returns the number of generated
- *         bytes; < 0 if an error occurred
+ * Return: 0 function was successful; < 0 if an error occurred
  */
 static inline int crypto_rng_get_bytes(struct crypto_rng *tfm,
                                        u8 *rdata, unsigned int dlen)
diff --git a/include/crypto/sha.h b/include/crypto/sha.h
index 190f8a0e0242..dd7905a3c22e 100644
--- a/include/crypto/sha.h
+++ b/include/crypto/sha.h
@@ -65,20 +65,20 @@
 #define SHA512_H7       0x5be0cd19137e2179ULL
 
 struct sha1_state {
-        u64 count;
         u32 state[SHA1_DIGEST_SIZE / 4];
+        u64 count;
         u8 buffer[SHA1_BLOCK_SIZE];
 };
 
 struct sha256_state {
-        u64 count;
         u32 state[SHA256_DIGEST_SIZE / 4];
+        u64 count;
         u8 buf[SHA256_BLOCK_SIZE];
 };
 
 struct sha512_state {
-        u64 count[2];
         u64 state[SHA512_DIGEST_SIZE / 8];
+        u64 count[2];
         u8 buf[SHA512_BLOCK_SIZE];
 };
 
@@ -87,9 +87,18 @@ struct shash_desc;
 extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
                               unsigned int len);
 
+extern int crypto_sha1_finup(struct shash_desc *desc, const u8 *data,
+                             unsigned int len, u8 *hash);
+
 extern int crypto_sha256_update(struct shash_desc *desc, const u8 *data,
                               unsigned int len);
 
+extern int crypto_sha256_finup(struct shash_desc *desc, const u8 *data,
+                               unsigned int len, u8 *hash);
+
 extern int crypto_sha512_update(struct shash_desc *desc, const u8 *data,
                               unsigned int len);
+
+extern int crypto_sha512_finup(struct shash_desc *desc, const u8 *data,
+                               unsigned int len, u8 *hash);
 #endif
diff --git a/include/crypto/sha1_base.h b/include/crypto/sha1_base.h
new file mode 100644
index 000000000000..d0df431f9a97
--- /dev/null
+++ b/include/crypto/sha1_base.h
@@ -0,0 +1,106 @@
+/*
+ * sha1_base.h - core logic for SHA-1 implementations
+ *
+ * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
+ *
+ * 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.
+ */
+
+#include <crypto/internal/hash.h>
+#include <crypto/sha.h>
+#include <linux/crypto.h>
+#include <linux/module.h>
+
+#include <asm/unaligned.h>
+
+typedef void (sha1_block_fn)(struct sha1_state *sst, u8 const *src, int blocks);
+
+static inline int sha1_base_init(struct shash_desc *desc)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA1_H0;
+        sctx->state[1] = SHA1_H1;
+        sctx->state[2] = SHA1_H2;
+        sctx->state[3] = SHA1_H3;
+        sctx->state[4] = SHA1_H4;
+        sctx->count = 0;
+
+        return 0;
+}
+
+static inline int sha1_base_do_update(struct shash_desc *desc,
+                                      const u8 *data,
+                                      unsigned int len,
+                                      sha1_block_fn *block_fn)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial = sctx->count % SHA1_BLOCK_SIZE;
+
+        sctx->count += len;
+
+        if (unlikely((partial + len) >= SHA1_BLOCK_SIZE)) {
+                int blocks;
+
+                if (partial) {
+                        int p = SHA1_BLOCK_SIZE - partial;
+
+                        memcpy(sctx->buffer + partial, data, p);
+                        data += p;
+                        len -= p;
+
+                        block_fn(sctx, sctx->buffer, 1);
+                }
+
+                blocks = len / SHA1_BLOCK_SIZE;
+                len %= SHA1_BLOCK_SIZE;
+
+                if (blocks) {
+                        block_fn(sctx, data, blocks);
+                        data += blocks * SHA1_BLOCK_SIZE;
+                }
+                partial = 0;
+        }
+        if (len)
+                memcpy(sctx->buffer + partial, data, len);
+
+        return 0;
+}
+
+static inline int sha1_base_do_finalize(struct shash_desc *desc,
+                                        sha1_block_fn *block_fn)
+{
+        const int bit_offset = SHA1_BLOCK_SIZE - sizeof(__be64);
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        __be64 *bits = (__be64 *)(sctx->buffer + bit_offset);
+        unsigned int partial = sctx->count % SHA1_BLOCK_SIZE;
+
+        sctx->buffer[partial++] = 0x80;
+        if (partial > bit_offset) {
+                memset(sctx->buffer + partial, 0x0, SHA1_BLOCK_SIZE - partial);
+                partial = 0;
+
+                block_fn(sctx, sctx->buffer, 1);
+        }
+
+        memset(sctx->buffer + partial, 0x0, bit_offset - partial);
+        *bits = cpu_to_be64(sctx->count << 3);
+        block_fn(sctx, sctx->buffer, 1);
+
+        return 0;
+}
+
+static inline int sha1_base_finish(struct shash_desc *desc, u8 *out)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        __be32 *digest = (__be32 *)out;
+        int i;
+
+        for (i = 0; i < SHA1_DIGEST_SIZE / sizeof(__be32); i++)
+                put_unaligned_be32(sctx->state[i], digest++);
+
+        *sctx = (struct sha1_state){};
+        return 0;
+}
diff --git a/include/crypto/sha256_base.h b/include/crypto/sha256_base.h
new file mode 100644
index 000000000000..d1f2195bb7de
--- /dev/null
+++ b/include/crypto/sha256_base.h
@@ -0,0 +1,128 @@
+/*
+ * sha256_base.h - core logic for SHA-256 implementations
+ *
+ * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
+ *
+ * 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.
+ */
+
+#include <crypto/internal/hash.h>
+#include <crypto/sha.h>
+#include <linux/crypto.h>
+#include <linux/module.h>
+
+#include <asm/unaligned.h>
+
+typedef void (sha256_block_fn)(struct sha256_state *sst, u8 const *src,
+                               int blocks);
+
+static inline int sha224_base_init(struct shash_desc *desc)
+{
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA224_H0;
+        sctx->state[1] = SHA224_H1;
+        sctx->state[2] = SHA224_H2;
+        sctx->state[3] = SHA224_H3;
+        sctx->state[4] = SHA224_H4;
+        sctx->state[5] = SHA224_H5;
+        sctx->state[6] = SHA224_H6;
+        sctx->state[7] = SHA224_H7;
+        sctx->count = 0;
+
+        return 0;
+}
+
+static inline int sha256_base_init(struct shash_desc *desc)
+{
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA256_H0;
+        sctx->state[1] = SHA256_H1;
+        sctx->state[2] = SHA256_H2;
+        sctx->state[3] = SHA256_H3;
+        sctx->state[4] = SHA256_H4;
+        sctx->state[5] = SHA256_H5;
+        sctx->state[6] = SHA256_H6;
+        sctx->state[7] = SHA256_H7;
+        sctx->count = 0;
+
+        return 0;
+}
+
+static inline int sha256_base_do_update(struct shash_desc *desc,
+                                        const u8 *data,
+                                        unsigned int len,
+                                        sha256_block_fn *block_fn)
+{
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial = sctx->count % SHA256_BLOCK_SIZE;
+
+        sctx->count += len;
+
+        if (unlikely((partial + len) >= SHA256_BLOCK_SIZE)) {
+                int blocks;
+
+                if (partial) {
+                        int p = SHA256_BLOCK_SIZE - partial;
+
+                        memcpy(sctx->buf + partial, data, p);
+                        data += p;
+                        len -= p;
+
+                        block_fn(sctx, sctx->buf, 1);
+                }
+
+                blocks = len / SHA256_BLOCK_SIZE;
+                len %= SHA256_BLOCK_SIZE;
+
+                if (blocks) {
+                        block_fn(sctx, data, blocks);
+                        data += blocks * SHA256_BLOCK_SIZE;
+                }
+                partial = 0;
+        }
+        if (len)
+                memcpy(sctx->buf + partial, data, len);
+
+        return 0;
+}
+
+static inline int sha256_base_do_finalize(struct shash_desc *desc,
+                                          sha256_block_fn *block_fn)
+{
+        const int bit_offset = SHA256_BLOCK_SIZE - sizeof(__be64);
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+        __be64 *bits = (__be64 *)(sctx->buf + bit_offset);
+        unsigned int partial = sctx->count % SHA256_BLOCK_SIZE;
+
+        sctx->buf[partial++] = 0x80;
+        if (partial > bit_offset) {
+                memset(sctx->buf + partial, 0x0, SHA256_BLOCK_SIZE - partial);
+                partial = 0;
+
+                block_fn(sctx, sctx->buf, 1);
+        }
+
+        memset(sctx->buf + partial, 0x0, bit_offset - partial);
+        *bits = cpu_to_be64(sctx->count << 3);
+        block_fn(sctx, sctx->buf, 1);
+
+        return 0;
+}
+
+static inline int sha256_base_finish(struct shash_desc *desc, u8 *out)
+{
+        unsigned int digest_size = crypto_shash_digestsize(desc->tfm);
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+        __be32 *digest = (__be32 *)out;
+        int i;
+
+        for (i = 0; digest_size > 0; i++, digest_size -= sizeof(__be32))
+                put_unaligned_be32(sctx->state[i], digest++);
+
+        *sctx = (struct sha256_state){};
+        return 0;
+}
diff --git a/include/crypto/sha512_base.h b/include/crypto/sha512_base.h
new file mode 100644
index 000000000000..6c5341e005ea
--- /dev/null
+++ b/include/crypto/sha512_base.h
@@ -0,0 +1,131 @@
+/*
+ * sha512_base.h - core logic for SHA-512 implementations
+ *
+ * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
+ *
+ * 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.
+ */
+
+#include <crypto/internal/hash.h>
+#include <crypto/sha.h>
+#include <linux/crypto.h>
+#include <linux/module.h>
+
+#include <asm/unaligned.h>
+
+typedef void (sha512_block_fn)(struct sha512_state *sst, u8 const *src,
+                               int blocks);
+
+static inline int sha384_base_init(struct shash_desc *desc)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA384_H0;
+        sctx->state[1] = SHA384_H1;
+        sctx->state[2] = SHA384_H2;
+        sctx->state[3] = SHA384_H3;
+        sctx->state[4] = SHA384_H4;
+        sctx->state[5] = SHA384_H5;
+        sctx->state[6] = SHA384_H6;
+        sctx->state[7] = SHA384_H7;
+        sctx->count[0] = sctx->count[1] = 0;
+
+        return 0;
+}
+
+static inline int sha512_base_init(struct shash_desc *desc)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA512_H0;
+        sctx->state[1] = SHA512_H1;
+        sctx->state[2] = SHA512_H2;
+        sctx->state[3] = SHA512_H3;
+        sctx->state[4] = SHA512_H4;
+        sctx->state[5] = SHA512_H5;
+        sctx->state[6] = SHA512_H6;
+        sctx->state[7] = SHA512_H7;
+        sctx->count[0] = sctx->count[1] = 0;
+
+        return 0;
+}
+
+static inline int sha512_base_do_update(struct shash_desc *desc,
+                                        const u8 *data,
+                                        unsigned int len,
+                                        sha512_block_fn *block_fn)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial = sctx->count[0] % SHA512_BLOCK_SIZE;
+
+        sctx->count[0] += len;
+        if (sctx->count[0] < len)
+                sctx->count[1]++;
+
+        if (unlikely((partial + len) >= SHA512_BLOCK_SIZE)) {
+                int blocks;
+
+                if (partial) {
+                        int p = SHA512_BLOCK_SIZE - partial;
+
+                        memcpy(sctx->buf + partial, data, p);
+                        data += p;
+                        len -= p;
+
+                        block_fn(sctx, sctx->buf, 1);
+                }
+
+                blocks = len / SHA512_BLOCK_SIZE;
+                len %= SHA512_BLOCK_SIZE;
+
+                if (blocks) {
+                        block_fn(sctx, data, blocks);
+                        data += blocks * SHA512_BLOCK_SIZE;
+                }
+                partial = 0;
+        }
+        if (len)
+                memcpy(sctx->buf + partial, data, len);
+
+        return 0;
+}
+
+static inline int sha512_base_do_finalize(struct shash_desc *desc,
+                                          sha512_block_fn *block_fn)
+{
+        const int bit_offset = SHA512_BLOCK_SIZE - sizeof(__be64[2]);
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+        __be64 *bits = (__be64 *)(sctx->buf + bit_offset);
+        unsigned int partial = sctx->count[0] % SHA512_BLOCK_SIZE;
+
+        sctx->buf[partial++] = 0x80;
+        if (partial > bit_offset) {
+                memset(sctx->buf + partial, 0x0, SHA512_BLOCK_SIZE - partial);
+                partial = 0;
+
+                block_fn(sctx, sctx->buf, 1);
+        }
+
+        memset(sctx->buf + partial, 0x0, bit_offset - partial);
+        bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61);
+        bits[1] = cpu_to_be64(sctx->count[0] << 3);
+        block_fn(sctx, sctx->buf, 1);
+
+        return 0;
+}
+
+static inline int sha512_base_finish(struct shash_desc *desc, u8 *out)
+{
+        unsigned int digest_size = crypto_shash_digestsize(desc->tfm);
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+        __be64 *digest = (__be64 *)out;
+        int i;
+
+        for (i = 0; digest_size > 0; i++, digest_size -= sizeof(__be64))
+                put_unaligned_be64(sctx->state[i], digest++);
+
+        *sctx = (struct sha512_state){};
+        return 0;
+}
diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index 5a4f49005169..de13bfc35634 100644
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
@@ -38,17 +38,18 @@ struct dw_hdmi_curr_ctrl {
         u16 curr[DW_HDMI_RES_MAX];
 };
 
-struct dw_hdmi_sym_term {
+struct dw_hdmi_phy_config {
         unsigned long mpixelclock;
         u16 sym_ctr;    /*clock symbol and transmitter control*/
         u16 term;       /*transmission termination value*/
+        u16 vlev_ctr;   /* voltage level control */
 };
 
 struct dw_hdmi_plat_data {
         enum dw_hdmi_devtype dev_type;
         const struct dw_hdmi_mpll_config *mpll_cfg;
         const struct dw_hdmi_curr_ctrl *cur_ctr;
-        const struct dw_hdmi_sym_term *sym_term;
+        const struct dw_hdmi_phy_config *phy_config;
         enum drm_mode_status (*mode_valid)(struct drm_connector *connector,
                                            struct drm_display_mode *mode);
 };
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index e928625a9da0..62c40777c009 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -104,6 +104,9 @@ struct dma_buf_attachment;
  * PRIME: used in the prime code.
  *        This is the category used by the DRM_DEBUG_PRIME() macro.
  *
+ * ATOMIC: used in the atomic code.
+ *        This is the category used by the DRM_DEBUG_ATOMIC() macro.
+ *
  * Enabling verbose debug messages is done through the drm.debug parameter,
  * each category being enabled by a bit.
  *
@@ -121,6 +124,7 @@ struct dma_buf_attachment;
 #define DRM_UT_DRIVER           0x02
 #define DRM_UT_KMS              0x04
 #define DRM_UT_PRIME            0x08
+#define DRM_UT_ATOMIC           0x10
 
 extern __printf(2, 3)
 void drm_ut_debug_printk(const char *function_name,
@@ -207,6 +211,11 @@ void drm_err(const char *format, ...);
                 if (unlikely(drm_debug & DRM_UT_PRIME))                 \
                         drm_ut_debug_printk(__func__, fmt, ##args);     \
         } while (0)
+#define DRM_DEBUG_ATOMIC(fmt, args...)                                  \
+        do {                                                            \
+                if (unlikely(drm_debug & DRM_UT_ATOMIC))                \
+                        drm_ut_debug_printk(__func__, fmt, ##args);     \
+        } while (0)
 
 /*@}*/
 
@@ -244,7 +253,6 @@ struct drm_ioctl_desc {
         unsigned int cmd;
         int flags;
         drm_ioctl_t *func;
-        unsigned int cmd_drv;
         const char *name;
 };
 
@@ -253,8 +261,13 @@ struct drm_ioctl_desc {
  * ioctl, for use by drm_ioctl().
  */
 
-#define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)                 \
-        [DRM_IOCTL_NR(DRM_##ioctl)] = {.cmd = DRM_##ioctl, .func = _func, .flags = _flags, .cmd_drv = DRM_IOCTL_##ioctl, .name = #ioctl}
+#define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)                         \
+        [DRM_IOCTL_NR(DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = {        \
+                .cmd = DRM_IOCTL_##ioctl,                               \
+                .func = _func,                                          \
+                .flags = _flags,                                        \
+                .name = #ioctl                                          \
+         }
 
 /* Event queued up for userspace to read */
 struct drm_pending_event {
@@ -922,6 +935,7 @@ extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);
 extern void drm_vblank_off(struct drm_device *dev, int crtc);
 extern void drm_vblank_on(struct drm_device *dev, int crtc);
 extern void drm_crtc_vblank_off(struct drm_crtc *crtc);
+extern void drm_crtc_vblank_reset(struct drm_crtc *crtc);
 extern void drm_crtc_vblank_on(struct drm_crtc *crtc);
 extern void drm_vblank_cleanup(struct drm_device *dev);
 
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index 51168a8b723a..c157103492b0 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -75,4 +75,28 @@ int __must_check drm_atomic_check_only(struct drm_atomic_state *state);
 int __must_check drm_atomic_commit(struct drm_atomic_state *state);
 int __must_check drm_atomic_async_commit(struct drm_atomic_state *state);
 
+#define for_each_connector_in_state(state, connector, connector_state, __i) \
+        for ((__i) = 0;                                                 \
+             (connector) = (state)->connectors[__i],                    \
+             (connector_state) = (state)->connector_states[__i],        \
+             (__i) < (state)->num_connector;                            \
+             (__i)++)                                                   \
+                if (connector)
+
+#define for_each_crtc_in_state(state, crtc, crtc_state, __i)    \
+        for ((__i) = 0;                                         \
+             (crtc) = (state)->crtcs[__i],                      \
+             (crtc_state) = (state)->crtc_states[__i],          \
+             (__i) < (state)->dev->mode_config.num_crtc;        \
+             (__i)++)                                           \
+                if (crtc_state)
+
+#define for_each_plane_in_state(state, plane, plane_state, __i) \
+        for ((__i) = 0;                                         \
+             (plane) = (state)->planes[__i],                    \
+             (plane_state) = (state)->plane_states[__i],        \
+             (__i) < (state)->dev->mode_config.num_total_plane; \
+             (__i)++)                                           \
+                if (plane_state)
+
 #endif /* DRM_ATOMIC_H_ */
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
index 8039d54a7441..d665781eb542 100644
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
@@ -43,9 +43,9 @@ int drm_atomic_helper_commit(struct drm_device *dev,
 void drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
                                         struct drm_atomic_state *old_state);
 
-void drm_atomic_helper_commit_pre_planes(struct drm_device *dev,
-                                         struct drm_atomic_state *state);
-void drm_atomic_helper_commit_post_planes(struct drm_device *dev,
+void drm_atomic_helper_commit_modeset_disables(struct drm_device *dev,
+                                               struct drm_atomic_state *state);
+void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,
                                           struct drm_atomic_state *old_state);
 
 int drm_atomic_helper_prepare_planes(struct drm_device *dev,
@@ -87,20 +87,34 @@ void drm_atomic_helper_connector_dpms(struct drm_connector *connector,
 
 /* default implementations for state handling */
 void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc);
+void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc,
+                                              struct drm_crtc_state *state);
 struct drm_crtc_state *
 drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc);
+void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
+                                            struct drm_crtc_state *state);
 void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
                                           struct drm_crtc_state *state);
 
 void drm_atomic_helper_plane_reset(struct drm_plane *plane);
+void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane,
+                                               struct drm_plane_state *state);
 struct drm_plane_state *
 drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane);
+void __drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,
+                                             struct drm_plane_state *state);
 void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,
                                           struct drm_plane_state *state);
 
 void drm_atomic_helper_connector_reset(struct drm_connector *connector);
+void
+__drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector,
+                                           struct drm_connector_state *state);
 struct drm_connector_state *
 drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector);
+void
+__drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
+                                            struct drm_connector_state *state);
 void drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
                                           struct drm_connector_state *state);
 
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 920e21a8f3fd..ca71c03143d1 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -53,7 +53,6 @@ struct fence;
 #define DRM_MODE_OBJECT_FB 0xfbfbfbfb
 #define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb
 #define DRM_MODE_OBJECT_PLANE 0xeeeeeeee
-#define DRM_MODE_OBJECT_BRIDGE 0xbdbdbdbd
 #define DRM_MODE_OBJECT_ANY 0
 
 struct drm_mode_object {
@@ -202,6 +201,7 @@ struct drm_framebuffer {
         const struct drm_framebuffer_funcs *funcs;
         unsigned int pitches[4];
         unsigned int offsets[4];
+        uint64_t modifier[4];
         unsigned int width;
         unsigned int height;
         /* depth can be 15 or 16 */
@@ -466,7 +466,7 @@ struct drm_crtc {
         int framedur_ns, linedur_ns, pixeldur_ns;
 
         /* if you are using the helper */
-        void *helper_private;
+        const void *helper_private;
 
         struct drm_object_properties properties;
 
@@ -596,7 +596,7 @@ struct drm_encoder {
         struct drm_crtc *crtc;
         struct drm_bridge *bridge;
         const struct drm_encoder_funcs *funcs;
-        void *helper_private;
+        const void *helper_private;
 };
 
 /* should we poll this connector for connects and disconnects */
@@ -700,7 +700,7 @@ struct drm_connector {
         /* requested DPMS state */
         int dpms;
 
-        void *helper_private;
+        const void *helper_private;
 
         /* forced on connector */
         struct drm_cmdline_mode cmdline_mode;
@@ -829,6 +829,7 @@ enum drm_plane_type {
  * @possible_crtcs: pipes this plane can be bound to
  * @format_types: array of formats supported by this plane
  * @format_count: number of formats supported
+ * @format_default: driver hasn't supplied supported formats for the plane
  * @crtc: currently bound CRTC
  * @fb: currently bound fb
  * @old_fb: Temporary tracking of the old fb while a modeset is ongoing. Used by
@@ -849,6 +850,7 @@ struct drm_plane {
         uint32_t possible_crtcs;
         uint32_t *format_types;
         uint32_t format_count;
+        bool format_default;
 
         struct drm_crtc *crtc;
         struct drm_framebuffer *fb;
@@ -861,7 +863,7 @@ struct drm_plane {
 
         enum drm_plane_type type;
 
-        void *helper_private;
+        const void *helper_private;
 
         struct drm_plane_state *state;
 };
@@ -912,7 +914,7 @@ struct drm_bridge {
 };
 
 /**
- * struct struct drm_atomic_state - the global state object for atomic updates
+ * struct drm_atomic_state - the global state object for atomic updates
  * @dev: parent DRM device
  * @allow_modeset: allow full modeset
  * @legacy_cursor_update: hint to enforce legacy cursor ioctl semantics
@@ -972,7 +974,7 @@ struct drm_mode_set {
  * struct drm_mode_config_funcs - basic driver provided mode setting functions
  * @fb_create: create a new framebuffer object
  * @output_poll_changed: function to handle output configuration changes
- * @atomic_check: check whether a give atomic state update is possible
+ * @atomic_check: check whether a given atomic state update is possible
  * @atomic_commit: commit an atomic state update previously verified with
  *      atomic_check()
  *
@@ -1155,6 +1157,9 @@ struct drm_mode_config {
         /* whether async page flip is supported or not */
         bool async_page_flip;
 
+        /* whether the driver supports fb modifiers */
+        bool allow_fb_modifiers;
+
         /* cursor size */
         uint32_t cursor_width, cursor_height;
 };
@@ -1259,6 +1264,8 @@ extern int drm_plane_init(struct drm_device *dev,
 extern void drm_plane_cleanup(struct drm_plane *plane);
 extern unsigned int drm_plane_index(struct drm_plane *plane);
 extern void drm_plane_force_disable(struct drm_plane *plane);
+extern int drm_plane_check_pixel_format(const struct drm_plane *plane,
+                                        u32 format);
 extern void drm_crtc_get_hv_timing(const struct drm_display_mode *mode,
                                    int *hdisplay, int *vdisplay);
 extern int drm_crtc_check_viewport(const struct drm_crtc *crtc,
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index c250a22b39ab..c8fc187061de 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -89,6 +89,7 @@ struct drm_crtc_helper_funcs {
         int (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode,
                         struct drm_display_mode *adjusted_mode, int x, int y,
                         struct drm_framebuffer *old_fb);
+        /* Actually set the mode for atomic helpers, optional */
         void (*mode_set_nofb)(struct drm_crtc *crtc);
 
         /* Move the crtc on the current fb to the given position *optional* */
@@ -119,7 +120,7 @@ struct drm_crtc_helper_funcs {
  * @mode_fixup: try to fixup proposed mode for this connector
  * @prepare: part of the disable sequence, called before the CRTC modeset
  * @commit: called after the CRTC modeset
- * @mode_set: set this mode
+ * @mode_set: set this mode, optional for atomic helpers
  * @get_crtc: return CRTC that the encoder is currently attached to
  * @detect: connection status detection
  * @disable: disable encoder when not in use (overrides DPMS off)
@@ -196,19 +197,19 @@ extern void drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
 static inline void drm_crtc_helper_add(struct drm_crtc *crtc,
                                        const struct drm_crtc_helper_funcs *funcs)
 {
-        crtc->helper_private = (void *)funcs;
+        crtc->helper_private = funcs;
 }
 
 static inline void drm_encoder_helper_add(struct drm_encoder *encoder,
                                           const struct drm_encoder_helper_funcs *funcs)
 {
-        encoder->helper_private = (void *)funcs;
+        encoder->helper_private = funcs;
 }
 
 static inline void drm_connector_helper_add(struct drm_connector *connector,
                                             const struct drm_connector_helper_funcs *funcs)
 {
-        connector->helper_private = (void *)funcs;
+        connector->helper_private = funcs;
 }
 
 extern void drm_helper_resume_force_mode(struct drm_device *dev);
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 7e25030a6aa2..523f04c90dea 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -42,6 +42,8 @@
  * 1.2 formally includes both eDP and DPI definitions.
  */
 
+#define DP_AUX_MAX_PAYLOAD_BYTES        16
+
 #define DP_AUX_I2C_WRITE                0x0
 #define DP_AUX_I2C_READ                 0x1
 #define DP_AUX_I2C_STATUS               0x2
@@ -92,6 +94,15 @@
 # define DP_MSA_TIMING_PAR_IGNORED          (1 << 6) /* eDP */
 # define DP_OUI_SUPPORT                     (1 << 7)
 
+#define DP_RECEIVE_PORT_0_CAP_0             0x008
+# define DP_LOCAL_EDID_PRESENT              (1 << 1)
+# define DP_ASSOCIATED_TO_PRECEDING_PORT    (1 << 2)
+
+#define DP_RECEIVE_PORT_0_BUFFER_SIZE       0x009
+
+#define DP_RECEIVE_PORT_1_CAP_0             0x00a
+#define DP_RECEIVE_PORT_1_BUFFER_SIZE       0x00b
+
 #define DP_I2C_SPEED_CAP                    0x00c    /* DPI */
 # define DP_I2C_SPEED_1K                    0x01
 # define DP_I2C_SPEED_5K                    0x02
@@ -101,8 +112,19 @@
 # define DP_I2C_SPEED_1M                    0x20
 
 #define DP_EDP_CONFIGURATION_CAP            0x00d   /* XXX 1.2? */
+# define DP_ALTERNATE_SCRAMBLER_RESET_CAP   (1 << 0)
+# define DP_FRAMING_CHANGE_CAP              (1 << 1)
+# define DP_DPCD_DISPLAY_CONTROL_CAPABLE     (1 << 3) /* edp v1.2 or higher */
+
 #define DP_TRAINING_AUX_RD_INTERVAL         0x00e   /* XXX 1.2? */
 
+#define DP_ADAPTER_CAP                      0x00f   /* 1.2 */
+# define DP_FORCE_LOAD_SENSE_CAP            (1 << 0)
+# define DP_ALTERNATE_I2C_PATTERN_CAP       (1 << 1)
+
+#define DP_SUPPORTED_LINK_RATES             0x010 /* eDP 1.4 */
+# define DP_MAX_SUPPORTED_RATES              8      /* 16-bit little-endian */
+
 /* Multiple stream transport */
 #define DP_FAUX_CAP                         0x020   /* 1.2 */
 # define DP_FAUX_CAP_1                      (1 << 0)
@@ -110,10 +132,56 @@
 #define DP_MSTM_CAP                         0x021   /* 1.2 */
 # define DP_MST_CAP                         (1 << 0)
 
+#define DP_NUMBER_OF_AUDIO_ENDPOINTS        0x022   /* 1.2 */
+
+/* AV_SYNC_DATA_BLOCK                                  1.2 */
+#define DP_AV_GRANULARITY                   0x023
+# define DP_AG_FACTOR_MASK                  (0xf << 0)
+# define DP_AG_FACTOR_3MS                   (0 << 0)
+# define DP_AG_FACTOR_2MS                   (1 << 0)
+# define DP_AG_FACTOR_1MS                   (2 << 0)
+# define DP_AG_FACTOR_500US                 (3 << 0)
+# define DP_AG_FACTOR_200US                 (4 << 0)
+# define DP_AG_FACTOR_100US                 (5 << 0)
+# define DP_AG_FACTOR_10US                  (6 << 0)
+# define DP_AG_FACTOR_1US                   (7 << 0)
+# define DP_VG_FACTOR_MASK                  (0xf << 4)
+# define DP_VG_FACTOR_3MS                   (0 << 4)
+# define DP_VG_FACTOR_2MS                   (1 << 4)
+# define DP_VG_FACTOR_1MS                   (2 << 4)
+# define DP_VG_FACTOR_500US                 (3 << 4)
+# define DP_VG_FACTOR_200US                 (4 << 4)
+# define DP_VG_FACTOR_100US                 (5 << 4)
+
+#define DP_AUD_DEC_LAT0                     0x024
+#define DP_AUD_DEC_LAT1                     0x025
+
+#define DP_AUD_PP_LAT0                      0x026
+#define DP_AUD_PP_LAT1                      0x027
+
+#define DP_VID_INTER_LAT                    0x028
+
+#define DP_VID_PROG_LAT                     0x029
+
+#define DP_REP_LAT                          0x02a
+
+#define DP_AUD_DEL_INS0                     0x02b
+#define DP_AUD_DEL_INS1                     0x02c
+#define DP_AUD_DEL_INS2                     0x02d
+/* End of AV_SYNC_DATA_BLOCK */
+
+#define DP_RECEIVER_ALPM_CAP                0x02e   /* eDP 1.4 */
+# define DP_ALPM_CAP                        (1 << 0)
+
+#define DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP   0x02f   /* eDP 1.4 */
+# define DP_AUX_FRAME_SYNC_CAP              (1 << 0)
+
 #define DP_GUID                             0x030   /* 1.2 */
 
 #define DP_PSR_SUPPORT                      0x070   /* XXX 1.2? */
 # define DP_PSR_IS_SUPPORTED                1
+# define DP_PSR2_IS_SUPPORTED               2       /* eDP 1.4 */
+
 #define DP_PSR_CAPS                         0x071   /* XXX 1.2? */
 # define DP_PSR_NO_TRAIN_ON_EXIT            1
 # define DP_PSR_SETUP_TIME_330              (0 << 1)
@@ -153,6 +221,7 @@
 
 /* link configuration */
 #define DP_LINK_BW_SET                      0x100
+# define DP_LINK_RATE_TABLE                 0x00    /* eDP 1.4 */
 # define DP_LINK_BW_1_62                    0x06
 # define DP_LINK_BW_2_7                     0x0a
 # define DP_LINK_BW_5_4                     0x14    /* 1.2 */
@@ -168,11 +237,12 @@
 # define DP_TRAINING_PATTERN_3              3       /* 1.2 */
 # define DP_TRAINING_PATTERN_MASK           0x3
 
-# define DP_LINK_QUAL_PATTERN_DISABLE       (0 << 2)
-# define DP_LINK_QUAL_PATTERN_D10_2         (1 << 2)
-# define DP_LINK_QUAL_PATTERN_ERROR_RATE    (2 << 2)
-# define DP_LINK_QUAL_PATTERN_PRBS7         (3 << 2)
-# define DP_LINK_QUAL_PATTERN_MASK          (3 << 2)
+/* DPCD 1.1 only. For DPCD >= 1.2 see per-lane DP_LINK_QUAL_LANEn_SET */
+# define DP_LINK_QUAL_PATTERN_11_DISABLE    (0 << 2)
+# define DP_LINK_QUAL_PATTERN_11_D10_2      (1 << 2)
+# define DP_LINK_QUAL_PATTERN_11_ERROR_RATE (2 << 2)
+# define DP_LINK_QUAL_PATTERN_11_PRBS7      (3 << 2)
+# define DP_LINK_QUAL_PATTERN_11_MASK       (3 << 2)
 
 # define DP_RECOVERED_CLOCK_OUT_EN          (1 << 4)
 # define DP_LINK_SCRAMBLING_DISABLE         (1 << 5)
@@ -215,17 +285,63 @@
 /* bitmask as for DP_I2C_SPEED_CAP */
 
 #define DP_EDP_CONFIGURATION_SET            0x10a   /* XXX 1.2? */
+# define DP_ALTERNATE_SCRAMBLER_RESET_ENABLE (1 << 0)
+# define DP_FRAMING_CHANGE_ENABLE           (1 << 1)
+# define DP_PANEL_SELF_TEST_ENABLE          (1 << 7)
+
+#define DP_LINK_QUAL_LANE0_SET              0x10b   /* DPCD >= 1.2 */
+#define DP_LINK_QUAL_LANE1_SET              0x10c
+#define DP_LINK_QUAL_LANE2_SET              0x10d
+#define DP_LINK_QUAL_LANE3_SET              0x10e
+# define DP_LINK_QUAL_PATTERN_DISABLE       0
+# define DP_LINK_QUAL_PATTERN_D10_2         1
+# define DP_LINK_QUAL_PATTERN_ERROR_RATE    2
+# define DP_LINK_QUAL_PATTERN_PRBS7         3
+# define DP_LINK_QUAL_PATTERN_80BIT_CUSTOM  4
+# define DP_LINK_QUAL_PATTERN_HBR2_EYE      5
+# define DP_LINK_QUAL_PATTERN_MASK          7
+
+#define DP_TRAINING_LANE0_1_SET2            0x10f
+#define DP_TRAINING_LANE2_3_SET2            0x110
+# define DP_LANE02_POST_CURSOR2_SET_MASK    (3 << 0)
+# define DP_LANE02_MAX_POST_CURSOR2_REACHED (1 << 2)
+# define DP_LANE13_POST_CURSOR2_SET_MASK    (3 << 4)
+# define DP_LANE13_MAX_POST_CURSOR2_REACHED (1 << 6)
 
 #define DP_MSTM_CTRL                        0x111   /* 1.2 */
 # define DP_MST_EN                          (1 << 0)
 # define DP_UP_REQ_EN                       (1 << 1)
 # define DP_UPSTREAM_IS_SRC                 (1 << 2)
 
+#define DP_AUDIO_DELAY0                     0x112   /* 1.2 */
+#define DP_AUDIO_DELAY1                     0x113
+#define DP_AUDIO_DELAY2                     0x114
+
+#define DP_LINK_RATE_SET                    0x115   /* eDP 1.4 */
+# define DP_LINK_RATE_SET_SHIFT             0
+# define DP_LINK_RATE_SET_MASK              (7 << 0)
+
+#define DP_RECEIVER_ALPM_CONFIG             0x116   /* eDP 1.4 */
+# define DP_ALPM_ENABLE                     (1 << 0)
+# define DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE  (1 << 1)
+
+#define DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF  0x117   /* eDP 1.4 */
+# define DP_AUX_FRAME_SYNC_ENABLE           (1 << 0)
+# define DP_IRQ_HPD_ENABLE                  (1 << 1)
+
+#define DP_UPSTREAM_DEVICE_DP_PWR_NEED      0x118   /* 1.2 */
+# define DP_PWR_NOT_NEEDED                  (1 << 0)
+
+#define DP_AUX_FRAME_SYNC_VALUE             0x15c   /* eDP 1.4 */
+# define DP_AUX_FRAME_SYNC_VALID            (1 << 0)
+
 #define DP_PSR_EN_CFG                       0x170   /* XXX 1.2? */
 # define DP_PSR_ENABLE                      (1 << 0)
 # define DP_PSR_MAIN_LINK_ACTIVE            (1 << 1)
 # define DP_PSR_CRC_VERIFICATION            (1 << 2)
 # define DP_PSR_FRAME_CAPTURE               (1 << 3)
+# define DP_PSR_SELECTIVE_UPDATE            (1 << 4)
+# define DP_PSR_IRQ_HPD_WITH_CRC_ERRORS     (1 << 5)
 
 #define DP_ADAPTER_CTRL                     0x1a0
 # define DP_ADAPTER_CTRL_FORCE_LOAD_SENSE   (1 << 0)
@@ -332,6 +448,49 @@
 # define DP_SET_POWER_D3                    0x2
 # define DP_SET_POWER_MASK                  0x3
 
+#define DP_EDP_DPCD_REV                     0x700    /* eDP 1.2 */
+# define DP_EDP_11                          0x00
+# define DP_EDP_12                          0x01
+# define DP_EDP_13                          0x02
+# define DP_EDP_14                          0x03
+
+#define DP_EDP_GENERAL_CAP_1                0x701
+
+#define DP_EDP_BACKLIGHT_ADJUSTMENT_CAP     0x702
+
+#define DP_EDP_GENERAL_CAP_2                0x703
+
+#define DP_EDP_GENERAL_CAP_3                0x704    /* eDP 1.4 */
+
+#define DP_EDP_DISPLAY_CONTROL_REGISTER     0x720
+
+#define DP_EDP_BACKLIGHT_MODE_SET_REGISTER  0x721
+
+#define DP_EDP_BACKLIGHT_BRIGHTNESS_MSB     0x722
+#define DP_EDP_BACKLIGHT_BRIGHTNESS_LSB     0x723
+
+#define DP_EDP_PWMGEN_BIT_COUNT             0x724
+#define DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN     0x725
+#define DP_EDP_PWMGEN_BIT_COUNT_CAP_MAX     0x726
+
+#define DP_EDP_BACKLIGHT_CONTROL_STATUS     0x727
+
+#define DP_EDP_BACKLIGHT_FREQ_SET           0x728
+
+#define DP_EDP_BACKLIGHT_FREQ_CAP_MIN_MSB   0x72a
+#define DP_EDP_BACKLIGHT_FREQ_CAP_MIN_MID   0x72b
+#define DP_EDP_BACKLIGHT_FREQ_CAP_MIN_LSB   0x72c
+
+#define DP_EDP_BACKLIGHT_FREQ_CAP_MAX_MSB   0x72d
+#define DP_EDP_BACKLIGHT_FREQ_CAP_MAX_MID   0x72e
+#define DP_EDP_BACKLIGHT_FREQ_CAP_MAX_LSB   0x72f
+
+#define DP_EDP_DBC_MINIMUM_BRIGHTNESS_SET   0x732
+#define DP_EDP_DBC_MAXIMUM_BRIGHTNESS_SET   0x733
+
+#define DP_EDP_REGIONAL_BACKLIGHT_BASE      0x740    /* eDP 1.4 */
+#define DP_EDP_REGIONAL_BACKLIGHT_0         0x741    /* eDP 1.4 */
+
 #define DP_SIDEBAND_MSG_DOWN_REQ_BASE       0x1000   /* 1.2 MST */
 #define DP_SIDEBAND_MSG_UP_REP_BASE         0x1200   /* 1.2 MST */
 #define DP_SIDEBAND_MSG_DOWN_REP_BASE       0x1400   /* 1.2 MST */
@@ -350,6 +509,7 @@
 #define DP_PSR_ERROR_STATUS                 0x2006  /* XXX 1.2? */
 # define DP_PSR_LINK_CRC_ERROR              (1 << 0)
 # define DP_PSR_RFB_STORAGE_ERROR           (1 << 1)
+# define DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR (1 << 2) /* eDP 1.4 */
 
 #define DP_PSR_ESI                          0x2007  /* XXX 1.2? */
 # define DP_PSR_CAPS_CHANGE                 (1 << 0)
@@ -363,6 +523,9 @@
 # define DP_PSR_SINK_INTERNAL_ERROR         7
 # define DP_PSR_SINK_STATE_MASK             0x07
 
+#define DP_RECEIVER_ALPM_STATUS             0x200b  /* eDP 1.4 */
+# define DP_ALPM_LOCK_TIMEOUT_ERROR         (1 << 0)
+
 /* DP 1.2 Sideband message defines */
 /* peer device type - DP 1.2a Table 2-92 */
 #define DP_PEER_DEVICE_NONE             0x0
@@ -519,6 +682,9 @@ struct drm_dp_aux_msg {
  * transactions. The drm_dp_aux_register_i2c_bus() function registers an
  * I2C adapter that can be passed to drm_probe_ddc(). Upon removal, drivers
  * should call drm_dp_aux_unregister_i2c_bus() to remove the I2C adapter.
+ * The I2C adapter uses long transfers by default; if a partial response is
+ * received, the adapter will drop down to the size given by the partial
+ * response for this transaction only.
  *
  * Note that the aux helper code assumes that the .transfer() function
  * only modifies the reply field of the drm_dp_aux_msg structure.  The
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 00c1da927245..a2507817be41 100644
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -486,6 +486,8 @@ int drm_dp_calc_pbn_mode(int clock, int bpp);
 
 bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int pbn, int *slots);
 
+int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
+
 
 void drm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
 
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 87d85e81d3a7..799050198323 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -215,6 +215,8 @@ struct detailed_timing {
 #define DRM_ELD_VER                     0
 # define DRM_ELD_VER_SHIFT              3
 # define DRM_ELD_VER_MASK               (0x1f << 3)
+# define DRM_ELD_VER_CEA861D            (2 << 3) /* supports 861D or below */
+# define DRM_ELD_VER_CANNED             (0x1f << 3)
 
 #define DRM_ELD_BASELINE_ELD_LEN        2       /* in dwords! */
 
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 21b944c456f6..0dfd94def593 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -44,6 +44,25 @@ struct drm_fb_helper_crtc {
         int x, y;
 };
 
+/**
+ * struct drm_fb_helper_surface_size - describes fbdev size and scanout surface size
+ * @fb_width: fbdev width
+ * @fb_height: fbdev height
+ * @surface_width: scanout buffer width
+ * @surface_height: scanout buffer height
+ * @surface_bpp: scanout buffer bpp
+ * @surface_depth: scanout buffer depth
+ *
+ * Note that the scanout surface width/height may be larger than the fbdev
+ * width/height.  In case of multiple displays, the scanout surface is sized
+ * according to the largest width/height (so it is large enough for all CRTCs
+ * to scanout).  But the fbdev width/height is sized to the minimum width/
+ * height of all the displays.  This ensures that fbcon fits on the smallest
+ * of the attached displays.
+ *
+ * So what is passed to drm_fb_helper_fill_var() should be fb_width/fb_height,
+ * rather than the surface size.
+ */
 struct drm_fb_helper_surface_size {
         u32 fb_width;
         u32 fb_height;
diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
index 1e6ae1458f7a..7a592d7e398b 100644
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@ -149,14 +149,16 @@ drm_gem_object_unreference(struct drm_gem_object *obj)
 static inline void
 drm_gem_object_unreference_unlocked(struct drm_gem_object *obj)
 {
-        if (obj && !atomic_add_unless(&obj->refcount.refcount, -1, 1)) {
-                struct drm_device *dev = obj->dev;
+        struct drm_device *dev;
+
+        if (!obj)
+                return;
 
-                mutex_lock(&dev->struct_mutex);
-                if (likely(atomic_dec_and_test(&obj->refcount.refcount)))
-                        drm_gem_object_free(&obj->refcount);
+        dev = obj->dev;
+        if (kref_put_mutex(&obj->refcount, drm_gem_object_free, &dev->struct_mutex))
                 mutex_unlock(&dev->struct_mutex);
-        }
+        else
+                might_lock(&dev->struct_mutex);
 }
 
 int drm_gem_handle_create(struct drm_file *file_priv,
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index a24addfdfcec..0de6290df4da 100644
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -68,8 +68,8 @@ struct drm_mm_node {
         unsigned scanned_preceeds_hole : 1;
         unsigned allocated : 1;
         unsigned long color;
-        unsigned long start;
-        unsigned long size;
+        u64 start;
+        u64 size;
         struct drm_mm *mm;
 };
 
@@ -82,16 +82,16 @@ struct drm_mm {
         unsigned int scan_check_range : 1;
         unsigned scan_alignment;
         unsigned long scan_color;
-        unsigned long scan_size;
-        unsigned long scan_hit_start;
-        unsigned long scan_hit_end;
+        u64 scan_size;
+        u64 scan_hit_start;
+        u64 scan_hit_end;
         unsigned scanned_blocks;
-        unsigned long scan_start;
-        unsigned long scan_end;
+        u64 scan_start;
+        u64 scan_end;
         struct drm_mm_node *prev_scanned_node;
 
         void (*color_adjust)(struct drm_mm_node *node, unsigned long color,
-                             unsigned long *start, unsigned long *end);
+                             u64 *start, u64 *end);
 };
 
 /**
@@ -124,7 +124,7 @@ static inline bool drm_mm_initialized(struct drm_mm *mm)
         return mm->hole_stack.next;
 }
 
-static inline unsigned long __drm_mm_hole_node_start(struct drm_mm_node *hole_node)
+static inline u64 __drm_mm_hole_node_start(struct drm_mm_node *hole_node)
 {
         return hole_node->start + hole_node->size;
 }
@@ -140,13 +140,13 @@ static inline unsigned long __drm_mm_hole_node_start(struct drm_mm_node *hole_no
  * Returns:
  * Start of the subsequent hole.
  */
-static inline unsigned long drm_mm_hole_node_start(struct drm_mm_node *hole_node)
+static inline u64 drm_mm_hole_node_start(struct drm_mm_node *hole_node)
 {
         BUG_ON(!hole_node->hole_follows);
         return __drm_mm_hole_node_start(hole_node);
 }
 
-static inline unsigned long __drm_mm_hole_node_end(struct drm_mm_node *hole_node)
+static inline u64 __drm_mm_hole_node_end(struct drm_mm_node *hole_node)
 {
         return list_entry(hole_node->node_list.next,
                           struct drm_mm_node, node_list)->start;
@@ -163,7 +163,7 @@ static inline unsigned long __drm_mm_hole_node_end(struct drm_mm_node *hole_node
  * Returns:
  * End of the subsequent hole.
  */
-static inline unsigned long drm_mm_hole_node_end(struct drm_mm_node *hole_node)
+static inline u64 drm_mm_hole_node_end(struct drm_mm_node *hole_node)
 {
         return __drm_mm_hole_node_end(hole_node);
 }
@@ -222,7 +222,7 @@ int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node);
 
 int drm_mm_insert_node_generic(struct drm_mm *mm,
                                struct drm_mm_node *node,
-                               unsigned long size,
+                               u64 size,
                                unsigned alignment,
                                unsigned long color,
                                enum drm_mm_search_flags sflags,
@@ -245,7 +245,7 @@ int drm_mm_insert_node_generic(struct drm_mm *mm,
  */
 static inline int drm_mm_insert_node(struct drm_mm *mm,
                                      struct drm_mm_node *node,
-                                     unsigned long size,
+                                     u64 size,
                                      unsigned alignment,
                                      enum drm_mm_search_flags flags)
 {
@@ -255,11 +255,11 @@ static inline int drm_mm_insert_node(struct drm_mm *mm,
 
 int drm_mm_insert_node_in_range_generic(struct drm_mm *mm,
                                         struct drm_mm_node *node,
-                                        unsigned long size,
+                                        u64 size,
                                         unsigned alignment,
                                         unsigned long color,
-                                        unsigned long start,
-                                        unsigned long end,
+                                        u64 start,
+                                        u64 end,
                                         enum drm_mm_search_flags sflags,
                                         enum drm_mm_allocator_flags aflags);
 /**
@@ -282,10 +282,10 @@ int drm_mm_insert_node_in_range_generic(struct drm_mm *mm,
  */
 static inline int drm_mm_insert_node_in_range(struct drm_mm *mm,
                                               struct drm_mm_node *node,
-                                              unsigned long size,
+                                              u64 size,
                                               unsigned alignment,
-                                              unsigned long start,
-                                              unsigned long end,
+                                              u64 start,
+                                              u64 end,
                                               enum drm_mm_search_flags flags)
 {
         return drm_mm_insert_node_in_range_generic(mm, node, size, alignment,
@@ -296,21 +296,21 @@ static inline int drm_mm_insert_node_in_range(struct drm_mm *mm,
 void drm_mm_remove_node(struct drm_mm_node *node);
 void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new);
 void drm_mm_init(struct drm_mm *mm,
-                 unsigned long start,
-                 unsigned long size);
+                 u64 start,
+                 u64 size);
 void drm_mm_takedown(struct drm_mm *mm);
 bool drm_mm_clean(struct drm_mm *mm);
 
 void drm_mm_init_scan(struct drm_mm *mm,
-                      unsigned long size,
+                      u64 size,
                       unsigned alignment,
                       unsigned long color);
 void drm_mm_init_scan_with_range(struct drm_mm *mm,
-                                 unsigned long size,
+                                 u64 size,
                                  unsigned alignment,
                                  unsigned long color,
-                                 unsigned long start,
-                                 unsigned long end);
+                                 u64 start,
+                                 u64 end);
 bool drm_mm_scan_add_block(struct drm_mm_node *node);
 bool drm_mm_scan_remove_block(struct drm_mm_node *node);
 
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index d92f6dd1fb11..0616188c7801 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -92,7 +92,7 @@ enum drm_mode_status {
 #define CRTC_STEREO_DOUBLE      (1 << 1) /* adjust timings for stereo modes */
 #define CRTC_NO_DBLSCAN         (1 << 2) /* don't adjust doublescan */
 #define CRTC_NO_VSCAN           (1 << 3) /* don't adjust doublescan */
-#define CRTC_STEREO_DOUBLE_ONLY (CRTC_NO_DBLSCAN | CRTC_NO_VSCAN)
+#define CRTC_STEREO_DOUBLE_ONLY (CRTC_STEREO_DOUBLE | CRTC_NO_DBLSCAN | CRTC_NO_VSCAN)
 
 #define DRM_MODE_FLAG_3D_MAX    DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF
 
diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h
index 1fbcc96063a7..13ff44b28893 100644
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
@@ -29,6 +29,7 @@
 struct drm_connector;
 struct drm_device;
 struct drm_panel;
+struct display_timing;
 
 /**
  * struct drm_panel_funcs - perform operations on a given panel
@@ -38,6 +39,8 @@ struct drm_panel;
  * @enable: enable panel (turn on back light, etc.)
  * @get_modes: add modes to the connector that the panel is attached to and
  * return the number of modes added
+ * @get_timings: copy display timings into the provided array and return
+ * the number of display timings available
  *
  * The .prepare() function is typically called before the display controller
  * starts to transmit video data. Panel drivers can use this to turn the panel
@@ -68,6 +71,8 @@ struct drm_panel_funcs {
         int (*prepare)(struct drm_panel *panel);
         int (*enable)(struct drm_panel *panel);
         int (*get_modes)(struct drm_panel *panel);
+        int (*get_timings)(struct drm_panel *panel, unsigned int num_timings,
+                           struct display_timing *timings);
 };
 
 struct drm_panel {
diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h
index 31c11d36fae6..96e16283afb9 100644
--- a/include/drm/drm_plane_helper.h
+++ b/include/drm/drm_plane_helper.h
@@ -59,9 +59,11 @@ extern int drm_crtc_init(struct drm_device *dev,
  */
 struct drm_plane_helper_funcs {
         int (*prepare_fb)(struct drm_plane *plane,
-                          struct drm_framebuffer *fb);
+                          struct drm_framebuffer *fb,
+                          const struct drm_plane_state *new_state);
         void (*cleanup_fb)(struct drm_plane *plane,
-                           struct drm_framebuffer *fb);
+                           struct drm_framebuffer *fb,
+                           const struct drm_plane_state *old_state);
 
         int (*atomic_check)(struct drm_plane *plane,
                             struct drm_plane_state *state);
@@ -74,7 +76,7 @@ struct drm_plane_helper_funcs {
 static inline void drm_plane_helper_add(struct drm_plane *plane,
                                         const struct drm_plane_helper_funcs *funcs)
 {
-        plane->helper_private = (void *)funcs;
+        plane->helper_private = funcs;
 }
 
 extern int drm_plane_helper_check_update(struct drm_plane *plane,
@@ -98,10 +100,6 @@ extern int drm_primary_helper_update(struct drm_plane *plane,
 extern int drm_primary_helper_disable(struct drm_plane *plane);
 extern void drm_primary_helper_destroy(struct drm_plane *plane);
 extern const struct drm_plane_funcs drm_primary_helper_funcs;
-extern struct drm_plane *drm_primary_helper_create_plane(struct drm_device *dev,
-                                                         const uint32_t *formats,
-                                                         int num_formats);
-
 
 int drm_plane_helper_update(struct drm_plane *plane, struct drm_crtc *crtc,
                             struct drm_framebuffer *fb,
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 180ad0e6de21..613372375ada 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -208,40 +208,41 @@
 #define INTEL_VLV_D_IDS(info) \
         INTEL_VGA_DEVICE(0x0155, info)
 
-#define _INTEL_BDW_M(gt, id, info) \
-        INTEL_VGA_DEVICE((((gt) - 1) << 4) | (id), info)
-#define _INTEL_BDW_D(gt, id, info) \
-        INTEL_VGA_DEVICE((((gt) - 1) << 4) | (id), info)
-
-#define _INTEL_BDW_M_IDS(gt, info) \
-        _INTEL_BDW_M(gt, 0x1602, info), /* ULT */ \
-        _INTEL_BDW_M(gt, 0x1606, info), /* ULT */ \
-        _INTEL_BDW_M(gt, 0x160B, info), /* Iris */ \
-        _INTEL_BDW_M(gt, 0x160E, info) /* ULX */
-
-#define _INTEL_BDW_D_IDS(gt, info) \
-        _INTEL_BDW_D(gt, 0x160A, info), /* Server */ \
-        _INTEL_BDW_D(gt, 0x160D, info) /* Workstation */
-
-#define INTEL_BDW_GT12M_IDS(info) \
-        _INTEL_BDW_M_IDS(1, info), \
-        _INTEL_BDW_M_IDS(2, info)
+#define INTEL_BDW_GT12M_IDS(info)  \
+        INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \
+        INTEL_VGA_DEVICE(0x1606, info), /* GT1 ULT */ \
+        INTEL_VGA_DEVICE(0x160B, info), /* GT1 Iris */ \
+        INTEL_VGA_DEVICE(0x160E, info), /* GT1 ULX */ \
+        INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */ \
+        INTEL_VGA_DEVICE(0x1616, info), /* GT2 ULT */ \
+        INTEL_VGA_DEVICE(0x161B, info), /* GT2 ULT */ \
+        INTEL_VGA_DEVICE(0x161E, info)  /* GT2 ULX */
 
 #define INTEL_BDW_GT12D_IDS(info) \
-        _INTEL_BDW_D_IDS(1, info), \
-        _INTEL_BDW_D_IDS(2, info)
+        INTEL_VGA_DEVICE(0x160A, info), /* GT1 Server */ \
+        INTEL_VGA_DEVICE(0x160D, info), /* GT1 Workstation */ \
+        INTEL_VGA_DEVICE(0x161A, info), /* GT2 Server */ \
+        INTEL_VGA_DEVICE(0x161D, info)  /* GT2 Workstation */
 
 #define INTEL_BDW_GT3M_IDS(info) \
-        _INTEL_BDW_M_IDS(3, info)
+        INTEL_VGA_DEVICE(0x1622, info), /* ULT */ \
+        INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \
+        INTEL_VGA_DEVICE(0x162B, info), /* Iris */ \
+        INTEL_VGA_DEVICE(0x162E, info)  /* ULX */
 
 #define INTEL_BDW_GT3D_IDS(info) \
-        _INTEL_BDW_D_IDS(3, info)
+        INTEL_VGA_DEVICE(0x162A, info), /* Server */ \
+        INTEL_VGA_DEVICE(0x162D, info)  /* Workstation */
 
 #define INTEL_BDW_RSVDM_IDS(info) \
-        _INTEL_BDW_M_IDS(4, info)
+        INTEL_VGA_DEVICE(0x1632, info), /* ULT */ \
+        INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \
+        INTEL_VGA_DEVICE(0x163B, info), /* Iris */ \
+        INTEL_VGA_DEVICE(0x163E, info)  /* ULX */
 
 #define INTEL_BDW_RSVDD_IDS(info) \
-        _INTEL_BDW_D_IDS(4, info)
+        INTEL_VGA_DEVICE(0x163A, info), /* Server */ \
+        INTEL_VGA_DEVICE(0x163D, info)  /* Workstation */
 
 #define INTEL_BDW_M_IDS(info) \
         INTEL_BDW_GT12M_IDS(info), \
@@ -259,21 +260,31 @@
         INTEL_VGA_DEVICE(0x22b2, info), \
         INTEL_VGA_DEVICE(0x22b3, info)
 
-#define INTEL_SKL_IDS(info) \
-        INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \
+#define INTEL_SKL_GT1_IDS(info) \
         INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \
-        INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
-        INTEL_VGA_DEVICE(0x1921, info), /* ULT GT2F */ \
         INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \
+        INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \
+        INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
+        INTEL_VGA_DEVICE(0x190A, info) /* SRV GT1 */
+
+#define INTEL_SKL_GT2_IDS(info) \
+        INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \
+        INTEL_VGA_DEVICE(0x1921, info), /* ULT GT2F */ \
         INTEL_VGA_DEVICE(0x191E, info), /* ULX GT2 */ \
         INTEL_VGA_DEVICE(0x1912, info), /* DT  GT2 */ \
-        INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \
         INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
-        INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
-        INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
         INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
-        INTEL_VGA_DEVICE(0x192A, info), /* SRV GT3 */ \
-        INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \
         INTEL_VGA_DEVICE(0x191D, info)  /* WKS GT2 */
 
+#define INTEL_SKL_GT3_IDS(info) \
+        INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
+        INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
+        INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */ \
+
+#define INTEL_SKL_IDS(info) \
+        INTEL_SKL_GT1_IDS(info), \
+        INTEL_SKL_GT2_IDS(info), \
+        INTEL_SKL_GT3_IDS(info)
+
+
 #endif /* _I915_PCIIDS_H */
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index 0ccf7f267ff9..c768ddfbe53c 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -249,7 +249,7 @@ struct ttm_buffer_object {
          * either of these locks held.
          */
 
-        unsigned long offset;
+        uint64_t offset; /* GPU address space is independent of CPU word size */
         uint32_t cur_placement;
 
         struct sg_table *sg;
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 142d752fc450..813042cede57 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -277,7 +277,7 @@ struct ttm_mem_type_manager {
         bool has_type;
         bool use_type;
         uint32_t flags;
-        unsigned long gpu_offset;
+        uint64_t gpu_offset; /* GPU address space is independent of CPU word size */
         uint64_t size;
         uint32_t available_caching;
         uint32_t default_caching;
diff --git a/include/dt-bindings/clock/exynos3250.h b/include/dt-bindings/clock/exynos3250.h
index 961b9c130ea9..aab088d30199 100644
--- a/include/dt-bindings/clock/exynos3250.h
+++ b/include/dt-bindings/clock/exynos3250.h
@@ -282,4 +282,65 @@
  */
 #define NR_CLKS_DMC                     21
 
+/*
+ * CMU ISP
+ */
+
+/* Dividers */
+
+#define CLK_DIV_ISP1                    1
+#define CLK_DIV_ISP0                    2
+#define CLK_DIV_MCUISP1                 3
+#define CLK_DIV_MCUISP0                 4
+#define CLK_DIV_MPWM                    5
+
+/* Gates */
+
+#define CLK_UART_ISP                    8
+#define CLK_WDT_ISP                     9
+#define CLK_PWM_ISP                     10
+#define CLK_I2C1_ISP                    11
+#define CLK_I2C0_ISP                    12
+#define CLK_MPWM_ISP                    13
+#define CLK_MCUCTL_ISP                  14
+#define CLK_PPMUISPX                    15
+#define CLK_PPMUISPMX                   16
+#define CLK_QE_LITE1                    17
+#define CLK_QE_LITE0                    18
+#define CLK_QE_FD                       19
+#define CLK_QE_DRC                      20
+#define CLK_QE_ISP                      21
+#define CLK_CSIS1                       22
+#define CLK_SMMU_LITE1                  23
+#define CLK_SMMU_LITE0                  24
+#define CLK_SMMU_FD                     25
+#define CLK_SMMU_DRC                    26
+#define CLK_SMMU_ISP                    27
+#define CLK_GICISP                      28
+#define CLK_CSIS0                       29
+#define CLK_MCUISP                      30
+#define CLK_LITE1                       31
+#define CLK_LITE0                       32
+#define CLK_FD                          33
+#define CLK_DRC                         34
+#define CLK_ISP                         35
+#define CLK_QE_ISPCX                    36
+#define CLK_QE_SCALERP                  37
+#define CLK_QE_SCALERC                  38
+#define CLK_SMMU_SCALERP                39
+#define CLK_SMMU_SCALERC                40
+#define CLK_SCALERP                     41
+#define CLK_SCALERC                     42
+#define CLK_SPI1_ISP                    43
+#define CLK_SPI0_ISP                    44
+#define CLK_SMMU_ISPCX                  45
+#define CLK_ASYNCAXIM                   46
+#define CLK_SCLK_MPWM_ISP               47
+
+/*
+ * Total number of clocks of CMU_ISP.
+ * NOTE: Must be equal to last clock ID increased by one.
+ */
+#define NR_CLKS_ISP                     48
+
 #endif /* _DT_BINDINGS_CLOCK_SAMSUNG_EXYNOS3250_CLOCK_H */
diff --git a/include/dt-bindings/clock/exynos5433.h b/include/dt-bindings/clock/exynos5433.h
new file mode 100644
index 000000000000..5bd80d5ecd0f
--- /dev/null
+++ b/include/dt-bindings/clock/exynos5433.h
@@ -0,0 +1,1403 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Author: Chanwoo Choi <cw00.choi@samsung.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 _DT_BINDINGS_CLOCK_EXYNOS5433_H
+#define _DT_BINDINGS_CLOCK_EXYNOS5433_H
+
+/* CMU_TOP */
+#define CLK_FOUT_ISP_PLL                1
+#define CLK_FOUT_AUD_PLL                2
+
+#define CLK_MOUT_AUD_PLL                10
+#define CLK_MOUT_ISP_PLL                11
+#define CLK_MOUT_AUD_PLL_USER_T         12
+#define CLK_MOUT_MPHY_PLL_USER          13
+#define CLK_MOUT_MFC_PLL_USER           14
+#define CLK_MOUT_BUS_PLL_USER           15
+#define CLK_MOUT_ACLK_HEVC_400          16
+#define CLK_MOUT_ACLK_CAM1_333          17
+#define CLK_MOUT_ACLK_CAM1_552_B        18
+#define CLK_MOUT_ACLK_CAM1_552_A        19
+#define CLK_MOUT_ACLK_ISP_DIS_400       20
+#define CLK_MOUT_ACLK_ISP_400           21
+#define CLK_MOUT_ACLK_BUS0_400          22
+#define CLK_MOUT_ACLK_MSCL_400_B        23
+#define CLK_MOUT_ACLK_MSCL_400_A        24
+#define CLK_MOUT_ACLK_GSCL_333          25
+#define CLK_MOUT_ACLK_G2D_400_B         26
+#define CLK_MOUT_ACLK_G2D_400_A         27
+#define CLK_MOUT_SCLK_JPEG_C            28
+#define CLK_MOUT_SCLK_JPEG_B            29
+#define CLK_MOUT_SCLK_JPEG_A            30
+#define CLK_MOUT_SCLK_MMC2_B            31
+#define CLK_MOUT_SCLK_MMC2_A            32
+#define CLK_MOUT_SCLK_MMC1_B            33
+#define CLK_MOUT_SCLK_MMC1_A            34
+#define CLK_MOUT_SCLK_MMC0_D            35
+#define CLK_MOUT_SCLK_MMC0_C            36
+#define CLK_MOUT_SCLK_MMC0_B            37
+#define CLK_MOUT_SCLK_MMC0_A            38
+#define CLK_MOUT_SCLK_SPI4              39
+#define CLK_MOUT_SCLK_SPI3              40
+#define CLK_MOUT_SCLK_UART2             41
+#define CLK_MOUT_SCLK_UART1             42
+#define CLK_MOUT_SCLK_UART0             43
+#define CLK_MOUT_SCLK_SPI2              44
+#define CLK_MOUT_SCLK_SPI1              45
+#define CLK_MOUT_SCLK_SPI0              46
+#define CLK_MOUT_ACLK_MFC_400_C         47
+#define CLK_MOUT_ACLK_MFC_400_B         48
+#define CLK_MOUT_ACLK_MFC_400_A         49
+#define CLK_MOUT_SCLK_ISP_SENSOR2       50
+#define CLK_MOUT_SCLK_ISP_SENSOR1       51
+#define CLK_MOUT_SCLK_ISP_SENSOR0       52
+#define CLK_MOUT_SCLK_ISP_UART          53
+#define CLK_MOUT_SCLK_ISP_SPI1          54
+#define CLK_MOUT_SCLK_ISP_SPI0          55
+#define CLK_MOUT_SCLK_PCIE_100          56
+#define CLK_MOUT_SCLK_UFSUNIPRO         57
+#define CLK_MOUT_SCLK_USBHOST30         58
+#define CLK_MOUT_SCLK_USBDRD30          59
+#define CLK_MOUT_SCLK_SLIMBUS           60
+#define CLK_MOUT_SCLK_SPDIF             61
+#define CLK_MOUT_SCLK_AUDIO1            62
+#define CLK_MOUT_SCLK_AUDIO0            63
+#define CLK_MOUT_SCLK_HDMI_SPDIF        64
+
+#define CLK_DIV_ACLK_FSYS_200           100
+#define CLK_DIV_ACLK_IMEM_SSSX_266      101
+#define CLK_DIV_ACLK_IMEM_200           102
+#define CLK_DIV_ACLK_IMEM_266           103
+#define CLK_DIV_ACLK_PERIC_66_B         104
+#define CLK_DIV_ACLK_PERIC_66_A         105
+#define CLK_DIV_ACLK_PERIS_66_B         106
+#define CLK_DIV_ACLK_PERIS_66_A         107
+#define CLK_DIV_SCLK_MMC1_B             108
+#define CLK_DIV_SCLK_MMC1_A             109
+#define CLK_DIV_SCLK_MMC0_B             110
+#define CLK_DIV_SCLK_MMC0_A             111
+#define CLK_DIV_SCLK_MMC2_B             112
+#define CLK_DIV_SCLK_MMC2_A             113
+#define CLK_DIV_SCLK_SPI1_B             114
+#define CLK_DIV_SCLK_SPI1_A             115
+#define CLK_DIV_SCLK_SPI0_B             116
+#define CLK_DIV_SCLK_SPI0_A             117
+#define CLK_DIV_SCLK_SPI2_B             118
+#define CLK_DIV_SCLK_SPI2_A             119
+#define CLK_DIV_SCLK_UART2              120
+#define CLK_DIV_SCLK_UART1              121
+#define CLK_DIV_SCLK_UART0              122
+#define CLK_DIV_SCLK_SPI4_B             123
+#define CLK_DIV_SCLK_SPI4_A             124
+#define CLK_DIV_SCLK_SPI3_B             125
+#define CLK_DIV_SCLK_SPI3_A             126
+#define CLK_DIV_SCLK_I2S1               127
+#define CLK_DIV_SCLK_PCM1               128
+#define CLK_DIV_SCLK_AUDIO1             129
+#define CLK_DIV_SCLK_AUDIO0             130
+#define CLK_DIV_ACLK_GSCL_111           131
+#define CLK_DIV_ACLK_GSCL_333           132
+#define CLK_DIV_ACLK_HEVC_400           133
+#define CLK_DIV_ACLK_MFC_400            134
+#define CLK_DIV_ACLK_G2D_266            135
+#define CLK_DIV_ACLK_G2D_400            136
+#define CLK_DIV_ACLK_G3D_400            137
+#define CLK_DIV_ACLK_BUS0_400           138
+#define CLK_DIV_ACLK_BUS1_400           139
+#define CLK_DIV_SCLK_PCIE_100           140
+#define CLK_DIV_SCLK_USBHOST30          141
+#define CLK_DIV_SCLK_UFSUNIPRO          142
+#define CLK_DIV_SCLK_USBDRD30           143
+#define CLK_DIV_SCLK_JPEG               144
+#define CLK_DIV_ACLK_MSCL_400           145
+#define CLK_DIV_ACLK_ISP_DIS_400        146
+#define CLK_DIV_ACLK_ISP_400            147
+#define CLK_DIV_ACLK_CAM0_333           148
+#define CLK_DIV_ACLK_CAM0_400           149
+#define CLK_DIV_ACLK_CAM0_552           150
+#define CLK_DIV_ACLK_CAM1_333           151
+#define CLK_DIV_ACLK_CAM1_400           152
+#define CLK_DIV_ACLK_CAM1_552           153
+#define CLK_DIV_SCLK_ISP_UART           154
+#define CLK_DIV_SCLK_ISP_SPI1_B         155
+#define CLK_DIV_SCLK_ISP_SPI1_A         156
+#define CLK_DIV_SCLK_ISP_SPI0_B         157
+#define CLK_DIV_SCLK_ISP_SPI0_A         158
+#define CLK_DIV_SCLK_ISP_SENSOR2_B      159
+#define CLK_DIV_SCLK_ISP_SENSOR2_A      160
+#define CLK_DIV_SCLK_ISP_SENSOR1_B      161
+#define CLK_DIV_SCLK_ISP_SENSOR1_A      162
+#define CLK_DIV_SCLK_ISP_SENSOR0_B      163
+#define CLK_DIV_SCLK_ISP_SENSOR0_A      164
+
+#define CLK_ACLK_PERIC_66               200
+#define CLK_ACLK_PERIS_66               201
+#define CLK_ACLK_FSYS_200               202
+#define CLK_SCLK_MMC2_FSYS              203
+#define CLK_SCLK_MMC1_FSYS              204
+#define CLK_SCLK_MMC0_FSYS              205
+#define CLK_SCLK_SPI4_PERIC             206
+#define CLK_SCLK_SPI3_PERIC             207
+#define CLK_SCLK_UART2_PERIC            208
+#define CLK_SCLK_UART1_PERIC            209
+#define CLK_SCLK_UART0_PERIC            210
+#define CLK_SCLK_SPI2_PERIC             211
+#define CLK_SCLK_SPI1_PERIC             212
+#define CLK_SCLK_SPI0_PERIC             213
+#define CLK_SCLK_SPDIF_PERIC            214
+#define CLK_SCLK_I2S1_PERIC             215
+#define CLK_SCLK_PCM1_PERIC             216
+#define CLK_SCLK_SLIMBUS                217
+#define CLK_SCLK_AUDIO1                 218
+#define CLK_SCLK_AUDIO0                 219
+#define CLK_ACLK_G2D_266                220
+#define CLK_ACLK_G2D_400                221
+#define CLK_ACLK_G3D_400                222
+#define CLK_ACLK_IMEM_SSX_266           223
+#define CLK_ACLK_BUS0_400               224
+#define CLK_ACLK_BUS1_400               225
+#define CLK_ACLK_IMEM_200               226
+#define CLK_ACLK_IMEM_266               227
+#define CLK_SCLK_PCIE_100_FSYS          228
+#define CLK_SCLK_UFSUNIPRO_FSYS         229
+#define CLK_SCLK_USBHOST30_FSYS         230
+#define CLK_SCLK_USBDRD30_FSYS          231
+#define CLK_ACLK_GSCL_111               232
+#define CLK_ACLK_GSCL_333               233
+#define CLK_SCLK_JPEG_MSCL              234
+#define CLK_ACLK_MSCL_400               235
+#define CLK_ACLK_MFC_400                236
+#define CLK_ACLK_HEVC_400               237
+#define CLK_ACLK_ISP_DIS_400            238
+#define CLK_ACLK_ISP_400                239
+#define CLK_ACLK_CAM0_333               240
+#define CLK_ACLK_CAM0_400               241
+#define CLK_ACLK_CAM0_552               242
+#define CLK_ACLK_CAM1_333               243
+#define CLK_ACLK_CAM1_400               244
+#define CLK_ACLK_CAM1_552               245
+#define CLK_SCLK_ISP_SENSOR2            246
+#define CLK_SCLK_ISP_SENSOR1            247
+#define CLK_SCLK_ISP_SENSOR0            248
+#define CLK_SCLK_ISP_MCTADC_CAM1        249
+#define CLK_SCLK_ISP_UART_CAM1          250
+#define CLK_SCLK_ISP_SPI1_CAM1          251
+#define CLK_SCLK_ISP_SPI0_CAM1          252
+#define CLK_SCLK_HDMI_SPDIF_DISP        253
+
+#define TOP_NR_CLK                      254
+
+/* CMU_CPIF */
+#define CLK_FOUT_MPHY_PLL               1
+
+#define CLK_MOUT_MPHY_PLL               2
+
+#define CLK_DIV_SCLK_MPHY               10
+
+#define CLK_SCLK_MPHY_PLL               11
+#define CLK_SCLK_UFS_MPHY               11
+
+#define CPIF_NR_CLK                     12
+
+/* CMU_MIF */
+#define CLK_FOUT_MEM0_PLL               1
+#define CLK_FOUT_MEM1_PLL               2
+#define CLK_FOUT_BUS_PLL                3
+#define CLK_FOUT_MFC_PLL                4
+#define CLK_DOUT_MFC_PLL                5
+#define CLK_DOUT_BUS_PLL                6
+#define CLK_DOUT_MEM1_PLL               7
+#define CLK_DOUT_MEM0_PLL               8
+
+#define CLK_MOUT_MFC_PLL_DIV2           10
+#define CLK_MOUT_BUS_PLL_DIV2           11
+#define CLK_MOUT_MEM1_PLL_DIV2          12
+#define CLK_MOUT_MEM0_PLL_DIV2          13
+#define CLK_MOUT_MFC_PLL                14
+#define CLK_MOUT_BUS_PLL                15
+#define CLK_MOUT_MEM1_PLL               16
+#define CLK_MOUT_MEM0_PLL               17
+#define CLK_MOUT_CLK2X_PHY_C            18
+#define CLK_MOUT_CLK2X_PHY_B            19
+#define CLK_MOUT_CLK2X_PHY_A            20
+#define CLK_MOUT_CLKM_PHY_C             21
+#define CLK_MOUT_CLKM_PHY_B             22
+#define CLK_MOUT_CLKM_PHY_A             23
+#define CLK_MOUT_ACLK_MIFNM_200         24
+#define CLK_MOUT_ACLK_MIFNM_400         25
+#define CLK_MOUT_ACLK_DISP_333_B        26
+#define CLK_MOUT_ACLK_DISP_333_A        27
+#define CLK_MOUT_SCLK_DECON_VCLK_C      28
+#define CLK_MOUT_SCLK_DECON_VCLK_B      29
+#define CLK_MOUT_SCLK_DECON_VCLK_A      30
+#define CLK_MOUT_SCLK_DECON_ECLK_C      31
+#define CLK_MOUT_SCLK_DECON_ECLK_B      32
+#define CLK_MOUT_SCLK_DECON_ECLK_A      33
+#define CLK_MOUT_SCLK_DECON_TV_ECLK_C   34
+#define CLK_MOUT_SCLK_DECON_TV_ECLK_B   35
+#define CLK_MOUT_SCLK_DECON_TV_ECLK_A   36
+#define CLK_MOUT_SCLK_DSD_C             37
+#define CLK_MOUT_SCLK_DSD_B             38
+#define CLK_MOUT_SCLK_DSD_A             39
+#define CLK_MOUT_SCLK_DSIM0_C           40
+#define CLK_MOUT_SCLK_DSIM0_B           41
+#define CLK_MOUT_SCLK_DSIM0_A           42
+#define CLK_MOUT_SCLK_DECON_TV_VCLK_C   46
+#define CLK_MOUT_SCLK_DECON_TV_VCLK_B   47
+#define CLK_MOUT_SCLK_DECON_TV_VCLK_A   48
+#define CLK_MOUT_SCLK_DSIM1_C           49
+#define CLK_MOUT_SCLK_DSIM1_B           50
+#define CLK_MOUT_SCLK_DSIM1_A           51
+
+#define CLK_DIV_SCLK_HPM_MIF            55
+#define CLK_DIV_ACLK_DREX1              56
+#define CLK_DIV_ACLK_DREX0              57
+#define CLK_DIV_CLK2XPHY                58
+#define CLK_DIV_ACLK_MIF_266            59
+#define CLK_DIV_ACLK_MIFND_133          60
+#define CLK_DIV_ACLK_MIF_133            61
+#define CLK_DIV_ACLK_MIFNM_200          62
+#define CLK_DIV_ACLK_MIF_200            63
+#define CLK_DIV_ACLK_MIF_400            64
+#define CLK_DIV_ACLK_BUS2_400           65
+#define CLK_DIV_ACLK_DISP_333           66
+#define CLK_DIV_ACLK_CPIF_200           67
+#define CLK_DIV_SCLK_DSIM1              68
+#define CLK_DIV_SCLK_DECON_TV_VCLK      69
+#define CLK_DIV_SCLK_DSIM0              70
+#define CLK_DIV_SCLK_DSD                71
+#define CLK_DIV_SCLK_DECON_TV_ECLK      72
+#define CLK_DIV_SCLK_DECON_VCLK         73
+#define CLK_DIV_SCLK_DECON_ECLK         74
+#define CLK_DIV_MIF_PRE                 75
+
+#define CLK_CLK2X_PHY1                  80
+#define CLK_CLK2X_PHY0                  81
+#define CLK_CLKM_PHY1                   82
+#define CLK_CLKM_PHY0                   83
+#define CLK_RCLK_DREX1                  84
+#define CLK_RCLK_DREX0                  85
+#define CLK_ACLK_DREX1_TZ               86
+#define CLK_ACLK_DREX0_TZ               87
+#define CLK_ACLK_DREX1_PEREV            88
+#define CLK_ACLK_DREX0_PEREV            89
+#define CLK_ACLK_DREX1_MEMIF            90
+#define CLK_ACLK_DREX0_MEMIF            91
+#define CLK_ACLK_DREX1_SCH              92
+#define CLK_ACLK_DREX0_SCH              93
+#define CLK_ACLK_DREX1_BUSIF            94
+#define CLK_ACLK_DREX0_BUSIF            95
+#define CLK_ACLK_DREX1_BUSIF_RD         96
+#define CLK_ACLK_DREX0_BUSIF_RD         97
+#define CLK_ACLK_DREX1                  98
+#define CLK_ACLK_DREX0                  99
+#define CLK_ACLK_ASYNCAXIM_ATLAS_CCIX   100
+#define CLK_ACLK_ASYNCAXIS_ATLAS_MIF    101
+#define CLK_ACLK_ASYNCAXIM_ATLAS_MIF    102
+#define CLK_ACLK_ASYNCAXIS_MIF_IMEM     103
+#define CLK_ACLK_ASYNCAXIS_NOC_P_CCI    104
+#define CLK_ACLK_ASYNCAXIM_NOC_P_CCI    105
+#define CLK_ACLK_ASYNCAXIS_CP1          106
+#define CLK_ACLK_ASYNCAXIM_CP1          107
+#define CLK_ACLK_ASYNCAXIS_CP0          108
+#define CLK_ACLK_ASYNCAXIM_CP0          109
+#define CLK_ACLK_ASYNCAXIS_DREX1_3      110
+#define CLK_ACLK_ASYNCAXIM_DREX1_3      111
+#define CLK_ACLK_ASYNCAXIS_DREX1_1      112
+#define CLK_ACLK_ASYNCAXIM_DREX1_1      113
+#define CLK_ACLK_ASYNCAXIS_DREX1_0      114
+#define CLK_ACLK_ASYNCAXIM_DREX1_0      115
+#define CLK_ACLK_ASYNCAXIS_DREX0_3      116
+#define CLK_ACLK_ASYNCAXIM_DREX0_3      117
+#define CLK_ACLK_ASYNCAXIS_DREX0_1      118
+#define CLK_ACLK_ASYNCAXIM_DREX0_1      119
+#define CLK_ACLK_ASYNCAXIS_DREX0_0      120
+#define CLK_ACLK_ASYNCAXIM_DREX0_0      121
+#define CLK_ACLK_AHB2APB_MIF2P          122
+#define CLK_ACLK_AHB2APB_MIF1P          123
+#define CLK_ACLK_AHB2APB_MIF0P          124
+#define CLK_ACLK_IXIU_CCI               125
+#define CLK_ACLK_XIU_MIFSFRX            126
+#define CLK_ACLK_MIFNP_133              127
+#define CLK_ACLK_MIFNM_200              128
+#define CLK_ACLK_MIFND_133              129
+#define CLK_ACLK_MIFND_400              130
+#define CLK_ACLK_CCI                    131
+#define CLK_ACLK_MIFND_266              132
+#define CLK_ACLK_PPMU_DREX1S3           133
+#define CLK_ACLK_PPMU_DREX1S1           134
+#define CLK_ACLK_PPMU_DREX1S0           135
+#define CLK_ACLK_PPMU_DREX0S3           136
+#define CLK_ACLK_PPMU_DREX0S1           137
+#define CLK_ACLK_PPMU_DREX0S0           138
+#define CLK_ACLK_BTS_APOLLO             139
+#define CLK_ACLK_BTS_ATLAS              140
+#define CLK_ACLK_ACE_SEL_APOLL          141
+#define CLK_ACLK_ACE_SEL_ATLAS          142
+#define CLK_ACLK_AXIDS_CCI_MIFSFRX      143
+#define CLK_ACLK_AXIUS_ATLAS_CCI        144
+#define CLK_ACLK_AXISYNCDNS_CCI         145
+#define CLK_ACLK_AXISYNCDN_CCI          146
+#define CLK_ACLK_AXISYNCDN_NOC_D        147
+#define CLK_ACLK_ASYNCACEM_APOLLO_CCI   148
+#define CLK_ACLK_ASYNCACEM_ATLAS_CCI    149
+#define CLK_ACLK_ASYNCAPBS_MIF_CSSYS    150
+#define CLK_ACLK_BUS2_400               151
+#define CLK_ACLK_DISP_333               152
+#define CLK_ACLK_CPIF_200               153
+#define CLK_PCLK_PPMU_DREX1S3           154
+#define CLK_PCLK_PPMU_DREX1S1           155
+#define CLK_PCLK_PPMU_DREX1S0           156
+#define CLK_PCLK_PPMU_DREX0S3           157
+#define CLK_PCLK_PPMU_DREX0S1           158
+#define CLK_PCLK_PPMU_DREX0S0           159
+#define CLK_PCLK_BTS_APOLLO             160
+#define CLK_PCLK_BTS_ATLAS              161
+#define CLK_PCLK_ASYNCAXI_NOC_P_CCI     162
+#define CLK_PCLK_ASYNCAXI_CP1           163
+#define CLK_PCLK_ASYNCAXI_CP0           164
+#define CLK_PCLK_ASYNCAXI_DREX1_3       165
+#define CLK_PCLK_ASYNCAXI_DREX1_1       166
+#define CLK_PCLK_ASYNCAXI_DREX1_0       167
+#define CLK_PCLK_ASYNCAXI_DREX0_3       168
+#define CLK_PCLK_ASYNCAXI_DREX0_1       169
+#define CLK_PCLK_ASYNCAXI_DREX0_0       170
+#define CLK_PCLK_MIFSRVND_133           171
+#define CLK_PCLK_PMU_MIF                172
+#define CLK_PCLK_SYSREG_MIF             173
+#define CLK_PCLK_GPIO_ALIVE             174
+#define CLK_PCLK_ABB                    175
+#define CLK_PCLK_PMU_APBIF              176
+#define CLK_PCLK_DDR_PHY1               177
+#define CLK_PCLK_DREX1                  178
+#define CLK_PCLK_DDR_PHY0               179
+#define CLK_PCLK_DREX0                  180
+#define CLK_PCLK_DREX0_TZ               181
+#define CLK_PCLK_DREX1_TZ               182
+#define CLK_PCLK_MONOTONIC_CNT          183
+#define CLK_PCLK_RTC                    184
+#define CLK_SCLK_DSIM1_DISP             185
+#define CLK_SCLK_DECON_TV_VCLK_DISP     186
+#define CLK_SCLK_FREQ_DET_BUS_PLL       187
+#define CLK_SCLK_FREQ_DET_MFC_PLL       188
+#define CLK_SCLK_FREQ_DET_MEM0_PLL      189
+#define CLK_SCLK_FREQ_DET_MEM1_PLL      190
+#define CLK_SCLK_DSIM0_DISP             191
+#define CLK_SCLK_DSD_DISP               192
+#define CLK_SCLK_DECON_TV_ECLK_DISP     193
+#define CLK_SCLK_DECON_VCLK_DISP        194
+#define CLK_SCLK_DECON_ECLK_DISP        195
+#define CLK_SCLK_HPM_MIF                196
+#define CLK_SCLK_MFC_PLL                197
+#define CLK_SCLK_BUS_PLL                198
+#define CLK_SCLK_BUS_PLL_APOLLO         199
+#define CLK_SCLK_BUS_PLL_ATLAS          200
+
+#define MIF_NR_CLK                      201
+
+/* CMU_PERIC */
+#define CLK_PCLK_SPI2                   1
+#define CLK_PCLK_SPI1                   2
+#define CLK_PCLK_SPI0                   3
+#define CLK_PCLK_UART2                  4
+#define CLK_PCLK_UART1                  5
+#define CLK_PCLK_UART0                  6
+#define CLK_PCLK_HSI2C3                 7
+#define CLK_PCLK_HSI2C2                 8
+#define CLK_PCLK_HSI2C1                 9
+#define CLK_PCLK_HSI2C0                 10
+#define CLK_PCLK_I2C7                   11
+#define CLK_PCLK_I2C6                   12
+#define CLK_PCLK_I2C5                   13
+#define CLK_PCLK_I2C4                   14
+#define CLK_PCLK_I2C3                   15
+#define CLK_PCLK_I2C2                   16
+#define CLK_PCLK_I2C1                   17
+#define CLK_PCLK_I2C0                   18
+#define CLK_PCLK_SPI4                   19
+#define CLK_PCLK_SPI3                   20
+#define CLK_PCLK_HSI2C11                21
+#define CLK_PCLK_HSI2C10                22
+#define CLK_PCLK_HSI2C9                 23
+#define CLK_PCLK_HSI2C8                 24
+#define CLK_PCLK_HSI2C7                 25
+#define CLK_PCLK_HSI2C6                 26
+#define CLK_PCLK_HSI2C5                 27
+#define CLK_PCLK_HSI2C4                 28
+#define CLK_SCLK_SPI4                   29
+#define CLK_SCLK_SPI3                   30
+#define CLK_SCLK_SPI2                   31
+#define CLK_SCLK_SPI1                   32
+#define CLK_SCLK_SPI0                   33
+#define CLK_SCLK_UART2                  34
+#define CLK_SCLK_UART1                  35
+#define CLK_SCLK_UART0                  36
+#define CLK_ACLK_AHB2APB_PERIC2P        37
+#define CLK_ACLK_AHB2APB_PERIC1P        38
+#define CLK_ACLK_AHB2APB_PERIC0P        39
+#define CLK_ACLK_PERICNP_66             40
+#define CLK_PCLK_SCI                    41
+#define CLK_PCLK_GPIO_FINGER            42
+#define CLK_PCLK_GPIO_ESE               43
+#define CLK_PCLK_PWM                    44
+#define CLK_PCLK_SPDIF                  45
+#define CLK_PCLK_PCM1                   46
+#define CLK_PCLK_I2S1                   47
+#define CLK_PCLK_ADCIF                  48
+#define CLK_PCLK_GPIO_TOUCH             49
+#define CLK_PCLK_GPIO_NFC               50
+#define CLK_PCLK_GPIO_PERIC             51
+#define CLK_PCLK_PMU_PERIC              52
+#define CLK_PCLK_SYSREG_PERIC           53
+#define CLK_SCLK_IOCLK_SPI4             54
+#define CLK_SCLK_IOCLK_SPI3             55
+#define CLK_SCLK_SCI                    56
+#define CLK_SCLK_SC_IN                  57
+#define CLK_SCLK_PWM                    58
+#define CLK_SCLK_IOCLK_SPI2             59
+#define CLK_SCLK_IOCLK_SPI1             60
+#define CLK_SCLK_IOCLK_SPI0             61
+#define CLK_SCLK_IOCLK_I2S1_BCLK        62
+#define CLK_SCLK_SPDIF                  63
+#define CLK_SCLK_PCM1                   64
+#define CLK_SCLK_I2S1                   65
+
+#define CLK_DIV_SCLK_SCI                70
+#define CLK_DIV_SCLK_SC_IN              71
+
+#define PERIC_NR_CLK                    72
+
+/* CMU_PERIS */
+#define CLK_PCLK_HPM_APBIF              1
+#define CLK_PCLK_TMU1_APBIF             2
+#define CLK_PCLK_TMU0_APBIF             3
+#define CLK_PCLK_PMU_PERIS              4
+#define CLK_PCLK_SYSREG_PERIS           5
+#define CLK_PCLK_CMU_TOP_APBIF          6
+#define CLK_PCLK_WDT_APOLLO             7
+#define CLK_PCLK_WDT_ATLAS              8
+#define CLK_PCLK_MCT                    9
+#define CLK_PCLK_HDMI_CEC               10
+#define CLK_ACLK_AHB2APB_PERIS1P        11
+#define CLK_ACLK_AHB2APB_PERIS0P        12
+#define CLK_ACLK_PERISNP_66             13
+#define CLK_PCLK_TZPC12                 14
+#define CLK_PCLK_TZPC11                 15
+#define CLK_PCLK_TZPC10                 16
+#define CLK_PCLK_TZPC9                  17
+#define CLK_PCLK_TZPC8                  18
+#define CLK_PCLK_TZPC7                  19
+#define CLK_PCLK_TZPC6                  20
+#define CLK_PCLK_TZPC5                  21
+#define CLK_PCLK_TZPC4                  22
+#define CLK_PCLK_TZPC3                  23
+#define CLK_PCLK_TZPC2                  24
+#define CLK_PCLK_TZPC1                  25
+#define CLK_PCLK_TZPC0                  26
+#define CLK_PCLK_SECKEY_APBIF           27
+#define CLK_PCLK_CHIPID_APBIF           28
+#define CLK_PCLK_TOPRTC                 29
+#define CLK_PCLK_CUSTOM_EFUSE_APBIF     30
+#define CLK_PCLK_ANTIRBK_CNT_APBIF      31
+#define CLK_PCLK_OTP_CON_APBIF          32
+#define CLK_SCLK_ASV_TB                 33
+#define CLK_SCLK_TMU1                   34
+#define CLK_SCLK_TMU0                   35
+#define CLK_SCLK_SECKEY                 36
+#define CLK_SCLK_CHIPID                 37
+#define CLK_SCLK_TOPRTC                 38
+#define CLK_SCLK_CUSTOM_EFUSE           39
+#define CLK_SCLK_ANTIRBK_CNT            40
+#define CLK_SCLK_OTP_CON                41
+
+#define PERIS_NR_CLK                    42
+
+/* CMU_FSYS */
+#define CLK_MOUT_ACLK_FSYS_200_USER     1
+#define CLK_MOUT_SCLK_MMC2_USER         2
+#define CLK_MOUT_SCLK_MMC1_USER         3
+#define CLK_MOUT_SCLK_MMC0_USER         4
+#define CLK_MOUT_SCLK_UFS_MPHY_USER     5
+#define CLK_MOUT_SCLK_PCIE_100_USER     6
+#define CLK_MOUT_SCLK_UFSUNIPRO_USER    7
+#define CLK_MOUT_SCLK_USBHOST30_USER    8
+#define CLK_MOUT_SCLK_USBDRD30_USER     9
+#define CLK_MOUT_PHYCLK_USBHOST30_UHOST30_PIPE_PCLK_USER        10
+#define CLK_MOUT_PHYCLK_USBHOST30_UHOST30_PHYCLOCK_USER         11
+#define CLK_MOUT_PHYCLK_USBHOST20_PHY_HSIC1_USER                12
+#define CLK_MOUT_PHYCLK_USBHOST20_PHY_CLK48MOHCI_USER           13
+#define CLK_MOUT_PHYCLK_USBHOST20_PHY_PHYCLOCK_USER             14
+#define CLK_MOUT_PHYCLK_USBHOST20_PHY_PHY_FREECLK_USER          15
+#define CLK_MOUT_PHYCLK_USBDRD30_UDRD30_PIPE_PCLK_USER          16
+#define CLK_MOUT_PHYCLK_USBDRD30_UDRD30_PHYCLOCK_USER           17
+#define CLK_MOUT_PHYCLK_UFS_RX1_SYMBOL_USER                     18
+#define CLK_MOUT_PHYCLK_UFS_RX0_SYMBOL_USER                     19
+#define CLK_MOUT_PHYCLK_UFS_TX1_SYMBOL_USER                     20
+#define CLK_MOUT_PHYCLK_UFS_TX0_SYMBOL_USER                     21
+#define CLK_MOUT_PHYCLK_LLI_MPHY_TO_UFS_USER                    22
+#define CLK_MOUT_SCLK_MPHY                                      23
+
+#define CLK_PHYCLK_USBDRD30_UDRD30_PHYCLOCK_PHY                 25
+#define CLK_PHYCLK_USBDRD30_UDRD30_PIPE_PCLK_PHY                26
+#define CLK_PHYCLK_USBHOST30_UHOST30_PHYCLOCK_PHY               27
+#define CLK_PHYCLK_USBHOST30_UHOST30_PIPE_PCLK_PHY              28
+#define CLK_PHYCLK_USBHOST20_PHY_FREECLK_PHY                    29
+#define CLK_PHYCLK_USBHOST20_PHY_PHYCLOCK_PHY                   30
+#define CLK_PHYCLK_USBHOST20_PHY_CLK48MOHCI_PHY                 31
+#define CLK_PHYCLK_USBHOST20_PHY_HSIC1_PHY                      32
+#define CLK_PHYCLK_UFS_TX0_SYMBOL_PHY                           33
+#define CLK_PHYCLK_UFS_RX0_SYMBOL_PHY                           34
+#define CLK_PHYCLK_UFS_TX1_SYMBOL_PHY                           35
+#define CLK_PHYCLK_UFS_RX1_SYMBOL_PHY                           36
+#define CLK_PHYCLK_LLI_MPHY_TO_UFS_PHY                          37
+
+#define CLK_ACLK_PCIE                   50
+#define CLK_ACLK_PDMA1                  51
+#define CLK_ACLK_TSI                    52
+#define CLK_ACLK_MMC2                   53
+#define CLK_ACLK_MMC1                   54
+#define CLK_ACLK_MMC0                   55
+#define CLK_ACLK_UFS                    56
+#define CLK_ACLK_USBHOST20              57
+#define CLK_ACLK_USBHOST30              58
+#define CLK_ACLK_USBDRD30               59
+#define CLK_ACLK_PDMA0                  60
+#define CLK_SCLK_MMC2                   61
+#define CLK_SCLK_MMC1                   62
+#define CLK_SCLK_MMC0                   63
+#define CLK_PDMA1                       64
+#define CLK_PDMA0                       65
+#define CLK_ACLK_XIU_FSYSPX             66
+#define CLK_ACLK_AHB_USBLINKH1          67
+#define CLK_ACLK_SMMU_PDMA1             68
+#define CLK_ACLK_BTS_PCIE               69
+#define CLK_ACLK_AXIUS_PDMA1            70
+#define CLK_ACLK_SMMU_PDMA0             71
+#define CLK_ACLK_BTS_UFS                72
+#define CLK_ACLK_BTS_USBHOST30          73
+#define CLK_ACLK_BTS_USBDRD30           74
+#define CLK_ACLK_AXIUS_PDMA0            75
+#define CLK_ACLK_AXIUS_USBHS            76
+#define CLK_ACLK_AXIUS_FSYSSX           77
+#define CLK_ACLK_AHB2APB_FSYSP          78
+#define CLK_ACLK_AHB2AXI_USBHS          79
+#define CLK_ACLK_AHB_USBLINKH0          80
+#define CLK_ACLK_AHB_USBHS              81
+#define CLK_ACLK_AHB_FSYSH              82
+#define CLK_ACLK_XIU_FSYSX              83
+#define CLK_ACLK_XIU_FSYSSX             84
+#define CLK_ACLK_FSYSNP_200             85
+#define CLK_ACLK_FSYSND_200             86
+#define CLK_PCLK_PCIE_CTRL              87
+#define CLK_PCLK_SMMU_PDMA1             88
+#define CLK_PCLK_PCIE_PHY               89
+#define CLK_PCLK_BTS_PCIE               90
+#define CLK_PCLK_SMMU_PDMA0             91
+#define CLK_PCLK_BTS_UFS                92
+#define CLK_PCLK_BTS_USBHOST30          93
+#define CLK_PCLK_BTS_USBDRD30           94
+#define CLK_PCLK_GPIO_FSYS              95
+#define CLK_PCLK_PMU_FSYS               96
+#define CLK_PCLK_SYSREG_FSYS            97
+#define CLK_SCLK_PCIE_100               98
+#define CLK_PHYCLK_USBHOST30_UHOST30_PIPE_PCLK  99
+#define CLK_PHYCLK_USBHOST30_UHOST30_PHYCLOCK   100
+#define CLK_PHYCLK_UFS_RX1_SYMBOL               101
+#define CLK_PHYCLK_UFS_RX0_SYMBOL               102
+#define CLK_PHYCLK_UFS_TX1_SYMBOL               103
+#define CLK_PHYCLK_UFS_TX0_SYMBOL               104
+#define CLK_PHYCLK_USBHOST20_PHY_HSIC1          105
+#define CLK_PHYCLK_USBHOST20_PHY_CLK48MOHCI     106
+#define CLK_PHYCLK_USBHOST20_PHY_PHYCLOCK       107
+#define CLK_PHYCLK_USBHOST20_PHY_FREECLK        108
+#define CLK_PHYCLK_USBDRD30_UDRD30_PIPE_PCLK    109
+#define CLK_PHYCLK_USBDRD30_UDRD30_PHYCLOCK     110
+#define CLK_SCLK_MPHY                   111
+#define CLK_SCLK_UFSUNIPRO              112
+#define CLK_SCLK_USBHOST30              113
+#define CLK_SCLK_USBDRD30               114
+
+#define FSYS_NR_CLK                     115
+
+/* CMU_G2D */
+#define CLK_MUX_ACLK_G2D_266_USER       1
+#define CLK_MUX_ACLK_G2D_400_USER       2
+
+#define CLK_DIV_PCLK_G2D                3
+
+#define CLK_ACLK_SMMU_MDMA1             4
+#define CLK_ACLK_BTS_MDMA1              5
+#define CLK_ACLK_BTS_G2D                6
+#define CLK_ACLK_ALB_G2D                7
+#define CLK_ACLK_AXIUS_G2DX             8
+#define CLK_ACLK_ASYNCAXI_SYSX          9
+#define CLK_ACLK_AHB2APB_G2D1P          10
+#define CLK_ACLK_AHB2APB_G2D0P          11
+#define CLK_ACLK_XIU_G2DX               12
+#define CLK_ACLK_G2DNP_133              13
+#define CLK_ACLK_G2DND_400              14
+#define CLK_ACLK_MDMA1                  15
+#define CLK_ACLK_G2D                    16
+#define CLK_ACLK_SMMU_G2D               17
+#define CLK_PCLK_SMMU_MDMA1             18
+#define CLK_PCLK_BTS_MDMA1              19
+#define CLK_PCLK_BTS_G2D                20
+#define CLK_PCLK_ALB_G2D                21
+#define CLK_PCLK_ASYNCAXI_SYSX          22
+#define CLK_PCLK_PMU_G2D                23
+#define CLK_PCLK_SYSREG_G2D             24
+#define CLK_PCLK_G2D                    25
+#define CLK_PCLK_SMMU_G2D               26
+
+#define G2D_NR_CLK                      27
+
+/* CMU_DISP */
+#define CLK_FOUT_DISP_PLL                               1
+
+#define CLK_MOUT_DISP_PLL                               2
+#define CLK_MOUT_SCLK_DSIM1_USER                        3
+#define CLK_MOUT_SCLK_DSIM0_USER                        4
+#define CLK_MOUT_SCLK_DSD_USER                          5
+#define CLK_MOUT_SCLK_DECON_TV_ECLK_USER                6
+#define CLK_MOUT_SCLK_DECON_VCLK_USER                   7
+#define CLK_MOUT_SCLK_DECON_ECLK_USER                   8
+#define CLK_MOUT_SCLK_DECON_TV_VCLK_USER                9
+#define CLK_MOUT_ACLK_DISP_333_USER                     10
+#define CLK_MOUT_PHYCLK_MIPIDPHY1_BITCLKDIV8_USER       11
+#define CLK_MOUT_PHYCLK_MIPIDPHY1_RXCLKESC0_USER        12
+#define CLK_MOUT_PHYCLK_MIPIDPHY0_BITCLKDIV8_USER       13
+#define CLK_MOUT_PHYCLK_MIPIDPHY0_RXCLKESC0_USER        14
+#define CLK_MOUT_PHYCLK_HDMIPHY_TMDS_CLKO_USER          15
+#define CLK_MOUT_PHYCLK_HDMIPHY_PIXEL_CLKO_USER         16
+#define CLK_MOUT_SCLK_DSIM0                             17
+#define CLK_MOUT_SCLK_DECON_TV_ECLK                     18
+#define CLK_MOUT_SCLK_DECON_VCLK                        19
+#define CLK_MOUT_SCLK_DECON_ECLK                        20
+#define CLK_MOUT_SCLK_DSIM1_B_DISP                      21
+#define CLK_MOUT_SCLK_DSIM1_A_DISP                      22
+#define CLK_MOUT_SCLK_DECON_TV_VCLK_C_DISP              23
+#define CLK_MOUT_SCLK_DECON_TV_VCLK_B_DISP              24
+#define CLK_MOUT_SCLK_DECON_TV_VCLK_A_DISP              25
+
+#define CLK_DIV_SCLK_DSIM1_DISP                         30
+#define CLK_DIV_SCLK_DECON_TV_VCLK_DISP                 31
+#define CLK_DIV_SCLK_DSIM0_DISP                         32
+#define CLK_DIV_SCLK_DECON_TV_ECLK_DISP                 33
+#define CLK_DIV_SCLK_DECON_VCLK_DISP                    34
+#define CLK_DIV_SCLK_DECON_ECLK_DISP                    35
+#define CLK_DIV_PCLK_DISP                               36
+
+#define CLK_ACLK_DECON_TV                               40
+#define CLK_ACLK_DECON                                  41
+#define CLK_ACLK_SMMU_TV1X                              42
+#define CLK_ACLK_SMMU_TV0X                              43
+#define CLK_ACLK_SMMU_DECON1X                           44
+#define CLK_ACLK_SMMU_DECON0X                           45
+#define CLK_ACLK_BTS_DECON_TV_M3                        46
+#define CLK_ACLK_BTS_DECON_TV_M2                        47
+#define CLK_ACLK_BTS_DECON_TV_M1                        48
+#define CLK_ACLK_BTS_DECON_TV_M0                        49
+#define CLK_ACLK_BTS_DECON_NM4                          50
+#define CLK_ACLK_BTS_DECON_NM3                          51
+#define CLK_ACLK_BTS_DECON_NM2                          52
+#define CLK_ACLK_BTS_DECON_NM1                          53
+#define CLK_ACLK_BTS_DECON_NM0                          54
+#define CLK_ACLK_AHB2APB_DISPSFR2P                      55
+#define CLK_ACLK_AHB2APB_DISPSFR1P                      56
+#define CLK_ACLK_AHB2APB_DISPSFR0P                      57
+#define CLK_ACLK_AHB_DISPH                              58
+#define CLK_ACLK_XIU_TV1X                               59
+#define CLK_ACLK_XIU_TV0X                               60
+#define CLK_ACLK_XIU_DECON1X                            61
+#define CLK_ACLK_XIU_DECON0X                            62
+#define CLK_ACLK_XIU_DISP1X                             63
+#define CLK_ACLK_XIU_DISPNP_100                         64
+#define CLK_ACLK_DISP1ND_333                            65
+#define CLK_ACLK_DISP0ND_333                            66
+#define CLK_PCLK_SMMU_TV1X                              67
+#define CLK_PCLK_SMMU_TV0X                              68
+#define CLK_PCLK_SMMU_DECON1X                           69
+#define CLK_PCLK_SMMU_DECON0X                           70
+#define CLK_PCLK_BTS_DECON_TV_M3                        71
+#define CLK_PCLK_BTS_DECON_TV_M2                        72
+#define CLK_PCLK_BTS_DECON_TV_M1                        73
+#define CLK_PCLK_BTS_DECON_TV_M0                        74
+#define CLK_PCLK_BTS_DECONM4                            75
+#define CLK_PCLK_BTS_DECONM3                            76
+#define CLK_PCLK_BTS_DECONM2                            77
+#define CLK_PCLK_BTS_DECONM1                            78
+#define CLK_PCLK_BTS_DECONM0                            79
+#define CLK_PCLK_MIC1                                   80
+#define CLK_PCLK_PMU_DISP                               81
+#define CLK_PCLK_SYSREG_DISP                            82
+#define CLK_PCLK_HDMIPHY                                83
+#define CLK_PCLK_HDMI                                   84
+#define CLK_PCLK_MIC0                                   85
+#define CLK_PCLK_DSIM1                                  86
+#define CLK_PCLK_DSIM0                                  87
+#define CLK_PCLK_DECON_TV                               88
+#define CLK_PHYCLK_MIPIDPHY1_BITCLKDIV8                 89
+#define CLK_PHYCLK_MIPIDPHY1_RXCLKESC0                  90
+#define CLK_SCLK_RGB_TV_VCLK_TO_DSIM1                   91
+#define CLK_SCLK_RGB_TV_VCLK_TO_MIC1                    92
+#define CLK_SCLK_DSIM1                                  93
+#define CLK_SCLK_DECON_TV_VCLK                          94
+#define CLK_PHYCLK_MIPIDPHY0_BITCLKDIV8                 95
+#define CLK_PHYCLK_MIPIDPHY0_RXCLKESC0                  96
+#define CLK_PHYCLK_HDMIPHY_TMDS_CLKO                    97
+#define CLK_PHYCLK_HDMI_PIXEL                           98
+#define CLK_SCLK_RGB_VCLK_TO_SMIES                      99
+#define CLK_SCLK_FREQ_DET_DISP_PLL                      100
+#define CLK_SCLK_RGB_VCLK_TO_DSIM0                      101
+#define CLK_SCLK_RGB_VCLK_TO_MIC0                       102
+#define CLK_SCLK_DSD                                    103
+#define CLK_SCLK_HDMI_SPDIF                             104
+#define CLK_SCLK_DSIM0                                  105
+#define CLK_SCLK_DECON_TV_ECLK                          106
+#define CLK_SCLK_DECON_VCLK                             107
+#define CLK_SCLK_DECON_ECLK                             108
+#define CLK_SCLK_RGB_VCLK                               109
+#define CLK_SCLK_RGB_TV_VCLK                            110
+
+#define DISP_NR_CLK                                     111
+
+/* CMU_AUD */
+#define CLK_MOUT_AUD_PLL_USER                           1
+#define CLK_MOUT_SCLK_AUD_PCM                           2
+#define CLK_MOUT_SCLK_AUD_I2S                           3
+
+#define CLK_DIV_ATCLK_AUD                               4
+#define CLK_DIV_PCLK_DBG_AUD                            5
+#define CLK_DIV_ACLK_AUD                                6
+#define CLK_DIV_AUD_CA5                                 7
+#define CLK_DIV_SCLK_AUD_SLIMBUS                        8
+#define CLK_DIV_SCLK_AUD_UART                           9
+#define CLK_DIV_SCLK_AUD_PCM                            10
+#define CLK_DIV_SCLK_AUD_I2S                            11
+
+#define CLK_ACLK_INTR_CTRL                              12
+#define CLK_ACLK_AXIDS2_LPASSP                          13
+#define CLK_ACLK_AXIDS1_LPASSP                          14
+#define CLK_ACLK_AXI2APB1_LPASSP                        15
+#define CLK_ACLK_AXI2APH_LPASSP                         16
+#define CLK_ACLK_SMMU_LPASSX                            17
+#define CLK_ACLK_AXIDS0_LPASSP                          18
+#define CLK_ACLK_AXI2APB0_LPASSP                        19
+#define CLK_ACLK_XIU_LPASSX                             20
+#define CLK_ACLK_AUDNP_133                              21
+#define CLK_ACLK_AUDND_133                              22
+#define CLK_ACLK_SRAMC                                  23
+#define CLK_ACLK_DMAC                                   24
+#define CLK_PCLK_WDT1                                   25
+#define CLK_PCLK_WDT0                                   26
+#define CLK_PCLK_SFR1                                   27
+#define CLK_PCLK_SMMU_LPASSX                            28
+#define CLK_PCLK_GPIO_AUD                               29
+#define CLK_PCLK_PMU_AUD                                30
+#define CLK_PCLK_SYSREG_AUD                             31
+#define CLK_PCLK_AUD_SLIMBUS                            32
+#define CLK_PCLK_AUD_UART                               33
+#define CLK_PCLK_AUD_PCM                                34
+#define CLK_PCLK_AUD_I2S                                35
+#define CLK_PCLK_TIMER                                  36
+#define CLK_PCLK_SFR0_CTRL                              37
+#define CLK_ATCLK_AUD                                   38
+#define CLK_PCLK_DBG_AUD                                39
+#define CLK_SCLK_AUD_CA5                                40
+#define CLK_SCLK_JTAG_TCK                               41
+#define CLK_SCLK_SLIMBUS_CLKIN                          42
+#define CLK_SCLK_AUD_SLIMBUS                            43
+#define CLK_SCLK_AUD_UART                               44
+#define CLK_SCLK_AUD_PCM                                45
+#define CLK_SCLK_I2S_BCLK                               46
+#define CLK_SCLK_AUD_I2S                                47
+
+#define AUD_NR_CLK                                      48
+
+/* CMU_BUS{0|1|2} */
+#define CLK_DIV_PCLK_BUS_133                            1
+
+#define CLK_ACLK_AHB2APB_BUSP                           2
+#define CLK_ACLK_BUSNP_133                              3
+#define CLK_ACLK_BUSND_400                              4
+#define CLK_PCLK_BUSSRVND_133                           5
+#define CLK_PCLK_PMU_BUS                                6
+#define CLK_PCLK_SYSREG_BUS                             7
+
+#define CLK_MOUT_ACLK_BUS2_400_USER                     8  /* Only CMU_BUS2 */
+#define CLK_ACLK_BUS2BEND_400                           9  /* Only CMU_BUS2 */
+#define CLK_ACLK_BUS2RTND_400                           10 /* Only CMU_BUS2 */
+
+#define BUSx_NR_CLK                                     11
+
+/* CMU_G3D */
+#define CLK_FOUT_G3D_PLL                                1
+
+#define CLK_MOUT_ACLK_G3D_400                           2
+#define CLK_MOUT_G3D_PLL                                3
+
+#define CLK_DIV_SCLK_HPM_G3D                            4
+#define CLK_DIV_PCLK_G3D                                5
+#define CLK_DIV_ACLK_G3D                                6
+#define CLK_ACLK_BTS_G3D1                               7
+#define CLK_ACLK_BTS_G3D0                               8
+#define CLK_ACLK_ASYNCAPBS_G3D                          9
+#define CLK_ACLK_ASYNCAPBM_G3D                          10
+#define CLK_ACLK_AHB2APB_G3DP                           11
+#define CLK_ACLK_G3DNP_150                              12
+#define CLK_ACLK_G3DND_600                              13
+#define CLK_ACLK_G3D                                    14
+#define CLK_PCLK_BTS_G3D1                               15
+#define CLK_PCLK_BTS_G3D0                               16
+#define CLK_PCLK_PMU_G3D                                17
+#define CLK_PCLK_SYSREG_G3D                             18
+#define CLK_SCLK_HPM_G3D                                19
+
+#define G3D_NR_CLK                                      20
+
+/* CMU_GSCL */
+#define CLK_MOUT_ACLK_GSCL_111_USER                     1
+#define CLK_MOUT_ACLK_GSCL_333_USER                     2
+
+#define CLK_ACLK_BTS_GSCL2                              3
+#define CLK_ACLK_BTS_GSCL1                              4
+#define CLK_ACLK_BTS_GSCL0                              5
+#define CLK_ACLK_AHB2APB_GSCLP                          6
+#define CLK_ACLK_XIU_GSCLX                              7
+#define CLK_ACLK_GSCLNP_111                             8
+#define CLK_ACLK_GSCLRTND_333                           9
+#define CLK_ACLK_GSCLBEND_333                           10
+#define CLK_ACLK_GSD                                    11
+#define CLK_ACLK_GSCL2                                  12
+#define CLK_ACLK_GSCL1                                  13
+#define CLK_ACLK_GSCL0                                  14
+#define CLK_ACLK_SMMU_GSCL0                             15
+#define CLK_ACLK_SMMU_GSCL1                             16
+#define CLK_ACLK_SMMU_GSCL2                             17
+#define CLK_PCLK_BTS_GSCL2                              18
+#define CLK_PCLK_BTS_GSCL1                              19
+#define CLK_PCLK_BTS_GSCL0                              20
+#define CLK_PCLK_PMU_GSCL                               21
+#define CLK_PCLK_SYSREG_GSCL                            22
+#define CLK_PCLK_GSCL2                                  23
+#define CLK_PCLK_GSCL1                                  24
+#define CLK_PCLK_GSCL0                                  25
+#define CLK_PCLK_SMMU_GSCL0                             26
+#define CLK_PCLK_SMMU_GSCL1                             27
+#define CLK_PCLK_SMMU_GSCL2                             28
+
+#define GSCL_NR_CLK                                     29
+
+/* CMU_APOLLO */
+#define CLK_FOUT_APOLLO_PLL                             1
+
+#define CLK_MOUT_APOLLO_PLL                             2
+#define CLK_MOUT_BUS_PLL_APOLLO_USER                    3
+#define CLK_MOUT_APOLLO                                 4
+
+#define CLK_DIV_CNTCLK_APOLLO                           5
+#define CLK_DIV_PCLK_DBG_APOLLO                         6
+#define CLK_DIV_ATCLK_APOLLO                            7
+#define CLK_DIV_PCLK_APOLLO                             8
+#define CLK_DIV_ACLK_APOLLO                             9
+#define CLK_DIV_APOLLO2                                 10
+#define CLK_DIV_APOLLO1                                 11
+#define CLK_DIV_SCLK_HPM_APOLLO                         12
+#define CLK_DIV_APOLLO_PLL                              13
+
+#define CLK_ACLK_ATBDS_APOLLO_3                         14
+#define CLK_ACLK_ATBDS_APOLLO_2                         15
+#define CLK_ACLK_ATBDS_APOLLO_1                         16
+#define CLK_ACLK_ATBDS_APOLLO_0                         17
+#define CLK_ACLK_ASATBSLV_APOLLO_3_CSSYS                18
+#define CLK_ACLK_ASATBSLV_APOLLO_2_CSSYS                19
+#define CLK_ACLK_ASATBSLV_APOLLO_1_CSSYS                20
+#define CLK_ACLK_ASATBSLV_APOLLO_0_CSSYS                21
+#define CLK_ACLK_ASYNCACES_APOLLO_CCI                   22
+#define CLK_ACLK_AHB2APB_APOLLOP                        23
+#define CLK_ACLK_APOLLONP_200                           24
+#define CLK_PCLK_ASAPBMST_CSSYS_APOLLO                  25
+#define CLK_PCLK_PMU_APOLLO                             26
+#define CLK_PCLK_SYSREG_APOLLO                          27
+#define CLK_CNTCLK_APOLLO                               28
+#define CLK_SCLK_HPM_APOLLO                             29
+#define CLK_SCLK_APOLLO                                 30
+
+#define APOLLO_NR_CLK                                   31
+
+/* CMU_ATLAS */
+#define CLK_FOUT_ATLAS_PLL                              1
+
+#define CLK_MOUT_ATLAS_PLL                              2
+#define CLK_MOUT_BUS_PLL_ATLAS_USER                     3
+#define CLK_MOUT_ATLAS                                  4
+
+#define CLK_DIV_CNTCLK_ATLAS                            5
+#define CLK_DIV_PCLK_DBG_ATLAS                          6
+#define CLK_DIV_ATCLK_ATLASO                            7
+#define CLK_DIV_PCLK_ATLAS                              8
+#define CLK_DIV_ACLK_ATLAS                              9
+#define CLK_DIV_ATLAS2                                  10
+#define CLK_DIV_ATLAS1                                  11
+#define CLK_DIV_SCLK_HPM_ATLAS                          12
+#define CLK_DIV_ATLAS_PLL                               13
+
+#define CLK_ACLK_ATB_AUD_CSSYS                          14
+#define CLK_ACLK_ATB_APOLLO3_CSSYS                      15
+#define CLK_ACLK_ATB_APOLLO2_CSSYS                      16
+#define CLK_ACLK_ATB_APOLLO1_CSSYS                      17
+#define CLK_ACLK_ATB_APOLLO0_CSSYS                      18
+#define CLK_ACLK_ASYNCAHBS_CSSYS_SSS                    19
+#define CLK_ACLK_ASYNCAXIS_CSSYS_CCIX                   20
+#define CLK_ACLK_ASYNCACES_ATLAS_CCI                    21
+#define CLK_ACLK_AHB2APB_ATLASP                         22
+#define CLK_ACLK_ATLASNP_200                            23
+#define CLK_PCLK_ASYNCAPB_AUD_CSSYS                     24
+#define CLK_PCLK_ASYNCAPB_ISP_CSSYS                     25
+#define CLK_PCLK_ASYNCAPB_APOLLO_CSSYS                  26
+#define CLK_PCLK_PMU_ATLAS                              27
+#define CLK_PCLK_SYSREG_ATLAS                           28
+#define CLK_PCLK_SECJTAG                                29
+#define CLK_CNTCLK_ATLAS                                30
+#define CLK_SCLK_FREQ_DET_ATLAS_PLL                     31
+#define CLK_SCLK_HPM_ATLAS                              32
+#define CLK_TRACECLK                                    33
+#define CLK_CTMCLK                                      34
+#define CLK_HCLK_CSSYS                                  35
+#define CLK_PCLK_DBG_CSSYS                              36
+#define CLK_PCLK_DBG                                    37
+#define CLK_ATCLK                                       38
+#define CLK_SCLK_ATLAS                                  39
+
+#define ATLAS_NR_CLK                                    40
+
+/* CMU_MSCL */
+#define CLK_MOUT_SCLK_JPEG_USER                         1
+#define CLK_MOUT_ACLK_MSCL_400_USER                     2
+#define CLK_MOUT_SCLK_JPEG                              3
+
+#define CLK_DIV_PCLK_MSCL                               4
+
+#define CLK_ACLK_BTS_JPEG                               5
+#define CLK_ACLK_BTS_M2MSCALER1                         6
+#define CLK_ACLK_BTS_M2MSCALER0                         7
+#define CLK_ACLK_AHB2APB_MSCL0P                         8
+#define CLK_ACLK_XIU_MSCLX                              9
+#define CLK_ACLK_MSCLNP_100                             10
+#define CLK_ACLK_MSCLND_400                             11
+#define CLK_ACLK_JPEG                                   12
+#define CLK_ACLK_M2MSCALER1                             13
+#define CLK_ACLK_M2MSCALER0                             14
+#define CLK_ACLK_SMMU_M2MSCALER0                        15
+#define CLK_ACLK_SMMU_M2MSCALER1                        16
+#define CLK_ACLK_SMMU_JPEG                              17
+#define CLK_PCLK_BTS_JPEG                               18
+#define CLK_PCLK_BTS_M2MSCALER1                         19
+#define CLK_PCLK_BTS_M2MSCALER0                         20
+#define CLK_PCLK_PMU_MSCL                               21
+#define CLK_PCLK_SYSREG_MSCL                            22
+#define CLK_PCLK_JPEG                                   23
+#define CLK_PCLK_M2MSCALER1                             24
+#define CLK_PCLK_M2MSCALER0                             25
+#define CLK_PCLK_SMMU_M2MSCALER0                        26
+#define CLK_PCLK_SMMU_M2MSCALER1                        27
+#define CLK_PCLK_SMMU_JPEG                              28
+#define CLK_SCLK_JPEG                                   29
+
+#define MSCL_NR_CLK                                     30
+
+/* CMU_MFC */
+#define CLK_MOUT_ACLK_MFC_400_USER                      1
+
+#define CLK_DIV_PCLK_MFC                                2
+
+#define CLK_ACLK_BTS_MFC_1                              3
+#define CLK_ACLK_BTS_MFC_0                              4
+#define CLK_ACLK_AHB2APB_MFCP                           5
+#define CLK_ACLK_XIU_MFCX                               6
+#define CLK_ACLK_MFCNP_100                              7
+#define CLK_ACLK_MFCND_400                              8
+#define CLK_ACLK_MFC                                    9
+#define CLK_ACLK_SMMU_MFC_1                             10
+#define CLK_ACLK_SMMU_MFC_0                             11
+#define CLK_PCLK_BTS_MFC_1                              12
+#define CLK_PCLK_BTS_MFC_0                              13
+#define CLK_PCLK_PMU_MFC                                14
+#define CLK_PCLK_SYSREG_MFC                             15
+#define CLK_PCLK_MFC                                    16
+#define CLK_PCLK_SMMU_MFC_1                             17
+#define CLK_PCLK_SMMU_MFC_0                             18
+
+#define MFC_NR_CLK                                      19
+
+/* CMU_HEVC */
+#define CLK_MOUT_ACLK_HEVC_400_USER                     1
+
+#define CLK_DIV_PCLK_HEVC                               2
+
+#define CLK_ACLK_BTS_HEVC_1                             3
+#define CLK_ACLK_BTS_HEVC_0                             4
+#define CLK_ACLK_AHB2APB_HEVCP                          5
+#define CLK_ACLK_XIU_HEVCX                              6
+#define CLK_ACLK_HEVCNP_100                             7
+#define CLK_ACLK_HEVCND_400                             8
+#define CLK_ACLK_HEVC                                   9
+#define CLK_ACLK_SMMU_HEVC_1                            10
+#define CLK_ACLK_SMMU_HEVC_0                            11
+#define CLK_PCLK_BTS_HEVC_1                             12
+#define CLK_PCLK_BTS_HEVC_0                             13
+#define CLK_PCLK_PMU_HEVC                               14
+#define CLK_PCLK_SYSREG_HEVC                            15
+#define CLK_PCLK_HEVC                                   16
+#define CLK_PCLK_SMMU_HEVC_1                            17
+#define CLK_PCLK_SMMU_HEVC_0                            18
+
+#define HEVC_NR_CLK                                     19
+
+/* CMU_ISP */
+#define CLK_MOUT_ACLK_ISP_DIS_400_USER                  1
+#define CLK_MOUT_ACLK_ISP_400_USER                      2
+
+#define CLK_DIV_PCLK_ISP_DIS                            3
+#define CLK_DIV_PCLK_ISP                                4
+#define CLK_DIV_ACLK_ISP_D_200                          5
+#define CLK_DIV_ACLK_ISP_C_200                          6
+
+#define CLK_ACLK_ISP_D_GLUE                             7
+#define CLK_ACLK_SCALERP                                8
+#define CLK_ACLK_3DNR                                   9
+#define CLK_ACLK_DIS                                    10
+#define CLK_ACLK_SCALERC                                11
+#define CLK_ACLK_DRC                                    12
+#define CLK_ACLK_ISP                                    13
+#define CLK_ACLK_AXIUS_SCALERP                          14
+#define CLK_ACLK_AXIUS_SCALERC                          15
+#define CLK_ACLK_AXIUS_DRC                              16
+#define CLK_ACLK_ASYNCAHBM_ISP2P                        17
+#define CLK_ACLK_ASYNCAHBM_ISP1P                        18
+#define CLK_ACLK_ASYNCAXIS_DIS1                         19
+#define CLK_ACLK_ASYNCAXIS_DIS0                         20
+#define CLK_ACLK_ASYNCAXIM_DIS1                         21
+#define CLK_ACLK_ASYNCAXIM_DIS0                         22
+#define CLK_ACLK_ASYNCAXIM_ISP2P                        23
+#define CLK_ACLK_ASYNCAXIM_ISP1P                        24
+#define CLK_ACLK_AHB2APB_ISP2P                          25
+#define CLK_ACLK_AHB2APB_ISP1P                          26
+#define CLK_ACLK_AXI2APB_ISP2P                          27
+#define CLK_ACLK_AXI2APB_ISP1P                          28
+#define CLK_ACLK_XIU_ISPEX1                             29
+#define CLK_ACLK_XIU_ISPEX0                             30
+#define CLK_ACLK_ISPND_400                              31
+#define CLK_ACLK_SMMU_SCALERP                           32
+#define CLK_ACLK_SMMU_3DNR                              33
+#define CLK_ACLK_SMMU_DIS1                              34
+#define CLK_ACLK_SMMU_DIS0                              35
+#define CLK_ACLK_SMMU_SCALERC                           36
+#define CLK_ACLK_SMMU_DRC                               37
+#define CLK_ACLK_SMMU_ISP                               38
+#define CLK_ACLK_BTS_SCALERP                            39
+#define CLK_ACLK_BTS_3DR                                40
+#define CLK_ACLK_BTS_DIS1                               41
+#define CLK_ACLK_BTS_DIS0                               42
+#define CLK_ACLK_BTS_SCALERC                            43
+#define CLK_ACLK_BTS_DRC                                44
+#define CLK_ACLK_BTS_ISP                                45
+#define CLK_PCLK_SMMU_SCALERP                           46
+#define CLK_PCLK_SMMU_3DNR                              47
+#define CLK_PCLK_SMMU_DIS1                              48
+#define CLK_PCLK_SMMU_DIS0                              49
+#define CLK_PCLK_SMMU_SCALERC                           50
+#define CLK_PCLK_SMMU_DRC                               51
+#define CLK_PCLK_SMMU_ISP                               52
+#define CLK_PCLK_BTS_SCALERP                            53
+#define CLK_PCLK_BTS_3DNR                               54
+#define CLK_PCLK_BTS_DIS1                               55
+#define CLK_PCLK_BTS_DIS0                               56
+#define CLK_PCLK_BTS_SCALERC                            57
+#define CLK_PCLK_BTS_DRC                                58
+#define CLK_PCLK_BTS_ISP                                59
+#define CLK_PCLK_ASYNCAXI_DIS1                          60
+#define CLK_PCLK_ASYNCAXI_DIS0                          61
+#define CLK_PCLK_PMU_ISP                                62
+#define CLK_PCLK_SYSREG_ISP                             63
+#define CLK_PCLK_CMU_ISP_LOCAL                          64
+#define CLK_PCLK_SCALERP                                65
+#define CLK_PCLK_3DNR                                   66
+#define CLK_PCLK_DIS_CORE                               67
+#define CLK_PCLK_DIS                                    68
+#define CLK_PCLK_SCALERC                                69
+#define CLK_PCLK_DRC                                    70
+#define CLK_PCLK_ISP                                    71
+#define CLK_SCLK_PIXELASYNCS_DIS                        72
+#define CLK_SCLK_PIXELASYNCM_DIS                        73
+#define CLK_SCLK_PIXELASYNCS_SCALERP                    74
+#define CLK_SCLK_PIXELASYNCM_ISPD                       75
+#define CLK_SCLK_PIXELASYNCS_ISPC                       76
+#define CLK_SCLK_PIXELASYNCM_ISPC                       77
+
+#define ISP_NR_CLK                                      78
+
+/* CMU_CAM0 */
+#define CLK_PHYCLK_RXBYTEECLKHS0_S4_PHY                 1
+#define CLK_PHYCLK_RXBYTEECLKHS0_S2A_PHY                2
+
+#define CLK_MOUT_ACLK_CAM0_333_USER                     3
+#define CLK_MOUT_ACLK_CAM0_400_USER                     4
+#define CLK_MOUT_ACLK_CAM0_552_USER                     5
+#define CLK_MOUT_PHYCLK_RXBYTECLKHS0_S4_USER            6
+#define CLK_MOUT_PHYCLK_RXBYTECLKHS0_S2A_USER           7
+#define CLK_MOUT_ACLK_LITE_D_B                          8
+#define CLK_MOUT_ACLK_LITE_D_A                          9
+#define CLK_MOUT_ACLK_LITE_B_B                          10
+#define CLK_MOUT_ACLK_LITE_B_A                          11
+#define CLK_MOUT_ACLK_LITE_A_B                          12
+#define CLK_MOUT_ACLK_LITE_A_A                          13
+#define CLK_MOUT_ACLK_CAM0_400                          14
+#define CLK_MOUT_ACLK_CSIS1_B                           15
+#define CLK_MOUT_ACLK_CSIS1_A                           16
+#define CLK_MOUT_ACLK_CSIS0_B                           17
+#define CLK_MOUT_ACLK_CSIS0_A                           18
+#define CLK_MOUT_ACLK_3AA1_B                            19
+#define CLK_MOUT_ACLK_3AA1_A                            20
+#define CLK_MOUT_ACLK_3AA0_B                            21
+#define CLK_MOUT_ACLK_3AA0_A                            22
+#define CLK_MOUT_SCLK_LITE_FREECNT_C                    23
+#define CLK_MOUT_SCLK_LITE_FREECNT_B                    24
+#define CLK_MOUT_SCLK_LITE_FREECNT_A                    25
+#define CLK_MOUT_SCLK_PIXELASYNC_LITE_C_B               26
+#define CLK_MOUT_SCLK_PIXELASYNC_LITE_C_A               27
+#define CLK_MOUT_SCLK_PIXELASYNC_LITE_C_INIT_B          28
+#define CLK_MOUT_SCLK_PIXELASYNC_LITE_C_INIT_A          29
+
+#define CLK_DIV_PCLK_CAM0_50                            30
+#define CLK_DIV_ACLK_CAM0_200                           31
+#define CLK_DIV_ACLK_CAM0_BUS_400                       32
+#define CLK_DIV_PCLK_LITE_D                             33
+#define CLK_DIV_ACLK_LITE_D                             34
+#define CLK_DIV_PCLK_LITE_B                             35
+#define CLK_DIV_ACLK_LITE_B                             36
+#define CLK_DIV_PCLK_LITE_A                             37
+#define CLK_DIV_ACLK_LITE_A                             38
+#define CLK_DIV_ACLK_CSIS1                              39
+#define CLK_DIV_ACLK_CSIS0                              40
+#define CLK_DIV_PCLK_3AA1                               41
+#define CLK_DIV_ACLK_3AA1                               42
+#define CLK_DIV_PCLK_3AA0                               43
+#define CLK_DIV_ACLK_3AA0                               44
+#define CLK_DIV_SCLK_PIXELASYNC_LITE_C                  45
+#define CLK_DIV_PCLK_PIXELASYNC_LITE_C                  46
+#define CLK_DIV_SCLK_PIXELASYNC_LITE_C_INIT             47
+
+#define CLK_ACLK_CSIS1                                  50
+#define CLK_ACLK_CSIS0                                  51
+#define CLK_ACLK_3AA1                                   52
+#define CLK_ACLK_3AA0                                   53
+#define CLK_ACLK_LITE_D                                 54
+#define CLK_ACLK_LITE_B                                 55
+#define CLK_ACLK_LITE_A                                 56
+#define CLK_ACLK_AHBSYNCDN                              57
+#define CLK_ACLK_AXIUS_LITE_D                           58
+#define CLK_ACLK_AXIUS_LITE_B                           59
+#define CLK_ACLK_AXIUS_LITE_A                           60
+#define CLK_ACLK_ASYNCAPBM_3AA1                         61
+#define CLK_ACLK_ASYNCAPBS_3AA1                         62
+#define CLK_ACLK_ASYNCAPBM_3AA0                         63
+#define CLK_ACLK_ASYNCAPBS_3AA0                         64
+#define CLK_ACLK_ASYNCAPBM_LITE_D                       65
+#define CLK_ACLK_ASYNCAPBS_LITE_D                       66
+#define CLK_ACLK_ASYNCAPBM_LITE_B                       67
+#define CLK_ACLK_ASYNCAPBS_LITE_B                       68
+#define CLK_ACLK_ASYNCAPBM_LITE_A                       69
+#define CLK_ACLK_ASYNCAPBS_LITE_A                       70
+#define CLK_ACLK_ASYNCAXIM_ISP0P                        71
+#define CLK_ACLK_ASYNCAXIM_3AA1                         72
+#define CLK_ACLK_ASYNCAXIS_3AA1                         73
+#define CLK_ACLK_ASYNCAXIM_3AA0                         74
+#define CLK_ACLK_ASYNCAXIS_3AA0                         75
+#define CLK_ACLK_ASYNCAXIM_LITE_D                       76
+#define CLK_ACLK_ASYNCAXIS_LITE_D                       77
+#define CLK_ACLK_ASYNCAXIM_LITE_B                       78
+#define CLK_ACLK_ASYNCAXIS_LITE_B                       79
+#define CLK_ACLK_ASYNCAXIM_LITE_A                       80
+#define CLK_ACLK_ASYNCAXIS_LITE_A                       81
+#define CLK_ACLK_AHB2APB_ISPSFRP                        82
+#define CLK_ACLK_AXI2APB_ISP0P                          83
+#define CLK_ACLK_AXI2AHB_ISP0P                          84
+#define CLK_ACLK_XIU_IS0X                               85
+#define CLK_ACLK_XIU_ISP0EX                             86
+#define CLK_ACLK_CAM0NP_276                             87
+#define CLK_ACLK_CAM0ND_400                             88
+#define CLK_ACLK_SMMU_3AA1                              89
+#define CLK_ACLK_SMMU_3AA0                              90
+#define CLK_ACLK_SMMU_LITE_D                            91
+#define CLK_ACLK_SMMU_LITE_B                            92
+#define CLK_ACLK_SMMU_LITE_A                            93
+#define CLK_ACLK_BTS_3AA1                               94
+#define CLK_ACLK_BTS_3AA0                               95
+#define CLK_ACLK_BTS_LITE_D                             96
+#define CLK_ACLK_BTS_LITE_B                             97
+#define CLK_ACLK_BTS_LITE_A                             98
+#define CLK_PCLK_SMMU_3AA1                              99
+#define CLK_PCLK_SMMU_3AA0                              100
+#define CLK_PCLK_SMMU_LITE_D                            101
+#define CLK_PCLK_SMMU_LITE_B                            102
+#define CLK_PCLK_SMMU_LITE_A                            103
+#define CLK_PCLK_BTS_3AA1                               104
+#define CLK_PCLK_BTS_3AA0                               105
+#define CLK_PCLK_BTS_LITE_D                             106
+#define CLK_PCLK_BTS_LITE_B                             107
+#define CLK_PCLK_BTS_LITE_A                             108
+#define CLK_PCLK_ASYNCAXI_CAM1                          109
+#define CLK_PCLK_ASYNCAXI_3AA1                          110
+#define CLK_PCLK_ASYNCAXI_3AA0                          111
+#define CLK_PCLK_ASYNCAXI_LITE_D                        112
+#define CLK_PCLK_ASYNCAXI_LITE_B                        113
+#define CLK_PCLK_ASYNCAXI_LITE_A                        114
+#define CLK_PCLK_PMU_CAM0                               115
+#define CLK_PCLK_SYSREG_CAM0                            116
+#define CLK_PCLK_CMU_CAM0_LOCAL                         117
+#define CLK_PCLK_CSIS1                                  118
+#define CLK_PCLK_CSIS0                                  119
+#define CLK_PCLK_3AA1                                   120
+#define CLK_PCLK_3AA0                                   121
+#define CLK_PCLK_LITE_D                                 122
+#define CLK_PCLK_LITE_B                                 123
+#define CLK_PCLK_LITE_A                                 124
+#define CLK_PHYCLK_RXBYTECLKHS0_S4                      125
+#define CLK_PHYCLK_RXBYTECLKHS0_S2A                     126
+#define CLK_SCLK_LITE_FREECNT                           127
+#define CLK_SCLK_PIXELASYNCM_3AA1                       128
+#define CLK_SCLK_PIXELASYNCM_3AA0                       129
+#define CLK_SCLK_PIXELASYNCS_3AA0                       130
+#define CLK_SCLK_PIXELASYNCM_LITE_C                     131
+#define CLK_SCLK_PIXELASYNCM_LITE_C_INIT                132
+#define CLK_SCLK_PIXELASYNCS_LITE_C_INIT                133
+
+#define CAM0_NR_CLK                                     134
+
+/* CMU_CAM1 */
+#define CLK_PHYCLK_RXBYTEECLKHS0_S2B                    1
+
+#define CLK_MOUT_SCLK_ISP_UART_USER                     2
+#define CLK_MOUT_SCLK_ISP_SPI1_USER                     3
+#define CLK_MOUT_SCLK_ISP_SPI0_USER                     4
+#define CLK_MOUT_ACLK_CAM1_333_USER                     5
+#define CLK_MOUT_ACLK_CAM1_400_USER                     6
+#define CLK_MOUT_ACLK_CAM1_552_USER                     7
+#define CLK_MOUT_PHYCLK_RXBYTECLKHS0_S2B_USER           8
+#define CLK_MOUT_ACLK_CSIS2_B                           9
+#define CLK_MOUT_ACLK_CSIS2_A                           10
+#define CLK_MOUT_ACLK_FD_B                              11
+#define CLK_MOUT_ACLK_FD_A                              12
+#define CLK_MOUT_ACLK_LITE_C_B                          13
+#define CLK_MOUT_ACLK_LITE_C_A                          14
+
+#define CLK_DIV_SCLK_ISP_WPWM                           15
+#define CLK_DIV_PCLK_CAM1_83                            16
+#define CLK_DIV_PCLK_CAM1_166                           17
+#define CLK_DIV_PCLK_DBG_CAM1                           18
+#define CLK_DIV_ATCLK_CAM1                              19
+#define CLK_DIV_ACLK_CSIS2                              20
+#define CLK_DIV_PCLK_FD                                 21
+#define CLK_DIV_ACLK_FD                                 22
+#define CLK_DIV_PCLK_LITE_C                             23
+#define CLK_DIV_ACLK_LITE_C                             24
+
+#define CLK_ACLK_ISP_GIC                                25
+#define CLK_ACLK_FD                                     26
+#define CLK_ACLK_LITE_C                                 27
+#define CLK_ACLK_CSIS2                                  28
+#define CLK_ACLK_ASYNCAPBM_FD                           29
+#define CLK_ACLK_ASYNCAPBS_FD                           30
+#define CLK_ACLK_ASYNCAPBM_LITE_C                       31
+#define CLK_ACLK_ASYNCAPBS_LITE_C                       32
+#define CLK_ACLK_ASYNCAHBS_SFRISP2H2                    33
+#define CLK_ACLK_ASYNCAHBS_SFRISP2H1                    34
+#define CLK_ACLK_ASYNCAXIM_CA5                          35
+#define CLK_ACLK_ASYNCAXIS_CA5                          36
+#define CLK_ACLK_ASYNCAXIS_ISPX2                        37
+#define CLK_ACLK_ASYNCAXIS_ISPX1                        38
+#define CLK_ACLK_ASYNCAXIS_ISPX0                        39
+#define CLK_ACLK_ASYNCAXIM_ISPEX                        40
+#define CLK_ACLK_ASYNCAXIM_ISP3P                        41
+#define CLK_ACLK_ASYNCAXIS_ISP3P                        42
+#define CLK_ACLK_ASYNCAXIM_FD                           43
+#define CLK_ACLK_ASYNCAXIS_FD                           44
+#define CLK_ACLK_ASYNCAXIM_LITE_C                       45
+#define CLK_ACLK_ASYNCAXIS_LITE_C                       46
+#define CLK_ACLK_AHB2APB_ISP5P                          47
+#define CLK_ACLK_AHB2APB_ISP3P                          48
+#define CLK_ACLK_AXI2APB_ISP3P                          49
+#define CLK_ACLK_AHB_SFRISP2H                           50
+#define CLK_ACLK_AXI_ISP_HX_R                           51
+#define CLK_ACLK_AXI_ISP_CX_R                           52
+#define CLK_ACLK_AXI_ISP_HX                             53
+#define CLK_ACLK_AXI_ISP_CX                             54
+#define CLK_ACLK_XIU_ISPX                               55
+#define CLK_ACLK_XIU_ISPEX                              56
+#define CLK_ACLK_CAM1NP_333                             57
+#define CLK_ACLK_CAM1ND_400                             58
+#define CLK_ACLK_SMMU_ISPCPU                            59
+#define CLK_ACLK_SMMU_FD                                60
+#define CLK_ACLK_SMMU_LITE_C                            61
+#define CLK_ACLK_BTS_ISP3P                              62
+#define CLK_ACLK_BTS_FD                                 63
+#define CLK_ACLK_BTS_LITE_C                             64
+#define CLK_ACLK_AHBDN_SFRISP2H                         65
+#define CLK_ACLK_AHBDN_ISP5P                            66
+#define CLK_ACLK_AXIUS_ISP3P                            67
+#define CLK_ACLK_AXIUS_FD                               68
+#define CLK_ACLK_AXIUS_LITE_C                           69
+#define CLK_PCLK_SMMU_ISPCPU                            70
+#define CLK_PCLK_SMMU_FD                                71
+#define CLK_PCLK_SMMU_LITE_C                            72
+#define CLK_PCLK_BTS_ISP3P                              73
+#define CLK_PCLK_BTS_FD                                 74
+#define CLK_PCLK_BTS_LITE_C                             75
+#define CLK_PCLK_ASYNCAXIM_CA5                          76
+#define CLK_PCLK_ASYNCAXIM_ISPEX                        77
+#define CLK_PCLK_ASYNCAXIM_ISP3P                        78
+#define CLK_PCLK_ASYNCAXIM_FD                           79
+#define CLK_PCLK_ASYNCAXIM_LITE_C                       80
+#define CLK_PCLK_PMU_CAM1                               81
+#define CLK_PCLK_SYSREG_CAM1                            82
+#define CLK_PCLK_CMU_CAM1_LOCAL                         83
+#define CLK_PCLK_ISP_MCTADC                             84
+#define CLK_PCLK_ISP_WDT                                85
+#define CLK_PCLK_ISP_PWM                                86
+#define CLK_PCLK_ISP_UART                               87
+#define CLK_PCLK_ISP_MCUCTL                             88
+#define CLK_PCLK_ISP_SPI1                               89
+#define CLK_PCLK_ISP_SPI0                               90
+#define CLK_PCLK_ISP_I2C2                               91
+#define CLK_PCLK_ISP_I2C1                               92
+#define CLK_PCLK_ISP_I2C0                               93
+#define CLK_PCLK_ISP_MPWM                               94
+#define CLK_PCLK_FD                                     95
+#define CLK_PCLK_LITE_C                                 96
+#define CLK_PCLK_CSIS2                                  97
+#define CLK_SCLK_ISP_I2C2                               98
+#define CLK_SCLK_ISP_I2C1                               99
+#define CLK_SCLK_ISP_I2C0                               100
+#define CLK_SCLK_ISP_PWM                                101
+#define CLK_PHYCLK_RXBYTECLKHS0_S2B                     102
+#define CLK_SCLK_LITE_C_FREECNT                         103
+#define CLK_SCLK_PIXELASYNCM_FD                         104
+#define CLK_SCLK_ISP_MCTADC                             105
+#define CLK_SCLK_ISP_UART                               106
+#define CLK_SCLK_ISP_SPI1                               107
+#define CLK_SCLK_ISP_SPI0                               108
+#define CLK_SCLK_ISP_MPWM                               109
+#define CLK_PCLK_DBG_ISP                                110
+#define CLK_ATCLK_ISP                                   111
+#define CLK_SCLK_ISP_CA5                                112
+
+#define CAM1_NR_CLK                                     113
+
+#endif /* _DT_BINDINGS_CLOCK_EXYNOS5433_H */
diff --git a/include/dt-bindings/clock/imx6qdl-clock.h b/include/dt-bindings/clock/imx6qdl-clock.h
index b690cdba163b..8780868458a0 100644
--- a/include/dt-bindings/clock/imx6qdl-clock.h
+++ b/include/dt-bindings/clock/imx6qdl-clock.h
@@ -248,6 +248,9 @@
 #define IMX6QDL_PLL6_BYPASS                     235
 #define IMX6QDL_PLL7_BYPASS                     236
 #define IMX6QDL_CLK_GPT_3M                      237
-#define IMX6QDL_CLK_END                         238
+#define IMX6QDL_CLK_VIDEO_27M                   238
+#define IMX6QDL_CLK_MIPI_CORE_CFG               239
+#define IMX6QDL_CLK_MIPI_IPG                    240
+#define IMX6QDL_CLK_END                         241
 
 #endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */
diff --git a/include/dt-bindings/clock/pistachio-clk.h b/include/dt-bindings/clock/pistachio-clk.h
new file mode 100644
index 000000000000..039f83facb68
--- /dev/null
+++ b/include/dt-bindings/clock/pistachio-clk.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * 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.
+ */
+
+#ifndef _DT_BINDINGS_CLOCK_PISTACHIO_H
+#define _DT_BINDINGS_CLOCK_PISTACHIO_H
+
+/* PLLs */
+#define CLK_MIPS_PLL                    0
+#define CLK_AUDIO_PLL                   1
+#define CLK_RPU_V_PLL                   2
+#define CLK_RPU_L_PLL                   3
+#define CLK_SYS_PLL                     4
+#define CLK_WIFI_PLL                    5
+#define CLK_BT_PLL                      6
+
+/* Fixed-factor clocks */
+#define CLK_WIFI_DIV4                   16
+#define CLK_WIFI_DIV8                   17
+
+/* Gate clocks */
+#define CLK_MIPS                        32
+#define CLK_AUDIO_IN                    33
+#define CLK_AUDIO                       34
+#define CLK_I2S                         35
+#define CLK_SPDIF                       36
+#define CLK_AUDIO_DAC                   37
+#define CLK_RPU_V                       38
+#define CLK_RPU_L                       39
+#define CLK_RPU_SLEEP                   40
+#define CLK_WIFI_PLL_GATE               41
+#define CLK_RPU_CORE                    42
+#define CLK_WIFI_ADC                    43
+#define CLK_WIFI_DAC                    44
+#define CLK_USB_PHY                     45
+#define CLK_ENET_IN                     46
+#define CLK_ENET                        47
+#define CLK_UART0                       48
+#define CLK_UART1                       49
+#define CLK_PERIPH_SYS                  50
+#define CLK_SPI0                        51
+#define CLK_SPI1                        52
+#define CLK_EVENT_TIMER                 53
+#define CLK_AUX_ADC_INTERNAL            54
+#define CLK_AUX_ADC                     55
+#define CLK_SD_HOST                     56
+#define CLK_BT                          57
+#define CLK_BT_DIV4                     58
+#define CLK_BT_DIV8                     59
+#define CLK_BT_1MHZ                     60
+
+/* Divider clocks */
+#define CLK_MIPS_INTERNAL_DIV           64
+#define CLK_MIPS_DIV                    65
+#define CLK_AUDIO_DIV                   66
+#define CLK_I2S_DIV                     67
+#define CLK_SPDIF_DIV                   68
+#define CLK_AUDIO_DAC_DIV               69
+#define CLK_RPU_V_DIV                   70
+#define CLK_RPU_L_DIV                   71
+#define CLK_RPU_SLEEP_DIV               72
+#define CLK_RPU_CORE_DIV                73
+#define CLK_USB_PHY_DIV                 74
+#define CLK_ENET_DIV                    75
+#define CLK_UART0_INTERNAL_DIV          76
+#define CLK_UART0_DIV                   77
+#define CLK_UART1_INTERNAL_DIV          78
+#define CLK_UART1_DIV                   79
+#define CLK_SYS_INTERNAL_DIV            80
+#define CLK_SPI0_INTERNAL_DIV           81
+#define CLK_SPI0_DIV                    82
+#define CLK_SPI1_INTERNAL_DIV           83
+#define CLK_SPI1_DIV                    84
+#define CLK_EVENT_TIMER_INTERNAL_DIV    85
+#define CLK_EVENT_TIMER_DIV             86
+#define CLK_AUX_ADC_INTERNAL_DIV        87
+#define CLK_AUX_ADC_DIV                 88
+#define CLK_SD_HOST_DIV                 89
+#define CLK_BT_DIV                      90
+#define CLK_BT_DIV4_DIV                 91
+#define CLK_BT_DIV8_DIV                 92
+#define CLK_BT_1MHZ_INTERNAL_DIV        93
+#define CLK_BT_1MHZ_DIV                 94
+
+/* Mux clocks */
+#define CLK_AUDIO_REF_MUX               96
+#define CLK_MIPS_PLL_MUX                97
+#define CLK_AUDIO_PLL_MUX               98
+#define CLK_AUDIO_MUX                   99
+#define CLK_RPU_V_PLL_MUX               100
+#define CLK_RPU_L_PLL_MUX               101
+#define CLK_RPU_L_MUX                   102
+#define CLK_WIFI_PLL_MUX                103
+#define CLK_WIFI_DIV4_MUX               104
+#define CLK_WIFI_DIV8_MUX               105
+#define CLK_RPU_CORE_MUX                106
+#define CLK_SYS_PLL_MUX                 107
+#define CLK_ENET_MUX                    108
+#define CLK_EVENT_TIMER_MUX             109
+#define CLK_SD_HOST_MUX                 110
+#define CLK_BT_PLL_MUX                  111
+#define CLK_DEBUG_MUX                   112
+
+#define CLK_NR_CLKS                     113
+
+/* Peripheral gate clocks */
+#define PERIPH_CLK_SYS                  0
+#define PERIPH_CLK_SYS_BUS              1
+#define PERIPH_CLK_DDR                  2
+#define PERIPH_CLK_ROM                  3
+#define PERIPH_CLK_COUNTER_FAST         4
+#define PERIPH_CLK_COUNTER_SLOW         5
+#define PERIPH_CLK_IR                   6
+#define PERIPH_CLK_WD                   7
+#define PERIPH_CLK_PDM                  8
+#define PERIPH_CLK_PWM                  9
+#define PERIPH_CLK_I2C0                 10
+#define PERIPH_CLK_I2C1                 11
+#define PERIPH_CLK_I2C2                 12
+#define PERIPH_CLK_I2C3                 13
+
+/* Peripheral divider clocks */
+#define PERIPH_CLK_ROM_DIV              32
+#define PERIPH_CLK_COUNTER_FAST_DIV     33
+#define PERIPH_CLK_COUNTER_SLOW_PRE_DIV 34
+#define PERIPH_CLK_COUNTER_SLOW_DIV     35
+#define PERIPH_CLK_IR_PRE_DIV           36
+#define PERIPH_CLK_IR_DIV               37
+#define PERIPH_CLK_WD_PRE_DIV           38
+#define PERIPH_CLK_WD_DIV               39
+#define PERIPH_CLK_PDM_PRE_DIV          40
+#define PERIPH_CLK_PDM_DIV              41
+#define PERIPH_CLK_PWM_PRE_DIV          42
+#define PERIPH_CLK_PWM_DIV              43
+#define PERIPH_CLK_I2C0_PRE_DIV         44
+#define PERIPH_CLK_I2C0_DIV             45
+#define PERIPH_CLK_I2C1_PRE_DIV         46
+#define PERIPH_CLK_I2C1_DIV             47
+#define PERIPH_CLK_I2C2_PRE_DIV         48
+#define PERIPH_CLK_I2C2_DIV             49
+#define PERIPH_CLK_I2C3_PRE_DIV         50
+#define PERIPH_CLK_I2C3_DIV             51
+
+#define PERIPH_CLK_NR_CLKS              52
+
+/* System gate clocks */
+#define SYS_CLK_I2C0                    0
+#define SYS_CLK_I2C1                    1
+#define SYS_CLK_I2C2                    2
+#define SYS_CLK_I2C3                    3
+#define SYS_CLK_I2S_IN                  4
+#define SYS_CLK_PAUD_OUT                5
+#define SYS_CLK_SPDIF_OUT               6
+#define SYS_CLK_SPI0_MASTER             7
+#define SYS_CLK_SPI0_SLAVE              8
+#define SYS_CLK_PWM                     9
+#define SYS_CLK_UART0                   10
+#define SYS_CLK_UART1                   11
+#define SYS_CLK_SPI1                    12
+#define SYS_CLK_MDC                     13
+#define SYS_CLK_SD_HOST                 14
+#define SYS_CLK_ENET                    15
+#define SYS_CLK_IR                      16
+#define SYS_CLK_WD                      17
+#define SYS_CLK_TIMER                   18
+#define SYS_CLK_I2S_OUT                 24
+#define SYS_CLK_SPDIF_IN                25
+#define SYS_CLK_EVENT_TIMER             26
+#define SYS_CLK_HASH                    27
+
+#define SYS_CLK_NR_CLKS                 28
+
+/* Gates for external input clocks */
+#define EXT_CLK_AUDIO_IN                0
+#define EXT_CLK_ENET_IN                 1
+
+#define EXT_CLK_NR_CLKS                 2
+
+#endif /* _DT_BINDINGS_CLOCK_PISTACHIO_H */
diff --git a/include/dt-bindings/clock/qcom,gcc-ipq806x.h b/include/dt-bindings/clock/qcom,gcc-ipq806x.h
index 04fb29ae30e6..ebd63fd05649 100644
--- a/include/dt-bindings/clock/qcom,gcc-ipq806x.h
+++ b/include/dt-bindings/clock/qcom,gcc-ipq806x.h
@@ -288,5 +288,6 @@
 #define UBI32_CORE2_CLK_SRC                     278
 #define UBI32_CORE1_CLK                         279
 #define UBI32_CORE2_CLK                         280
+#define EBI2_AON_CLK                            281
 
 #endif
diff --git a/include/dt-bindings/clock/qcom,gcc-msm8916.h b/include/dt-bindings/clock/qcom,gcc-msm8916.h
new file mode 100644
index 000000000000..e430f644dd6c
--- /dev/null
+++ b/include/dt-bindings/clock/qcom,gcc-msm8916.h
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2015 Linaro Limited
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ */
+
+#ifndef _DT_BINDINGS_CLK_MSM_GCC_8916_H
+#define _DT_BINDINGS_CLK_MSM_GCC_8916_H
+
+#define GPLL0                                   0
+#define GPLL0_VOTE                              1
+#define BIMC_PLL                                2
+#define BIMC_PLL_VOTE                           3
+#define GPLL1                                   4
+#define GPLL1_VOTE                              5
+#define GPLL2                                   6
+#define GPLL2_VOTE                              7
+#define PCNOC_BFDCD_CLK_SRC                     8
+#define SYSTEM_NOC_BFDCD_CLK_SRC                9
+#define CAMSS_AHB_CLK_SRC                       10
+#define APSS_AHB_CLK_SRC                        11
+#define CSI0_CLK_SRC                            12
+#define CSI1_CLK_SRC                            13
+#define GFX3D_CLK_SRC                           14
+#define VFE0_CLK_SRC                            15
+#define BLSP1_QUP1_I2C_APPS_CLK_SRC             16
+#define BLSP1_QUP1_SPI_APPS_CLK_SRC             17
+#define BLSP1_QUP2_I2C_APPS_CLK_SRC             18
+#define BLSP1_QUP2_SPI_APPS_CLK_SRC             19
+#define BLSP1_QUP3_I2C_APPS_CLK_SRC             20
+#define BLSP1_QUP3_SPI_APPS_CLK_SRC             21
+#define BLSP1_QUP4_I2C_APPS_CLK_SRC             22
+#define BLSP1_QUP4_SPI_APPS_CLK_SRC             23
+#define BLSP1_QUP5_I2C_APPS_CLK_SRC             24
+#define BLSP1_QUP5_SPI_APPS_CLK_SRC             25
+#define BLSP1_QUP6_I2C_APPS_CLK_SRC             26
+#define BLSP1_QUP6_SPI_APPS_CLK_SRC             27
+#define BLSP1_UART1_APPS_CLK_SRC                28
+#define BLSP1_UART2_APPS_CLK_SRC                29
+#define CCI_CLK_SRC                             30
+#define CAMSS_GP0_CLK_SRC                       31
+#define CAMSS_GP1_CLK_SRC                       32
+#define JPEG0_CLK_SRC                           33
+#define MCLK0_CLK_SRC                           34
+#define MCLK1_CLK_SRC                           35
+#define CSI0PHYTIMER_CLK_SRC                    36
+#define CSI1PHYTIMER_CLK_SRC                    37
+#define CPP_CLK_SRC                             38
+#define CRYPTO_CLK_SRC                          39
+#define GP1_CLK_SRC                             40
+#define GP2_CLK_SRC                             41
+#define GP3_CLK_SRC                             42
+#define BYTE0_CLK_SRC                           43
+#define ESC0_CLK_SRC                            44
+#define MDP_CLK_SRC                             45
+#define PCLK0_CLK_SRC                           46
+#define VSYNC_CLK_SRC                           47
+#define PDM2_CLK_SRC                            48
+#define SDCC1_APPS_CLK_SRC                      49
+#define SDCC2_APPS_CLK_SRC                      50
+#define APSS_TCU_CLK_SRC                        51
+#define USB_HS_SYSTEM_CLK_SRC                   52
+#define VCODEC0_CLK_SRC                         53
+#define GCC_BLSP1_AHB_CLK                       54
+#define GCC_BLSP1_SLEEP_CLK                     55
+#define GCC_BLSP1_QUP1_I2C_APPS_CLK             56
+#define GCC_BLSP1_QUP1_SPI_APPS_CLK             57
+#define GCC_BLSP1_QUP2_I2C_APPS_CLK             58
+#define GCC_BLSP1_QUP2_SPI_APPS_CLK             59
+#define GCC_BLSP1_QUP3_I2C_APPS_CLK             60
+#define GCC_BLSP1_QUP3_SPI_APPS_CLK             61
+#define GCC_BLSP1_QUP4_I2C_APPS_CLK             62
+#define GCC_BLSP1_QUP4_SPI_APPS_CLK             63
+#define GCC_BLSP1_QUP5_I2C_APPS_CLK             64
+#define GCC_BLSP1_QUP5_SPI_APPS_CLK             65
+#define GCC_BLSP1_QUP6_I2C_APPS_CLK             66
+#define GCC_BLSP1_QUP6_SPI_APPS_CLK             67
+#define GCC_BLSP1_UART1_APPS_CLK                68
+#define GCC_BLSP1_UART2_APPS_CLK                69
+#define GCC_BOOT_ROM_AHB_CLK                    70
+#define GCC_CAMSS_CCI_AHB_CLK                   71
+#define GCC_CAMSS_CCI_CLK                       72
+#define GCC_CAMSS_CSI0_AHB_CLK                  73
+#define GCC_CAMSS_CSI0_CLK                      74
+#define GCC_CAMSS_CSI0PHY_CLK                   75
+#define GCC_CAMSS_CSI0PIX_CLK                   76
+#define GCC_CAMSS_CSI0RDI_CLK                   77
+#define GCC_CAMSS_CSI1_AHB_CLK                  78
+#define GCC_CAMSS_CSI1_CLK                      79
+#define GCC_CAMSS_CSI1PHY_CLK                   80
+#define GCC_CAMSS_CSI1PIX_CLK                   81
+#define GCC_CAMSS_CSI1RDI_CLK                   82
+#define GCC_CAMSS_CSI_VFE0_CLK                  83
+#define GCC_CAMSS_GP0_CLK                       84
+#define GCC_CAMSS_GP1_CLK                       85
+#define GCC_CAMSS_ISPIF_AHB_CLK                 86
+#define GCC_CAMSS_JPEG0_CLK                     87
+#define GCC_CAMSS_JPEG_AHB_CLK                  88
+#define GCC_CAMSS_JPEG_AXI_CLK                  89
+#define GCC_CAMSS_MCLK0_CLK                     90
+#define GCC_CAMSS_MCLK1_CLK                     91
+#define GCC_CAMSS_MICRO_AHB_CLK                 92
+#define GCC_CAMSS_CSI0PHYTIMER_CLK              93
+#define GCC_CAMSS_CSI1PHYTIMER_CLK              94
+#define GCC_CAMSS_AHB_CLK                       95
+#define GCC_CAMSS_TOP_AHB_CLK                   96
+#define GCC_CAMSS_CPP_AHB_CLK                   97
+#define GCC_CAMSS_CPP_CLK                       98
+#define GCC_CAMSS_VFE0_CLK                      99
+#define GCC_CAMSS_VFE_AHB_CLK                   100
+#define GCC_CAMSS_VFE_AXI_CLK                   101
+#define GCC_CRYPTO_AHB_CLK                      102
+#define GCC_CRYPTO_AXI_CLK                      103
+#define GCC_CRYPTO_CLK                          104
+#define GCC_OXILI_GMEM_CLK                      105
+#define GCC_GP1_CLK                             106
+#define GCC_GP2_CLK                             107
+#define GCC_GP3_CLK                             108
+#define GCC_MDSS_AHB_CLK                        109
+#define GCC_MDSS_AXI_CLK                        110
+#define GCC_MDSS_BYTE0_CLK                      111
+#define GCC_MDSS_ESC0_CLK                       112
+#define GCC_MDSS_MDP_CLK                        113
+#define GCC_MDSS_PCLK0_CLK                      114
+#define GCC_MDSS_VSYNC_CLK                      115
+#define GCC_MSS_CFG_AHB_CLK                     116
+#define GCC_OXILI_AHB_CLK                       117
+#define GCC_OXILI_GFX3D_CLK                     118
+#define GCC_PDM2_CLK                            119
+#define GCC_PDM_AHB_CLK                         120
+#define GCC_PRNG_AHB_CLK                        121
+#define GCC_SDCC1_AHB_CLK                       122
+#define GCC_SDCC1_APPS_CLK                      123
+#define GCC_SDCC2_AHB_CLK                       124
+#define GCC_SDCC2_APPS_CLK                      125
+#define GCC_GTCU_AHB_CLK                        126
+#define GCC_JPEG_TBU_CLK                        127
+#define GCC_MDP_TBU_CLK                         128
+#define GCC_SMMU_CFG_CLK                        129
+#define GCC_VENUS_TBU_CLK                       130
+#define GCC_VFE_TBU_CLK                         131
+#define GCC_USB2A_PHY_SLEEP_CLK                 132
+#define GCC_USB_HS_AHB_CLK                      133
+#define GCC_USB_HS_SYSTEM_CLK                   134
+#define GCC_VENUS0_AHB_CLK                      135
+#define GCC_VENUS0_AXI_CLK                      136
+#define GCC_VENUS0_VCODEC0_CLK                  137
+
+#endif
diff --git a/include/dt-bindings/clock/r8a73a4-clock.h b/include/dt-bindings/clock/r8a73a4-clock.h
new file mode 100644
index 000000000000..9a4b4c9ca44a
--- /dev/null
+++ b/include/dt-bindings/clock/r8a73a4-clock.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Ulrich Hecht
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_R8A73A4_H__
+#define __DT_BINDINGS_CLOCK_R8A73A4_H__
+
+/* CPG */
+#define R8A73A4_CLK_MAIN        0
+#define R8A73A4_CLK_PLL0        1
+#define R8A73A4_CLK_PLL1        2
+#define R8A73A4_CLK_PLL2        3
+#define R8A73A4_CLK_PLL2S       4
+#define R8A73A4_CLK_PLL2H       5
+#define R8A73A4_CLK_Z           6
+#define R8A73A4_CLK_Z2          7
+#define R8A73A4_CLK_I           8
+#define R8A73A4_CLK_M3          9
+#define R8A73A4_CLK_B           10
+#define R8A73A4_CLK_M1          11
+#define R8A73A4_CLK_M2          12
+#define R8A73A4_CLK_ZX          13
+#define R8A73A4_CLK_ZS          14
+#define R8A73A4_CLK_HP          15
+
+/* MSTP2 */
+#define R8A73A4_CLK_DMAC        18
+#define R8A73A4_CLK_SCIFB3      17
+#define R8A73A4_CLK_SCIFB2      16
+#define R8A73A4_CLK_SCIFB1      7
+#define R8A73A4_CLK_SCIFB0      6
+#define R8A73A4_CLK_SCIFA0      4
+#define R8A73A4_CLK_SCIFA1      3
+
+/* MSTP3 */
+#define R8A73A4_CLK_CMT1        29
+#define R8A73A4_CLK_IIC1        23
+#define R8A73A4_CLK_IIC0        18
+#define R8A73A4_CLK_IIC7        17
+#define R8A73A4_CLK_IIC6        16
+#define R8A73A4_CLK_MMCIF0      15
+#define R8A73A4_CLK_SDHI0       14
+#define R8A73A4_CLK_SDHI1       13
+#define R8A73A4_CLK_SDHI2       12
+#define R8A73A4_CLK_MMCIF1      5
+#define R8A73A4_CLK_IIC2        0
+
+/* MSTP4 */
+#define R8A73A4_CLK_IIC3        11
+#define R8A73A4_CLK_IIC4        10
+#define R8A73A4_CLK_IIC5        9
+
+/* MSTP5 */
+#define R8A73A4_CLK_THERMAL     22
+#define R8A73A4_CLK_IIC8        15
+
+#endif /* __DT_BINDINGS_CLOCK_R8A73A4_H__ */
diff --git a/include/dt-bindings/clock/r8a7778-clock.h b/include/dt-bindings/clock/r8a7778-clock.h
new file mode 100644
index 000000000000..f6b07c5399de
--- /dev/null
+++ b/include/dt-bindings/clock/r8a7778-clock.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 Ulrich Hecht
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_R8A7778_H__
+#define __DT_BINDINGS_CLOCK_R8A7778_H__
+
+/* CPG */
+#define R8A7778_CLK_PLLA        0
+#define R8A7778_CLK_PLLB        1
+#define R8A7778_CLK_B           2
+#define R8A7778_CLK_OUT         3
+#define R8A7778_CLK_P           4
+#define R8A7778_CLK_S           5
+#define R8A7778_CLK_S1          6
+
+/* MSTP0 */
+#define R8A7778_CLK_I2C0        30
+#define R8A7778_CLK_I2C1        29
+#define R8A7778_CLK_I2C2        28
+#define R8A7778_CLK_I2C3        27
+#define R8A7778_CLK_SCIF0       26
+#define R8A7778_CLK_SCIF1       25
+#define R8A7778_CLK_SCIF2       24
+#define R8A7778_CLK_SCIF3       23
+#define R8A7778_CLK_SCIF4       22
+#define R8A7778_CLK_SCIF5       21
+#define R8A7778_CLK_TMU0        16
+#define R8A7778_CLK_TMU1        15
+#define R8A7778_CLK_TMU2        14
+#define R8A7778_CLK_SSI0        12
+#define R8A7778_CLK_SSI1        11
+#define R8A7778_CLK_SSI2        10
+#define R8A7778_CLK_SSI3        9
+#define R8A7778_CLK_SRU         8
+#define R8A7778_CLK_HSPI        7
+
+/* MSTP1 */
+#define R8A7778_CLK_ETHER       14
+#define R8A7778_CLK_VIN0        10
+#define R8A7778_CLK_VIN1        9
+#define R8A7778_CLK_USB         0
+
+/* MSTP3 */
+#define R8A7778_CLK_MMC         31
+#define R8A7778_CLK_SDHI0       23
+#define R8A7778_CLK_SDHI1       22
+#define R8A7778_CLK_SDHI2       21
+#define R8A7778_CLK_SSI4        11
+#define R8A7778_CLK_SSI5        10
+#define R8A7778_CLK_SSI6        9
+#define R8A7778_CLK_SSI7        8
+#define R8A7778_CLK_SSI8        7
+
+/* MSTP5 */
+#define R8A7778_CLK_SRU_SRC0    31
+#define R8A7778_CLK_SRU_SRC1    30
+#define R8A7778_CLK_SRU_SRC2    29
+#define R8A7778_CLK_SRU_SRC3    28
+#define R8A7778_CLK_SRU_SRC4    27
+#define R8A7778_CLK_SRU_SRC5    26
+#define R8A7778_CLK_SRU_SRC6    25
+#define R8A7778_CLK_SRU_SRC7    24
+#define R8A7778_CLK_SRU_SRC8    23
+
+#endif /* __DT_BINDINGS_CLOCK_R8A7778_H__ */
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index 91940271cf83..3f2c6b198d4a 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -21,6 +21,8 @@
 #define R8A7790_CLK_SD0                 7
 #define R8A7790_CLK_SD1                 8
 #define R8A7790_CLK_Z                   9
+#define R8A7790_CLK_RCAN                10
+#define R8A7790_CLK_ADSP                11
 
 /* MSTP0 */
 #define R8A7790_CLK_MSIOF0              0
@@ -80,6 +82,7 @@
 /* MSTP5 */
 #define R8A7790_CLK_AUDIO_DMAC1         1
 #define R8A7790_CLK_AUDIO_DMAC0         2
+#define R8A7790_CLK_ADSP_MOD            6
 #define R8A7790_CLK_THERMAL             22
 #define R8A7790_CLK_PWM                 23
 
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index f096f3f6c16a..8fc5dc8faeea 100644
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -20,6 +20,8 @@
 #define R8A7791_CLK_SDH                 6
 #define R8A7791_CLK_SD0                 7
 #define R8A7791_CLK_Z                   8
+#define R8A7791_CLK_RCAN                9
+#define R8A7791_CLK_ADSP                10
 
 /* MSTP0 */
 #define R8A7791_CLK_MSIOF0              0
@@ -71,6 +73,7 @@
 /* MSTP5 */
 #define R8A7791_CLK_AUDIO_DMAC1         1
 #define R8A7791_CLK_AUDIO_DMAC0         2
+#define R8A7791_CLK_ADSP_MOD            6
 #define R8A7791_CLK_THERMAL             22
 #define R8A7791_CLK_PWM                 23
 
diff --git a/include/dt-bindings/clock/sh73a0-clock.h b/include/dt-bindings/clock/sh73a0-clock.h
index 1dd3eb2b7d90..53369568c24c 100644
--- a/include/dt-bindings/clock/sh73a0-clock.h
+++ b/include/dt-bindings/clock/sh73a0-clock.h
@@ -76,4 +76,7 @@
 #define SH73A0_CLK_IIC4         10
 #define SH73A0_CLK_KEYSC        3
 
+/* MSTP5 */
+#define SH73A0_CLK_INTCA0       8
+
 #endif
diff --git a/include/dt-bindings/clock/tegra124-car-common.h b/include/dt-bindings/clock/tegra124-car-common.h
index ae2eb17a1658..a2156090563f 100644
--- a/include/dt-bindings/clock/tegra124-car-common.h
+++ b/include/dt-bindings/clock/tegra124-car-common.h
@@ -297,7 +297,7 @@
 #define TEGRA124_CLK_PLL_C4 270
 #define TEGRA124_CLK_PLL_DP 271
 #define TEGRA124_CLK_PLL_E_MUX 272
-#define TEGRA124_CLK_PLLD_DSI 273
+#define TEGRA124_CLK_PLL_D_DSI_OUT 273
 /* 274 */
 /* 275 */
 /* 276 */
diff --git a/include/dt-bindings/dma/jz4780-dma.h b/include/dt-bindings/dma/jz4780-dma.h
new file mode 100644
index 000000000000..df017fdfb44e
--- /dev/null
+++ b/include/dt-bindings/dma/jz4780-dma.h
@@ -0,0 +1,49 @@
+#ifndef __DT_BINDINGS_DMA_JZ4780_DMA_H__
+#define __DT_BINDINGS_DMA_JZ4780_DMA_H__
+
+/*
+ * Request type numbers for the JZ4780 DMA controller (written to the DRTn
+ * register for the channel).
+ */
+#define JZ4780_DMA_I2S1_TX      0x4
+#define JZ4780_DMA_I2S1_RX      0x5
+#define JZ4780_DMA_I2S0_TX      0x6
+#define JZ4780_DMA_I2S0_RX      0x7
+#define JZ4780_DMA_AUTO         0x8
+#define JZ4780_DMA_SADC_RX      0x9
+#define JZ4780_DMA_UART4_TX     0xc
+#define JZ4780_DMA_UART4_RX     0xd
+#define JZ4780_DMA_UART3_TX     0xe
+#define JZ4780_DMA_UART3_RX     0xf
+#define JZ4780_DMA_UART2_TX     0x10
+#define JZ4780_DMA_UART2_RX     0x11
+#define JZ4780_DMA_UART1_TX     0x12
+#define JZ4780_DMA_UART1_RX     0x13
+#define JZ4780_DMA_UART0_TX     0x14
+#define JZ4780_DMA_UART0_RX     0x15
+#define JZ4780_DMA_SSI0_TX      0x16
+#define JZ4780_DMA_SSI0_RX      0x17
+#define JZ4780_DMA_SSI1_TX      0x18
+#define JZ4780_DMA_SSI1_RX      0x19
+#define JZ4780_DMA_MSC0_TX      0x1a
+#define JZ4780_DMA_MSC0_RX      0x1b
+#define JZ4780_DMA_MSC1_TX      0x1c
+#define JZ4780_DMA_MSC1_RX      0x1d
+#define JZ4780_DMA_MSC2_TX      0x1e
+#define JZ4780_DMA_MSC2_RX      0x1f
+#define JZ4780_DMA_PCM0_TX      0x20
+#define JZ4780_DMA_PCM0_RX      0x21
+#define JZ4780_DMA_SMB0_TX      0x24
+#define JZ4780_DMA_SMB0_RX      0x25
+#define JZ4780_DMA_SMB1_TX      0x26
+#define JZ4780_DMA_SMB1_RX      0x27
+#define JZ4780_DMA_SMB2_TX      0x28
+#define JZ4780_DMA_SMB2_RX      0x29
+#define JZ4780_DMA_SMB3_TX      0x2a
+#define JZ4780_DMA_SMB3_RX      0x2b
+#define JZ4780_DMA_SMB4_TX      0x2c
+#define JZ4780_DMA_SMB4_RX      0x2d
+#define JZ4780_DMA_DES_TX       0x2e
+#define JZ4780_DMA_DES_RX       0x2f
+
+#endif /* __DT_BINDINGS_DMA_JZ4780_DMA_H__ */
diff --git a/include/dt-bindings/gpio/meson8b-gpio.h b/include/dt-bindings/gpio/meson8b-gpio.h
new file mode 100644
index 000000000000..c38cb20d7182
--- /dev/null
+++ b/include/dt-bindings/gpio/meson8b-gpio.h
@@ -0,0 +1,32 @@
+/*
+ * GPIO definitions for Amlogic Meson8b SoCs
+ *
+ * Copyright (C) 2015 Endless Mobile, Inc.
+ * Author: Carlo Caione <carlo@endlessm.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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _DT_BINDINGS_MESON8B_GPIO_H
+#define _DT_BINDINGS_MESON8B_GPIO_H
+
+#include <dt-bindings/gpio/meson8-gpio.h>
+
+/* GPIO Bank DIF */
+#define DIF_0_P         120
+#define DIF_0_N         121
+#define DIF_1_P         122
+#define DIF_1_N         123
+#define DIF_2_P         124
+#define DIF_2_N         125
+#define DIF_3_P         126
+#define DIF_3_N         127
+#define DIF_4_P         128
+#define DIF_4_N         129
+
+#endif /* _DT_BINDINGS_MESON8B_GPIO_H */
diff --git a/include/dt-bindings/interrupt-controller/irq-st.h b/include/dt-bindings/interrupt-controller/irq-st.h
new file mode 100644
index 000000000000..4c59aceb9be0
--- /dev/null
+++ b/include/dt-bindings/interrupt-controller/irq-st.h
@@ -0,0 +1,30 @@
+/*
+ *  include/linux/irqchip/irq-st.h
+ *
+ *  Copyright (C) 2014 STMicroelectronics – All Rights Reserved
+ *
+ *  Author: Lee Jones <lee.jones@linaro.org>
+ *
+ * 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 _DT_BINDINGS_INTERRUPT_CONTROLLER_ST_H
+#define _DT_BINDINGS_INTERRUPT_CONTROLLER_ST_H
+
+#define ST_IRQ_SYSCFG_EXT_0             0
+#define ST_IRQ_SYSCFG_EXT_1             1
+#define ST_IRQ_SYSCFG_EXT_2             2
+#define ST_IRQ_SYSCFG_CTI_0             3
+#define ST_IRQ_SYSCFG_CTI_1             4
+#define ST_IRQ_SYSCFG_PMU_0             5
+#define ST_IRQ_SYSCFG_PMU_1             6
+#define ST_IRQ_SYSCFG_pl310_L2          7
+#define ST_IRQ_SYSCFG_DISABLED          0xFFFFFFFF
+
+#define ST_IRQ_SYSCFG_EXT_1_INV         0x1
+#define ST_IRQ_SYSCFG_EXT_2_INV         0x2
+#define ST_IRQ_SYSCFG_EXT_3_INV         0x4
+
+#endif
diff --git a/include/dt-bindings/leds/common.h b/include/dt-bindings/leds/common.h
new file mode 100644
index 000000000000..79fcef72ef57
--- /dev/null
+++ b/include/dt-bindings/leds/common.h
@@ -0,0 +1,21 @@
+/*
+ * This header provides macros for the common LEDs device tree bindings.
+ *
+ * Copyright (C) 2015, Samsung Electronics Co., Ltd.
+ *
+ * Author: Jacek Anaszewski <j.anaszewski@samsung.com>
+ */
+
+#ifndef __DT_BINDINGS_LEDS_H__
+#define __DT_BINDINGS_LEDS_H
+
+/* External trigger type */
+#define LEDS_TRIG_TYPE_EDGE     0
+#define LEDS_TRIG_TYPE_LEVEL    1
+
+/* Boost modes */
+#define LEDS_BOOST_OFF          0
+#define LEDS_BOOST_ADAPTIVE     1
+#define LEDS_BOOST_FIXED        2
+
+#endif /* __DT_BINDINGS_LEDS_H */
diff --git a/include/dt-bindings/media/omap3-isp.h b/include/dt-bindings/media/omap3-isp.h
new file mode 100644
index 000000000000..b18c60e468c7
--- /dev/null
+++ b/include/dt-bindings/media/omap3-isp.h
@@ -0,0 +1,22 @@
+/*
+ * include/dt-bindings/media/omap3-isp.h
+ *
+ * Copyright (C) 2015 Sakari Ailus
+ *
+ * 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.
+ */
+
+#ifndef __DT_BINDINGS_OMAP3_ISP_H__
+#define __DT_BINDINGS_OMAP3_ISP_H__
+
+#define OMAP3ISP_PHY_TYPE_COMPLEX_IO    0
+#define OMAP3ISP_PHY_TYPE_CSIPHY        1
+
+#endif /* __DT_BINDINGS_OMAP3_ISP_H__ */
diff --git a/include/dt-bindings/media/xilinx-vip.h b/include/dt-bindings/media/xilinx-vip.h
new file mode 100644
index 000000000000..6298fec00685
--- /dev/null
+++ b/include/dt-bindings/media/xilinx-vip.h
@@ -0,0 +1,39 @@
+/*
+ * Xilinx Video IP Core
+ *
+ * Copyright (C) 2013-2015 Ideas on Board
+ * Copyright (C) 2013-2015 Xilinx, Inc.
+ *
+ * Contacts: Hyun Kwon <hyun.kwon@xilinx.com>
+ *           Laurent Pinchart <laurent.pinchart@ideasonboard.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 __DT_BINDINGS_MEDIA_XILINX_VIP_H__
+#define __DT_BINDINGS_MEDIA_XILINX_VIP_H__
+
+/*
+ * Video format codes as defined in "AXI4-Stream Video IP and System Design
+ * Guide".
+ */
+#define XVIP_VF_YUV_422                 0
+#define XVIP_VF_YUV_444                 1
+#define XVIP_VF_RBG                     2
+#define XVIP_VF_YUV_420                 3
+#define XVIP_VF_YUVA_422                4
+#define XVIP_VF_YUVA_444                5
+#define XVIP_VF_RGBA                    6
+#define XVIP_VF_YUVA_420                7
+#define XVIP_VF_YUVD_422                8
+#define XVIP_VF_YUVD_444                9
+#define XVIP_VF_RGBD                    10
+#define XVIP_VF_YUVD_420                11
+#define XVIP_VF_MONO_SENSOR             12
+#define XVIP_VF_CUSTOM2                 13
+#define XVIP_VF_CUSTOM3                 14
+#define XVIP_VF_CUSTOM4                 15
+
+#endif /* __DT_BINDINGS_MEDIA_XILINX_VIP_H__ */
diff --git a/include/linux/mfd/arizona/gpio.h b/include/dt-bindings/mfd/arizona.h
index d2146bb74f89..c7af7c7ef793 100644
--- a/include/linux/mfd/arizona/gpio.h
+++ b/include/dt-bindings/mfd/arizona.h
@@ -1,7 +1,7 @@
 /*
- * GPIO configuration for Arizona devices
+ * Device Tree defines for Arizona devices
  *
- * Copyright 2013 Wolfson Microelectronics. PLC.
+ * Copyright 2015 Cirrus Logic Inc.
  *
  * Author: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
  *
@@ -10,9 +10,10 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef _ARIZONA_GPIO_H
-#define _ARIZONA_GPIO_H
+#ifndef _DT_BINDINGS_MFD_ARIZONA_H
+#define _DT_BINDINGS_MFD_ARIZONA_H
 
+/* GPIO Function Definitions */
 #define ARIZONA_GP_FN_TXLRCLK                    0x00
 #define ARIZONA_GP_FN_GPIO                       0x01
 #define ARIZONA_GP_FN_IRQ1                       0x02
@@ -61,36 +62,32 @@
 #define ARIZONA_GP_FN_SYSCLK_ENA_STATUS          0x4B
 #define ARIZONA_GP_FN_ASYNCCLK_ENA_STATUS        0x4C
 
-#define ARIZONA_GPN_DIR                          0x8000  /* GPN_DIR */
-#define ARIZONA_GPN_DIR_MASK                     0x8000  /* GPN_DIR */
-#define ARIZONA_GPN_DIR_SHIFT                        15  /* GPN_DIR */
-#define ARIZONA_GPN_DIR_WIDTH                         1  /* GPN_DIR */
-#define ARIZONA_GPN_PU                           0x4000  /* GPN_PU */
-#define ARIZONA_GPN_PU_MASK                      0x4000  /* GPN_PU */
-#define ARIZONA_GPN_PU_SHIFT                         14  /* GPN_PU */
-#define ARIZONA_GPN_PU_WIDTH                          1  /* GPN_PU */
-#define ARIZONA_GPN_PD                           0x2000  /* GPN_PD */
-#define ARIZONA_GPN_PD_MASK                      0x2000  /* GPN_PD */
-#define ARIZONA_GPN_PD_SHIFT                         13  /* GPN_PD */
-#define ARIZONA_GPN_PD_WIDTH                          1  /* GPN_PD */
-#define ARIZONA_GPN_LVL                          0x0800  /* GPN_LVL */
-#define ARIZONA_GPN_LVL_MASK                     0x0800  /* GPN_LVL */
-#define ARIZONA_GPN_LVL_SHIFT                        11  /* GPN_LVL */
-#define ARIZONA_GPN_LVL_WIDTH                         1  /* GPN_LVL */
-#define ARIZONA_GPN_POL                          0x0400  /* GPN_POL */
-#define ARIZONA_GPN_POL_MASK                     0x0400  /* GPN_POL */
-#define ARIZONA_GPN_POL_SHIFT                        10  /* GPN_POL */
-#define ARIZONA_GPN_POL_WIDTH                         1  /* GPN_POL */
-#define ARIZONA_GPN_OP_CFG                       0x0200  /* GPN_OP_CFG */
-#define ARIZONA_GPN_OP_CFG_MASK                  0x0200  /* GPN_OP_CFG */
-#define ARIZONA_GPN_OP_CFG_SHIFT                      9  /* GPN_OP_CFG */
-#define ARIZONA_GPN_OP_CFG_WIDTH                      1  /* GPN_OP_CFG */
-#define ARIZONA_GPN_DB                           0x0100  /* GPN_DB */
-#define ARIZONA_GPN_DB_MASK                      0x0100  /* GPN_DB */
-#define ARIZONA_GPN_DB_SHIFT                          8  /* GPN_DB */
-#define ARIZONA_GPN_DB_WIDTH                          1  /* GPN_DB */
-#define ARIZONA_GPN_FN_MASK                      0x007F  /* GPN_DB */
-#define ARIZONA_GPN_FN_SHIFT                          0  /* GPN_DB */
-#define ARIZONA_GPN_FN_WIDTH                          7  /* GPN_DB */
+/* GPIO Configuration Bits */
+#define ARIZONA_GPN_DIR                          0x8000
+#define ARIZONA_GPN_PU                           0x4000
+#define ARIZONA_GPN_PD                           0x2000
+#define ARIZONA_GPN_LVL                          0x0800
+#define ARIZONA_GPN_POL                          0x0400
+#define ARIZONA_GPN_OP_CFG                       0x0200
+#define ARIZONA_GPN_DB                           0x0100
+
+/* Provide some defines for the most common configs */
+#define ARIZONA_GP_DEFAULT             0xffffffff
+#define ARIZONA_GP_OUTPUT              (ARIZONA_GP_FN_GPIO)
+#define ARIZONA_GP_INPUT               (ARIZONA_GP_FN_GPIO | \
+                                        ARIZONA_GPN_DIR)
+
+#define ARIZONA_32KZ_MCLK1 1
+#define ARIZONA_32KZ_MCLK2 2
+#define ARIZONA_32KZ_NONE  3
+
+#define ARIZONA_DMIC_MICVDD   0
+#define ARIZONA_DMIC_MICBIAS1 1
+#define ARIZONA_DMIC_MICBIAS2 2
+#define ARIZONA_DMIC_MICBIAS3 3
+
+#define ARIZONA_INMODE_DIFF 0
+#define ARIZONA_INMODE_SE   1
+#define ARIZONA_INMODE_DMIC 2
 
 #endif
diff --git a/include/dt-bindings/mfd/qcom-rpm.h b/include/dt-bindings/mfd/qcom-rpm.h
index 388a6f3d6165..13a9d4bf2662 100644
--- a/include/dt-bindings/mfd/qcom-rpm.h
+++ b/include/dt-bindings/mfd/qcom-rpm.h
@@ -141,6 +141,12 @@
 #define QCOM_RPM_SYS_FABRIC_MODE                131
 #define QCOM_RPM_USB_OTG_SWITCH                 132
 #define QCOM_RPM_VDDMIN_GPIO                    133
+#define QCOM_RPM_NSS_FABRIC_0_CLK               134
+#define QCOM_RPM_NSS_FABRIC_1_CLK               135
+#define QCOM_RPM_SMB208_S1a                     136
+#define QCOM_RPM_SMB208_S1b                     137
+#define QCOM_RPM_SMB208_S2a                     138
+#define QCOM_RPM_SMB208_S2b                     139
 
 /*
  * Constants used to select force mode for regulators.
diff --git a/include/dt-bindings/phy/phy-miphy365x.h b/include/dt-bindings/phy/phy-miphy365x.h
deleted file mode 100644
index 8ef8aba6edd6..000000000000
--- a/include/dt-bindings/phy/phy-miphy365x.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * This header provides constants for the phy framework
- * based on the STMicroelectronics MiPHY365x.
- *
- * Author: Lee Jones <lee.jones@linaro.org>
- */
-#ifndef _DT_BINDINGS_PHY_MIPHY
-#define _DT_BINDINGS_PHY_MIPHY
-
-#define MIPHY_TYPE_SATA         1
-#define MIPHY_TYPE_PCIE         2
-#define MIPHY_TYPE_USB          3
-
-#endif /* _DT_BINDINGS_PHY_MIPHY */
diff --git a/include/dt-bindings/pinctrl/am33xx.h b/include/dt-bindings/pinctrl/am33xx.h
index 2fbc804e1a45..226f77246a70 100644
--- a/include/dt-bindings/pinctrl/am33xx.h
+++ b/include/dt-bindings/pinctrl/am33xx.h
@@ -13,7 +13,8 @@
 
 #define PULL_DISABLE            (1 << 3)
 #define INPUT_EN                (1 << 5)
-#define SLEWCTRL_FAST           (1 << 6)
+#define SLEWCTRL_SLOW           (1 << 6)
+#define SLEWCTRL_FAST           0
 
 /* update macro depending on INPUT_EN and PULL_ENA */
 #undef PIN_OUTPUT
diff --git a/include/dt-bindings/pinctrl/am43xx.h b/include/dt-bindings/pinctrl/am43xx.h
index 9c2e4f82381e..5f4d01898c9c 100644
--- a/include/dt-bindings/pinctrl/am43xx.h
+++ b/include/dt-bindings/pinctrl/am43xx.h
@@ -18,7 +18,8 @@
 #define PULL_DISABLE            (1 << 16)
 #define PULL_UP                 (1 << 17)
 #define INPUT_EN                (1 << 18)
-#define SLEWCTRL_FAST           (1 << 19)
+#define SLEWCTRL_SLOW           (1 << 19)
+#define SLEWCTRL_FAST           0
 #define DS0_PULL_UP_DOWN_EN     (1 << 27)
 
 #define PIN_OUTPUT              (PULL_DISABLE)
diff --git a/include/dt-bindings/pinctrl/mt65xx.h b/include/dt-bindings/pinctrl/mt65xx.h
new file mode 100644
index 000000000000..1198f4541327
--- /dev/null
+++ b/include/dt-bindings/pinctrl/mt65xx.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Hongzhou.Yang <hongzhou.yang@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _DT_BINDINGS_PINCTRL_MT65XX_H
+#define _DT_BINDINGS_PINCTRL_MT65XX_H
+
+#define MTK_PIN_NO(x) ((x) << 8)
+#define MTK_GET_PIN_NO(x) ((x) >> 8)
+#define MTK_GET_PIN_FUNC(x) ((x) & 0xf)
+
+#define MTK_PUPD_SET_R1R0_00 100
+#define MTK_PUPD_SET_R1R0_01 101
+#define MTK_PUPD_SET_R1R0_10 102
+#define MTK_PUPD_SET_R1R0_11 103
+
+#define MTK_DRIVE_2mA  2
+#define MTK_DRIVE_4mA  4
+#define MTK_DRIVE_6mA  6
+#define MTK_DRIVE_8mA  8
+#define MTK_DRIVE_10mA 10
+#define MTK_DRIVE_12mA 12
+#define MTK_DRIVE_14mA 14
+#define MTK_DRIVE_16mA 16
+#define MTK_DRIVE_20mA 20
+#define MTK_DRIVE_24mA 24
+#define MTK_DRIVE_28mA 28
+#define MTK_DRIVE_32mA 32
+
+#endif /* _DT_BINDINGS_PINCTRL_MT65XX_H */
diff --git a/include/dt-bindings/pinctrl/qcom,pmic-gpio.h b/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
index fa74d7cc960c..aafa76cb569d 100644
--- a/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
+++ b/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
@@ -48,6 +48,14 @@
 #define PM8058_GPIO_L5                  6
 #define PM8058_GPIO_L2                  7
 
+/*
+ * Note: PM8916 GPIO1 and GPIO2 are supporting
+ * only L2(1.15V) and L5(1.8V) options
+ */
+#define PM8916_GPIO_VPH                 0
+#define PM8916_GPIO_L2                  2
+#define PM8916_GPIO_L5                  3
+
 #define PM8917_GPIO_VPH                 0
 #define PM8917_GPIO_S4                  2
 #define PM8917_GPIO_L15                 3
@@ -115,6 +123,13 @@
 #define PM8058_GPIO39_MP3_CLK           PMIC_GPIO_FUNC_FUNC1
 #define PM8058_GPIO40_EXT_BB_EN         PMIC_GPIO_FUNC_FUNC1
 
+#define PM8916_GPIO1_BAT_ALRM_OUT       PMIC_GPIO_FUNC_FUNC1
+#define PM8916_GPIO1_KEYP_DRV           PMIC_GPIO_FUNC_FUNC2
+#define PM8916_GPIO2_DIV_CLK            PMIC_GPIO_FUNC_FUNC1
+#define PM8916_GPIO2_SLEEP_CLK          PMIC_GPIO_FUNC_FUNC2
+#define PM8916_GPIO3_KEYP_DRV           PMIC_GPIO_FUNC_FUNC1
+#define PM8916_GPIO4_KEYP_DRV           PMIC_GPIO_FUNC_FUNC2
+
 #define PM8917_GPIO9_18_KEYP_DRV        PMIC_GPIO_FUNC_FUNC1
 #define PM8917_GPIO20_BAT_ALRM_OUT      PMIC_GPIO_FUNC_FUNC1
 #define PM8917_GPIO21_23_UART_TX        PMIC_GPIO_FUNC_FUNC2
diff --git a/include/dt-bindings/pinctrl/qcom,pmic-mpp.h b/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
index d2c7dabe3223..c10205491f8d 100644
--- a/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
+++ b/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
@@ -10,6 +10,10 @@
 #define PM8841_MPP_VPH                  0
 #define PM8841_MPP_S3                   2
 
+#define PM8916_MPP_VPH                  0
+#define PM8916_MPP_L2                   2
+#define PM8916_MPP_L5                   3
+
 #define PM8941_MPP_VPH                  0
 #define PM8941_MPP_L1                   1
 #define PM8941_MPP_S3                   2
diff --git a/include/dt-bindings/reset/qcom,gcc-msm8916.h b/include/dt-bindings/reset/qcom,gcc-msm8916.h
new file mode 100644
index 000000000000..3d90410f09c7
--- /dev/null
+++ b/include/dt-bindings/reset/qcom,gcc-msm8916.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2015 Linaro Limited
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ */
+
+#ifndef _DT_BINDINGS_RESET_MSM_GCC_8916_H
+#define _DT_BINDINGS_RESET_MSM_GCC_8916_H
+
+#define GCC_BLSP1_BCR                   0
+#define GCC_BLSP1_QUP1_BCR              1
+#define GCC_BLSP1_UART1_BCR             2
+#define GCC_BLSP1_QUP2_BCR              3
+#define GCC_BLSP1_UART2_BCR             4
+#define GCC_BLSP1_QUP3_BCR              5
+#define GCC_BLSP1_QUP4_BCR              6
+#define GCC_BLSP1_QUP5_BCR              7
+#define GCC_BLSP1_QUP6_BCR              8
+#define GCC_IMEM_BCR                    9
+#define GCC_SMMU_BCR                    10
+#define GCC_APSS_TCU_BCR                11
+#define GCC_SMMU_XPU_BCR                12
+#define GCC_PCNOC_TBU_BCR               13
+#define GCC_PRNG_BCR                    14
+#define GCC_BOOT_ROM_BCR                15
+#define GCC_CRYPTO_BCR                  16
+#define GCC_SEC_CTRL_BCR                17
+#define GCC_AUDIO_CORE_BCR              18
+#define GCC_ULT_AUDIO_BCR               19
+#define GCC_DEHR_BCR                    20
+#define GCC_SYSTEM_NOC_BCR              21
+#define GCC_PCNOC_BCR                   22
+#define GCC_TCSR_BCR                    23
+#define GCC_QDSS_BCR                    24
+#define GCC_DCD_BCR                     25
+#define GCC_MSG_RAM_BCR                 26
+#define GCC_MPM_BCR                     27
+#define GCC_SPMI_BCR                    28
+#define GCC_SPDM_BCR                    29
+#define GCC_MM_SPDM_BCR                 30
+#define GCC_BIMC_BCR                    31
+#define GCC_RBCPR_BCR                   32
+#define GCC_TLMM_BCR                    33
+#define GCC_USB_HS_BCR                  34
+#define GCC_USB2A_PHY_BCR               35
+#define GCC_SDCC1_BCR                   36
+#define GCC_SDCC2_BCR                   37
+#define GCC_PDM_BCR                     38
+#define GCC_SNOC_BUS_TIMEOUT0_BCR       39
+#define GCC_PCNOC_BUS_TIMEOUT0_BCR      40
+#define GCC_PCNOC_BUS_TIMEOUT1_BCR      41
+#define GCC_PCNOC_BUS_TIMEOUT2_BCR      42
+#define GCC_PCNOC_BUS_TIMEOUT3_BCR      43
+#define GCC_PCNOC_BUS_TIMEOUT4_BCR      44
+#define GCC_PCNOC_BUS_TIMEOUT5_BCR      45
+#define GCC_PCNOC_BUS_TIMEOUT6_BCR      46
+#define GCC_PCNOC_BUS_TIMEOUT7_BCR      47
+#define GCC_PCNOC_BUS_TIMEOUT8_BCR      48
+#define GCC_PCNOC_BUS_TIMEOUT9_BCR      49
+#define GCC_MMSS_BCR                    50
+#define GCC_VENUS0_BCR                  51
+#define GCC_MDSS_BCR                    52
+#define GCC_CAMSS_PHY0_BCR              53
+#define GCC_CAMSS_CSI0_BCR              54
+#define GCC_CAMSS_CSI0PHY_BCR           55
+#define GCC_CAMSS_CSI0RDI_BCR           56
+#define GCC_CAMSS_CSI0PIX_BCR           57
+#define GCC_CAMSS_PHY1_BCR              58
+#define GCC_CAMSS_CSI1_BCR              59
+#define GCC_CAMSS_CSI1PHY_BCR           60
+#define GCC_CAMSS_CSI1RDI_BCR           61
+#define GCC_CAMSS_CSI1PIX_BCR           62
+#define GCC_CAMSS_ISPIF_BCR             63
+#define GCC_CAMSS_CCI_BCR               64
+#define GCC_CAMSS_MCLK0_BCR             65
+#define GCC_CAMSS_MCLK1_BCR             66
+#define GCC_CAMSS_GP0_BCR               67
+#define GCC_CAMSS_GP1_BCR               68
+#define GCC_CAMSS_TOP_BCR               69
+#define GCC_CAMSS_MICRO_BCR             70
+#define GCC_CAMSS_JPEG_BCR              71
+#define GCC_CAMSS_VFE_BCR               72
+#define GCC_CAMSS_CSI_VFE0_BCR          73
+#define GCC_OXILI_BCR                   74
+#define GCC_GMEM_BCR                    75
+#define GCC_CAMSS_AHB_BCR               76
+#define GCC_MDP_TBU_BCR                 77
+#define GCC_GFX_TBU_BCR                 78
+#define GCC_GFX_TCU_BCR                 79
+#define GCC_MSS_TBU_AXI_BCR             80
+#define GCC_MSS_TBU_GSS_AXI_BCR         81
+#define GCC_MSS_TBU_Q6_AXI_BCR          82
+#define GCC_GTCU_AHB_BCR                83
+#define GCC_SMMU_CFG_BCR                84
+#define GCC_VFE_TBU_BCR                 85
+#define GCC_VENUS_TBU_BCR               86
+#define GCC_JPEG_TBU_BCR                87
+#define GCC_PRONTO_TBU_BCR              88
+#define GCC_SMMU_CATS_BCR               89
+
+#endif
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h
index b3f45a578344..e5966758c093 100644
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
@@ -24,17 +24,14 @@
 #include <linux/workqueue.h>
 
 struct arch_timer_kvm {
-#ifdef CONFIG_KVM_ARM_TIMER
         /* Is the timer enabled */
         bool                    enabled;
 
         /* Virtual offset */
         cycle_t                 cntvoff;
-#endif
 };
 
 struct arch_timer_cpu {
-#ifdef CONFIG_KVM_ARM_TIMER
         /* Registers: control register, timer value */
         u32                             cntv_ctl;       /* Saved/restored */
         cycle_t                         cntv_cval;      /* Saved/restored */
@@ -55,10 +52,8 @@ struct arch_timer_cpu {
 
         /* Timer IRQ */
         const struct kvm_irq_level      *irq;
-#endif
 };
 
-#ifdef CONFIG_KVM_ARM_TIMER
 int kvm_timer_hyp_init(void);
 void kvm_timer_enable(struct kvm *kvm);
 void kvm_timer_init(struct kvm *kvm);
@@ -72,30 +67,6 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu);
 u64 kvm_arm_timer_get_reg(struct kvm_vcpu *, u64 regid);
 int kvm_arm_timer_set_reg(struct kvm_vcpu *, u64 regid, u64 value);
 
-#else
-static inline int kvm_timer_hyp_init(void)
-{
-        return 0;
-};
-
-static inline void kvm_timer_enable(struct kvm *kvm) {}
-static inline void kvm_timer_init(struct kvm *kvm) {}
-static inline void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
-                                        const struct kvm_irq_level *irq) {}
-static inline void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) {}
-static inline void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) {}
-static inline void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) {}
-static inline void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) {}
-
-static inline int kvm_arm_timer_set_reg(struct kvm_vcpu *vcpu, u64 regid, u64 value)
-{
-        return 0;
-}
-
-static inline u64 kvm_arm_timer_get_reg(struct kvm_vcpu *vcpu, u64 regid)
-{
-        return 0;
-}
-#endif
+bool kvm_timer_should_fire(struct kvm_vcpu *vcpu);
 
 #endif
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 7c55dd5dd2c9..133ea00aa83b 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -24,6 +24,7 @@
 #include <linux/irqreturn.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
+#include <kvm/iodev.h>
 
 #define VGIC_NR_IRQS_LEGACY     256
 #define VGIC_NR_SGIS            16
@@ -114,6 +115,7 @@ struct vgic_ops {
         void    (*sync_lr_elrsr)(struct kvm_vcpu *, int, struct vgic_lr);
         u64     (*get_elrsr)(const struct kvm_vcpu *vcpu);
         u64     (*get_eisr)(const struct kvm_vcpu *vcpu);
+        void    (*clear_eisr)(struct kvm_vcpu *vcpu);
         u32     (*get_interrupt_status)(const struct kvm_vcpu *vcpu);
         void    (*enable_underflow)(struct kvm_vcpu *vcpu);
         void    (*disable_underflow)(struct kvm_vcpu *vcpu);
@@ -139,16 +141,21 @@ struct vgic_params {
 };
 
 struct vgic_vm_ops {
-        bool    (*handle_mmio)(struct kvm_vcpu *, struct kvm_run *,
-                               struct kvm_exit_mmio *);
         bool    (*queue_sgi)(struct kvm_vcpu *, int irq);
         void    (*add_sgi_source)(struct kvm_vcpu *, int irq, int source);
         int     (*init_model)(struct kvm *);
         int     (*map_resources)(struct kvm *, const struct vgic_params *);
 };
 
+struct vgic_io_device {
+        gpa_t addr;
+        int len;
+        const struct vgic_io_range *reg_ranges;
+        struct kvm_vcpu *redist_vcpu;
+        struct kvm_io_device dev;
+};
+
 struct vgic_dist {
-#ifdef CONFIG_KVM_ARM_VGIC
         spinlock_t              lock;
         bool                    in_kernel;
         bool                    ready;
@@ -196,6 +203,9 @@ struct vgic_dist {
         /* Level-triggered interrupt queued on VCPU interface */
         struct vgic_bitmap      irq_queued;
 
+        /* Interrupt was active when unqueue from VCPU interface */
+        struct vgic_bitmap      irq_active;
+
         /* Interrupt priority. Not used yet. */
         struct vgic_bytemap     irq_priority;
 
@@ -236,8 +246,12 @@ struct vgic_dist {
         /* Bitmap indicating which CPU has something pending */
         unsigned long           *irq_pending_on_cpu;
 
+        /* Bitmap indicating which CPU has active IRQs */
+        unsigned long           *irq_active_on_cpu;
+
         struct vgic_vm_ops      vm_ops;
-#endif
+        struct vgic_io_device   dist_iodev;
+        struct vgic_io_device   *redist_iodevs;
 };
 
 struct vgic_v2_cpu_if {
@@ -265,13 +279,18 @@ struct vgic_v3_cpu_if {
 };
 
 struct vgic_cpu {
-#ifdef CONFIG_KVM_ARM_VGIC
         /* per IRQ to LR mapping */
         u8              *vgic_irq_lr_map;
 
-        /* Pending interrupts on this VCPU */
+        /* Pending/active/both interrupts on this VCPU */
         DECLARE_BITMAP( pending_percpu, VGIC_NR_PRIVATE_IRQS);
+        DECLARE_BITMAP( active_percpu, VGIC_NR_PRIVATE_IRQS);
+        DECLARE_BITMAP( pend_act_percpu, VGIC_NR_PRIVATE_IRQS);
+
+        /* Pending/active/both shared interrupts, dynamically sized */
         unsigned long   *pending_shared;
+        unsigned long   *active_shared;
+        unsigned long   *pend_act_shared;
 
         /* Bitmap of used/free list registers */
         DECLARE_BITMAP( lr_used, VGIC_V2_MAX_LRS);
@@ -284,7 +303,6 @@ struct vgic_cpu {
                 struct vgic_v2_cpu_if   vgic_v2;
                 struct vgic_v3_cpu_if   vgic_v3;
         };
-#endif
 };
 
 #define LR_EMPTY        0xff
@@ -294,10 +312,7 @@ struct vgic_cpu {
 
 struct kvm;
 struct kvm_vcpu;
-struct kvm_run;
-struct kvm_exit_mmio;
 
-#ifdef CONFIG_KVM_ARM_VGIC
 int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write);
 int kvm_vgic_hyp_init(void);
 int kvm_vgic_map_resources(struct kvm *kvm);
@@ -311,8 +326,7 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num,
                         bool level);
 void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg);
 int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu);
-bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run,
-                      struct kvm_exit_mmio *mmio);
+int kvm_vgic_vcpu_active_irq(struct kvm_vcpu *vcpu);
 
 #define irqchip_in_kernel(k)    (!!((k)->arch.vgic.in_kernel))
 #define vgic_initialized(k)     (!!((k)->arch.vgic.nr_cpus))
@@ -334,84 +348,4 @@ static inline int vgic_v3_probe(struct device_node *vgic_node,
 }
 #endif
 
-#else
-static inline int kvm_vgic_hyp_init(void)
-{
-        return 0;
-}
-
-static inline int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr)
-{
-        return 0;
-}
-
-static inline int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write)
-{
-        return -ENXIO;
-}
-
-static inline int kvm_vgic_map_resources(struct kvm *kvm)
-{
-        return 0;
-}
-
-static inline int kvm_vgic_create(struct kvm *kvm, u32 type)
-{
-        return 0;
-}
-
-static inline void kvm_vgic_destroy(struct kvm *kvm)
-{
-}
-
-static inline void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)
-{
-}
-
-static inline int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
-{
-        return 0;
-}
-
-static inline void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu) {}
-static inline void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu) {}
-
-static inline int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid,
-                                      unsigned int irq_num, bool level)
-{
-        return 0;
-}
-
-static inline int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu)
-{
-        return 0;
-}
-
-static inline bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run,
-                                    struct kvm_exit_mmio *mmio)
-{
-        return false;
-}
-
-static inline int irqchip_in_kernel(struct kvm *kvm)
-{
-        return 0;
-}
-
-static inline bool vgic_initialized(struct kvm *kvm)
-{
-        return true;
-}
-
-static inline bool vgic_ready(struct kvm *kvm)
-{
-        return true;
-}
-
-static inline int kvm_vgic_get_max_vcpus(void)
-{
-        return KVM_MAX_VCPUS;
-}
-#endif
-
 #endif
diff --git a/include/kvm/iodev.h b/include/kvm/iodev.h
new file mode 100644
index 000000000000..a6d208b916f5
--- /dev/null
+++ b/include/kvm/iodev.h
@@ -0,0 +1,76 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __KVM_IODEV_H__
+#define __KVM_IODEV_H__
+
+#include <linux/kvm_types.h>
+#include <linux/errno.h>
+
+struct kvm_io_device;
+struct kvm_vcpu;
+
+/**
+ * kvm_io_device_ops are called under kvm slots_lock.
+ * read and write handlers return 0 if the transaction has been handled,
+ * or non-zero to have it passed to the next device.
+ **/
+struct kvm_io_device_ops {
+        int (*read)(struct kvm_vcpu *vcpu,
+                    struct kvm_io_device *this,
+                    gpa_t addr,
+                    int len,
+                    void *val);
+        int (*write)(struct kvm_vcpu *vcpu,
+                     struct kvm_io_device *this,
+                     gpa_t addr,
+                     int len,
+                     const void *val);
+        void (*destructor)(struct kvm_io_device *this);
+};
+
+
+struct kvm_io_device {
+        const struct kvm_io_device_ops *ops;
+};
+
+static inline void kvm_iodevice_init(struct kvm_io_device *dev,
+                                     const struct kvm_io_device_ops *ops)
+{
+        dev->ops = ops;
+}
+
+static inline int kvm_iodevice_read(struct kvm_vcpu *vcpu,
+                                    struct kvm_io_device *dev, gpa_t addr,
+                                    int l, void *v)
+{
+        return dev->ops->read ? dev->ops->read(vcpu, dev, addr, l, v)
+                                : -EOPNOTSUPP;
+}
+
+static inline int kvm_iodevice_write(struct kvm_vcpu *vcpu,
+                                     struct kvm_io_device *dev, gpa_t addr,
+                                     int l, const void *v)
+{
+        return dev->ops->write ? dev->ops->write(vcpu, dev, addr, l, v)
+                                 : -EOPNOTSUPP;
+}
+
+static inline void kvm_iodevice_destructor(struct kvm_io_device *dev)
+{
+        if (dev->ops->destructor)
+                dev->ops->destructor(dev);
+}
+
+#endif /* __KVM_IODEV_H__ */
diff --git a/include/linux/a.out.h b/include/linux/a.out.h
index 220f14338895..ee884168989f 100644
--- a/include/linux/a.out.h
+++ b/include/linux/a.out.h
@@ -4,44 +4,6 @@
 #include <uapi/linux/a.out.h>
 
 #ifndef __ASSEMBLY__
-#if defined (M_OLDSUN2)
-#else
-#endif
-#if defined (M_68010)
-#else
-#endif
-#if defined (M_68020)
-#else
-#endif
-#if defined (M_SPARC)
-#else
-#endif
-#if !defined (N_MAGIC)
-#endif
-#if !defined (N_BADMAG)
-#endif
-#if !defined (N_TXTOFF)
-#endif
-#if !defined (N_DATOFF)
-#endif
-#if !defined (N_TRELOFF)
-#endif
-#if !defined (N_DRELOFF)
-#endif
-#if !defined (N_SYMOFF)
-#endif
-#if !defined (N_STROFF)
-#endif
-#if !defined (N_TXTADDR)
-#endif
-#if defined(vax) || defined(hp300) || defined(pyr)
-#endif
-#ifdef  sony
-#endif  /* Sony.  */
-#ifdef is68k
-#endif
-#if defined(m68k) && defined(PORTAR)
-#endif
 #ifdef linux
 #include <asm/page.h>
 #if defined(__i386__) || defined(__mc68000__)
@@ -51,34 +13,5 @@
 #endif
 #endif
 #endif
-#ifndef N_DATADDR
-#endif
-#if !defined (N_BSSADDR)
-#endif
-#if !defined (N_NLIST_DECLARED)
-#endif /* no N_NLIST_DECLARED.  */
-#if !defined (N_UNDF)
-#endif
-#if !defined (N_ABS)
-#endif
-#if !defined (N_TEXT)
-#endif
-#if !defined (N_DATA)
-#endif
-#if !defined (N_BSS)
-#endif
-#if !defined (N_FN)
-#endif
-#if !defined (N_EXT)
-#endif
-#if !defined (N_TYPE)
-#endif
-#if !defined (N_STAB)
-#endif
-#if !defined (N_RELOCATION_INFO_DECLARED)
-#ifdef NS32K
-#else
-#endif
-#endif /* no N_RELOCATION_INFO_DECLARED.  */
 #endif /*__ASSEMBLY__ */
 #endif /* __A_OUT_GNU_H__ */
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 24c7aa8b1d20..e4da5e35e29c 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -53,10 +53,16 @@ static inline acpi_handle acpi_device_handle(struct acpi_device *adev)
         return adev ? adev->handle : NULL;
 }
 
-#define ACPI_COMPANION(dev)             ((dev)->acpi_node.companion)
-#define ACPI_COMPANION_SET(dev, adev)   ACPI_COMPANION(dev) = (adev)
+#define ACPI_COMPANION(dev)             acpi_node((dev)->fwnode)
+#define ACPI_COMPANION_SET(dev, adev)   set_primary_fwnode(dev, (adev) ? \
+        acpi_fwnode_handle(adev) : NULL)
 #define ACPI_HANDLE(dev)                acpi_device_handle(ACPI_COMPANION(dev))
 
+static inline bool has_acpi_companion(struct device *dev)
+{
+        return is_acpi_node(dev->fwnode);
+}
+
 static inline void acpi_preset_companion(struct device *dev,
                                          struct acpi_device *parent, u64 addr)
 {
@@ -73,6 +79,7 @@ enum acpi_irq_model_id {
         ACPI_IRQ_MODEL_IOAPIC,
         ACPI_IRQ_MODEL_IOSAPIC,
         ACPI_IRQ_MODEL_PLATFORM,
+        ACPI_IRQ_MODEL_GIC,
         ACPI_IRQ_MODEL_COUNT
 };
 
@@ -146,9 +153,14 @@ void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa);
 int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);
 void acpi_numa_arch_fixup(void);
 
+#ifndef PHYS_CPUID_INVALID
+typedef u32 phys_cpuid_t;
+#define PHYS_CPUID_INVALID (phys_cpuid_t)(-1)
+#endif
+
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
 /* Arch dependent functions for cpu hotplug support */
-int acpi_map_cpu(acpi_handle handle, int physid, int *pcpu);
+int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu);
 int acpi_unmap_cpu(int cpu);
 #endif /* CONFIG_ACPI_HOTPLUG_CPU */
 
@@ -471,6 +483,11 @@ static inline struct fwnode_handle *acpi_fwnode_handle(struct acpi_device *adev)
         return NULL;
 }
 
+static inline bool has_acpi_companion(struct device *dev)
+{
+        return false;
+}
+
 static inline const char *acpi_dev_name(struct acpi_device *adev)
 {
         return NULL;
diff --git a/include/linux/acpi_irq.h b/include/linux/acpi_irq.h
new file mode 100644
index 000000000000..f10c87265855
--- /dev/null
+++ b/include/linux/acpi_irq.h
@@ -0,0 +1,10 @@
+#ifndef _LINUX_ACPI_IRQ_H
+#define _LINUX_ACPI_IRQ_H
+
+#include <linux/irq.h>
+
+#ifndef acpi_irq_init
+static inline void acpi_irq_init(void) { }
+#endif
+
+#endif /* _LINUX_ACPI_IRQ_H */
diff --git a/include/linux/aio.h b/include/linux/aio.h
index d9c92daa3944..9eb42dbc5582 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -1,86 +1,23 @@
 #ifndef __LINUX__AIO_H
 #define __LINUX__AIO_H
 
-#include <linux/list.h>
-#include <linux/workqueue.h>
 #include <linux/aio_abi.h>
-#include <linux/uio.h>
-#include <linux/rcupdate.h>
-
-#include <linux/atomic.h>
 
 struct kioctx;
 struct kiocb;
+struct mm_struct;
 
 #define KIOCB_KEY               0
 
-/*
- * We use ki_cancel == KIOCB_CANCELLED to indicate that a kiocb has been either
- * cancelled or completed (this makes a certain amount of sense because
- * successful cancellation - io_cancel() - does deliver the completion to
- * userspace).
- *
- * And since most things don't implement kiocb cancellation and we'd really like
- * kiocb completion to be lockless when possible, we use ki_cancel to
- * synchronize cancellation and completion - we only set it to KIOCB_CANCELLED
- * with xchg() or cmpxchg(), see batch_complete_aio() and kiocb_cancel().
- */
-#define KIOCB_CANCELLED         ((void *) (~0ULL))
-
 typedef int (kiocb_cancel_fn)(struct kiocb *);
 
-struct kiocb {
-        struct file             *ki_filp;
-        struct kioctx           *ki_ctx;        /* NULL for sync ops */
-        kiocb_cancel_fn         *ki_cancel;
-        void                    *private;
-
-        union {
-                void __user             *user;
-                struct task_struct      *tsk;
-        } ki_obj;
-
-        __u64                   ki_user_data;   /* user's data for completion */
-        loff_t                  ki_pos;
-        size_t                  ki_nbytes;      /* copy of iocb->aio_nbytes */
-
-        struct list_head        ki_list;        /* the aio core uses this
-                                                 * for cancellation */
-
-        /*
-         * If the aio_resfd field of the userspace iocb is not zero,
-         * this is the underlying eventfd context to deliver events to.
-         */
-        struct eventfd_ctx      *ki_eventfd;
-};
-
-static inline bool is_sync_kiocb(struct kiocb *kiocb)
-{
-        return kiocb->ki_ctx == NULL;
-}
-
-static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)
-{
-        *kiocb = (struct kiocb) {
-                        .ki_ctx = NULL,
-                        .ki_filp = filp,
-                        .ki_obj.tsk = current,
-                };
-}
-
 /* prototypes */
 #ifdef CONFIG_AIO
-extern ssize_t wait_on_sync_kiocb(struct kiocb *iocb);
-extern void aio_complete(struct kiocb *iocb, long res, long res2);
-struct mm_struct;
 extern void exit_aio(struct mm_struct *mm);
 extern long do_io_submit(aio_context_t ctx_id, long nr,
                          struct iocb __user *__user *iocbpp, bool compat);
 void kiocb_set_cancel_fn(struct kiocb *req, kiocb_cancel_fn *cancel);
 #else
-static inline ssize_t wait_on_sync_kiocb(struct kiocb *iocb) { return 0; }
-static inline void aio_complete(struct kiocb *iocb, long res, long res2) { }
-struct mm_struct;
 static inline void exit_aio(struct mm_struct *mm) { }
 static inline long do_io_submit(aio_context_t ctx_id, long nr,
                                 struct iocb __user * __user *iocbpp,
@@ -89,11 +26,6 @@ static inline void kiocb_set_cancel_fn(struct kiocb *req,
                                        kiocb_cancel_fn *cancel) { }
 #endif /* CONFIG_AIO */
 
-static inline struct kiocb *list_kiocb(struct list_head *h)
-{
-        return list_entry(h, struct kiocb, ki_list);
-}
-
 /* for sysctl: */
 extern unsigned long aio_nr;
 extern unsigned long aio_max_nr;
diff --git a/include/linux/arm-cci.h b/include/linux/arm-cci.h
index 79d6edf446d5..521ec1f2e6bc 100644
--- a/include/linux/arm-cci.h
+++ b/include/linux/arm-cci.h
@@ -24,16 +24,22 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 
+#include <asm/arm-cci.h>
+
 struct device_node;
 
 #ifdef CONFIG_ARM_CCI
 extern bool cci_probed(void);
+#else
+static inline bool cci_probed(void) { return false; }
+#endif
+
+#ifdef CONFIG_ARM_CCI400_PORT_CTRL
 extern int cci_ace_get_port(struct device_node *dn);
 extern int cci_disable_port_by_cpu(u64 mpidr);
 extern int __cci_control_port_by_device(struct device_node *dn, bool enable);
 extern int __cci_control_port_by_index(u32 port, bool enable);
 #else
-static inline bool cci_probed(void) { return false; }
 static inline int cci_ace_get_port(struct device_node *dn)
 {
         return -ENODEV;
@@ -49,6 +55,7 @@ static inline int __cci_control_port_by_index(u32 port, bool enable)
         return -ENODEV;
 }
 #endif
+
 #define cci_disable_port_by_device(dev) \
         __cci_control_port_by_device(dev, false)
 #define cci_enable_port_by_device(dev) \
diff --git a/include/linux/async_tx.h b/include/linux/async_tx.h
index 179b38ffd351..388574ea38ed 100644
--- a/include/linux/async_tx.h
+++ b/include/linux/async_tx.h
@@ -60,12 +60,15 @@ struct dma_chan_ref {
  * dependency chain
  * @ASYNC_TX_FENCE: specify that the next operation in the dependency
  * chain uses this operation's result as an input
+ * @ASYNC_TX_PQ_XOR_DST: do not overwrite the syndrome but XOR it with the
+ * input data. Required for rmw case.
  */
 enum async_tx_flags {
         ASYNC_TX_XOR_ZERO_DST    = (1 << 0),
         ASYNC_TX_XOR_DROP_DST    = (1 << 1),
         ASYNC_TX_ACK             = (1 << 2),
         ASYNC_TX_FENCE           = (1 << 3),
+        ASYNC_TX_PQ_XOR_DST      = (1 << 4),
 };
 
 /**
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 1648026e06b4..b666b773e111 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -94,6 +94,8 @@ enum {
         ATA_ID_SECTOR_SIZE      = 106,
         ATA_ID_WWN              = 108,
         ATA_ID_LOGICAL_SECTOR_SIZE      = 117,  /* and 118 */
+        ATA_ID_COMMAND_SET_3    = 119,
+        ATA_ID_COMMAND_SET_4    = 120,
         ATA_ID_LAST_LUN         = 126,
         ATA_ID_DLF              = 128,
         ATA_ID_CSFO             = 129,
@@ -177,7 +179,7 @@ enum {
         ATA_DSC                 = (1 << 4),     /* drive seek complete */
         ATA_DRQ                 = (1 << 3),     /* data request i/o */
         ATA_CORR                = (1 << 2),     /* corrected data error */
-        ATA_IDX                 = (1 << 1),     /* index */
+        ATA_SENSE               = (1 << 1),     /* sense code available */
         ATA_ERR                 = (1 << 0),     /* have an error */
         ATA_SRST                = (1 << 2),     /* software reset */
         ATA_ICRC                = (1 << 7),     /* interface CRC error */
@@ -382,6 +384,8 @@ enum {
         SATA_SSP                = 0x06, /* Software Settings Preservation */
         SATA_DEVSLP             = 0x09, /* Device Sleep */
 
+        SETFEATURE_SENSE_DATA = 0xC3, /* Sense Data Reporting feature */
+
         /* feature values for SET_MAX */
         ATA_SET_MAX_ADDR        = 0x00,
         ATA_SET_MAX_PASSWD      = 0x01,
@@ -525,6 +529,8 @@ struct ata_bmdma_prd {
 #define ata_id_cdb_intr(id)     (((id)[ATA_ID_CONFIG] & 0x60) == 0x20)
 #define ata_id_has_da(id)       ((id)[ATA_ID_SATA_CAPABILITY_2] & (1 << 4))
 #define ata_id_has_devslp(id)   ((id)[ATA_ID_FEATURE_SUPP] & (1 << 8))
+#define ata_id_has_ncq_autosense(id) \
+                                ((id)[ATA_ID_FEATURE_SUPP] & (1 << 7))
 
 static inline bool ata_id_has_hipm(const u16 *id)
 {
@@ -696,6 +702,27 @@ static inline bool ata_id_wcache_enabled(const u16 *id)
         return id[ATA_ID_CFS_ENABLE_1] & (1 << 5);
 }
 
+static inline bool ata_id_has_read_log_dma_ext(const u16 *id)
+{
+        if (!(id[ATA_ID_CFS_ENABLE_2] & (1 << 15)))
+                return false;
+        return id[ATA_ID_COMMAND_SET_3] & (1 << 3);
+}
+
+static inline bool ata_id_has_sense_reporting(const u16 *id)
+{
+        if (!(id[ATA_ID_CFS_ENABLE_2] & (1 << 15)))
+                return false;
+        return id[ATA_ID_COMMAND_SET_3] & (1 << 6);
+}
+
+static inline bool ata_id_sense_reporting_enabled(const u16 *id)
+{
+        if (!(id[ATA_ID_CFS_ENABLE_2] & (1 << 15)))
+                return false;
+        return id[ATA_ID_COMMAND_SET_4] & (1 << 6);
+}
+
 /**
  *      ata_id_major_version    -       get ATA level of drive
  *      @id: Identify data
diff --git a/include/linux/bcm47xx_nvram.h b/include/linux/bcm47xx_nvram.h
new file mode 100644
index 000000000000..b12b07e75929
--- /dev/null
+++ b/include/linux/bcm47xx_nvram.h
@@ -0,0 +1,34 @@
+/*
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ */
+
+#ifndef __BCM47XX_NVRAM_H
+#define __BCM47XX_NVRAM_H
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+
+#ifdef CONFIG_BCM47XX
+int bcm47xx_nvram_init_from_mem(u32 base, u32 lim);
+int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);
+int bcm47xx_nvram_gpio_pin(const char *name);
+#else
+static inline int bcm47xx_nvram_init_from_mem(u32 base, u32 lim)
+{
+        return -ENOTSUPP;
+};
+static inline int bcm47xx_nvram_getenv(const char *name, char *val,
+                                       size_t val_len)
+{
+        return -ENOTSUPP;
+};
+static inline int bcm47xx_nvram_gpio_pin(const char *name)
+{
+        return -ENOTSUPP;
+};
+#endif
+
+#endif /* __BCM47XX_NVRAM_H */
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 994739da827f..e34f906647d3 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -434,6 +434,27 @@ static inline struct bcma_device *bcma_find_core(struct bcma_bus *bus,
         return bcma_find_core_unit(bus, coreid, 0);
 }
 
+#ifdef CONFIG_BCMA_HOST_PCI
+extern void bcma_host_pci_up(struct bcma_bus *bus);
+extern void bcma_host_pci_down(struct bcma_bus *bus);
+extern int bcma_host_pci_irq_ctl(struct bcma_bus *bus,
+                                 struct bcma_device *core, bool enable);
+#else
+static inline void bcma_host_pci_up(struct bcma_bus *bus)
+{
+}
+static inline void bcma_host_pci_down(struct bcma_bus *bus)
+{
+}
+static inline int bcma_host_pci_irq_ctl(struct bcma_bus *bus,
+                                        struct bcma_device *core, bool enable)
+{
+        if (bus->hosttype == BCMA_HOSTTYPE_PCI)
+                return -ENOTSUPP;
+        return 0;
+}
+#endif
+
 extern bool bcma_core_is_enabled(struct bcma_device *core);
 extern void bcma_core_disable(struct bcma_device *core, u32 flags);
 extern int bcma_core_enable(struct bcma_device *core, u32 flags);
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index db6fa217f98b..6cceedf65ca2 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -663,14 +663,6 @@ struct bcma_drv_cc_b {
 #define bcma_cc_maskset32(cc, offset, mask, set) \
         bcma_cc_write32(cc, offset, (bcma_cc_read32(cc, offset) & (mask)) | (set))
 
-extern void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);
-extern void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);
-
-extern void bcma_chipco_suspend(struct bcma_drv_cc *cc);
-extern void bcma_chipco_resume(struct bcma_drv_cc *cc);
-
-void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
-
 extern u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks);
 
 extern u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc);
@@ -690,9 +682,6 @@ u32 bcma_chipco_gpio_pullup(struct bcma_drv_cc *cc, u32 mask, u32 value);
 u32 bcma_chipco_gpio_pulldown(struct bcma_drv_cc *cc, u32 mask, u32 value);
 
 /* PMU support */
-extern void bcma_pmu_init(struct bcma_drv_cc *cc);
-extern void bcma_pmu_early_init(struct bcma_drv_cc *cc);
-
 extern void bcma_chipco_pll_write(struct bcma_drv_cc *cc, u32 offset,
                                   u32 value);
 extern void bcma_chipco_pll_maskset(struct bcma_drv_cc *cc, u32 offset,
diff --git a/include/linux/bcma/bcma_driver_gmac_cmn.h b/include/linux/bcma/bcma_driver_gmac_cmn.h
index 4dd1f33e36a2..4354d4ea6713 100644
--- a/include/linux/bcma/bcma_driver_gmac_cmn.h
+++ b/include/linux/bcma/bcma_driver_gmac_cmn.h
@@ -91,10 +91,4 @@ struct bcma_drv_gmac_cmn {
 #define gmac_cmn_write16(gc, offset, val)       bcma_write16((gc)->core, offset, val)
 #define gmac_cmn_write32(gc, offset, val)       bcma_write32((gc)->core, offset, val)
 
-#ifdef CONFIG_BCMA_DRIVER_GMAC_CMN
-extern void bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc);
-#else
-static inline void bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc) { }
-#endif
-
 #endif /* LINUX_BCMA_DRIVER_GMAC_CMN_H_ */
diff --git a/include/linux/bcma/bcma_driver_mips.h b/include/linux/bcma/bcma_driver_mips.h
index 0b3b32aeeb8a..8eea7f9e33b4 100644
--- a/include/linux/bcma/bcma_driver_mips.h
+++ b/include/linux/bcma/bcma_driver_mips.h
@@ -39,21 +39,6 @@ struct bcma_drv_mips {
         u8 early_setup_done:1;
 };
 
-#ifdef CONFIG_BCMA_DRIVER_MIPS
-extern void bcma_core_mips_init(struct bcma_drv_mips *mcore);
-extern void bcma_core_mips_early_init(struct bcma_drv_mips *mcore);
-
-extern unsigned int bcma_core_mips_irq(struct bcma_device *dev);
-#else
-static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore) { }
-static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }
-
-static inline unsigned int bcma_core_mips_irq(struct bcma_device *dev)
-{
-        return 0;
-}
-#endif
-
 extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);
 
 #endif /* LINUX_BCMA_DRIVER_MIPS_H_ */
diff --git a/include/linux/bcma/bcma_driver_pci.h b/include/linux/bcma/bcma_driver_pci.h
index 3f809ae372c4..5ba6918ca20b 100644
--- a/include/linux/bcma/bcma_driver_pci.h
+++ b/include/linux/bcma/bcma_driver_pci.h
@@ -238,13 +238,13 @@ struct bcma_drv_pci {
 #define pcicore_write16(pc, offset, val)        bcma_write16((pc)->core, offset, val)
 #define pcicore_write32(pc, offset, val)        bcma_write32((pc)->core, offset, val)
 
-extern void bcma_core_pci_early_init(struct bcma_drv_pci *pc);
-extern void bcma_core_pci_init(struct bcma_drv_pci *pc);
-extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
-                                 struct bcma_device *core, bool enable);
-extern void bcma_core_pci_up(struct bcma_bus *bus);
-extern void bcma_core_pci_down(struct bcma_bus *bus);
+#ifdef CONFIG_BCMA_DRIVER_PCI
 extern void bcma_core_pci_power_save(struct bcma_bus *bus, bool up);
+#else
+static inline void bcma_core_pci_power_save(struct bcma_bus *bus, bool up)
+{
+}
+#endif
 
 extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
 extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
diff --git a/include/linux/bcma/bcma_driver_pcie2.h b/include/linux/bcma/bcma_driver_pcie2.h
index 5988b05781c3..31e6d17ab798 100644
--- a/include/linux/bcma/bcma_driver_pcie2.h
+++ b/include/linux/bcma/bcma_driver_pcie2.h
@@ -143,6 +143,8 @@
 
 struct bcma_drv_pcie2 {
         struct bcma_device *core;
+
+        u16 reqsize;
 };
 
 #define pcie2_read16(pcie2, offset)             bcma_read16((pcie2)->core, offset)
@@ -153,6 +155,4 @@ struct bcma_drv_pcie2 {
 #define pcie2_set32(pcie2, offset, set)         bcma_set32((pcie2)->core, offset, set)
 #define pcie2_mask32(pcie2, offset, mask)       bcma_mask32((pcie2)->core, offset, mask)
 
-void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2);
-
 #endif /* LINUX_BCMA_DRIVER_PCIE2_H_ */
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index dbfbf4990005..ea17cca9e685 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -172,12 +172,8 @@ extern unsigned int bitmap_ord_to_pos(const unsigned long *bitmap, unsigned int
 extern int bitmap_print_to_pagebuf(bool list, char *buf,
                                    const unsigned long *maskp, int nmaskbits);
 
-#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG))
-#define BITMAP_LAST_WORD_MASK(nbits)                                    \
-(                                                                       \
-        ((nbits) % BITS_PER_LONG) ?                                     \
-                (1UL<<((nbits) % BITS_PER_LONG))-1 : ~0UL               \
-)
+#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1)))
+#define BITMAP_LAST_WORD_MASK(nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1)))
 
 #define small_const_nbits(nbits) \
         (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
@@ -287,16 +283,16 @@ static inline int bitmap_empty(const unsigned long *src, unsigned nbits)
 {
         if (small_const_nbits(nbits))
                 return ! (*src & BITMAP_LAST_WORD_MASK(nbits));
-        else
-                return __bitmap_empty(src, nbits);
+
+        return find_first_bit(src, nbits) == nbits;
 }
 
 static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
 {
         if (small_const_nbits(nbits))
                 return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits));
-        else
-                return __bitmap_full(src, nbits);
+
+        return find_first_zero_bit(src, nbits) == nbits;
 }
 
 static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 5d858e02997f..297f5bda4fdf 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -218,9 +218,9 @@ static inline unsigned long __ffs64(u64 word)
 /**
  * find_last_bit - find the last set bit in a memory region
  * @addr: The address to start the search at
- * @size: The maximum size to search
+ * @size: The number of bits to search
  *
- * Returns the bit number of the first set bit, or size.
+ * Returns the bit number of the last set bit, or size.
  */
 extern unsigned long find_last_bit(const unsigned long *addr,
                                    unsigned long size);
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 7aec86127335..2056a99b92f8 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -13,7 +13,7 @@ struct blk_mq_cpu_notifier {
 };
 
 struct blk_mq_ctxmap {
-        unsigned int map_size;
+        unsigned int size;
         unsigned int bits_per_word;
         struct blk_align_bitmap *map;
 };
@@ -164,6 +164,8 @@ enum {
                 << BLK_MQ_F_ALLOC_POLICY_START_BIT)
 
 struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *);
+struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
+                                                  struct request_queue *q);
 void blk_mq_finish_init(struct request_queue *q);
 int blk_mq_register_disk(struct gendisk *);
 void blk_mq_unregister_disk(struct gendisk *);
@@ -218,6 +220,7 @@ void blk_mq_start_hw_queue(struct blk_mq_hw_ctx *hctx);
 void blk_mq_stop_hw_queues(struct request_queue *q);
 void blk_mq_start_hw_queues(struct request_queue *q);
 void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async);
+void blk_mq_run_hw_queues(struct request_queue *q, bool async);
 void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs);
 void blk_mq_tag_busy_iter(struct blk_mq_hw_ctx *hctx, busy_iter_fn *fn,
                 void *priv);
@@ -227,7 +230,7 @@ void blk_mq_freeze_queue_start(struct request_queue *q);
 
 /*
  * Driver command data is immediately after the request. So subtract request
- * size to get back to the original request.
+ * size to get back to the original request, add request size to get the PDU.
  */
 static inline struct request *blk_mq_rq_from_pdu(void *pdu)
 {
@@ -235,7 +238,7 @@ static inline struct request *blk_mq_rq_from_pdu(void *pdu)
 }
 static inline void *blk_mq_rq_to_pdu(struct request *rq)
 {
-        return (void *) rq + sizeof(*rq);
+        return rq + 1;
 }
 
 #define queue_for_each_hw_ctx(q, hctx, i)                               \
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index c294e3e25e37..a1b25e35ea5f 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -181,7 +181,9 @@ enum rq_flag_bits {
         __REQ_ELVPRIV,          /* elevator private data attached */
         __REQ_FAILED,           /* set if the request failed */
         __REQ_QUIET,            /* don't worry about errors */
-        __REQ_PREEMPT,          /* set for "ide_preempt" requests */
+        __REQ_PREEMPT,          /* set for "ide_preempt" requests and also
+                                   for requests for which the SCSI "quiesce"
+                                   state must be ignored. */
         __REQ_ALLOCED,          /* request came from our alloc pool */
         __REQ_COPY_USER,        /* contains copies of user pages */
         __REQ_FLUSH_SEQ,        /* request for flush sequence */
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index bbfceb756452..d5cda067115a 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -32,23 +32,19 @@ struct bpf_map {
         u32 key_size;
         u32 value_size;
         u32 max_entries;
-        struct bpf_map_ops *ops;
+        const struct bpf_map_ops *ops;
         struct work_struct work;
 };
 
 struct bpf_map_type_list {
         struct list_head list_node;
-        struct bpf_map_ops *ops;
+        const struct bpf_map_ops *ops;
         enum bpf_map_type type;
 };
 
-void bpf_register_map_type(struct bpf_map_type_list *tl);
-void bpf_map_put(struct bpf_map *map);
-struct bpf_map *bpf_map_get(struct fd f);
-
 /* function argument constraints */
 enum bpf_arg_type {
-        ARG_ANYTHING = 0,       /* any argument is ok */
+        ARG_DONTCARE = 0,       /* unused argument in helper function */
 
         /* the following constraints used to prototype
          * bpf_map_lookup/update/delete_elem() functions
@@ -62,6 +58,9 @@ enum bpf_arg_type {
          */
         ARG_PTR_TO_STACK,       /* any pointer to eBPF program stack */
         ARG_CONST_STACK_SIZE,   /* number of bytes accessed from stack */
+
+        ARG_PTR_TO_CTX,         /* pointer to context */
+        ARG_ANYTHING,           /* any (initialized) argument is ok */
 };
 
 /* type of values returned from helper functions */
@@ -105,41 +104,61 @@ struct bpf_verifier_ops {
          * with 'type' (read or write) is allowed
          */
         bool (*is_valid_access)(int off, int size, enum bpf_access_type type);
+
+        u32 (*convert_ctx_access)(int dst_reg, int src_reg, int ctx_off,
+                                  struct bpf_insn *insn);
 };
 
 struct bpf_prog_type_list {
         struct list_head list_node;
-        struct bpf_verifier_ops *ops;
+        const struct bpf_verifier_ops *ops;
         enum bpf_prog_type type;
 };
 
-void bpf_register_prog_type(struct bpf_prog_type_list *tl);
-
 struct bpf_prog;
 
 struct bpf_prog_aux {
         atomic_t refcnt;
-        bool is_gpl_compatible;
-        enum bpf_prog_type prog_type;
-        struct bpf_verifier_ops *ops;
-        struct bpf_map **used_maps;
         u32 used_map_cnt;
+        const struct bpf_verifier_ops *ops;
+        struct bpf_map **used_maps;
         struct bpf_prog *prog;
         struct work_struct work;
 };
 
 #ifdef CONFIG_BPF_SYSCALL
-void bpf_prog_put(struct bpf_prog *prog);
-#else
-static inline void bpf_prog_put(struct bpf_prog *prog) {}
-#endif
+void bpf_register_prog_type(struct bpf_prog_type_list *tl);
+void bpf_register_map_type(struct bpf_map_type_list *tl);
+
 struct bpf_prog *bpf_prog_get(u32 ufd);
+void bpf_prog_put(struct bpf_prog *prog);
+
+struct bpf_map *bpf_map_get(struct fd f);
+void bpf_map_put(struct bpf_map *map);
+
 /* verify correctness of eBPF program */
-int bpf_check(struct bpf_prog *fp, union bpf_attr *attr);
+int bpf_check(struct bpf_prog **fp, union bpf_attr *attr);
+#else
+static inline void bpf_register_prog_type(struct bpf_prog_type_list *tl)
+{
+}
+
+static inline struct bpf_prog *bpf_prog_get(u32 ufd)
+{
+        return ERR_PTR(-EOPNOTSUPP);
+}
+
+static inline void bpf_prog_put(struct bpf_prog *prog)
+{
+}
+#endif /* CONFIG_BPF_SYSCALL */
 
 /* verifier prototypes for helper functions called from eBPF programs */
-extern struct bpf_func_proto bpf_map_lookup_elem_proto;
-extern struct bpf_func_proto bpf_map_update_elem_proto;
-extern struct bpf_func_proto bpf_map_delete_elem_proto;
+extern const struct bpf_func_proto bpf_map_lookup_elem_proto;
+extern const struct bpf_func_proto bpf_map_update_elem_proto;
+extern const struct bpf_func_proto bpf_map_delete_elem_proto;
+
+extern const struct bpf_func_proto bpf_get_prandom_u32_proto;
+extern const struct bpf_func_proto bpf_get_smp_processor_id_proto;
 
 #endif /* _LINUX_BPF_H */
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 7ccd928cc1f2..ae2982c0f7a6 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -11,6 +11,7 @@
 #define PHY_ID_BCM5421                  0x002060e0
 #define PHY_ID_BCM5464                  0x002060b0
 #define PHY_ID_BCM5461                  0x002060c0
+#define PHY_ID_BCM54616S                0x03625d10
 #define PHY_ID_BCM57780                 0x03625d90
 
 #define PHY_ID_BCM7250                  0xae025280
@@ -19,6 +20,7 @@
 #define PHY_ID_BCM7425                  0x03625e60
 #define PHY_ID_BCM7429                  0x600d8730
 #define PHY_ID_BCM7439                  0x600d8480
+#define PHY_ID_BCM7439_2                0xae025080
 #define PHY_ID_BCM7445                  0x600d8510
 
 #define PHY_BCM_OUI_MASK                0xfffffc00
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index c05ff0f9f9a5..c3a9c8fc60fa 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -61,6 +61,8 @@ struct can_priv {
         char tx_led_trig_name[CAN_LED_NAME_SZ];
         struct led_trigger *rx_led_trig;
         char rx_led_trig_name[CAN_LED_NAME_SZ];
+        struct led_trigger *rxtx_led_trig;
+        char rxtx_led_trig_name[CAN_LED_NAME_SZ];
 #endif
 };
 
diff --git a/include/linux/can/led.h b/include/linux/can/led.h
index e0475c5cbb92..146de4506d21 100644
--- a/include/linux/can/led.h
+++ b/include/linux/can/led.h
@@ -21,8 +21,10 @@ enum can_led_event {
 
 #ifdef CONFIG_CAN_LEDS
 
-/* keep space for interface name + "-tx"/"-rx" suffix and null terminator */
-#define CAN_LED_NAME_SZ (IFNAMSIZ + 4)
+/* keep space for interface name + "-tx"/"-rx"/"-rxtx"
+ * suffix and null terminator
+ */
+#define CAN_LED_NAME_SZ (IFNAMSIZ + 6)
 
 void can_led_event(struct net_device *netdev, enum can_led_event event);
 void devm_can_led_init(struct net_device *netdev);
diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h
index cc00d15c6107..b6a52a4b457a 100644
--- a/include/linux/can/skb.h
+++ b/include/linux/can/skb.h
@@ -44,16 +44,11 @@ static inline void can_skb_reserve(struct sk_buff *skb)
         skb_reserve(skb, sizeof(struct can_skb_priv));
 }
 
-static inline void can_skb_destructor(struct sk_buff *skb)
-{
-        sock_put(skb->sk);
-}
-
 static inline void can_skb_set_owner(struct sk_buff *skb, struct sock *sk)
 {
         if (sk) {
                 sock_hold(sk);
-                skb->destructor = can_skb_destructor;
+                skb->destructor = sock_efree;
                 skb->sk = sk;
         }
 }
diff --git a/include/linux/capability.h b/include/linux/capability.h
index aa93e5ef594c..af9f0b9e80e6 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -205,6 +205,7 @@ static inline kernel_cap_t cap_raise_nfsd_set(const kernel_cap_t a,
                            cap_intersect(permitted, __cap_nfsd_set));
 }
 
+#ifdef CONFIG_MULTIUSER
 extern bool has_capability(struct task_struct *t, int cap);
 extern bool has_ns_capability(struct task_struct *t,
                               struct user_namespace *ns, int cap);
@@ -213,6 +214,34 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
                                       struct user_namespace *ns, int cap);
 extern bool capable(int cap);
 extern bool ns_capable(struct user_namespace *ns, int cap);
+#else
+static inline bool has_capability(struct task_struct *t, int cap)
+{
+        return true;
+}
+static inline bool has_ns_capability(struct task_struct *t,
+                              struct user_namespace *ns, int cap)
+{
+        return true;
+}
+static inline bool has_capability_noaudit(struct task_struct *t, int cap)
+{
+        return true;
+}
+static inline bool has_ns_capability_noaudit(struct task_struct *t,
+                                      struct user_namespace *ns, int cap)
+{
+        return true;
+}
+static inline bool capable(int cap)
+{
+        return true;
+}
+static inline bool ns_capable(struct user_namespace *ns, int cap)
+{
+        return true;
+}
+#endif /* CONFIG_MULTIUSER */
 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
 
diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h
index 71e05bbf8ceb..4763ad64e832 100644
--- a/include/linux/ceph/ceph_features.h
+++ b/include/linux/ceph/ceph_features.h
@@ -50,6 +50,19 @@
 #define CEPH_FEATURE_MDS_INLINE_DATA     (1ULL<<40)
 #define CEPH_FEATURE_CRUSH_TUNABLES3     (1ULL<<41)
 #define CEPH_FEATURE_OSD_PRIMARY_AFFINITY (1ULL<<41)  /* overlap w/ tunables3 */
+#define CEPH_FEATURE_MSGR_KEEPALIVE2   (1ULL<<42)
+#define CEPH_FEATURE_OSD_POOLRESEND    (1ULL<<43)
+#define CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 (1ULL<<44)
+#define CEPH_FEATURE_OSD_SET_ALLOC_HINT (1ULL<<45)
+#define CEPH_FEATURE_OSD_FADVISE_FLAGS (1ULL<<46)
+#define CEPH_FEATURE_OSD_REPOP         (1ULL<<46)   /* overlap with fadvise */
+#define CEPH_FEATURE_OSD_OBJECT_DIGEST  (1ULL<<46)  /* overlap with fadvise */
+#define CEPH_FEATURE_OSD_TRANSACTION_MAY_LAYOUT (1ULL<<46) /* overlap w/ fadvise */
+#define CEPH_FEATURE_MDS_QUOTA      (1ULL<<47)
+#define CEPH_FEATURE_CRUSH_V4      (1ULL<<48)  /* straw2 buckets */
+#define CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY (1ULL<<49)
+// duplicated since it was introduced at the same time as MIN_SIZE_RECOVERY
+#define CEPH_FEATURE_OSD_PROXY_FEATURES (1ULL<<49)  /* overlap w/ above */
 
 /*
  * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature
@@ -93,7 +106,8 @@ static inline u64 ceph_sanitize_features(u64 features)
          CEPH_FEATURE_EXPORT_PEER |             \
          CEPH_FEATURE_OSDMAP_ENC |              \
          CEPH_FEATURE_CRUSH_TUNABLES3 |         \
-         CEPH_FEATURE_OSD_PRIMARY_AFFINITY)
+         CEPH_FEATURE_OSD_PRIMARY_AFFINITY |    \
+         CEPH_FEATURE_CRUSH_V4)
 
 #define CEPH_FEATURES_REQUIRED_DEFAULT   \
         (CEPH_FEATURE_NOSRCADDR |        \
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index 31eb03d0c766..d7d072a25c27 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -323,6 +323,7 @@ enum {
         CEPH_MDS_OP_MKSNAP     = 0x01400,
         CEPH_MDS_OP_RMSNAP     = 0x01401,
         CEPH_MDS_OP_LSSNAP     = 0x00402,
+        CEPH_MDS_OP_RENAMESNAP = 0x01403,
 };
 
 extern const char *ceph_mds_op_name(int op);
diff --git a/include/linux/ceph/debugfs.h b/include/linux/ceph/debugfs.h
index 1df086d7882d..29cf897cc5cd 100644
--- a/include/linux/ceph/debugfs.h
+++ b/include/linux/ceph/debugfs.h
@@ -7,13 +7,7 @@
 #define CEPH_DEFINE_SHOW_FUNC(name)                                     \
 static int name##_open(struct inode *inode, struct file *file)          \
 {                                                                       \
-        struct seq_file *sf;                                            \
-        int ret;                                                        \
-                                                                        \
-        ret = single_open(file, name, NULL);                            \
-        sf = file->private_data;                                        \
-        sf->private = inode->i_private;                                 \
-        return ret;                                                     \
+        return single_open(file, name, inode->i_private);               \
 }                                                                       \
                                                                         \
 static const struct file_operations name##_fops = {                     \
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 16fff9608848..30f92cefaa72 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -135,6 +135,7 @@ struct ceph_client {
         struct dentry *debugfs_dir;
         struct dentry *debugfs_monmap;
         struct dentry *debugfs_osdmap;
+        struct dentry *debugfs_options;
 #endif
 };
 
@@ -191,6 +192,7 @@ extern struct ceph_options *ceph_parse_options(char *options,
                               const char *dev_name, const char *dev_name_end,
                               int (*parse_extra_token)(char *c, void *private),
                               void *private);
+int ceph_print_client_options(struct seq_file *m, struct ceph_client *client);
 extern void ceph_destroy_options(struct ceph_options *opt);
 extern int ceph_compare_options(struct ceph_options *new_opt,
                                 struct ceph_client *client);
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index 561ea896c657..e55c08bc3a96 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -175,13 +175,12 @@ static inline int ceph_decode_pgid(void **p, void *end, struct ceph_pg *pgid)
         __u8 version;
 
         if (!ceph_has_room(p, end, 1 + 8 + 4 + 4)) {
-                pr_warning("incomplete pg encoding");
-
+                pr_warn("incomplete pg encoding\n");
                 return -EINVAL;
         }
         version = ceph_decode_8(p);
         if (version > 1) {
-                pr_warning("do not understand pg encoding %d > 1",
+                pr_warn("do not understand pg encoding %d > 1\n",
                         (int)version);
                 return -EINVAL;
         }
diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
index 4ce9056b31a8..bda5ec0b4b4d 100644
--- a/include/linux/cleancache.h
+++ b/include/linux/cleancache.h
@@ -5,6 +5,10 @@
 #include <linux/exportfs.h>
 #include <linux/mm.h>
 
+#define CLEANCACHE_NO_POOL              -1
+#define CLEANCACHE_NO_BACKEND           -2
+#define CLEANCACHE_NO_BACKEND_SHARED    -3
+
 #define CLEANCACHE_KEY_MAX 6
 
 /*
@@ -33,10 +37,9 @@ struct cleancache_ops {
         void (*invalidate_fs)(int);
 };
 
-extern struct cleancache_ops *
-        cleancache_register_ops(struct cleancache_ops *ops);
+extern int cleancache_register_ops(struct cleancache_ops *ops);
 extern void __cleancache_init_fs(struct super_block *);
-extern void __cleancache_init_shared_fs(char *, struct super_block *);
+extern void __cleancache_init_shared_fs(struct super_block *);
 extern int  __cleancache_get_page(struct page *);
 extern void __cleancache_put_page(struct page *);
 extern void __cleancache_invalidate_page(struct address_space *, struct page *);
@@ -78,10 +81,10 @@ static inline void cleancache_init_fs(struct super_block *sb)
                 __cleancache_init_fs(sb);
 }
 
-static inline void cleancache_init_shared_fs(char *uuid, struct super_block *sb)
+static inline void cleancache_init_shared_fs(struct super_block *sb)
 {
         if (cleancache_enabled)
-                __cleancache_init_shared_fs(uuid, sb);
+                __cleancache_init_shared_fs(sb);
 }
 
 static inline int cleancache_get_page(struct page *page)
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 5591ea71a8d1..df695313f975 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -541,7 +541,7 @@ struct clk_gpio {
 
 extern const struct clk_ops clk_gpio_gate_ops;
 struct clk *clk_register_gpio_gate(struct device *dev, const char *name,
-                const char *parent_name, struct gpio_desc *gpio,
+                const char *parent_name, unsigned gpio, bool active_low,
                 unsigned long flags);
 
 void of_gpio_clk_gate_setup(struct device_node *node);
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 8381bbfbc308..68c16a6bedb3 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -125,6 +125,19 @@ int clk_set_phase(struct clk *clk, int degrees);
  */
 int clk_get_phase(struct clk *clk);
 
+/**
+ * clk_is_match - check if two clk's point to the same hardware clock
+ * @p: clk compared against q
+ * @q: clk compared against p
+ *
+ * Returns true if the two struct clk pointers both point to the same hardware
+ * clock node. Put differently, returns true if struct clk *p and struct clk *q
+ * share the same struct clk_core object.
+ *
+ * Returns false otherwise. Note that two NULL clks are treated as matching.
+ */
+bool clk_is_match(const struct clk *p, const struct clk *q);
+
 #else
 
 static inline long clk_get_accuracy(struct clk *clk)
@@ -142,6 +155,11 @@ static inline long clk_get_phase(struct clk *clk)
         return -ENOTSUPP;
 }
 
+static inline bool clk_is_match(const struct clk *p, const struct clk *q)
+{
+        return p == q;
+}
+
 #endif
 
 /**
diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h
index c8e3b3d1eded..7669f7618f39 100644
--- a/include/linux/clk/at91_pmc.h
+++ b/include/linux/clk/at91_pmc.h
@@ -20,10 +20,10 @@
 extern void __iomem *at91_pmc_base;
 
 #define at91_pmc_read(field) \
-        __raw_readl(at91_pmc_base + field)
+        readl_relaxed(at91_pmc_base + field)
 
 #define at91_pmc_write(field, value) \
-        __raw_writel(value, at91_pmc_base + field)
+        writel_relaxed(value, at91_pmc_base + field)
 #else
 .extern at91_pmc_base
 #endif
diff --git a/include/linux/clk/shmobile.h b/include/linux/clk/shmobile.h
index 9f8a14041dd5..63a8159c4e64 100644
--- a/include/linux/clk/shmobile.h
+++ b/include/linux/clk/shmobile.h
@@ -16,6 +16,7 @@
 
 #include <linux/types.h>
 
+void r8a7778_clocks_init(u32 mode);
 void r8a7779_clocks_init(u32 mode);
 void rcar_gen2_clocks_init(u32 mode);
 
diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h
index 67844003493d..79b76e13d904 100644
--- a/include/linux/clk/ti.h
+++ b/include/linux/clk/ti.h
@@ -215,14 +215,14 @@ struct ti_dt_clk {
                 .node_name = name,      \
         }
 
-/* Maximum number of clock memmaps */
-#define CLK_MAX_MEMMAPS                 4
-
 /* Static memmap indices */
 enum {
         TI_CLKM_CM = 0,
+        TI_CLKM_CM2,
         TI_CLKM_PRM,
         TI_CLKM_SCRM,
+        TI_CLKM_CTRL,
+        CLK_MAX_MEMMAPS
 };
 
 typedef void (*ti_of_clk_init_cb_t)(struct clk_hw *, struct device_node *);
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 2e4cb67f6e56..96c280b2c263 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -8,33 +8,19 @@
 #ifndef _LINUX_CLOCKCHIPS_H
 #define _LINUX_CLOCKCHIPS_H
 
-/* Clock event notification values */
-enum clock_event_nofitiers {
-        CLOCK_EVT_NOTIFY_ADD,
-        CLOCK_EVT_NOTIFY_BROADCAST_ON,
-        CLOCK_EVT_NOTIFY_BROADCAST_OFF,
-        CLOCK_EVT_NOTIFY_BROADCAST_FORCE,
-        CLOCK_EVT_NOTIFY_BROADCAST_ENTER,
-        CLOCK_EVT_NOTIFY_BROADCAST_EXIT,
-        CLOCK_EVT_NOTIFY_SUSPEND,
-        CLOCK_EVT_NOTIFY_RESUME,
-        CLOCK_EVT_NOTIFY_CPU_DYING,
-        CLOCK_EVT_NOTIFY_CPU_DEAD,
-};
-
-#ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD
+#ifdef CONFIG_GENERIC_CLOCKEVENTS
 
-#include <linux/clocksource.h>
-#include <linux/cpumask.h>
-#include <linux/ktime.h>
-#include <linux/notifier.h>
+# include <linux/clocksource.h>
+# include <linux/cpumask.h>
+# include <linux/ktime.h>
+# include <linux/notifier.h>
 
 struct clock_event_device;
 struct module;
 
-/* Clock event mode commands */
+/* Clock event mode commands for legacy ->set_mode(): OBSOLETE */
 enum clock_event_mode {
-        CLOCK_EVT_MODE_UNUSED = 0,
+        CLOCK_EVT_MODE_UNUSED,
         CLOCK_EVT_MODE_SHUTDOWN,
         CLOCK_EVT_MODE_PERIODIC,
         CLOCK_EVT_MODE_ONESHOT,
@@ -42,30 +28,49 @@ enum clock_event_mode {
 };
 
 /*
+ * Possible states of a clock event device.
+ *
+ * DETACHED:    Device is not used by clockevents core. Initial state or can be
+ *              reached from SHUTDOWN.
+ * SHUTDOWN:    Device is powered-off. Can be reached from PERIODIC or ONESHOT.
+ * PERIODIC:    Device is programmed to generate events periodically. Can be
+ *              reached from DETACHED or SHUTDOWN.
+ * ONESHOT:     Device is programmed to generate event only once. Can be reached
+ *              from DETACHED or SHUTDOWN.
+ */
+enum clock_event_state {
+        CLOCK_EVT_STATE_DETACHED,
+        CLOCK_EVT_STATE_SHUTDOWN,
+        CLOCK_EVT_STATE_PERIODIC,
+        CLOCK_EVT_STATE_ONESHOT,
+};
+
+/*
  * Clock event features
  */
-#define CLOCK_EVT_FEAT_PERIODIC         0x000001
-#define CLOCK_EVT_FEAT_ONESHOT          0x000002
-#define CLOCK_EVT_FEAT_KTIME            0x000004
+# define CLOCK_EVT_FEAT_PERIODIC        0x000001
+# define CLOCK_EVT_FEAT_ONESHOT         0x000002
+# define CLOCK_EVT_FEAT_KTIME           0x000004
+
 /*
- * x86(64) specific misfeatures:
+ * x86(64) specific (mis)features:
  *
  * - Clockevent source stops in C3 State and needs broadcast support.
  * - Local APIC timer is used as a dummy device.
  */
-#define CLOCK_EVT_FEAT_C3STOP           0x000008
-#define CLOCK_EVT_FEAT_DUMMY            0x000010
+# define CLOCK_EVT_FEAT_C3STOP          0x000008
+# define CLOCK_EVT_FEAT_DUMMY           0x000010
 
 /*
  * Core shall set the interrupt affinity dynamically in broadcast mode
  */
-#define CLOCK_EVT_FEAT_DYNIRQ           0x000020
-#define CLOCK_EVT_FEAT_PERCPU           0x000040
+# define CLOCK_EVT_FEAT_DYNIRQ          0x000020
+# define CLOCK_EVT_FEAT_PERCPU          0x000040
 
 /*
  * Clockevent device is based on a hrtimer for broadcast
  */
-#define CLOCK_EVT_FEAT_HRTIMER          0x000080
+# define CLOCK_EVT_FEAT_HRTIMER         0x000080
 
 /**
  * struct clock_event_device - clock event device descriptor
@@ -78,10 +83,15 @@ enum clock_event_mode {
  * @min_delta_ns:       minimum delta value in ns
  * @mult:               nanosecond to cycles multiplier
  * @shift:              nanoseconds to cycles divisor (power of two)
- * @mode:               operating mode assigned by the management code
+ * @mode:               operating mode, relevant only to ->set_mode(), OBSOLETE
+ * @state:              current state of the device, assigned by the core code
  * @features:           features
  * @retries:            number of forced programming retries
- * @set_mode:           set mode function
+ * @set_mode:           legacy set mode function, only for modes <= CLOCK_EVT_MODE_RESUME.
+ * @set_state_periodic: switch state to periodic, if !set_mode
+ * @set_state_oneshot:  switch state to oneshot, if !set_mode
+ * @set_state_shutdown: switch state to shutdown, if !set_mode
+ * @tick_resume:        resume clkevt device, if !set_mode
  * @broadcast:          function to broadcast events
  * @min_delta_ticks:    minimum delta value in ticks stored for reconfiguration
  * @max_delta_ticks:    maximum delta value in ticks stored for reconfiguration
@@ -95,22 +105,31 @@ enum clock_event_mode {
  */
 struct clock_event_device {
         void                    (*event_handler)(struct clock_event_device *);
-        int                     (*set_next_event)(unsigned long evt,
-                                                  struct clock_event_device *);
-        int                     (*set_next_ktime)(ktime_t expires,
-                                                  struct clock_event_device *);
+        int                     (*set_next_event)(unsigned long evt, struct clock_event_device *);
+        int                     (*set_next_ktime)(ktime_t expires, struct clock_event_device *);
         ktime_t                 next_event;
         u64                     max_delta_ns;
         u64                     min_delta_ns;
         u32                     mult;
         u32                     shift;
         enum clock_event_mode   mode;
+        enum clock_event_state  state;
         unsigned int            features;
         unsigned long           retries;
 
+        /*
+         * State transition callback(s): Only one of the two groups should be
+         * defined:
+         * - set_mode(), only for modes <= CLOCK_EVT_MODE_RESUME.
+         * - set_state_{shutdown|periodic|oneshot}(), tick_resume().
+         */
+        void                    (*set_mode)(enum clock_event_mode mode, struct clock_event_device *);
+        int                     (*set_state_periodic)(struct clock_event_device *);
+        int                     (*set_state_oneshot)(struct clock_event_device *);
+        int                     (*set_state_shutdown)(struct clock_event_device *);
+        int                     (*tick_resume)(struct clock_event_device *);
+
         void                    (*broadcast)(const struct cpumask *mask);
-        void                    (*set_mode)(enum clock_event_mode mode,
-                                            struct clock_event_device *);
         void                    (*suspend)(struct clock_event_device *);
         void                    (*resume)(struct clock_event_device *);
         unsigned long           min_delta_ticks;
@@ -136,18 +155,18 @@ struct clock_event_device {
  *
  * factor = (clock_ticks << shift) / nanoseconds
  */
-static inline unsigned long div_sc(unsigned long ticks, unsigned long nsec,
-                                   int shift)
+static inline unsigned long
+div_sc(unsigned long ticks, unsigned long nsec, int shift)
 {
-        uint64_t tmp = ((uint64_t)ticks) << shift;
+        u64 tmp = ((u64)ticks) << shift;
 
         do_div(tmp, nsec);
+
         return (unsigned long) tmp;
 }
 
 /* Clock event layer functions */
-extern u64 clockevent_delta2ns(unsigned long latch,
-                               struct clock_event_device *evt);
+extern u64 clockevent_delta2ns(unsigned long latch, struct clock_event_device *evt);
 extern void clockevents_register_device(struct clock_event_device *dev);
 extern int clockevents_unbind_device(struct clock_event_device *ced, int cpu);
 
@@ -158,57 +177,42 @@ extern void clockevents_config_and_register(struct clock_event_device *dev,
 
 extern int clockevents_update_freq(struct clock_event_device *ce, u32 freq);
 
-extern void clockevents_exchange_device(struct clock_event_device *old,
-                                        struct clock_event_device *new);
-extern void clockevents_set_mode(struct clock_event_device *dev,
-                                 enum clock_event_mode mode);
-extern int clockevents_program_event(struct clock_event_device *dev,
-                                     ktime_t expires, bool force);
-
-extern void clockevents_handle_noop(struct clock_event_device *dev);
-
 static inline void
 clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec)
 {
-        return clocks_calc_mult_shift(&ce->mult, &ce->shift, NSEC_PER_SEC,
-                                      freq, minsec);
+        return clocks_calc_mult_shift(&ce->mult, &ce->shift, NSEC_PER_SEC, freq, minsec);
 }
 
 extern void clockevents_suspend(void);
 extern void clockevents_resume(void);
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
-#ifdef CONFIG_ARCH_HAS_TICK_BROADCAST
+# ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
+#  ifdef CONFIG_ARCH_HAS_TICK_BROADCAST
 extern void tick_broadcast(const struct cpumask *mask);
-#else
-#define tick_broadcast  NULL
-#endif
+#  else
+#   define tick_broadcast       NULL
+#  endif
 extern int tick_receive_broadcast(void);
-#endif
+# endif
 
-#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)
+# if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)
 extern void tick_setup_hrtimer_broadcast(void);
 extern int tick_check_broadcast_expired(void);
-#else
+# else
 static inline int tick_check_broadcast_expired(void) { return 0; }
-static inline void tick_setup_hrtimer_broadcast(void) {};
-#endif
+static inline void tick_setup_hrtimer_broadcast(void) { }
+# endif
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
 extern int clockevents_notify(unsigned long reason, void *arg);
-#else
-static inline int clockevents_notify(unsigned long reason, void *arg) { return 0; }
-#endif
-
-#else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */
 
-static inline void clockevents_suspend(void) {}
-static inline void clockevents_resume(void) {}
+#else /* !CONFIG_GENERIC_CLOCKEVENTS: */
 
+static inline void clockevents_suspend(void) { }
+static inline void clockevents_resume(void) { }
 static inline int clockevents_notify(unsigned long reason, void *arg) { return 0; }
 static inline int tick_check_broadcast_expired(void) { return 0; }
-static inline void tick_setup_hrtimer_broadcast(void) {};
+static inline void tick_setup_hrtimer_broadcast(void) { }
 
-#endif
+#endif /* !CONFIG_GENERIC_CLOCKEVENTS */
 
-#endif
+#endif /* _LINUX_CLOCKCHIPS_H */
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 9c78d15d33e4..d27d0152271f 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -56,6 +56,7 @@ struct module;
  * @shift:              cycle to nanosecond divisor (power of two)
  * @max_idle_ns:        max idle time permitted by the clocksource (nsecs)
  * @maxadj:             maximum adjustment value to mult (~11%)
+ * @max_cycles:         maximum safe cycle value which won't overflow on multiplication
  * @flags:              flags describing special properties
  * @archdata:           arch-specific data
  * @suspend:            suspend function for the clocksource, if necessary
@@ -76,7 +77,7 @@ struct clocksource {
 #ifdef CONFIG_ARCH_CLOCKSOURCE_DATA
         struct arch_clocksource_data archdata;
 #endif
-
+        u64 max_cycles;
         const char *name;
         struct list_head list;
         int rating;
@@ -178,7 +179,6 @@ static inline s64 clocksource_cyc2ns(cycle_t cycles, u32 mult, u32 shift)
 }
 
 
-extern int clocksource_register(struct clocksource*);
 extern int clocksource_unregister(struct clocksource*);
 extern void clocksource_touch_watchdog(void);
 extern struct clocksource* clocksource_get_next(void);
@@ -189,7 +189,7 @@ extern struct clocksource * __init clocksource_default_clock(void);
 extern void clocksource_mark_unstable(struct clocksource *cs);
 
 extern u64
-clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask);
+clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask, u64 *max_cycles);
 extern void
 clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec);
 
@@ -200,7 +200,16 @@ clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec);
 extern int
 __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq);
 extern void
-__clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq);
+__clocksource_update_freq_scale(struct clocksource *cs, u32 scale, u32 freq);
+
+/*
+ * Don't call this unless you are a default clocksource
+ * (AKA: jiffies) and absolutely have to.
+ */
+static inline int __clocksource_register(struct clocksource *cs)
+{
+        return __clocksource_register_scale(cs, 1, 0);
+}
 
 static inline int clocksource_register_hz(struct clocksource *cs, u32 hz)
 {
@@ -212,14 +221,14 @@ static inline int clocksource_register_khz(struct clocksource *cs, u32 khz)
         return __clocksource_register_scale(cs, 1000, khz);
 }
 
-static inline void __clocksource_updatefreq_hz(struct clocksource *cs, u32 hz)
+static inline void __clocksource_update_freq_hz(struct clocksource *cs, u32 hz)
 {
-        __clocksource_updatefreq_scale(cs, 1, hz);
+        __clocksource_update_freq_scale(cs, 1, hz);
 }
 
-static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz)
+static inline void __clocksource_update_freq_khz(struct clocksource *cs, u32 khz)
 {
-        __clocksource_updatefreq_scale(cs, 1000, khz);
+        __clocksource_update_freq_scale(cs, 1000, khz);
 }
 
 
@@ -244,4 +253,10 @@ extern void clocksource_of_init(void);
 static inline void clocksource_of_init(void) {}
 #endif
 
+#ifdef CONFIG_ACPI
+void acpi_generic_timer_init(void);
+#else
+static inline void acpi_generic_timer_init(void) { }
+#endif
+
 #endif /* _LINUX_CLOCKSOURCE_H */
diff --git a/include/linux/cma.h b/include/linux/cma.h
index 9384ba66e975..f7ef093ec49a 100644
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -16,16 +16,16 @@
 struct cma;
 
 extern unsigned long totalcma_pages;
-extern phys_addr_t cma_get_base(struct cma *cma);
-extern unsigned long cma_get_size(struct cma *cma);
+extern phys_addr_t cma_get_base(const struct cma *cma);
+extern unsigned long cma_get_size(const struct cma *cma);
 
 extern int __init cma_declare_contiguous(phys_addr_t base,
                         phys_addr_t size, phys_addr_t limit,
                         phys_addr_t alignment, unsigned int order_per_bit,
                         bool fixed, struct cma **res_cma);
-extern int cma_init_reserved_mem(phys_addr_t base,
-                                        phys_addr_t size, int order_per_bit,
+extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,
+                                        unsigned int order_per_bit,
                                         struct cma **res_cma);
-extern struct page *cma_alloc(struct cma *cma, int count, unsigned int align);
-extern bool cma_release(struct cma *cma, struct page *pages, int count);
+extern struct page *cma_alloc(struct cma *cma, unsigned int count, unsigned int align);
+extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count);
 #endif
diff --git a/include/linux/compaction.h b/include/linux/compaction.h
index a014559e4a49..aa8f61cf3a19 100644
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
@@ -34,6 +34,7 @@ extern int sysctl_compaction_handler(struct ctl_table *table, int write,
 extern int sysctl_extfrag_threshold;
 extern int sysctl_extfrag_handler(struct ctl_table *table, int write,
                         void __user *buffer, size_t *length, loff_t *ppos);
+extern int sysctl_compact_unevictable_allowed;
 
 extern int fragmentation_index(struct zone *zone, unsigned int order);
 extern unsigned long try_to_compact_pages(gfp_t gfp_mask, unsigned int order,
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 1b45e4a0519b..0e41ca0e5927 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -192,29 +192,16 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 
 #include <uapi/linux/types.h>
 
-static __always_inline void data_access_exceeds_word_size(void)
-#ifdef __compiletime_warning
-__compiletime_warning("data access exceeds word size and won't be atomic")
-#endif
-;
-
-static __always_inline void data_access_exceeds_word_size(void)
-{
-}
-
 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
 {
         switch (size) {
         case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
         case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
         case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
-#ifdef CONFIG_64BIT
         case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
-#endif
         default:
                 barrier();
                 __builtin_memcpy((void *)res, (const void *)p, size);
-                data_access_exceeds_word_size();
                 barrier();
         }
 }
@@ -225,13 +212,10 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
         case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
         case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
         case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
-#ifdef CONFIG_64BIT
         case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
-#endif
         default:
                 barrier();
                 __builtin_memcpy((void *)p, (const void *)res, size);
-                data_access_exceeds_word_size();
                 barrier();
         }
 }
diff --git a/include/linux/console.h b/include/linux/console.h
index 7571a16bd653..9f50fb413c11 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -123,7 +123,7 @@ struct console {
         struct tty_driver *(*device)(struct console *, int *);
         void    (*unblank)(void);
         int     (*setup)(struct console *, char *);
-        int     (*early_setup)(void);
+        int     (*match)(struct console *, char *name, int idx, char *options);
         short   flags;
         short   index;
         int     cflag;
@@ -141,7 +141,6 @@ extern int console_set_on_cmdline;
 extern struct console *early_console;
 
 extern int add_preferred_console(char *name, int idx, char *options);
-extern int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options);
 extern void register_console(struct console *);
 extern int unregister_console(struct console *);
 extern struct console *console_drivers;
diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index 37b81bd51ec0..2821838256b4 100644
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -10,6 +10,8 @@
 #ifdef CONFIG_CONTEXT_TRACKING
 extern void context_tracking_cpu_set(int cpu);
 
+extern void context_tracking_enter(enum ctx_state state);
+extern void context_tracking_exit(enum ctx_state state);
 extern void context_tracking_user_enter(void);
 extern void context_tracking_user_exit(void);
 extern void __context_tracking_task_switch(struct task_struct *prev,
@@ -35,7 +37,8 @@ static inline enum ctx_state exception_enter(void)
                 return 0;
 
         prev_ctx = this_cpu_read(context_tracking.state);
-        context_tracking_user_exit();
+        if (prev_ctx != CONTEXT_KERNEL)
+                context_tracking_exit(prev_ctx);
 
         return prev_ctx;
 }
@@ -43,8 +46,8 @@ static inline enum ctx_state exception_enter(void)
 static inline void exception_exit(enum ctx_state prev_ctx)
 {
         if (context_tracking_is_enabled()) {
-                if (prev_ctx == IN_USER)
-                        context_tracking_user_enter();
+                if (prev_ctx != CONTEXT_KERNEL)
+                        context_tracking_enter(prev_ctx);
         }
 }
 
@@ -78,10 +81,16 @@ static inline void guest_enter(void)
                 vtime_guest_enter(current);
         else
                 current->flags |= PF_VCPU;
+
+        if (context_tracking_is_enabled())
+                context_tracking_enter(CONTEXT_GUEST);
 }
 
 static inline void guest_exit(void)
 {
+        if (context_tracking_is_enabled())
+                context_tracking_exit(CONTEXT_GUEST);
+
         if (vtime_accounting_enabled())
                 vtime_guest_exit(current);
         else
diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h
index 97a81225d037..6b7b96a32b75 100644
--- a/include/linux/context_tracking_state.h
+++ b/include/linux/context_tracking_state.h
@@ -13,8 +13,9 @@ struct context_tracking {
          */
         bool active;
         enum ctx_state {
-                IN_KERNEL = 0,
-                IN_USER,
+                CONTEXT_KERNEL = 0,
+                CONTEXT_USER,
+                CONTEXT_GUEST,
         } state;
 };
 
@@ -34,11 +35,13 @@ static inline bool context_tracking_cpu_is_enabled(void)
 
 static inline bool context_tracking_in_user(void)
 {
-        return __this_cpu_read(context_tracking.state) == IN_USER;
+        return __this_cpu_read(context_tracking.state) == CONTEXT_USER;
 }
 #else
 static inline bool context_tracking_in_user(void) { return false; }
 static inline bool context_tracking_active(void) { return false; }
+static inline bool context_tracking_is_enabled(void) { return false; }
+static inline bool context_tracking_cpu_is_enabled(void) { return false; }
 #endif /* CONFIG_CONTEXT_TRACKING */
 
 #endif
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 4260e8594bd7..c0fb6b1b4712 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -73,6 +73,7 @@ enum {
         /* migration should happen before other stuff but after perf */
         CPU_PRI_PERF            = 20,
         CPU_PRI_MIGRATION       = 10,
+        CPU_PRI_SMPBOOT         = 9,
         /* bring up workqueues before normal notifiers and down after */
         CPU_PRI_WORKQUEUE_UP    = 5,
         CPU_PRI_WORKQUEUE_DOWN  = -5,
@@ -95,6 +96,10 @@ enum {
                                         * Called on the new cpu, just before
                                         * enabling interrupts. Must not sleep,
                                         * must not fail */
+#define CPU_DYING_IDLE          0x000B /* CPU (unsigned)v dying, reached
+                                        * idle loop. */
+#define CPU_BROKEN              0x000C /* CPU (unsigned)v did not die properly,
+                                        * perhaps due to preemption. */
 
 /* Used for CPU hotplug events occurring while tasks are frozen due to a suspend
  * operation in progress
@@ -161,6 +166,7 @@ static inline void __unregister_cpu_notifier(struct notifier_block *nb)
 }
 #endif
 
+void smpboot_thread_init(void);
 int cpu_up(unsigned int cpu);
 void notify_cpu_starting(unsigned int cpu);
 extern void cpu_maps_update_begin(void);
@@ -208,6 +214,10 @@ static inline void cpu_notifier_register_done(void)
 {
 }
 
+static inline void smpboot_thread_init(void)
+{
+}
+
 #endif /* CONFIG_SMP */
 extern struct bus_type cpu_subsys;
 
@@ -271,4 +281,14 @@ void arch_cpu_idle_enter(void);
 void arch_cpu_idle_exit(void);
 void arch_cpu_idle_dead(void);
 
+DECLARE_PER_CPU(bool, cpu_dead_idle);
+
+int cpu_report_state(int cpu);
+int cpu_check_up_prepare(int cpu);
+void cpu_set_state_online(int cpu);
+#ifdef CONFIG_HOTPLUG_CPU
+bool cpu_wait_death(unsigned int cpu, int seconds);
+bool cpu_report_death(void);
+#endif /* #ifdef CONFIG_HOTPLUG_CPU */
+
 #endif /* _LINUX_CPU_H_ */
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index f551a9299ac9..9c5e89254796 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -77,7 +77,6 @@ struct cpuidle_device {
         unsigned int            cpu;
 
         int                     last_residency;
-        int                     state_count;
         struct cpuidle_state_usage      states_usage[CPUIDLE_STATE_MAX];
         struct cpuidle_state_kobj *kobjs[CPUIDLE_STATE_MAX];
         struct cpuidle_driver_kobj *kobj_driver;
@@ -126,6 +125,8 @@ struct cpuidle_driver {
 
 #ifdef CONFIG_CPU_IDLE
 extern void disable_cpuidle(void);
+extern bool cpuidle_not_available(struct cpuidle_driver *drv,
+                                  struct cpuidle_device *dev);
 
 extern int cpuidle_select(struct cpuidle_driver *drv,
                           struct cpuidle_device *dev);
@@ -150,11 +151,17 @@ extern void cpuidle_resume(void);
 extern int cpuidle_enable_device(struct cpuidle_device *dev);
 extern void cpuidle_disable_device(struct cpuidle_device *dev);
 extern int cpuidle_play_dead(void);
-extern void cpuidle_enter_freeze(void);
+extern int cpuidle_find_deepest_state(struct cpuidle_driver *drv,
+                                      struct cpuidle_device *dev);
+extern int cpuidle_enter_freeze(struct cpuidle_driver *drv,
+                                struct cpuidle_device *dev);
 
 extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev);
 #else
 static inline void disable_cpuidle(void) { }
+static inline bool cpuidle_not_available(struct cpuidle_driver *drv,
+                                         struct cpuidle_device *dev)
+{return true; }
 static inline int cpuidle_select(struct cpuidle_driver *drv,
                                  struct cpuidle_device *dev)
 {return -ENODEV; }
@@ -183,7 +190,12 @@ static inline int cpuidle_enable_device(struct cpuidle_device *dev)
 {return -ENODEV; }
 static inline void cpuidle_disable_device(struct cpuidle_device *dev) { }
 static inline int cpuidle_play_dead(void) {return -ENODEV; }
-static inline void cpuidle_enter_freeze(void) { }
+static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv,
+                                             struct cpuidle_device *dev)
+{return -ENODEV; }
+static inline int cpuidle_enter_freeze(struct cpuidle_driver *drv,
+                                       struct cpuidle_device *dev)
+{return -ENODEV; }
 static inline struct cpuidle_driver *cpuidle_get_cpu_driver(
         struct cpuidle_device *dev) {return NULL; }
 #endif
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 086549a665e2..27e285b92b5f 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -11,6 +11,7 @@
 #include <linux/bitmap.h>
 #include <linux/bug.h>
 
+/* Don't assign or return these: may not be this big! */
 typedef struct cpumask { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t;
 
 /**
@@ -289,11 +290,11 @@ static inline void cpumask_clear_cpu(int cpu, struct cpumask *dstp)
  * @cpumask: the cpumask pointer
  *
  * Returns 1 if @cpu is set in @cpumask, else returns 0
- *
- * No static inline type checking - see Subtlety (1) above.
  */
-#define cpumask_test_cpu(cpu, cpumask) \
-        test_bit(cpumask_check(cpu), cpumask_bits((cpumask)))
+static inline int cpumask_test_cpu(int cpu, const struct cpumask *cpumask)
+{
+        return test_bit(cpumask_check(cpu), cpumask_bits((cpumask)));
+}
 
 /**
  * cpumask_test_and_set_cpu - atomically test and set a cpu in a cpumask
@@ -609,9 +610,7 @@ static inline int cpulist_parse(const char *buf, struct cpumask *dstp)
  */
 static inline size_t cpumask_size(void)
 {
-        /* FIXME: Once all cpumask assignments are eliminated, this
-         * can be nr_cpumask_bits */
-        return BITS_TO_LONGS(NR_CPUS) * sizeof(long);
+        return BITS_TO_LONGS(nr_cpumask_bits) * sizeof(long);
 }
 
 /*
@@ -768,7 +767,7 @@ static inline const struct cpumask *get_cpu_mask(unsigned int cpu)
 #if NR_CPUS <= BITS_PER_LONG
 #define CPU_BITS_ALL                                            \
 {                                                               \
-        [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD \
+        [BITS_TO_LONGS(NR_CPUS)-1] = BITMAP_LAST_WORD_MASK(NR_CPUS)     \
 }
 
 #else /* NR_CPUS > BITS_PER_LONG */
@@ -776,7 +775,7 @@ static inline const struct cpumask *get_cpu_mask(unsigned int cpu)
 #define CPU_BITS_ALL                                            \
 {                                                               \
         [0 ... BITS_TO_LONGS(NR_CPUS)-2] = ~0UL,                \
-        [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD         \
+        [BITS_TO_LONGS(NR_CPUS)-1] = BITMAP_LAST_WORD_MASK(NR_CPUS)     \
 }
 #endif /* NR_CPUS > BITS_PER_LONG */
 
@@ -797,32 +796,18 @@ cpumap_print_to_pagebuf(bool list, char *buf, const struct cpumask *mask)
                                       nr_cpu_ids);
 }
 
-/*
- *
- * From here down, all obsolete.  Use cpumask_ variants!
- *
- */
-#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
-#define cpumask_of_cpu(cpu) (*get_cpu_mask(cpu))
-
-#define CPU_MASK_LAST_WORD BITMAP_LAST_WORD_MASK(NR_CPUS)
-
 #if NR_CPUS <= BITS_PER_LONG
-
 #define CPU_MASK_ALL                                                    \
 (cpumask_t) { {                                                         \
-        [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD                 \
+        [BITS_TO_LONGS(NR_CPUS)-1] = BITMAP_LAST_WORD_MASK(NR_CPUS)     \
 } }
-
 #else
-
 #define CPU_MASK_ALL                                                    \
 (cpumask_t) { {                                                         \
         [0 ... BITS_TO_LONGS(NR_CPUS)-2] = ~0UL,                        \
-        [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD                 \
+        [BITS_TO_LONGS(NR_CPUS)-1] = BITMAP_LAST_WORD_MASK(NR_CPUS)     \
 } }
-
-#endif
+#endif /* NR_CPUS > BITS_PER_LONG */
 
 #define CPU_MASK_NONE                                                   \
 (cpumask_t) { {                                                         \
@@ -834,143 +819,4 @@ cpumap_print_to_pagebuf(bool list, char *buf, const struct cpumask *mask)
         [0] =  1UL                                                      \
 } }
 
-#if NR_CPUS == 1
-#define first_cpu(src)          ({ (void)(src); 0; })
-#define next_cpu(n, src)        ({ (void)(src); 1; })
-#define any_online_cpu(mask)    0
-#define for_each_cpu_mask(cpu, mask)    \
-        for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
-#else /* NR_CPUS > 1 */
-int __first_cpu(const cpumask_t *srcp);
-int __next_cpu(int n, const cpumask_t *srcp);
-
-#define first_cpu(src)          __first_cpu(&(src))
-#define next_cpu(n, src)        __next_cpu((n), &(src))
-#define any_online_cpu(mask) cpumask_any_and(&mask, cpu_online_mask)
-#define for_each_cpu_mask(cpu, mask)                    \
-        for ((cpu) = -1;                                \
-                (cpu) = next_cpu((cpu), (mask)),        \
-                (cpu) < NR_CPUS; )
-#endif /* SMP */
-
-#if NR_CPUS <= 64
-
-#define for_each_cpu_mask_nr(cpu, mask) for_each_cpu_mask(cpu, mask)
-
-#else /* NR_CPUS > 64 */
-
-int __next_cpu_nr(int n, const cpumask_t *srcp);
-#define for_each_cpu_mask_nr(cpu, mask)                 \
-        for ((cpu) = -1;                                \
-                (cpu) = __next_cpu_nr((cpu), &(mask)),  \
-                (cpu) < nr_cpu_ids; )
-
-#endif /* NR_CPUS > 64 */
-
-#define cpus_addr(src) ((src).bits)
-
-#define cpu_set(cpu, dst) __cpu_set((cpu), &(dst))
-static inline void __cpu_set(int cpu, volatile cpumask_t *dstp)
-{
-        set_bit(cpu, dstp->bits);
-}
-
-#define cpu_clear(cpu, dst) __cpu_clear((cpu), &(dst))
-static inline void __cpu_clear(int cpu, volatile cpumask_t *dstp)
-{
-        clear_bit(cpu, dstp->bits);
-}
-
-#define cpus_setall(dst) __cpus_setall(&(dst), NR_CPUS)
-static inline void __cpus_setall(cpumask_t *dstp, unsigned int nbits)
-{
-        bitmap_fill(dstp->bits, nbits);
-}
-
-#define cpus_clear(dst) __cpus_clear(&(dst), NR_CPUS)
-static inline void __cpus_clear(cpumask_t *dstp, unsigned int nbits)
-{
-        bitmap_zero(dstp->bits, nbits);
-}
-
-/* No static inline type checking - see Subtlety (1) above. */
-#define cpu_isset(cpu, cpumask) test_bit((cpu), (cpumask).bits)
-
-#define cpu_test_and_set(cpu, cpumask) __cpu_test_and_set((cpu), &(cpumask))
-static inline int __cpu_test_and_set(int cpu, cpumask_t *addr)
-{
-        return test_and_set_bit(cpu, addr->bits);
-}
-
-#define cpus_and(dst, src1, src2) __cpus_and(&(dst), &(src1), &(src2), NR_CPUS)
-static inline int __cpus_and(cpumask_t *dstp, const cpumask_t *src1p,
-                                        const cpumask_t *src2p, unsigned int nbits)
-{
-        return bitmap_and(dstp->bits, src1p->bits, src2p->bits, nbits);
-}
-
-#define cpus_or(dst, src1, src2) __cpus_or(&(dst), &(src1), &(src2), NR_CPUS)
-static inline void __cpus_or(cpumask_t *dstp, const cpumask_t *src1p,
-                                        const cpumask_t *src2p, unsigned int nbits)
-{
-        bitmap_or(dstp->bits, src1p->bits, src2p->bits, nbits);
-}
-
-#define cpus_xor(dst, src1, src2) __cpus_xor(&(dst), &(src1), &(src2), NR_CPUS)
-static inline void __cpus_xor(cpumask_t *dstp, const cpumask_t *src1p,
-                                        const cpumask_t *src2p, unsigned int nbits)
-{
-        bitmap_xor(dstp->bits, src1p->bits, src2p->bits, nbits);
-}
-
-#define cpus_andnot(dst, src1, src2) \
-                                __cpus_andnot(&(dst), &(src1), &(src2), NR_CPUS)
-static inline int __cpus_andnot(cpumask_t *dstp, const cpumask_t *src1p,
-                                        const cpumask_t *src2p, unsigned int nbits)
-{
-        return bitmap_andnot(dstp->bits, src1p->bits, src2p->bits, nbits);
-}
-
-#define cpus_equal(src1, src2) __cpus_equal(&(src1), &(src2), NR_CPUS)
-static inline int __cpus_equal(const cpumask_t *src1p,
-                                        const cpumask_t *src2p, unsigned int nbits)
-{
-        return bitmap_equal(src1p->bits, src2p->bits, nbits);
-}
-
-#define cpus_intersects(src1, src2) __cpus_intersects(&(src1), &(src2), NR_CPUS)
-static inline int __cpus_intersects(const cpumask_t *src1p,
-                                        const cpumask_t *src2p, unsigned int nbits)
-{
-        return bitmap_intersects(src1p->bits, src2p->bits, nbits);
-}
-
-#define cpus_subset(src1, src2) __cpus_subset(&(src1), &(src2), NR_CPUS)
-static inline int __cpus_subset(const cpumask_t *src1p,
-                                        const cpumask_t *src2p, unsigned int nbits)
-{
-        return bitmap_subset(src1p->bits, src2p->bits, nbits);
-}
-
-#define cpus_empty(src) __cpus_empty(&(src), NR_CPUS)
-static inline int __cpus_empty(const cpumask_t *srcp, unsigned int nbits)
-{
-        return bitmap_empty(srcp->bits, nbits);
-}
-
-#define cpus_weight(cpumask) __cpus_weight(&(cpumask), NR_CPUS)
-static inline int __cpus_weight(const cpumask_t *srcp, unsigned int nbits)
-{
-        return bitmap_weight(srcp->bits, nbits);
-}
-
-#define cpus_shift_left(dst, src, n) \
-                        __cpus_shift_left(&(dst), &(src), (n), NR_CPUS)
-static inline void __cpus_shift_left(cpumask_t *dstp,
-                                        const cpumask_t *srcp, int n, int nbits)
-{
-        bitmap_shift_left(dstp->bits, srcp->bits, n, nbits);
-}
-#endif /* !CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS */
-
 #endif /* __LINUX_CPUMASK_H */
diff --git a/include/linux/cred.h b/include/linux/cred.h
index 2fb2ca2127ed..8b6c083e68a7 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -62,9 +62,27 @@ do {							\
                 groups_free(group_info);                \
 } while (0)
 
-extern struct group_info *groups_alloc(int);
 extern struct group_info init_groups;
+#ifdef CONFIG_MULTIUSER
+extern struct group_info *groups_alloc(int);
 extern void groups_free(struct group_info *);
+
+extern int in_group_p(kgid_t);
+extern int in_egroup_p(kgid_t);
+#else
+static inline void groups_free(struct group_info *group_info)
+{
+}
+
+static inline int in_group_p(kgid_t grp)
+{
+        return 1;
+}
+static inline int in_egroup_p(kgid_t grp)
+{
+        return 1;
+}
+#endif
 extern int set_current_groups(struct group_info *);
 extern void set_groups(struct cred *, struct group_info *);
 extern int groups_search(const struct group_info *, kgid_t);
@@ -74,9 +92,6 @@ extern bool may_setgroups(void);
 #define GROUP_AT(gi, i) \
         ((gi)->blocks[(i) / NGROUPS_PER_BLOCK][(i) % NGROUPS_PER_BLOCK])
 
-extern int in_group_p(kgid_t);
-extern int in_egroup_p(kgid_t);
-
 /*
  * The security context of a task
  *
diff --git a/include/linux/crush/crush.h b/include/linux/crush/crush.h
index 4fad5f8ee01d..48a1a7d100f1 100644
--- a/include/linux/crush/crush.h
+++ b/include/linux/crush/crush.h
@@ -96,13 +96,15 @@ struct crush_rule {
  *  uniform         O(1)       poor         poor
  *  list            O(n)       optimal      poor
  *  tree            O(log n)   good         good
- *  straw           O(n)       optimal      optimal
+ *  straw           O(n)       better       better
+ *  straw2          O(n)       optimal      optimal
  */
 enum {
         CRUSH_BUCKET_UNIFORM = 1,
         CRUSH_BUCKET_LIST = 2,
         CRUSH_BUCKET_TREE = 3,
-        CRUSH_BUCKET_STRAW = 4
+        CRUSH_BUCKET_STRAW = 4,
+        CRUSH_BUCKET_STRAW2 = 5,
 };
 extern const char *crush_bucket_alg_name(int alg);
 
@@ -149,6 +151,11 @@ struct crush_bucket_straw {
         __u32 *straws;         /* 16-bit fixed point */
 };
 
+struct crush_bucket_straw2 {
+        struct crush_bucket h;
+        __u32 *item_weights;   /* 16-bit fixed point */
+};
+
 
 
 /*
@@ -189,6 +196,7 @@ extern void crush_destroy_bucket_uniform(struct crush_bucket_uniform *b);
 extern void crush_destroy_bucket_list(struct crush_bucket_list *b);
 extern void crush_destroy_bucket_tree(struct crush_bucket_tree *b);
 extern void crush_destroy_bucket_straw(struct crush_bucket_straw *b);
+extern void crush_destroy_bucket_straw2(struct crush_bucket_straw2 *b);
 extern void crush_destroy_bucket(struct crush_bucket *b);
 extern void crush_destroy_rule(struct crush_rule *r);
 extern void crush_destroy(struct crush_map *map);
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index fb5ef16d6a12..10df5d2d093a 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -95,6 +95,12 @@
 #define CRYPTO_ALG_KERN_DRIVER_ONLY     0x00001000
 
 /*
+ * Mark a cipher as a service implementation only usable by another
+ * cipher and never by a normal user of the kernel crypto API
+ */
+#define CRYPTO_ALG_INTERNAL             0x00002000
+
+/*
  * Transform masks and values (for crt_flags).
  */
 #define CRYPTO_TFM_REQ_MASK             0x000fff00
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index d8358799c594..df334cbacc6d 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -404,26 +404,11 @@ static inline bool d_mountpoint(const struct dentry *dentry)
 /*
  * Directory cache entry type accessor functions.
  */
-static inline void __d_set_type(struct dentry *dentry, unsigned type)
-{
-        dentry->d_flags = (dentry->d_flags & ~DCACHE_ENTRY_TYPE) | type;
-}
-
-static inline void __d_clear_type(struct dentry *dentry)
-{
-        __d_set_type(dentry, DCACHE_MISS_TYPE);
-}
-
-static inline void d_set_type(struct dentry *dentry, unsigned type)
-{
-        spin_lock(&dentry->d_lock);
-        __d_set_type(dentry, type);
-        spin_unlock(&dentry->d_lock);
-}
-
 static inline unsigned __d_entry_type(const struct dentry *dentry)
 {
-        return dentry->d_flags & DCACHE_ENTRY_TYPE;
+        unsigned type = READ_ONCE(dentry->d_flags);
+        smp_rmb();
+        return type & DCACHE_ENTRY_TYPE;
 }
 
 static inline bool d_is_miss(const struct dentry *dentry)
@@ -482,6 +467,44 @@ static inline bool d_is_positive(const struct dentry *dentry)
         return !d_is_negative(dentry);
 }
 
+/**
+ * d_really_is_negative - Determine if a dentry is really negative (ignoring fallthroughs)
+ * @dentry: The dentry in question
+ *
+ * Returns true if the dentry represents either an absent name or a name that
+ * doesn't map to an inode (ie. ->d_inode is NULL).  The dentry could represent
+ * a true miss, a whiteout that isn't represented by a 0,0 chardev or a
+ * fallthrough marker in an opaque directory.
+ *
+ * Note!  (1) This should be used *only* by a filesystem to examine its own
+ * dentries.  It should not be used to look at some other filesystem's
+ * dentries.  (2) It should also be used in combination with d_inode() to get
+ * the inode.  (3) The dentry may have something attached to ->d_lower and the
+ * type field of the flags may be set to something other than miss or whiteout.
+ */
+static inline bool d_really_is_negative(const struct dentry *dentry)
+{
+        return dentry->d_inode == NULL;
+}
+
+/**
+ * d_really_is_positive - Determine if a dentry is really positive (ignoring fallthroughs)
+ * @dentry: The dentry in question
+ *
+ * Returns true if the dentry represents a name that maps to an inode
+ * (ie. ->d_inode is not NULL).  The dentry might still represent a whiteout if
+ * that is represented on medium as a 0,0 chardev.
+ *
+ * Note!  (1) This should be used *only* by a filesystem to examine its own
+ * dentries.  It should not be used to look at some other filesystem's
+ * dentries.  (2) It should also be used in combination with d_inode() to get
+ * the inode.
+ */
+static inline bool d_really_is_positive(const struct dentry *dentry)
+{
+        return dentry->d_inode != NULL;
+}
+
 extern void d_set_fallthru(struct dentry *dentry);
 
 static inline bool d_is_fallthru(const struct dentry *dentry)
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 439ff698000a..221025423e6c 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -43,6 +43,7 @@ enum dccp_state {
         DCCP_CLOSING         = TCP_CLOSING,
         DCCP_TIME_WAIT       = TCP_TIME_WAIT,
         DCCP_CLOSED          = TCP_CLOSE,
+        DCCP_NEW_SYN_RECV    = TCP_NEW_SYN_RECV,
         DCCP_PARTOPEN        = TCP_MAX_STATES,
         DCCP_PASSIVE_CLOSEREQ,                  /* clients receiving CloseReq */
         DCCP_MAX_STATES
@@ -57,6 +58,7 @@ enum {
         DCCPF_CLOSING         = TCPF_CLOSING,
         DCCPF_TIME_WAIT       = TCPF_TIME_WAIT,
         DCCPF_CLOSED          = TCPF_CLOSE,
+        DCCPF_NEW_SYN_RECV    = TCPF_NEW_SYN_RECV,
         DCCPF_PARTOPEN        = (1 << DCCP_PARTOPEN),
 };
 
@@ -317,6 +319,6 @@ static inline const char *dccp_role(const struct sock *sk)
         return NULL;
 }
 
-extern void dccp_syn_ack_timeout(struct sock *sk, struct request_sock *req);
+extern void dccp_syn_ack_timeout(const struct request_sock *req);
 
 #endif /* _LINUX_DCCP_H */
diff --git a/include/linux/devfreq-event.h b/include/linux/devfreq-event.h
index 602fbbfcfeed..0a83a1e648b0 100644
--- a/include/linux/devfreq-event.h
+++ b/include/linux/devfreq-event.h
@@ -91,7 +91,7 @@ struct devfreq_event_desc {
         const char *name;
         void *driver_data;
 
-        struct devfreq_event_ops *ops;
+        const struct devfreq_event_ops *ops;
 };
 
 #if defined(CONFIG_PM_DEVFREQ_EVENT)
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 2646aed1d3fe..51cc1deb7af3 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -375,6 +375,7 @@ int dm_create(int minor, struct mapped_device **md);
  */
 struct mapped_device *dm_get_md(dev_t dev);
 void dm_get(struct mapped_device *md);
+int dm_hold(struct mapped_device *md);
 void dm_put(struct mapped_device *md);
 
 /*
@@ -604,9 +605,4 @@ static inline unsigned long to_bytes(sector_t n)
         return (n << SECTOR_SHIFT);
 }
 
-/*-----------------------------------------------------------------
- * Helper for block layer and dm core operations
- *---------------------------------------------------------------*/
-int dm_underlying_device_busy(struct request_queue *q);
-
 #endif  /* _LINUX_DEVICE_MAPPER_H */
diff --git a/include/linux/device.h b/include/linux/device.h
index 0eb8ee2dc6d1..6558af90c8fe 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -38,6 +38,7 @@ struct class;
 struct subsys_private;
 struct bus_type;
 struct device_node;
+struct fwnode_handle;
 struct iommu_ops;
 struct iommu_group;
 
@@ -650,14 +651,6 @@ struct device_dma_parameters {
         unsigned long segment_boundary_mask;
 };
 
-struct acpi_device;
-
-struct acpi_dev_node {
-#ifdef CONFIG_ACPI
-        struct acpi_device *companion;
-#endif
-};
-
 /**
  * struct device - The basic device structure
  * @parent:     The device's "parent" device, the device to which it is attached.
@@ -703,7 +696,7 @@ struct acpi_dev_node {
  * @cma_area:   Contiguous memory area for dma allocations
  * @archdata:   For arch-specific additions.
  * @of_node:    Associated device tree node.
- * @acpi_node:  Associated ACPI device node.
+ * @fwnode:     Associated device node supplied by platform firmware.
  * @devt:       For creating the sysfs "dev".
  * @id:         device instance
  * @devres_lock: Spinlock to protect the resource of the device.
@@ -779,7 +772,7 @@ struct device {
         struct dev_archdata     archdata;
 
         struct device_node      *of_node; /* associated device tree node */
-        struct acpi_dev_node    acpi_node; /* associated ACPI device node */
+        struct fwnode_handle    *fwnode; /* firmware device node */
 
         dev_t                   devt;   /* dev_t, creates the sysfs "dev" */
         u32                     id;     /* device instance */
@@ -916,6 +909,13 @@ static inline void device_lock_assert(struct device *dev)
         lockdep_assert_held(&dev->mutex);
 }
 
+static inline struct device_node *dev_of_node(struct device *dev)
+{
+        if (!IS_ENABLED(CONFIG_OF))
+                return NULL;
+        return dev->of_node;
+}
+
 void driver_init(void);
 
 /*
@@ -947,6 +947,9 @@ extern void unlock_device_hotplug(void);
 extern int lock_device_hotplug_sysfs(void);
 extern int device_offline(struct device *dev);
 extern int device_online(struct device *dev);
+extern void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode);
+extern void set_secondary_fwnode(struct device *dev, struct fwnode_handle *fwnode);
+
 /*
  * Root device objects for grouping under /sys/devices
  */
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 694e1fe1c4b4..2f0b431b73e0 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -163,6 +163,33 @@ struct dma_buf_attachment {
 };
 
 /**
+ * struct dma_buf_export_info - holds information needed to export a dma_buf
+ * @exp_name:   name of the exporting module - useful for debugging.
+ * @ops:        Attach allocator-defined dma buf ops to the new buffer
+ * @size:       Size of the buffer
+ * @flags:      mode flags for the file
+ * @resv:       reservation-object, NULL to allocate default one
+ * @priv:       Attach private data of allocator to this buffer
+ *
+ * This structure holds the information required to export the buffer. Used
+ * with dma_buf_export() only.
+ */
+struct dma_buf_export_info {
+        const char *exp_name;
+        const struct dma_buf_ops *ops;
+        size_t size;
+        int flags;
+        struct reservation_object *resv;
+        void *priv;
+};
+
+/**
+ * helper macro for exporters; zeros and fills in most common values
+ */
+#define DEFINE_DMA_BUF_EXPORT_INFO(a)   \
+        struct dma_buf_export_info a = { .exp_name = KBUILD_MODNAME }
+
+/**
  * get_dma_buf - convenience wrapper for get_file.
  * @dmabuf:     [in]    pointer to dma_buf
  *
@@ -181,12 +208,7 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
 void dma_buf_detach(struct dma_buf *dmabuf,
                                 struct dma_buf_attachment *dmabuf_attach);
 
-struct dma_buf *dma_buf_export_named(void *priv, const struct dma_buf_ops *ops,
-                               size_t size, int flags, const char *,
-                               struct reservation_object *);
-
-#define dma_buf_export(priv, ops, size, flags, resv)    \
-        dma_buf_export_named(priv, ops, size, flags, KBUILD_MODNAME, resv)
+struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info);
 
 int dma_buf_fd(struct dma_buf *dmabuf, int flags);
 struct dma_buf *dma_buf_get(int fd);
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index c3007cb4bfa6..ac07ff090919 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -34,6 +34,10 @@ struct dma_map_ops {
         void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
                            size_t size, enum dma_data_direction dir,
                            struct dma_attrs *attrs);
+        /*
+         * map_sg returns 0 on error and a value > 0 on success.
+         * It should never return a value < 0.
+         */
         int (*map_sg)(struct device *dev, struct scatterlist *sg,
                       int nents, enum dma_data_direction dir,
                       struct dma_attrs *attrs);
diff --git a/include/linux/dma/hsu.h b/include/linux/dma/hsu.h
new file mode 100644
index 000000000000..234393a6997b
--- /dev/null
+++ b/include/linux/dma/hsu.h
@@ -0,0 +1,48 @@
+/*
+ * Driver for the High Speed UART DMA
+ *
+ * Copyright (C) 2015 Intel Corporation
+ *
+ * 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 _DMA_HSU_H
+#define _DMA_HSU_H
+
+#include <linux/device.h>
+#include <linux/interrupt.h>
+
+#include <linux/platform_data/dma-hsu.h>
+
+struct hsu_dma;
+
+/**
+ * struct hsu_dma_chip - representation of HSU DMA hardware
+ * @dev:                 struct device of the DMA controller
+ * @irq:                 irq line
+ * @regs:                memory mapped I/O space
+ * @length:              I/O space length
+ * @offset:              offset of the I/O space where registers are located
+ * @hsu:                 struct hsu_dma that is filed by ->probe()
+ * @pdata:               platform data for the DMA controller if provided
+ */
+struct hsu_dma_chip {
+        struct device                   *dev;
+        int                             irq;
+        void __iomem                    *regs;
+        unsigned int                    length;
+        unsigned int                    offset;
+        struct hsu_dma                  *hsu;
+        struct hsu_dma_platform_data    *pdata;
+};
+
+/* Export to the internal users */
+irqreturn_t hsu_dma_irq(struct hsu_dma_chip *chip, unsigned short nr);
+
+/* Export to the platform drivers */
+int hsu_dma_probe(struct hsu_dma_chip *chip);
+int hsu_dma_remove(struct hsu_dma_chip *chip);
+
+#endif /* _DMA_HSU_H */
diff --git a/include/linux/amba/xilinx_dma.h b/include/linux/dma/xilinx_dma.h
index 34b98f276ed0..34b98f276ed0 100644
--- a/include/linux/amba/xilinx_dma.h
+++ b/include/linux/dma/xilinx_dma.h
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index b6997a0cb528..ad419757241f 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -11,10 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
  * The full GNU General Public License is included in this distribution in the
  * file called COPYING.
  */
@@ -574,7 +570,6 @@ struct dma_tx_state {
  * @copy_align: alignment shift for memcpy operations
  * @xor_align: alignment shift for xor operations
  * @pq_align: alignment shift for pq operations
- * @fill_align: alignment shift for memset operations
  * @dev_id: unique device ID
  * @dev: struct device reference for dma mapping api
  * @src_addr_widths: bit mask of src addr widths the device supports
@@ -625,7 +620,6 @@ struct dma_device {
         u8 copy_align;
         u8 xor_align;
         u8 pq_align;
-        u8 fill_align;
         #define DMA_HAS_PQ_CONTINUE (1 << 15)
 
         int dev_id;
@@ -826,12 +820,6 @@ static inline bool is_dma_pq_aligned(struct dma_device *dev, size_t off1,
         return dmaengine_check_align(dev->pq_align, off1, off2, len);
 }
 
-static inline bool is_dma_fill_aligned(struct dma_device *dev, size_t off1,
-                                       size_t off2, size_t len)
-{
-        return dmaengine_check_align(dev->fill_align, off1, off2, len);
-}
-
 static inline void
 dma_set_maxpq(struct dma_device *dma, int maxpq, int has_pq_continue)
 {
@@ -1098,7 +1086,6 @@ void dma_async_device_unregister(struct dma_device *device);
 void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
 struct dma_chan *dma_get_slave_channel(struct dma_chan *chan);
 struct dma_chan *dma_get_any_slave_channel(struct dma_device *device);
-struct dma_chan *net_dma_find_channel(void);
 #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
 #define dma_request_slave_channel_compat(mask, x, y, dev, name) \
         __dma_request_slave_channel_compat(&(mask), x, y, dev, name)
@@ -1116,27 +1103,4 @@ static inline struct dma_chan
 
         return __dma_request_channel(mask, fn, fn_param);
 }
-
-/* --- Helper iov-locking functions --- */
-
-struct dma_page_list {
-        char __user *base_address;
-        int nr_pages;
-        struct page **pages;
-};
-
-struct dma_pinned_list {
-        int nr_iovecs;
-        struct dma_page_list page_list[0];
-};
-
-struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
-void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
-
-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
-        struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
-        struct dma_pinned_list *pinned_list, struct page *page,
-        unsigned int offset, size_t len);
-
 #endif /* DMAENGINE_H */
diff --git a/include/linux/dmapool.h b/include/linux/dmapool.h
index 022e34fcbd1b..52456aa566a0 100644
--- a/include/linux/dmapool.h
+++ b/include/linux/dmapool.h
@@ -14,6 +14,8 @@
 #include <asm/io.h>
 #include <asm/scatterlist.h>
 
+struct device;
+
 struct dma_pool *dma_pool_create(const char *name, struct device *dev, 
                         size_t size, size_t align, size_t allocation);
 
diff --git a/include/linux/efi.h b/include/linux/efi.h
index cf7e431cbc73..af5be0368dec 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -942,6 +942,7 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_64BIT               5       /* Is the firmware 64-bit? */
 #define EFI_PARAVIRT            6       /* Access is via a paravirt interface */
 #define EFI_ARCH_1              7       /* First arch-specific bit */
+#define EFI_DBG                 8       /* Print additional debug info at runtime */
 
 #ifdef CONFIG_EFI
 /*
diff --git a/include/linux/elf-randomize.h b/include/linux/elf-randomize.h
new file mode 100644
index 000000000000..b5f0bda9472e
--- /dev/null
+++ b/include/linux/elf-randomize.h
@@ -0,0 +1,22 @@
+#ifndef _ELF_RANDOMIZE_H
+#define _ELF_RANDOMIZE_H
+
+struct mm_struct;
+
+#ifndef CONFIG_ARCH_HAS_ELF_RANDOMIZE
+static inline unsigned long arch_mmap_rnd(void) { return 0; }
+# if defined(arch_randomize_brk) && defined(CONFIG_COMPAT_BRK)
+#  define compat_brk_randomized
+# endif
+# ifndef arch_randomize_brk
+#  define arch_randomize_brk(mm)        (mm->brk)
+# endif
+#else
+extern unsigned long arch_mmap_rnd(void);
+extern unsigned long arch_randomize_brk(struct mm_struct *mm);
+# ifdef CONFIG_COMPAT_BRK
+#  define compat_brk_randomized
+# endif
+#endif
+
+#endif
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 1d869d185a0d..606563ef8a72 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -35,7 +35,6 @@ extern const struct header_ops eth_header_ops;
 
 int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
                const void *daddr, const void *saddr, unsigned len);
-int eth_rebuild_header(struct sk_buff *skb);
 int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr);
 int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh,
                      __be16 type);
diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index a23556c32703..591f8c3ef410 100644
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -153,7 +153,7 @@ struct f2fs_orphan_block {
  */
 struct f2fs_extent {
         __le32 fofs;            /* start file offset of the extent */
-        __le32 blk_addr;        /* start block address of the extent */
+        __le32 blk;             /* start block address of the extent */
         __le32 len;             /* lengh of the extent */
 } __packed;
 
@@ -178,6 +178,7 @@ struct f2fs_extent {
 #define F2FS_INLINE_DATA        0x02    /* file inline data flag */
 #define F2FS_INLINE_DENTRY      0x04    /* file inline dentry flag */
 #define F2FS_DATA_EXIST         0x08    /* file inline data exist flag */
+#define F2FS_INLINE_DOTS        0x10    /* file having implicit dot dentries */
 
 #define MAX_INLINE_DATA         (sizeof(__le32) * (DEF_ADDRS_PER_INODE - \
                                                 F2FS_INLINE_XATTR_ADDRS - 1))
diff --git a/include/linux/falloc.h b/include/linux/falloc.h
index 31591686ac2d..996111000a8c 100644
--- a/include/linux/falloc.h
+++ b/include/linux/falloc.h
@@ -21,4 +21,10 @@ struct space_resv {
 #define FS_IOC_RESVSP           _IOW('X', 40, struct space_resv)
 #define FS_IOC_RESVSP64         _IOW('X', 42, struct space_resv)
 
+#define FALLOC_FL_SUPPORTED_MASK        (FALLOC_FL_KEEP_SIZE |          \
+                                         FALLOC_FL_PUNCH_HOLE |         \
+                                         FALLOC_FL_COLLAPSE_RANGE |     \
+                                         FALLOC_FL_ZERO_RANGE |         \
+                                         FALLOC_FL_INSERT_RANGE)
+
 #endif /* _FALLOC_H_ */
diff --git a/include/linux/filter.h b/include/linux/filter.h
index caac2087a4d5..fa11b3a367be 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -145,8 +145,6 @@ struct bpf_prog_aux;
                 .off   = 0,                                     \
                 .imm   = ((__u64) (IMM)) >> 32 })
 
-#define BPF_PSEUDO_MAP_FD       1
-
 /* pseudo BPF_LD_IMM64 insn used to refer to process-local map_fd */
 #define BPF_LD_MAP_FD(DST, MAP_FD)                              \
         BPF_LD_IMM64_RAW(DST, BPF_PSEUDO_MAP_FD, MAP_FD)
@@ -310,9 +308,11 @@ struct bpf_binary_header {
 struct bpf_prog {
         u16                     pages;          /* Number of allocated pages */
         bool                    jited;          /* Is our filter JIT'ed? */
+        bool                    gpl_compatible; /* Is our filter GPL compatible? */
         u32                     len;            /* Number of filter blocks */
-        struct sock_fprog_kern  *orig_prog;     /* Original BPF program */
+        enum bpf_prog_type      type;           /* Type of BPF program */
         struct bpf_prog_aux     *aux;           /* Auxiliary fields */
+        struct sock_fprog_kern  *orig_prog;     /* Original BPF program */
         unsigned int            (*bpf_func)(const struct sk_buff *skb,
                                             const struct bpf_insn *filter);
         /* Instructions for interpreter */
@@ -454,6 +454,7 @@ static inline u16 bpf_anc_helper(const struct sock_filter *ftest)
                 BPF_ANCILLARY(VLAN_TAG_PRESENT);
                 BPF_ANCILLARY(PAY_OFFSET);
                 BPF_ANCILLARY(RANDOM);
+                BPF_ANCILLARY(VLAN_TPID);
                 }
                 /* Fallthrough. */
         default:
diff --git a/include/linux/fixp-arith.h b/include/linux/fixp-arith.h
index 3089d7382325..d4686fe1cac7 100644
--- a/include/linux/fixp-arith.h
+++ b/include/linux/fixp-arith.h
@@ -1,6 +1,8 @@
 #ifndef _FIXP_ARITH_H
 #define _FIXP_ARITH_H
 
+#include <linux/math64.h>
+
 /*
  * Simplistic fixed-point arithmetics.
  * Hmm, I'm probably duplicating some code :(
@@ -29,59 +31,126 @@
 
 #include <linux/types.h>
 
-/* The type representing fixed-point values */
-typedef s16 fixp_t;
+static const s32 sin_table[] = {
+        0x00000000, 0x023be165, 0x04779632, 0x06b2f1d2, 0x08edc7b6, 0x0b27eb5c,
+        0x0d61304d, 0x0f996a26, 0x11d06c96, 0x14060b67, 0x163a1a7d, 0x186c6ddd,
+        0x1a9cd9ac, 0x1ccb3236, 0x1ef74bf2, 0x2120fb82, 0x234815ba, 0x256c6f9e,
+        0x278dde6e, 0x29ac379f, 0x2bc750e8, 0x2ddf003f, 0x2ff31bdd, 0x32037a44,
+        0x340ff241, 0x36185aee, 0x381c8bb5, 0x3a1c5c56, 0x3c17a4e7, 0x3e0e3ddb,
+        0x3fffffff, 0x41ecc483, 0x43d464fa, 0x45b6bb5d, 0x4793a20f, 0x496af3e1,
+        0x4b3c8c11, 0x4d084650, 0x4ecdfec6, 0x508d9210, 0x5246dd48, 0x53f9be04,
+        0x55a6125a, 0x574bb8e5, 0x58ea90c2, 0x5a827999, 0x5c135399, 0x5d9cff82,
+        0x5f1f5ea0, 0x609a52d1, 0x620dbe8a, 0x637984d3, 0x64dd894f, 0x6639b039,
+        0x678dde6d, 0x68d9f963, 0x6a1de735, 0x6b598ea1, 0x6c8cd70a, 0x6db7a879,
+        0x6ed9eba0, 0x6ff389de, 0x71046d3c, 0x720c8074, 0x730baeec, 0x7401e4bf,
+        0x74ef0ebb, 0x75d31a5f, 0x76adf5e5, 0x777f903b, 0x7847d908, 0x7906c0af,
+        0x79bc384c, 0x7a6831b8, 0x7b0a9f8c, 0x7ba3751c, 0x7c32a67c, 0x7cb82884,
+        0x7d33f0c8, 0x7da5f5a3, 0x7e0e2e31, 0x7e6c924f, 0x7ec11aa3, 0x7f0bc095,
+        0x7f4c7e52, 0x7f834ecf, 0x7fb02dc4, 0x7fd317b3, 0x7fec09e1, 0x7ffb025e,
+        0x7fffffff
+};
 
-#define FRAC_N 8
-#define FRAC_MASK ((1<<FRAC_N)-1)
+/**
+ * __fixp_sin32() returns the sin of an angle in degrees
+ *
+ * @degrees: angle, in degrees, from 0 to 360.
+ *
+ * The returned value ranges from -0x7fffffff to +0x7fffffff.
+ */
+static inline s32 __fixp_sin32(int degrees)
+{
+        s32 ret;
+        bool negative = false;
 
-/* Not to be used directly. Use fixp_{cos,sin} */
-static const fixp_t cos_table[46] = {
-        0x0100, 0x00FF, 0x00FF, 0x00FE, 0x00FD, 0x00FC, 0x00FA, 0x00F8,
-        0x00F6, 0x00F3, 0x00F0, 0x00ED, 0x00E9, 0x00E6, 0x00E2, 0x00DD,
-        0x00D9, 0x00D4, 0x00CF, 0x00C9, 0x00C4, 0x00BE, 0x00B8, 0x00B1,
-        0x00AB, 0x00A4, 0x009D, 0x0096, 0x008F, 0x0087, 0x0080, 0x0078,
-        0x0070, 0x0068, 0x005F, 0x0057, 0x004F, 0x0046, 0x003D, 0x0035,
-        0x002C, 0x0023, 0x001A, 0x0011, 0x0008, 0x0000
-};
+        if (degrees > 180) {
+                negative = true;
+                degrees -= 180;
+        }
+        if (degrees > 90)
+                degrees = 180 - degrees;
 
+        ret = sin_table[degrees];
 
-/* a: 123 -> 123.0 */
-static inline fixp_t fixp_new(s16 a)
-{
-        return a<<FRAC_N;
+        return negative ? -ret : ret;
 }
 
-/* a: 0xFFFF -> -1.0
-      0x8000 -> 1.0
-      0x0000 -> 0.0
-*/
-static inline fixp_t fixp_new16(s16 a)
+/**
+ * fixp_sin32() returns the sin of an angle in degrees
+ *
+ * @degrees: angle, in degrees. The angle can be positive or negative
+ *
+ * The returned value ranges from -0x7fffffff to +0x7fffffff.
+ */
+static inline s32 fixp_sin32(int degrees)
 {
-        return ((s32)a)>>(16-FRAC_N);
+        degrees = (degrees % 360 + 360) % 360;
+
+        return __fixp_sin32(degrees);
 }
 
-static inline fixp_t fixp_cos(unsigned int degrees)
+/* cos(x) = sin(x + 90 degrees) */
+#define fixp_cos32(v) fixp_sin32((v) + 90)
+
+/*
+ * 16 bits variants
+ *
+ * The returned value ranges from -0x7fff to 0x7fff
+ */
+
+#define fixp_sin16(v) (fixp_sin32(v) >> 16)
+#define fixp_cos16(v) (fixp_cos32(v) >> 16)
+
+/**
+ * fixp_sin32_rad() - calculates the sin of an angle in radians
+ *
+ * @radians: angle, in radians
+ * @twopi: value to be used for 2*pi
+ *
+ * Provides a variant for the cases where just 360
+ * values is not enough. This function uses linear
+ * interpolation to a wider range of values given by
+ * twopi var.
+ *
+ * Experimental tests gave a maximum difference of
+ * 0.000038 between the value calculated by sin() and
+ * the one produced by this function, when twopi is
+ * equal to 360000. That seems to be enough precision
+ * for practical purposes.
+ *
+ * Please notice that two high numbers for twopi could cause
+ * overflows, so the routine will not allow values of twopi
+ * bigger than 1^18.
+ */
+static inline s32 fixp_sin32_rad(u32 radians, u32 twopi)
 {
-        int quadrant = (degrees / 90) & 3;
-        unsigned int i = degrees % 90;
+        int degrees;
+        s32 v1, v2, dx, dy;
+        s64 tmp;
 
-        if (quadrant == 1 || quadrant == 3)
-                i = 90 - i;
+        /*
+         * Avoid too large values for twopi, as we don't want overflows.
+         */
+        BUG_ON(twopi > 1 << 18);
 
-        i >>= 1;
+        degrees = (radians * 360) / twopi;
+        tmp = radians - (degrees * twopi) / 360;
 
-        return (quadrant == 1 || quadrant == 2)? -cos_table[i] : cos_table[i];
-}
+        degrees = (degrees % 360 + 360) % 360;
+        v1 = __fixp_sin32(degrees);
 
-static inline fixp_t fixp_sin(unsigned int degrees)
-{
-        return -fixp_cos(degrees + 90);
-}
+        v2 = fixp_sin32(degrees + 1);
 
-static inline fixp_t fixp_mult(fixp_t a, fixp_t b)
-{
-        return ((s32)(a*b))>>FRAC_N;
+        dx = twopi / 360;
+        dy = v2 - v1;
+
+        tmp *= dy;
+
+        return v1 +  div_s64(tmp, dx);
 }
 
+/* cos(x) = sin(x + pi/2 radians) */
+
+#define fixp_cos32_rad(rad, twopi)      \
+        fixp_sin32_rad(rad + twopi / 4, twopi)
+
 #endif
diff --git a/include/linux/fs.h b/include/linux/fs.h
index b4d71b5e1ff2..35ec87e490b1 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -314,6 +314,33 @@ struct page;
 struct address_space;
 struct writeback_control;
 
+#define IOCB_EVENTFD            (1 << 0)
+#define IOCB_APPEND             (1 << 1)
+#define IOCB_DIRECT             (1 << 2)
+
+struct kiocb {
+        struct file             *ki_filp;
+        loff_t                  ki_pos;
+        void (*ki_complete)(struct kiocb *iocb, long ret, long ret2);
+        void                    *private;
+        int                     ki_flags;
+};
+
+static inline bool is_sync_kiocb(struct kiocb *kiocb)
+{
+        return kiocb->ki_complete == NULL;
+}
+
+static inline int iocb_flags(struct file *file);
+
+static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)
+{
+        *kiocb = (struct kiocb) {
+                .ki_filp = filp,
+                .ki_flags = iocb_flags(filp),
+        };
+}
+
 /*
  * "descriptor" for what we're up to with a read.
  * This allows us to use the same read code yet
@@ -361,7 +388,7 @@ struct address_space_operations {
         void (*invalidatepage) (struct page *, unsigned int, unsigned int);
         int (*releasepage) (struct page *, gfp_t);
         void (*freepage)(struct page *);
-        ssize_t (*direct_IO)(int, struct kiocb *, struct iov_iter *iter, loff_t offset);
+        ssize_t (*direct_IO)(struct kiocb *, struct iov_iter *iter, loff_t offset);
         /*
          * migrate the contents of a page to the specified target. If
          * migrate_mode is MIGRATE_ASYNC, it must not block.
@@ -604,6 +631,7 @@ struct inode {
         struct mutex            i_mutex;
 
         unsigned long           dirtied_when;   /* jiffies of first dirtying */
+        unsigned long           dirtied_time_when;
 
         struct hlist_node       i_hash;
         struct list_head        i_wb_list;      /* backing dev IO list */
@@ -847,6 +875,7 @@ static inline struct file *get_file(struct file *f)
         atomic_long_inc(&f->f_count);
         return f;
 }
+#define get_file_rcu(x) atomic_long_inc_not_zero(&(x)->f_count)
 #define fput_atomic(x)  atomic_long_add_unless(&(x)->f_count, -1, 1)
 #define file_count(x)   atomic_long_read(&(x)->f_count)
 
@@ -892,8 +921,8 @@ struct file_lock_operations {
 struct lock_manager_operations {
         int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
         unsigned long (*lm_owner_key)(struct file_lock *);
-        void (*lm_get_owner)(struct file_lock *, struct file_lock *);
-        void (*lm_put_owner)(struct file_lock *);
+        fl_owner_t (*lm_get_owner)(fl_owner_t);
+        void (*lm_put_owner)(fl_owner_t);
         void (*lm_notify)(struct file_lock *);  /* unblock callback */
         int (*lm_grant)(struct file_lock *, int);
         bool (*lm_break)(struct file_lock *);
@@ -1018,6 +1047,9 @@ extern void lease_get_mtime(struct inode *, struct timespec *time);
 extern int generic_setlease(struct file *, long, struct file_lock **, void **priv);
 extern int vfs_setlease(struct file *, long, struct file_lock **, void **);
 extern int lease_modify(struct file_lock *, int, struct list_head *);
+struct files_struct;
+extern void show_fd_locks(struct seq_file *f,
+                         struct file *filp, struct files_struct *files);
 #else /* !CONFIG_FILE_LOCKING */
 static inline int fcntl_getlk(struct file *file, unsigned int cmd,
                               struct flock __user *user)
@@ -1154,6 +1186,10 @@ static inline int lease_modify(struct file_lock *fl, int arg,
 {
         return -EINVAL;
 }
+
+struct files_struct;
+static inline void show_fd_locks(struct seq_file *f,
+                        struct file *filp, struct files_struct *files) {}
 #endif /* !CONFIG_FILE_LOCKING */
 
 
@@ -1539,8 +1575,6 @@ struct file_operations {
         loff_t (*llseek) (struct file *, loff_t, int);
         ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
         ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
-        ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
-        ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
         ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
         ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
         int (*iterate) (struct file *, struct dir_context *);
@@ -1548,7 +1582,7 @@ struct file_operations {
         long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
         long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
         int (*mmap) (struct file *, struct vm_area_struct *);
-        void (*mremap)(struct file *, struct vm_area_struct *);
+        int (*mremap)(struct file *, struct vm_area_struct *);
         int (*open) (struct inode *, struct file *);
         int (*flush) (struct file *, fl_owner_t id);
         int (*release) (struct inode *, struct file *);
@@ -1616,6 +1650,7 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
                               struct iovec **ret_pointer);
 
 extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
+extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *);
 extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
 extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
 extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
@@ -1785,7 +1820,7 @@ struct super_operations {
 #define I_SYNC                  (1 << __I_SYNC)
 #define I_REFERENCED            (1 << 8)
 #define __I_DIO_WAKEUP          9
-#define I_DIO_WAKEUP            (1 << I_DIO_WAKEUP)
+#define I_DIO_WAKEUP            (1 << __I_DIO_WAKEUP)
 #define I_LINKABLE              (1 << 10)
 #define I_DIRTY_TIME            (1 << 11)
 #define __I_DIRTY_TIME_EXPIRED  12
@@ -2144,7 +2179,7 @@ struct filename {
         const __user char       *uptr;  /* original userland pointer */
         struct audit_names      *aname;
         int                     refcnt;
-        bool                    separate; /* should "name" be freed? */
+        const char              iname[];
 };
 
 extern long vfs_truncate(struct path *, loff_t);
@@ -2544,16 +2579,12 @@ extern int sb_min_blocksize(struct super_block *, int);
 
 extern int generic_file_mmap(struct file *, struct vm_area_struct *);
 extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
-int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
+extern ssize_t generic_write_checks(struct kiocb *, struct iov_iter *);
 extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *);
 extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
 extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);
 extern ssize_t generic_file_direct_write(struct kiocb *, struct iov_iter *, loff_t);
 extern ssize_t generic_perform_write(struct file *, struct iov_iter *, loff_t);
-extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
-extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
-extern ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
-extern ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
 
 ssize_t vfs_iter_read(struct file *file, struct iov_iter *iter, loff_t *ppos);
 ssize_t vfs_iter_write(struct file *file, struct iov_iter *iter, loff_t *ppos);
@@ -2591,12 +2622,13 @@ extern loff_t fixed_size_llseek(struct file *file, loff_t offset,
 extern int generic_file_open(struct inode * inode, struct file * filp);
 extern int nonseekable_open(struct inode * inode, struct file * filp);
 
-ssize_t dax_do_io(int rw, struct kiocb *, struct inode *, struct iov_iter *,
-                loff_t, get_block_t, dio_iodone_t, int flags);
+ssize_t dax_do_io(struct kiocb *, struct inode *, struct iov_iter *, loff_t,
+                  get_block_t, dio_iodone_t, int flags);
 int dax_clear_blocks(struct inode *, sector_t block, long size);
 int dax_zero_page_range(struct inode *, loff_t from, unsigned len, get_block_t);
 int dax_truncate_page(struct inode *, loff_t from, get_block_t);
 int dax_fault(struct vm_area_struct *, struct vm_fault *, get_block_t);
+int dax_pfn_mkwrite(struct vm_area_struct *, struct vm_fault *);
 #define dax_mkwrite(vma, vmf, gb)       dax_fault(vma, vmf, gb)
 
 #ifdef CONFIG_BLOCK
@@ -2612,27 +2644,56 @@ enum {
 
         /* filesystem can handle aio writes beyond i_size */
         DIO_ASYNC_EXTEND = 0x04,
+
+        /* inode/fs/bdev does not need truncate protection */
+        DIO_SKIP_DIO_COUNT = 0x08,
 };
 
 void dio_end_io(struct bio *bio, int error);
 
-ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
-        struct block_device *bdev, struct iov_iter *iter, loff_t offset,
-        get_block_t get_block, dio_iodone_t end_io,
-        dio_submit_t submit_io, int flags);
+ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
+                             struct block_device *bdev, struct iov_iter *iter,
+                             loff_t offset, get_block_t get_block,
+                             dio_iodone_t end_io, dio_submit_t submit_io,
+                             int flags);
 
-static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
-                struct inode *inode, struct iov_iter *iter, loff_t offset,
-                get_block_t get_block)
+static inline ssize_t blockdev_direct_IO(struct kiocb *iocb,
+                                         struct inode *inode,
+                                         struct iov_iter *iter, loff_t offset,
+                                         get_block_t get_block)
 {
-        return __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iter,
+        return __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter,
                                     offset, get_block, NULL, NULL,
                                     DIO_LOCKING | DIO_SKIP_HOLES);
 }
 #endif
 
 void inode_dio_wait(struct inode *inode);
-void inode_dio_done(struct inode *inode);
+
+/*
+ * inode_dio_begin - signal start of a direct I/O requests
+ * @inode: inode the direct I/O happens on
+ *
+ * This is called once we've finished processing a direct I/O request,
+ * and is used to wake up callers waiting for direct I/O to be quiesced.
+ */
+static inline void inode_dio_begin(struct inode *inode)
+{
+        atomic_inc(&inode->i_dio_count);
+}
+
+/*
+ * inode_dio_end - signal finish of a direct I/O requests
+ * @inode: inode the direct I/O happens on
+ *
+ * This is called once we've finished processing a direct I/O request,
+ * and is used to wake up callers waiting for direct I/O to be quiesced.
+ */
+static inline void inode_dio_end(struct inode *inode)
+{
+        if (atomic_dec_and_test(&inode->i_dio_count))
+                wake_up_bit(&inode->i_state, __I_DIO_WAKEUP);
+}
 
 extern void inode_set_flags(struct inode *inode, unsigned int flags,
                             unsigned int mask);
@@ -2661,7 +2722,6 @@ void inode_sub_bytes(struct inode *inode, loff_t bytes);
 loff_t inode_get_bytes(struct inode *inode);
 void inode_set_bytes(struct inode *inode, loff_t bytes);
 
-extern int vfs_readdir(struct file *, filldir_t, void *);
 extern int iterate_dir(struct file *, struct dir_context *);
 
 extern int vfs_stat(const char __user *, struct kstat *);
@@ -2759,6 +2819,16 @@ static inline bool io_is_direct(struct file *filp)
         return (filp->f_flags & O_DIRECT) || IS_DAX(file_inode(filp));
 }
 
+static inline int iocb_flags(struct file *file)
+{
+        int res = 0;
+        if (file->f_flags & O_APPEND)
+                res |= IOCB_APPEND;
+        if (io_is_direct(file))
+                res |= IOCB_DIRECT;
+        return res;
+}
+
 static inline ino_t parent_ino(struct dentry *dentry)
 {
         ino_t res;
diff --git a/include/linux/fs_pin.h b/include/linux/fs_pin.h
index 9dc4e0384bfb..3886b3bffd7f 100644
--- a/include/linux/fs_pin.h
+++ b/include/linux/fs_pin.h
@@ -13,6 +13,8 @@ struct vfsmount;
 static inline void init_fs_pin(struct fs_pin *p, void (*kill)(struct fs_pin *))
 {
         init_waitqueue_head(&p->wait);
+        INIT_HLIST_NODE(&p->s_list);
+        INIT_HLIST_NODE(&p->m_list);
         p->kill = kill;
 }
 
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index c674ee8f7fca..46e83c2156c6 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -13,6 +13,7 @@ struct trace_array;
 struct trace_buffer;
 struct tracer;
 struct dentry;
+struct bpf_prog;
 
 struct trace_print_flags {
         unsigned long           mask;
@@ -202,7 +203,7 @@ enum trace_reg {
 struct ftrace_event_call;
 
 struct ftrace_event_class {
-        char                    *system;
+        const char              *system;
         void                    *probe;
 #ifdef CONFIG_PERF_EVENTS
         void                    *perf_probe;
@@ -252,6 +253,7 @@ enum {
         TRACE_EVENT_FL_WAS_ENABLED_BIT,
         TRACE_EVENT_FL_USE_CALL_FILTER_BIT,
         TRACE_EVENT_FL_TRACEPOINT_BIT,
+        TRACE_EVENT_FL_KPROBE_BIT,
 };
 
 /*
@@ -265,6 +267,7 @@ enum {
  *                     it is best to clear the buffers that used it).
  *  USE_CALL_FILTER - For ftrace internal events, don't use file filter
  *  TRACEPOINT    - Event is a tracepoint
+ *  KPROBE        - Event is a kprobe
  */
 enum {
         TRACE_EVENT_FL_FILTERED         = (1 << TRACE_EVENT_FL_FILTERED_BIT),
@@ -274,6 +277,7 @@ enum {
         TRACE_EVENT_FL_WAS_ENABLED      = (1 << TRACE_EVENT_FL_WAS_ENABLED_BIT),
         TRACE_EVENT_FL_USE_CALL_FILTER  = (1 << TRACE_EVENT_FL_USE_CALL_FILTER_BIT),
         TRACE_EVENT_FL_TRACEPOINT       = (1 << TRACE_EVENT_FL_TRACEPOINT_BIT),
+        TRACE_EVENT_FL_KPROBE           = (1 << TRACE_EVENT_FL_KPROBE_BIT),
 };
 
 struct ftrace_event_call {
@@ -285,7 +289,7 @@ struct ftrace_event_call {
                 struct tracepoint       *tp;
         };
         struct trace_event      event;
-        const char              *print_fmt;
+        char                    *print_fmt;
         struct event_filter     *filter;
         void                    *mod;
         void                    *data;
@@ -303,6 +307,7 @@ struct ftrace_event_call {
 #ifdef CONFIG_PERF_EVENTS
         int                             perf_refcount;
         struct hlist_head __percpu      *perf_events;
+        struct bpf_prog                 *prog;
 
         int     (*perf_perm)(struct ftrace_event_call *,
                              struct perf_event *);
@@ -548,6 +553,15 @@ event_trigger_unlock_commit_regs(struct ftrace_event_file *file,
                 event_triggers_post_call(file, tt);
 }
 
+#ifdef CONFIG_BPF_SYSCALL
+unsigned int trace_call_bpf(struct bpf_prog *prog, void *ctx);
+#else
+static inline unsigned int trace_call_bpf(struct bpf_prog *prog, void *ctx)
+{
+        return 1;
+}
+#endif
+
 enum {
         FILTER_OTHER = 0,
         FILTER_STATIC_STRING,
diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h
new file mode 100644
index 000000000000..0408545bce42
--- /dev/null
+++ b/include/linux/fwnode.h
@@ -0,0 +1,27 @@
+/*
+ * fwnode.h - Firmware device node object handle type definition.
+ *
+ * Copyright (C) 2015, Intel Corporation
+ * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.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 _LINUX_FWNODE_H_
+#define _LINUX_FWNODE_H_
+
+enum fwnode_type {
+        FWNODE_INVALID = 0,
+        FWNODE_OF,
+        FWNODE_ACPI,
+        FWNODE_PDATA,
+};
+
+struct fwnode_handle {
+        enum fwnode_type type;
+        struct fwnode_handle *secondary;
+};
+
+#endif
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 51bd1e72a917..97a9373e61e8 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -57,8 +57,10 @@ struct vm_area_struct;
  * _might_ fail.  This depends upon the particular VM implementation.
  *
  * __GFP_NOFAIL: The VM implementation _must_ retry infinitely: the caller
- * cannot handle allocation failures.  This modifier is deprecated and no new
- * users should be added.
+ * cannot handle allocation failures. New users should be evaluated carefully
+ * (and the flag should be used only when there is no reasonable failure policy)
+ * but it is definitely preferable to use the flag rather than opencode endless
+ * loop around allocator.
  *
  * __GFP_NORETRY: The VM implementation must not retry indefinitely.
  *
@@ -117,16 +119,6 @@ struct vm_area_struct;
                          __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN | \
                          __GFP_NO_KSWAPD)
 
-/*
- * GFP_THISNODE does not perform any reclaim, you most likely want to
- * use __GFP_THISNODE to allocate from a given node without fallback!
- */
-#ifdef CONFIG_NUMA
-#define GFP_THISNODE    (__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY)
-#else
-#define GFP_THISNODE    ((__force gfp_t)0)
-#endif
-
 /* This mask makes up all the page movable related flags */
 #define GFP_MOVABLE_MASK (__GFP_RECLAIMABLE|__GFP_MOVABLE)
 
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index 45afc2dee560..3a7c9ffd5ab9 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -16,6 +16,15 @@ struct device;
  */
 struct gpio_desc;
 
+/**
+ * Struct containing an array of descriptors that can be obtained using
+ * gpiod_get_array().
+ */
+struct gpio_descs {
+        unsigned int ndescs;
+        struct gpio_desc *desc[];
+};
+
 #define GPIOD_FLAGS_BIT_DIR_SET         BIT(0)
 #define GPIOD_FLAGS_BIT_DIR_OUT         BIT(1)
 #define GPIOD_FLAGS_BIT_DIR_VAL         BIT(2)
@@ -34,6 +43,9 @@ enum gpiod_flags {
 
 #ifdef CONFIG_GPIOLIB
 
+/* Return the number of GPIOs associated with a device / function */
+int gpiod_count(struct device *dev, const char *con_id);
+
 /* Acquire and dispose GPIOs */
 struct gpio_desc *__must_check __gpiod_get(struct device *dev,
                                          const char *con_id,
@@ -49,7 +61,14 @@ struct gpio_desc *__must_check __gpiod_get_index_optional(struct device *dev,
                                                         const char *con_id,
                                                         unsigned int index,
                                                         enum gpiod_flags flags);
+struct gpio_descs *__must_check gpiod_get_array(struct device *dev,
+                                                const char *con_id,
+                                                enum gpiod_flags flags);
+struct gpio_descs *__must_check gpiod_get_array_optional(struct device *dev,
+                                                        const char *con_id,
+                                                        enum gpiod_flags flags);
 void gpiod_put(struct gpio_desc *desc);
+void gpiod_put_array(struct gpio_descs *descs);
 
 struct gpio_desc *__must_check __devm_gpiod_get(struct device *dev,
                                               const char *con_id,
@@ -64,7 +83,14 @@ struct gpio_desc *__must_check __devm_gpiod_get_optional(struct device *dev,
 struct gpio_desc *__must_check
 __devm_gpiod_get_index_optional(struct device *dev, const char *con_id,
                               unsigned int index, enum gpiod_flags flags);
+struct gpio_descs *__must_check devm_gpiod_get_array(struct device *dev,
+                                                     const char *con_id,
+                                                     enum gpiod_flags flags);
+struct gpio_descs *__must_check
+devm_gpiod_get_array_optional(struct device *dev, const char *con_id,
+                              enum gpiod_flags flags);
 void devm_gpiod_put(struct device *dev, struct gpio_desc *desc);
+void devm_gpiod_put_array(struct device *dev, struct gpio_descs *descs);
 
 int gpiod_get_direction(struct gpio_desc *desc);
 int gpiod_direction_input(struct gpio_desc *desc);
@@ -110,9 +136,15 @@ struct fwnode_handle;
 struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
                                          const char *propname);
 struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
+                                            const char *con_id,
                                             struct fwnode_handle *child);
 #else /* CONFIG_GPIOLIB */
 
+static inline int gpiod_count(struct device *dev, const char *con_id)
+{
+        return 0;
+}
+
 static inline struct gpio_desc *__must_check __gpiod_get(struct device *dev,
                                                 const char *con_id,
                                                 enum gpiod_flags flags)
@@ -142,6 +174,20 @@ __gpiod_get_index_optional(struct device *dev, const char *con_id,
         return ERR_PTR(-ENOSYS);
 }
 
+static inline struct gpio_descs *__must_check
+gpiod_get_array(struct device *dev, const char *con_id,
+                enum gpiod_flags flags)
+{
+        return ERR_PTR(-ENOSYS);
+}
+
+static inline struct gpio_descs *__must_check
+gpiod_get_array_optional(struct device *dev, const char *con_id,
+                         enum gpiod_flags flags)
+{
+        return ERR_PTR(-ENOSYS);
+}
+
 static inline void gpiod_put(struct gpio_desc *desc)
 {
         might_sleep();
@@ -150,6 +196,14 @@ static inline void gpiod_put(struct gpio_desc *desc)
         WARN_ON(1);
 }
 
+static inline void gpiod_put_array(struct gpio_descs *descs)
+{
+        might_sleep();
+
+        /* GPIO can never have been requested */
+        WARN_ON(1);
+}
+
 static inline struct gpio_desc *__must_check
 __devm_gpiod_get(struct device *dev,
                  const char *con_id,
@@ -181,6 +235,20 @@ __devm_gpiod_get_index_optional(struct device *dev, const char *con_id,
         return ERR_PTR(-ENOSYS);
 }
 
+static inline struct gpio_descs *__must_check
+devm_gpiod_get_array(struct device *dev, const char *con_id,
+                     enum gpiod_flags flags)
+{
+        return ERR_PTR(-ENOSYS);
+}
+
+static inline struct gpio_descs *__must_check
+devm_gpiod_get_array_optional(struct device *dev, const char *con_id,
+                              enum gpiod_flags flags)
+{
+        return ERR_PTR(-ENOSYS);
+}
+
 static inline void devm_gpiod_put(struct device *dev, struct gpio_desc *desc)
 {
         might_sleep();
@@ -189,6 +257,15 @@ static inline void devm_gpiod_put(struct device *dev, struct gpio_desc *desc)
         WARN_ON(1);
 }
 
+static inline void devm_gpiod_put_array(struct device *dev,
+                                        struct gpio_descs *descs)
+{
+        might_sleep();
+
+        /* GPIO can never have been requested */
+        WARN_ON(1);
+}
+
 
 static inline int gpiod_get_direction(const struct gpio_desc *desc)
 {
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index c497c62889d1..f1b36593ec9f 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -6,6 +6,7 @@
 #include <linux/irq.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/irqdomain.h>
+#include <linux/pinctrl/pinctrl.h>
 
 struct device;
 struct gpio_desc;
@@ -173,6 +174,53 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
 
 #endif /* CONFIG_GPIOLIB_IRQCHIP */
 
+#ifdef CONFIG_PINCTRL
+
+/**
+ * struct gpio_pin_range - pin range controlled by a gpio chip
+ * @head: list for maintaining set of pin ranges, used internally
+ * @pctldev: pinctrl device which handles corresponding pins
+ * @range: actual range of pins controlled by a gpio controller
+ */
+
+struct gpio_pin_range {
+        struct list_head node;
+        struct pinctrl_dev *pctldev;
+        struct pinctrl_gpio_range range;
+};
+
+int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
+                           unsigned int gpio_offset, unsigned int pin_offset,
+                           unsigned int npins);
+int gpiochip_add_pingroup_range(struct gpio_chip *chip,
+                        struct pinctrl_dev *pctldev,
+                        unsigned int gpio_offset, const char *pin_group);
+void gpiochip_remove_pin_ranges(struct gpio_chip *chip);
+
+#else
+
+static inline int
+gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
+                       unsigned int gpio_offset, unsigned int pin_offset,
+                       unsigned int npins)
+{
+        return 0;
+}
+static inline int
+gpiochip_add_pingroup_range(struct gpio_chip *chip,
+                        struct pinctrl_dev *pctldev,
+                        unsigned int gpio_offset, const char *pin_group)
+{
+        return 0;
+}
+
+static inline void
+gpiochip_remove_pin_ranges(struct gpio_chip *chip)
+{
+}
+
+#endif /* CONFIG_PINCTRL */
+
 struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *chip, u16 hwnum,
                                             const char *label);
 void gpiochip_free_own_desc(struct gpio_desc *desc);
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index cba442ec3c66..f4af03404b97 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -9,7 +9,7 @@
 
 
 extern void synchronize_irq(unsigned int irq);
-extern void synchronize_hardirq(unsigned int irq);
+extern bool synchronize_hardirq(unsigned int irq);
 
 #if defined(CONFIG_TINY_RCU)
 
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h
index 51f7ccadf923..0408421d885f 100644
--- a/include/linux/hid-sensor-hub.h
+++ b/include/linux/hid-sensor-hub.h
@@ -33,6 +33,8 @@
  * @units:              Measurment unit for this attribute.
  * @unit_expo:          Exponent used in the data.
  * @size:               Size in bytes for data size.
+ * @logical_minimum:    Logical minimum value for this attribute.
+ * @logical_maximum:    Logical maximum value for this attribute.
  */
 struct hid_sensor_hub_attribute_info {
         u32 usage_id;
@@ -47,19 +49,43 @@ struct hid_sensor_hub_attribute_info {
 };
 
 /**
+ * struct sensor_hub_pending - Synchronous read pending information
+ * @status:             Pending status true/false.
+ * @ready:              Completion synchronization data.
+ * @usage_id:           Usage id for physical device, E.g. Gyro usage id.
+ * @attr_usage_id:      Usage Id of a field, E.g. X-AXIS for a gyro.
+ * @raw_size:           Response size for a read request.
+ * @raw_data:           Place holder for received response.
+ */
+struct sensor_hub_pending {
+        bool status;
+        struct completion ready;
+        u32 usage_id;
+        u32 attr_usage_id;
+        int raw_size;
+        u8  *raw_data;
+};
+
+/**
  * struct hid_sensor_hub_device - Stores the hub instance data
  * @hdev:               Stores the hid instance.
  * @vendor_id:          Vendor id of hub device.
  * @product_id:         Product id of hub device.
+ * @usage:              Usage id for this hub device instance.
  * @start_collection_index: Starting index for a phy type collection
  * @end_collection_index: Last index for a phy type collection
+ * @mutex:              synchronizing mutex.
+ * @pending:            Holds information of pending sync read request.
  */
 struct hid_sensor_hub_device {
         struct hid_device *hdev;
         u32 vendor_id;
         u32 product_id;
+        u32 usage;
         int start_collection_index;
         int end_collection_index;
+        struct mutex mutex;
+        struct sensor_hub_pending pending;
 };
 
 /**
@@ -146,41 +172,55 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
 
 /**
 * sensor_hub_input_attr_get_raw_value() - Synchronous read request
+* @hsdev:       Hub device instance.
 * @usage_id:    Attribute usage id of parent physical device as per spec
 * @attr_usage_id:       Attribute usage id as per spec
 * @report_id:   Report id to look for
+* @flag:      Synchronous or asynchronous read
 *
-* Issues a synchronous read request for an input attribute. Returns
-* data upto 32 bits. Since client can get events, so this call should
-* not be used for data paths, this will impact performance.
+* Issues a synchronous or asynchronous read request for an input attribute.
+* Returns data upto 32 bits.
 */
 
+enum sensor_hub_read_flags {
+        SENSOR_HUB_SYNC,
+        SENSOR_HUB_ASYNC,
+};
+
 int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
-                        u32 usage_id,
-                        u32 attr_usage_id, u32 report_id);
+                                        u32 usage_id,
+                                        u32 attr_usage_id, u32 report_id,
+                                        enum sensor_hub_read_flags flag
+);
+
 /**
 * sensor_hub_set_feature() - Feature set request
+* @hsdev:       Hub device instance.
 * @report_id:   Report id to look for
 * @field_index: Field index inside a report
-* @value:       Value to set
+* @buffer_size: size of the buffer
+* @buffer:      buffer to use in the feature set
 *
 * Used to set a field in feature report. For example this can set polling
 * interval, sensitivity, activate/deactivate state.
 */
 int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
-                        u32 field_index, s32 value);
+                           u32 field_index, int buffer_size, void *buffer);
 
 /**
 * sensor_hub_get_feature() - Feature get request
+* @hsdev:       Hub device instance.
 * @report_id:   Report id to look for
 * @field_index: Field index inside a report
-* @value:       Place holder for return value
+* @buffer_size: size of the buffer
+* @buffer:      buffer to copy output
 *
 * Used to get a field in feature report. For example this can get polling
-* interval, sensitivity, activate/deactivate state.
+* interval, sensitivity, activate/deactivate state. On success it returns
+* number of bytes copied to buffer. On failure, it returns value < 0.
 */
 int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
-                        u32 field_index, s32 *value);
+                           u32 field_index, int buffer_size, void *buffer);
 
 /* hid-sensor-attributes */
 
diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h
index 109f0e633e01..f2ee90aed0c2 100644
--- a/include/linux/hid-sensor-ids.h
+++ b/include/linux/hid-sensor-ids.h
@@ -21,6 +21,8 @@
 
 #define HID_MAX_PHY_DEVICES                                     0xFF
 
+#define HID_USAGE_SENSOR_COLLECTION                             0x200001
+
 /* Accel 3D (200073) */
 #define HID_USAGE_SENSOR_ACCEL_3D                               0x200073
 #define HID_USAGE_SENSOR_DATA_ACCELERATION                      0x200452
diff --git a/include/linux/hid.h b/include/linux/hid.h
index efc7787a41a8..176b43670e5d 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -159,6 +159,7 @@ struct hid_item {
 #define HID_UP_LED              0x00080000
 #define HID_UP_BUTTON           0x00090000
 #define HID_UP_ORDINAL          0x000a0000
+#define HID_UP_TELEPHONY        0x000b0000
 #define HID_UP_CONSUMER         0x000c0000
 #define HID_UP_DIGITIZER        0x000d0000
 #define HID_UP_PID              0x000f0000
@@ -269,6 +270,7 @@ struct hid_item {
 #define HID_DG_DEVICEINDEX      0x000d0053
 #define HID_DG_CONTACTCOUNT     0x000d0054
 #define HID_DG_CONTACTMAX       0x000d0055
+#define HID_DG_BUTTONTYPE       0x000d0059
 #define HID_DG_BARRELSWITCH2    0x000d005a
 #define HID_DG_TOOLSERIALNUMBER 0x000d005b
 
@@ -514,10 +516,10 @@ struct hid_device {							/* device report descriptor */
 #ifdef CONFIG_HID_BATTERY_STRENGTH
         /*
          * Power supply information for HID devices which report
-         * battery strength. power_supply is registered iff
-         * battery.name is non-NULL.
+         * battery strength. power_supply was successfully registered if
+         * battery is non-NULL.
          */
-        struct power_supply battery;
+        struct power_supply *battery;
         __s32 battery_min;
         __s32 battery_max;
         __s32 battery_report_type;
diff --git a/include/linux/host1x.h b/include/linux/host1x.h
index 464f33814a94..d2ba7d334039 100644
--- a/include/linux/host1x.h
+++ b/include/linux/host1x.h
@@ -135,6 +135,7 @@ struct host1x_syncpt *host1x_syncpt_get(struct host1x *host, u32 id);
 u32 host1x_syncpt_id(struct host1x_syncpt *sp);
 u32 host1x_syncpt_read_min(struct host1x_syncpt *sp);
 u32 host1x_syncpt_read_max(struct host1x_syncpt *sp);
+u32 host1x_syncpt_read(struct host1x_syncpt *sp);
 int host1x_syncpt_incr(struct host1x_syncpt *sp);
 u32 host1x_syncpt_incr_max(struct host1x_syncpt *sp, u32 incrs);
 int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout,
diff --git a/include/linux/hsi/hsi.h b/include/linux/hsi/hsi.h
index 3ec06300d535..5dd60c2e120f 100644
--- a/include/linux/hsi/hsi.h
+++ b/include/linux/hsi/hsi.h
@@ -135,9 +135,9 @@ static inline int hsi_register_board_info(struct hsi_board_info const *info,
  * @device: Driver model representation of the device
  * @tx_cfg: HSI TX configuration
  * @rx_cfg: HSI RX configuration
- * e_handler: Callback for handling port events (RX Wake High/Low)
- * pclaimed: Keeps tracks if the clients claimed its associated HSI port
- * nb: Notifier block for port events
+ * @e_handler: Callback for handling port events (RX Wake High/Low)
+ * @pclaimed: Keeps tracks if the clients claimed its associated HSI port
+ * @nb: Notifier block for port events
  */
 struct hsi_client {
         struct device           device;
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 7b5785032049..205026175c42 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -22,7 +22,13 @@ struct mmu_gather;
 struct hugepage_subpool {
         spinlock_t lock;
         long count;
-        long max_hpages, used_hpages;
+        long max_hpages;        /* Maximum huge pages or -1 if no maximum. */
+        long used_hpages;       /* Used count against maximum, includes */
+                                /* both alloced and reserved pages. */
+        struct hstate *hstate;
+        long min_hpages;        /* Minimum huge pages or -1 if no minimum. */
+        long rsv_hpages;        /* Pages reserved against global pool to */
+                                /* sasitfy minimum size. */
 };
 
 struct resv_map {
@@ -38,11 +44,10 @@ extern int hugetlb_max_hstate __read_mostly;
 #define for_each_hstate(h) \
         for ((h) = hstates; (h) < &hstates[hugetlb_max_hstate]; (h)++)
 
-struct hugepage_subpool *hugepage_new_subpool(long nr_blocks);
+struct hugepage_subpool *hugepage_new_subpool(struct hstate *h, long max_hpages,
+                                                long min_hpages);
 void hugepage_put_subpool(struct hugepage_subpool *spool);
 
-int PageHuge(struct page *page);
-
 void reset_vma_resv_huge_pages(struct vm_area_struct *vma);
 int hugetlb_sysctl_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);
 int hugetlb_overcommit_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);
@@ -79,7 +84,6 @@ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed);
 int dequeue_hwpoisoned_huge_page(struct page *page);
 bool isolate_huge_page(struct page *page, struct list_head *list);
 void putback_active_hugepage(struct page *page);
-bool is_hugepage_active(struct page *page);
 void free_huge_page(struct page *page);
 
 #ifdef CONFIG_ARCH_WANT_HUGE_PMD_SHARE
@@ -109,11 +113,6 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma,
 
 #else /* !CONFIG_HUGETLB_PAGE */
 
-static inline int PageHuge(struct page *page)
-{
-        return 0;
-}
-
 static inline void reset_vma_resv_huge_pages(struct vm_area_struct *vma)
 {
 }
@@ -152,7 +151,6 @@ static inline bool isolate_huge_page(struct page *page, struct list_head *list)
         return false;
 }
 #define putback_active_hugepage(p)      do {} while (0)
-#define is_hugepage_active(x)   false
 
 static inline unsigned long hugetlb_change_protection(struct vm_area_struct *vma,
                 unsigned long address, unsigned long end, pgprot_t newprot)
diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h
index eb7b414d232b..4f7d8f4b1e9a 100644
--- a/include/linux/hw_random.h
+++ b/include/linux/hw_random.h
@@ -50,10 +50,14 @@ struct hwrng {
         struct completion cleanup_done;
 };
 
+struct device;
+
 /** Register a new Hardware Random Number Generator driver. */
 extern int hwrng_register(struct hwrng *rng);
+extern int devm_hwrng_register(struct device *dev, struct hwrng *rng);
 /** Unregister a Hardware Random Number Generator driver. */
 extern void hwrng_unregister(struct hwrng *rng);
+extern void devm_hwrng_unregister(struct device *dve, struct hwrng *rng);
 /** Feed random bits into the pool. */
 extern void add_hwgenerator_randomness(const char *buffer, size_t count, size_t entropy);
 
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 5a2ba674795e..902c37aef67e 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -646,12 +646,13 @@ struct hv_input_signal_event_buffer {
 };
 
 struct vmbus_channel {
+        /* Unique channel id */
+        int id;
+
         struct list_head listentry;
 
         struct hv_device *device_obj;
 
-        struct work_struct work;
-
         enum vmbus_channel_state state;
 
         struct vmbus_channel_offer_channel offermsg;
@@ -672,7 +673,6 @@ struct vmbus_channel {
         struct hv_ring_buffer_info outbound;    /* send to parent */
         struct hv_ring_buffer_info inbound;     /* receive from parent */
         spinlock_t inbound_lock;
-        struct workqueue_struct *controlwq;
 
         struct vmbus_close_msg close_msg;
 
@@ -758,6 +758,9 @@ struct vmbus_channel {
          * link up channels based on their CPU affinity.
          */
         struct list_head percpu_list;
+
+        int num_sc;
+        int next_oc;
 };
 
 static inline void set_channel_read_state(struct vmbus_channel *c, bool state)
@@ -861,6 +864,14 @@ extern int vmbus_sendpacket(struct vmbus_channel *channel,
                                   enum vmbus_packet_type type,
                                   u32 flags);
 
+extern int vmbus_sendpacket_ctl(struct vmbus_channel *channel,
+                                  void *buffer,
+                                  u32 bufferLen,
+                                  u64 requestid,
+                                  enum vmbus_packet_type type,
+                                  u32 flags,
+                                  bool kick_q);
+
 extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
                                             struct hv_page_buffer pagebuffers[],
                                             u32 pagecount,
@@ -868,6 +879,15 @@ extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
                                             u32 bufferlen,
                                             u64 requestid);
 
+extern int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
+                                           struct hv_page_buffer pagebuffers[],
+                                           u32 pagecount,
+                                           void *buffer,
+                                           u32 bufferlen,
+                                           u64 requestid,
+                                           u32 flags,
+                                           bool kick_q);
+
 extern int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
                                         struct hv_multipage_buffer *mpb,
                                         void *buffer,
@@ -1107,6 +1127,16 @@ void vmbus_driver_unregister(struct hv_driver *hv_driver);
                 }
 
 /*
+ * NetworkDirect. This is the guest RDMA service.
+ * {8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}
+ */
+#define HV_ND_GUID \
+        .guid = { \
+                        0x3d, 0xaf, 0x2e, 0x8c, 0xa7, 0x32, 0x09, 0x4b, \
+                        0xab, 0x99, 0xbd, 0x1f, 0x1c, 0x86, 0xb5, 0x01 \
+                }
+
+/*
  * Common header for Hyper-V ICs
  */
 
@@ -1213,6 +1243,7 @@ void hv_kvp_onchannelcallback(void *);
 int hv_vss_init(struct hv_util_service *);
 void hv_vss_deinit(void);
 void hv_vss_onchannelcallback(void *);
+void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid);
 
 extern struct resource hyperv_mmio;
 
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index f17da50402a4..e83a738a3b87 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -253,10 +253,10 @@ static inline void i2c_set_clientdata(struct i2c_client *dev, void *data)
 
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
 enum i2c_slave_event {
-        I2C_SLAVE_REQ_READ_START,
-        I2C_SLAVE_REQ_READ_END,
-        I2C_SLAVE_REQ_WRITE_START,
-        I2C_SLAVE_REQ_WRITE_END,
+        I2C_SLAVE_READ_REQUESTED,
+        I2C_SLAVE_WRITE_REQUESTED,
+        I2C_SLAVE_READ_PROCESSED,
+        I2C_SLAVE_WRITE_RECEIVED,
         I2C_SLAVE_STOP,
 };
 
@@ -278,7 +278,7 @@ static inline int i2c_slave_event(struct i2c_client *client,
  * @platform_data: stored in i2c_client.dev.platform_data
  * @archdata: copied into i2c_client.dev.archdata
  * @of_node: pointer to OpenFirmware device node
- * @acpi_node: ACPI device node
+ * @fwnode: device node supplied by the platform firmware
  * @irq: stored in i2c_client.irq
  *
  * I2C doesn't actually support hardware probing, although controllers and
@@ -299,7 +299,7 @@ struct i2c_board_info {
         void            *platform_data;
         struct dev_archdata     *archdata;
         struct device_node *of_node;
-        struct acpi_dev_node acpi_node;
+        struct fwnode_handle *fwnode;
         int             irq;
 };
 
@@ -435,8 +435,8 @@ struct i2c_bus_recovery_info {
         void (*set_scl)(struct i2c_adapter *, int val);
         int (*get_sda)(struct i2c_adapter *);
 
-        void (*prepare_recovery)(struct i2c_bus_recovery_info *bri);
-        void (*unprepare_recovery)(struct i2c_bus_recovery_info *bri);
+        void (*prepare_recovery)(struct i2c_adapter *);
+        void (*unprepare_recovery)(struct i2c_adapter *);
 
         /* gpio recovery */
         int scl_gpio;
@@ -449,6 +449,48 @@ int i2c_recover_bus(struct i2c_adapter *adap);
 int i2c_generic_gpio_recovery(struct i2c_adapter *adap);
 int i2c_generic_scl_recovery(struct i2c_adapter *adap);
 
+/**
+ * struct i2c_adapter_quirks - describe flaws of an i2c adapter
+ * @flags: see I2C_AQ_* for possible flags and read below
+ * @max_num_msgs: maximum number of messages per transfer
+ * @max_write_len: maximum length of a write message
+ * @max_read_len: maximum length of a read message
+ * @max_comb_1st_msg_len: maximum length of the first msg in a combined message
+ * @max_comb_2nd_msg_len: maximum length of the second msg in a combined message
+ *
+ * Note about combined messages: Some I2C controllers can only send one message
+ * per transfer, plus something called combined message or write-then-read.
+ * This is (usually) a small write message followed by a read message and
+ * barely enough to access register based devices like EEPROMs. There is a flag
+ * to support this mode. It implies max_num_msg = 2 and does the length checks
+ * with max_comb_*_len because combined message mode usually has its own
+ * limitations. Because of HW implementations, some controllers can actually do
+ * write-then-anything or other variants. To support that, write-then-read has
+ * been broken out into smaller bits like write-first and read-second which can
+ * be combined as needed.
+ */
+
+struct i2c_adapter_quirks {
+        u64 flags;
+        int max_num_msgs;
+        u16 max_write_len;
+        u16 max_read_len;
+        u16 max_comb_1st_msg_len;
+        u16 max_comb_2nd_msg_len;
+};
+
+/* enforce max_num_msgs = 2 and use max_comb_*_len for length checks */
+#define I2C_AQ_COMB                     BIT(0)
+/* first combined message must be write */
+#define I2C_AQ_COMB_WRITE_FIRST         BIT(1)
+/* second combined message must be read */
+#define I2C_AQ_COMB_READ_SECOND         BIT(2)
+/* both combined messages must have the same target address */
+#define I2C_AQ_COMB_SAME_ADDR           BIT(3)
+/* convenience macro for typical write-then read case */
+#define I2C_AQ_COMB_WRITE_THEN_READ     (I2C_AQ_COMB | I2C_AQ_COMB_WRITE_FIRST | \
+                                         I2C_AQ_COMB_READ_SECOND | I2C_AQ_COMB_SAME_ADDR)
+
 /*
  * i2c_adapter is the structure used to identify a physical i2c bus along
  * with the access algorithms necessary to access it.
@@ -474,6 +516,7 @@ struct i2c_adapter {
         struct list_head userspace_clients;
 
         struct i2c_bus_recovery_info *bus_recovery_info;
+        const struct i2c_adapter_quirks *quirks;
 };
 #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
 
diff --git a/include/linux/ieee802154.h b/include/linux/ieee802154.h
index 6e82d888287c..8872ca103d06 100644
--- a/include/linux/ieee802154.h
+++ b/include/linux/ieee802154.h
@@ -28,7 +28,9 @@
 #include <asm/byteorder.h>
 
 #define IEEE802154_MTU                  127
-#define IEEE802154_MIN_PSDU_LEN         5
+#define IEEE802154_ACK_PSDU_LEN         5
+#define IEEE802154_MIN_PSDU_LEN         9
+#define IEEE802154_FCS_LEN              2
 
 #define IEEE802154_PAN_ID_BROADCAST     0xffff
 #define IEEE802154_ADDR_SHORT_BROADCAST 0xffff
@@ -38,6 +40,7 @@
 
 #define IEEE802154_LIFS_PERIOD          40
 #define IEEE802154_SIFS_PERIOD          12
+#define IEEE802154_MAX_SIFS_FRAME_SIZE  18
 
 #define IEEE802154_MAX_CHANNEL          26
 #define IEEE802154_MAX_PAGE             31
@@ -204,11 +207,18 @@ enum {
 
 /**
  * ieee802154_is_valid_psdu_len - check if psdu len is valid
+ * available lengths:
+ *      0-4     Reserved
+ *      5       MPDU (Acknowledgment)
+ *      6-8     Reserved
+ *      9-127   MPDU
+ *
  * @len: psdu len with (MHR + payload + MFR)
  */
 static inline bool ieee802154_is_valid_psdu_len(const u8 len)
 {
-        return (len >= IEEE802154_MIN_PSDU_LEN && len <= IEEE802154_MTU);
+        return (len == IEEE802154_ACK_PSDU_LEN ||
+                (len >= IEEE802154_MIN_PSDU_LEN && len <= IEEE802154_MTU));
 }
 
 /**
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index a57bca2ea97e..dad8b00beed2 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -44,6 +44,7 @@ struct br_ip_list {
 #define BR_PROMISC              BIT(7)
 #define BR_PROXYARP             BIT(8)
 #define BR_LEARNING_SYNC        BIT(9)
+#define BR_PROXYARP_WIFI        BIT(10)
 
 extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));
 
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 119130e9298b..da4929927f69 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -14,5 +14,6 @@ struct ifla_vf_info {
         __u32 linkstate;
         __u32 min_tx_rate;
         __u32 max_tx_rate;
+        __u32 rss_query_en;
 };
 #endif /* _LINUX_IF_LINK_H */
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index aff7ad8a4ea3..66a7d7600f43 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -19,6 +19,7 @@
 #include <linux/netdevice.h>
 #include <linux/ppp_channel.h>
 #include <linux/skbuff.h>
+#include <linux/workqueue.h>
 #include <uapi/linux/if_pppox.h>
 
 static inline struct pppoe_hdr *pppoe_hdr(const struct sk_buff *skb)
@@ -32,6 +33,7 @@ struct pppoe_opt {
         struct pppoe_addr       pa;       /* what this socket is bound to*/
         struct sockaddr_pppox   relay;    /* what socket data will be
                                              relayed to (PPPoE relaying) */
+        struct work_struct      padt_work;/* Work item for handling PADT */
 };
 
 struct pptp_opt {
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index b11b28a30b9e..920e4457ce6e 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -561,4 +561,71 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
                 skb->protocol = htons(ETH_P_802_2);
 }
 
+/**
+ * skb_vlan_tagged - check if skb is vlan tagged.
+ * @skb: skbuff to query
+ *
+ * Returns true if the skb is tagged, regardless of whether it is hardware
+ * accelerated or not.
+ */
+static inline bool skb_vlan_tagged(const struct sk_buff *skb)
+{
+        if (!skb_vlan_tag_present(skb) &&
+            likely(skb->protocol != htons(ETH_P_8021Q) &&
+                   skb->protocol != htons(ETH_P_8021AD)))
+                return false;
+
+        return true;
+}
+
+/**
+ * skb_vlan_tagged_multi - check if skb is vlan tagged with multiple headers.
+ * @skb: skbuff to query
+ *
+ * Returns true if the skb is tagged with multiple vlan headers, regardless
+ * of whether it is hardware accelerated or not.
+ */
+static inline bool skb_vlan_tagged_multi(const struct sk_buff *skb)
+{
+        __be16 protocol = skb->protocol;
+
+        if (!skb_vlan_tag_present(skb)) {
+                struct vlan_ethhdr *veh;
+
+                if (likely(protocol != htons(ETH_P_8021Q) &&
+                           protocol != htons(ETH_P_8021AD)))
+                        return false;
+
+                veh = (struct vlan_ethhdr *)skb->data;
+                protocol = veh->h_vlan_encapsulated_proto;
+        }
+
+        if (protocol != htons(ETH_P_8021Q) && protocol != htons(ETH_P_8021AD))
+                return false;
+
+        return true;
+}
+
+/**
+ * vlan_features_check - drop unsafe features for skb with multiple tags.
+ * @skb: skbuff to query
+ * @features: features to be checked
+ *
+ * Returns features without unsafe ones if the skb has multiple tags.
+ */
+static inline netdev_features_t vlan_features_check(const struct sk_buff *skb,
+                                                    netdev_features_t features)
+{
+        if (skb_vlan_tagged_multi(skb))
+                features = netdev_intersect_features(features,
+                                                     NETIF_F_SG |
+                                                     NETIF_F_HIGHDMA |
+                                                     NETIF_F_FRAGLIST |
+                                                     NETIF_F_GEN_CSUM |
+                                                     NETIF_F_HW_VLAN_CTAG_TX |
+                                                     NETIF_F_HW_VLAN_STAG_TX);
+
+        return features;
+}
+
 #endif /* !(_LINUX_IF_VLAN_H_) */
diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h
index b65850a41127..eb8622b78ec9 100644
--- a/include/linux/iio/buffer.h
+++ b/include/linux/iio/buffer.h
@@ -21,8 +21,8 @@ struct iio_buffer;
  * struct iio_buffer_access_funcs - access functions for buffers.
  * @store_to:           actually store stuff to the buffer
  * @read_first_n:       try to get a specified number of bytes (must exist)
- * @data_available:     indicates whether data for reading from the buffer is
- *                      available.
+ * @data_available:     indicates how much data is available for reading from
+ *                      the buffer.
  * @request_update:     if a parameter change has been marked, update underlying
  *                      storage.
  * @set_bytes_per_datum:set number of bytes per datum
@@ -43,7 +43,7 @@ struct iio_buffer_access_funcs {
         int (*read_first_n)(struct iio_buffer *buffer,
                             size_t n,
                             char __user *buf);
-        bool (*data_available)(struct iio_buffer *buffer);
+        size_t (*data_available)(struct iio_buffer *buffer);
 
         int (*request_update)(struct iio_buffer *buffer);
 
@@ -72,6 +72,7 @@ struct iio_buffer_access_funcs {
  * @demux_bounce:       [INTERN] buffer for doing gather from incoming scan.
  * @buffer_list:        [INTERN] entry in the devices list of current buffers.
  * @ref:                [INTERN] reference count of the buffer.
+ * @watermark:          [INTERN] number of datums to wait for poll/read.
  */
 struct iio_buffer {
         int                                     length;
@@ -90,6 +91,7 @@ struct iio_buffer {
         void                                    *demux_bounce;
         struct list_head                        buffer_list;
         struct kref                             ref;
+        unsigned int                            watermark;
 };
 
 /**
diff --git a/include/linux/iio/dac/max517.h b/include/linux/iio/dac/max517.h
index f6d1d252f08d..7668716cd73c 100644
--- a/include/linux/iio/dac/max517.h
+++ b/include/linux/iio/dac/max517.h
@@ -9,7 +9,7 @@
 #define IIO_DAC_MAX517_H_
 
 struct max517_platform_data {
-        u16                             vref_mv[2];
+        u16                             vref_mv[8];
 };
 
 #endif /* IIO_DAC_MAX517_H_ */
diff --git a/include/linux/iio/events.h b/include/linux/iio/events.h
index 03fa332ad2a8..8ad87d1c5340 100644
--- a/include/linux/iio/events.h
+++ b/include/linux/iio/events.h
@@ -9,22 +9,8 @@
 #ifndef _IIO_EVENTS_H_
 #define _IIO_EVENTS_H_
 
-#include <linux/ioctl.h>
-#include <linux/types.h>
 #include <linux/iio/types.h>
-
-/**
- * struct iio_event_data - The actual event being pushed to userspace
- * @id:         event identifier
- * @timestamp:  best estimate of time of event occurrence (often from
- *              the interrupt handler)
- */
-struct iio_event_data {
-        __u64   id;
-        __s64   timestamp;
-};
-
-#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)
+#include <uapi/linux/iio/events.h>
 
 /**
  * IIO_EVENT_CODE() - create event identifier
@@ -70,18 +56,4 @@ struct iio_event_data {
 #define IIO_UNMOD_EVENT_CODE(chan_type, number, type, direction)        \
         IIO_EVENT_CODE(chan_type, 0, 0, direction, type, number, 0, 0)
 
-#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
-
-#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0x7F)
-
-#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
-
-/* Event code number extraction depends on which type of event we have.
- * Perhaps review this function in the future*/
-#define IIO_EVENT_CODE_EXTRACT_CHAN(mask) ((__s16)(mask & 0xFFFF))
-#define IIO_EVENT_CODE_EXTRACT_CHAN2(mask) ((__s16)(((mask) >> 16) & 0xFFFF))
-
-#define IIO_EVENT_CODE_EXTRACT_MODIFIER(mask) ((mask >> 40) & 0xFF)
-#define IIO_EVENT_CODE_EXTRACT_DIFF(mask) (((mask) >> 55) & 0x1)
-
 #endif
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 80d855061064..d86b753e9b30 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -338,6 +338,16 @@ struct iio_dev;
  *                      provide a custom of_xlate function that reads the
  *                      *args* and returns the appropriate index in registered
  *                      IIO channels array.
+ * @hwfifo_set_watermark: function pointer to set the current hardware
+ *                      fifo watermark level; see hwfifo_* entries in
+ *                      Documentation/ABI/testing/sysfs-bus-iio for details on
+ *                      how the hardware fifo operates
+ * @hwfifo_flush_to_buffer: function pointer to flush the samples stored
+ *                      in the hardware fifo to the device buffer. The driver
+ *                      should not flush more than count samples. The function
+ *                      must return the number of samples flushed, 0 if no
+ *                      samples were flushed or a negative integer if no samples
+ *                      were flushed and there was an error.
  **/
 struct iio_info {
         struct module                   *driver_module;
@@ -399,6 +409,9 @@ struct iio_info {
                                   unsigned *readval);
         int (*of_xlate)(struct iio_dev *indio_dev,
                         const struct of_phandle_args *iiospec);
+        int (*hwfifo_set_watermark)(struct iio_dev *indio_dev, unsigned val);
+        int (*hwfifo_flush_to_buffer)(struct iio_dev *indio_dev,
+                                      unsigned count);
 };
 
 /**
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 580ed5bdb3fa..942b6de68e2f 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -10,76 +10,7 @@
 #ifndef _IIO_TYPES_H_
 #define _IIO_TYPES_H_
 
-enum iio_chan_type {
-        IIO_VOLTAGE,
-        IIO_CURRENT,
-        IIO_POWER,
-        IIO_ACCEL,
-        IIO_ANGL_VEL,
-        IIO_MAGN,
-        IIO_LIGHT,
-        IIO_INTENSITY,
-        IIO_PROXIMITY,
-        IIO_TEMP,
-        IIO_INCLI,
-        IIO_ROT,
-        IIO_ANGL,
-        IIO_TIMESTAMP,
-        IIO_CAPACITANCE,
-        IIO_ALTVOLTAGE,
-        IIO_CCT,
-        IIO_PRESSURE,
-        IIO_HUMIDITYRELATIVE,
-        IIO_ACTIVITY,
-        IIO_STEPS,
-        IIO_ENERGY,
-        IIO_DISTANCE,
-        IIO_VELOCITY,
-};
-
-enum iio_modifier {
-        IIO_NO_MOD,
-        IIO_MOD_X,
-        IIO_MOD_Y,
-        IIO_MOD_Z,
-        IIO_MOD_X_AND_Y,
-        IIO_MOD_X_AND_Z,
-        IIO_MOD_Y_AND_Z,
-        IIO_MOD_X_AND_Y_AND_Z,
-        IIO_MOD_X_OR_Y,
-        IIO_MOD_X_OR_Z,
-        IIO_MOD_Y_OR_Z,
-        IIO_MOD_X_OR_Y_OR_Z,
-        IIO_MOD_LIGHT_BOTH,
-        IIO_MOD_LIGHT_IR,
-        IIO_MOD_ROOT_SUM_SQUARED_X_Y,
-        IIO_MOD_SUM_SQUARED_X_Y_Z,
-        IIO_MOD_LIGHT_CLEAR,
-        IIO_MOD_LIGHT_RED,
-        IIO_MOD_LIGHT_GREEN,
-        IIO_MOD_LIGHT_BLUE,
-        IIO_MOD_QUATERNION,
-        IIO_MOD_TEMP_AMBIENT,
-        IIO_MOD_TEMP_OBJECT,
-        IIO_MOD_NORTH_MAGN,
-        IIO_MOD_NORTH_TRUE,
-        IIO_MOD_NORTH_MAGN_TILT_COMP,
-        IIO_MOD_NORTH_TRUE_TILT_COMP,
-        IIO_MOD_RUNNING,
-        IIO_MOD_JOGGING,
-        IIO_MOD_WALKING,
-        IIO_MOD_STILL,
-        IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z,
-};
-
-enum iio_event_type {
-        IIO_EV_TYPE_THRESH,
-        IIO_EV_TYPE_MAG,
-        IIO_EV_TYPE_ROC,
-        IIO_EV_TYPE_THRESH_ADAPTIVE,
-        IIO_EV_TYPE_MAG_ADAPTIVE,
-        IIO_EV_TYPE_CHANGE,
-};
+#include <uapi/linux/iio/types.h>
 
 enum iio_event_info {
         IIO_EV_INFO_ENABLE,
@@ -88,13 +19,6 @@ enum iio_event_info {
         IIO_EV_INFO_PERIOD,
 };
 
-enum iio_event_direction {
-        IIO_EV_DIR_EITHER,
-        IIO_EV_DIR_RISING,
-        IIO_EV_DIR_FALLING,
-        IIO_EV_DIR_NONE,
-};
-
 #define IIO_VAL_INT 1
 #define IIO_VAL_INT_PLUS_MICRO 2
 #define IIO_VAL_INT_PLUS_NANO 3
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 46da02410a09..ac48b10c9395 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -11,33 +11,34 @@ struct sk_buff;
 struct netlink_callback;
 
 struct inet_diag_handler {
-        void                    (*dump)(struct sk_buff *skb,
-                                        struct netlink_callback *cb,
-                                        struct inet_diag_req_v2 *r,
-                                        struct nlattr *bc);
-
-        int                     (*dump_one)(struct sk_buff *in_skb,
-                                        const struct nlmsghdr *nlh,
-                                        struct inet_diag_req_v2 *req);
-
-        void                    (*idiag_get_info)(struct sock *sk,
-                                                  struct inet_diag_msg *r,
-                                                  void *info);
-        __u16                   idiag_type;
+        void            (*dump)(struct sk_buff *skb,
+                                struct netlink_callback *cb,
+                                const struct inet_diag_req_v2 *r,
+                                struct nlattr *bc);
+
+        int             (*dump_one)(struct sk_buff *in_skb,
+                                    const struct nlmsghdr *nlh,
+                                    const struct inet_diag_req_v2 *req);
+
+        void            (*idiag_get_info)(struct sock *sk,
+                                          struct inet_diag_msg *r,
+                                          void *info);
+        __u16           idiag_type;
 };
 
 struct inet_connection_sock;
 int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
-                              struct sk_buff *skb, struct inet_diag_req_v2 *req,
-                              struct user_namespace *user_ns,
-                              u32 pid, u32 seq, u16 nlmsg_flags,
-                              const struct nlmsghdr *unlh);
+                      struct sk_buff *skb, const struct inet_diag_req_v2 *req,
+                      struct user_namespace *user_ns,
+                      u32 pid, u32 seq, u16 nlmsg_flags,
+                      const struct nlmsghdr *unlh);
 void inet_diag_dump_icsk(struct inet_hashinfo *h, struct sk_buff *skb,
-                struct netlink_callback *cb, struct inet_diag_req_v2 *r,
-                struct nlattr *bc);
+                         struct netlink_callback *cb,
+                         const struct inet_diag_req_v2 *r,
+                         struct nlattr *bc);
 int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo,
-                struct sk_buff *in_skb, const struct nlmsghdr *nlh,
-                struct inet_diag_req_v2 *req);
+                            struct sk_buff *in_skb, const struct nlmsghdr *nlh,
+                            const struct inet_diag_req_v2 *req);
 
 int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk);
 
diff --git a/include/linux/init.h b/include/linux/init.h
index 2df8e8dd10a4..21b6d768edd7 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -253,21 +253,41 @@ struct obs_kernel_param {
  * obs_kernel_param "array" too far apart in .init.setup.
  */
 #define __setup_param(str, unique_id, fn, early)                        \
-        static const char __setup_str_##unique_id[] __initconst \
-                __aligned(1) = str; \
-        static struct obs_kernel_param __setup_##unique_id      \
-                __used __section(.init.setup)                   \
-                __attribute__((aligned((sizeof(long)))))        \
+        static const char __setup_str_##unique_id[] __initconst         \
+                __aligned(1) = str;                                     \
+        static struct obs_kernel_param __setup_##unique_id              \
+                __used __section(.init.setup)                           \
+                __attribute__((aligned((sizeof(long)))))                \
                 = { __setup_str_##unique_id, fn, early }
 
-#define __setup(str, fn)                                        \
+#define __setup(str, fn)                                                \
         __setup_param(str, fn, fn, 0)
 
-/* NOTE: fn is as per module_param, not __setup!  Emits warning if fn
- * returns non-zero. */
-#define early_param(str, fn)                                    \
+/*
+ * NOTE: fn is as per module_param, not __setup!
+ * Emits warning if fn returns non-zero.
+ */
+#define early_param(str, fn)                                            \
         __setup_param(str, fn, fn, 1)
 
+#define early_param_on_off(str_on, str_off, var, config)                \
+                                                                        \
+        int var = IS_ENABLED(config);                                   \
+                                                                        \
+        static int __init parse_##var##_on(char *arg)                   \
+        {                                                               \
+                var = 1;                                                \
+                return 0;                                               \
+        }                                                               \
+        __setup_param(str_on, parse_##var##_on, parse_##var##_on, 1);   \
+                                                                        \
+        static int __init parse_##var##_off(char *arg)                  \
+        {                                                               \
+                var = 0;                                                \
+                return 0;                                               \
+        }                                                               \
+        __setup_param(str_off, parse_##var##_off, parse_##var##_off, 1)
+
 /* Relies on boot_command_line being set */
 void __init parse_early_param(void);
 void __init parse_early_options(char *cmdline);
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index a65208a8fe18..796ef9645827 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -115,10 +115,19 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
  * Extended Capability Register
  */
 
-#define ecap_niotlb_iunits(e)   ((((e) >> 24) & 0xff) + 1)
+#define ecap_pss(e)             ((e >> 35) & 0x1f)
+#define ecap_eafs(e)            ((e >> 34) & 0x1)
+#define ecap_nwfs(e)            ((e >> 33) & 0x1)
+#define ecap_srs(e)             ((e >> 31) & 0x1)
+#define ecap_ers(e)             ((e >> 30) & 0x1)
+#define ecap_prs(e)             ((e >> 29) & 0x1)
+#define ecap_pasid(e)           ((e >> 28) & 0x1)
+#define ecap_dis(e)             ((e >> 27) & 0x1)
+#define ecap_nest(e)            ((e >> 26) & 0x1)
+#define ecap_mts(e)             ((e >> 25) & 0x1)
+#define ecap_ecs(e)             ((e >> 24) & 0x1)
 #define ecap_iotlb_offset(e)    ((((e) >> 8) & 0x3ff) * 16)
-#define ecap_max_iotlb_offset(e) \
-        (ecap_iotlb_offset(e) + ecap_niotlb_iunits(e) * 16)
+#define ecap_max_iotlb_offset(e) (ecap_iotlb_offset(e) + 16)
 #define ecap_coherent(e)        ((e) & 0x1)
 #define ecap_qis(e)             ((e) & 0x2)
 #define ecap_pass_through(e)    ((e >> 6) & 0x1)
@@ -180,6 +189,9 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
 #define DMA_GSTS_IRES (((u32)1) << 25)
 #define DMA_GSTS_CFIS (((u32)1) << 23)
 
+/* DMA_RTADDR_REG */
+#define DMA_RTADDR_RTT (((u64)1) << 11)
+
 /* CCMD_REG */
 #define DMA_CCMD_ICC (((u64)1) << 63)
 #define DMA_CCMD_GLOBAL_INVL (((u64)1) << 61)
diff --git a/include/linux/intel_mid_dma.h b/include/linux/intel_mid_dma.h
deleted file mode 100644
index 10496bd24c5c..000000000000
--- a/include/linux/intel_mid_dma.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  intel_mid_dma.h - Intel MID DMA Drivers
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Author: Vinod Koul <vinod.koul@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *
- */
-#ifndef __INTEL_MID_DMA_H__
-#define __INTEL_MID_DMA_H__
-
-#include <linux/dmaengine.h>
-
-#define DMA_PREP_CIRCULAR_LIST          (1 << 10)
-
-/*DMA mode configurations*/
-enum intel_mid_dma_mode {
-        LNW_DMA_PER_TO_MEM = 0, /*periphral to memory configuration*/
-        LNW_DMA_MEM_TO_PER,     /*memory to periphral configuration*/
-        LNW_DMA_MEM_TO_MEM,     /*mem to mem confg (testing only)*/
-};
-
-/*DMA handshaking*/
-enum intel_mid_dma_hs_mode {
-        LNW_DMA_HW_HS = 0,      /*HW Handshaking only*/
-        LNW_DMA_SW_HS = 1,      /*SW Handshaking not recommended*/
-};
-
-/*Burst size configuration*/
-enum intel_mid_dma_msize {
-        LNW_DMA_MSIZE_1 = 0x0,
-        LNW_DMA_MSIZE_4 = 0x1,
-        LNW_DMA_MSIZE_8 = 0x2,
-        LNW_DMA_MSIZE_16 = 0x3,
-        LNW_DMA_MSIZE_32 = 0x4,
-        LNW_DMA_MSIZE_64 = 0x5,
-};
-
-/**
- * struct intel_mid_dma_slave - DMA slave structure
- *
- * @dirn: DMA trf direction
- * @src_width: tx register width
- * @dst_width: rx register width
- * @hs_mode: HW/SW handshaking mode
- * @cfg_mode: DMA data transfer mode (per-per/mem-per/mem-mem)
- * @src_msize: Source DMA burst size
- * @dst_msize: Dst DMA burst size
- * @per_addr: Periphral address
- * @device_instance: DMA peripheral device instance, we can have multiple
- *              peripheral device connected to single DMAC
- */
-struct intel_mid_dma_slave {
-        enum intel_mid_dma_hs_mode      hs_mode;  /*handshaking*/
-        enum intel_mid_dma_mode         cfg_mode; /*mode configuration*/
-        unsigned int            device_instance; /*0, 1 for periphral instance*/
-        struct dma_slave_config         dma_slave;
-};
-
-#endif /*__INTEL_MID_DMA_H__*/
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index d9b05b5bf8c7..950ae4501826 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -39,8 +39,6 @@
  * These flags used only by the kernel as part of the
  * irq handling routines.
  *
- * IRQF_DISABLED - keep irqs disabled when calling the action handler.
- *                 DEPRECATED. This flag is a NOOP and scheduled to be removed
  * IRQF_SHARED - allow sharing the irq among several devices
  * IRQF_PROBE_SHARED - set by callers when they expect sharing mismatches to occur
  * IRQF_TIMER - Flag to mark this interrupt as timer interrupt
@@ -52,13 +50,18 @@
  * IRQF_ONESHOT - Interrupt is not reenabled after the hardirq handler finished.
  *                Used by threaded interrupts which need to keep the
  *                irq line disabled until the threaded handler has been run.
- * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend
+ * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend.  Does not guarantee
+ *                   that this interrupt will wake the system from a suspended
+ *                   state.  See Documentation/power/suspend-and-interrupts.txt
  * IRQF_FORCE_RESUME - Force enable it on resume even if IRQF_NO_SUSPEND is set
  * IRQF_NO_THREAD - Interrupt cannot be threaded
  * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device
  *                resume time.
+ * IRQF_COND_SUSPEND - If the IRQ is shared with a NO_SUSPEND user, execute this
+ *                interrupt handler after suspending interrupts. For system
+ *                wakeup devices users need to implement wakeup detection in
+ *                their interrupt handlers.
  */
-#define IRQF_DISABLED           0x00000020
 #define IRQF_SHARED             0x00000080
 #define IRQF_PROBE_SHARED       0x00000100
 #define __IRQF_TIMER            0x00000200
@@ -70,6 +73,7 @@
 #define IRQF_FORCE_RESUME       0x00008000
 #define IRQF_NO_THREAD          0x00010000
 #define IRQF_EARLY_RESUME       0x00020000
+#define IRQF_COND_SUSPEND       0x00040000
 
 #define IRQF_TIMER              (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)
 
@@ -184,6 +188,7 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
 #endif
 
 extern void disable_irq_nosync(unsigned int irq);
+extern bool disable_hardirq(unsigned int irq);
 extern void disable_irq(unsigned int irq);
 extern void disable_percpu_irq(unsigned int irq);
 extern void enable_irq(unsigned int irq);
@@ -356,6 +361,20 @@ static inline int disable_irq_wake(unsigned int irq)
         return irq_set_irq_wake(irq, 0);
 }
 
+/*
+ * irq_get_irqchip_state/irq_set_irqchip_state specific flags
+ */
+enum irqchip_irq_state {
+        IRQCHIP_STATE_PENDING,          /* Is interrupt pending? */
+        IRQCHIP_STATE_ACTIVE,           /* Is interrupt in progress? */
+        IRQCHIP_STATE_MASKED,           /* Is interrupt masked? */
+        IRQCHIP_STATE_LINE_LEVEL,       /* Is IRQ line high? */
+};
+
+extern int irq_get_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
+                                 bool *state);
+extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
+                                 bool state);
 
 #ifdef CONFIG_IRQ_FORCED_THREADING
 extern bool force_irqthreads;
diff --git a/include/linux/io.h b/include/linux/io.h
index fa02e55e5a2e..986f2bffea1e 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -38,6 +38,14 @@ static inline int ioremap_page_range(unsigned long addr, unsigned long end,
 }
 #endif
 
+#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
+void __init ioremap_huge_init(void);
+int arch_ioremap_pud_supported(void);
+int arch_ioremap_pmd_supported(void);
+#else
+static inline void ioremap_huge_init(void) { }
+#endif
+
 /*
  * Managed iomap interface
  */
@@ -64,6 +72,8 @@ void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
                            resource_size_t size);
 void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
                                    resource_size_t size);
+void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset,
+                                   resource_size_t size);
 void devm_iounmap(struct device *dev, void __iomem *addr);
 int check_signature(const volatile void __iomem *io_addr,
                         const unsigned char *signature, int length);
diff --git a/include/linux/iommu-common.h b/include/linux/iommu-common.h
new file mode 100644
index 000000000000..bbced83b32ee
--- /dev/null
+++ b/include/linux/iommu-common.h
@@ -0,0 +1,51 @@
+#ifndef _LINUX_IOMMU_COMMON_H
+#define _LINUX_IOMMU_COMMON_H
+
+#include <linux/spinlock_types.h>
+#include <linux/device.h>
+#include <asm/page.h>
+
+#define IOMMU_POOL_HASHBITS     4
+#define IOMMU_NR_POOLS          (1 << IOMMU_POOL_HASHBITS)
+
+struct iommu_pool {
+        unsigned long   start;
+        unsigned long   end;
+        unsigned long   hint;
+        spinlock_t      lock;
+};
+
+struct iommu_map_table {
+        unsigned long           table_map_base;
+        unsigned long           table_shift;
+        unsigned long           nr_pools;
+        void                    (*lazy_flush)(struct iommu_map_table *);
+        unsigned long           poolsize;
+        struct iommu_pool       pools[IOMMU_NR_POOLS];
+        u32                     flags;
+#define IOMMU_HAS_LARGE_POOL    0x00000001
+#define IOMMU_NO_SPAN_BOUND     0x00000002
+#define IOMMU_NEED_FLUSH        0x00000004
+        struct iommu_pool       large_pool;
+        unsigned long           *map;
+};
+
+extern void iommu_tbl_pool_init(struct iommu_map_table *iommu,
+                                unsigned long num_entries,
+                                u32 table_shift,
+                                void (*lazy_flush)(struct iommu_map_table *),
+                                bool large_pool, u32 npools,
+                                bool skip_span_boundary_check);
+
+extern unsigned long iommu_tbl_range_alloc(struct device *dev,
+                                           struct iommu_map_table *iommu,
+                                           unsigned long npages,
+                                           unsigned long *handle,
+                                           unsigned long mask,
+                                           unsigned int align_order);
+
+extern void iommu_tbl_range_free(struct iommu_map_table *iommu,
+                                 u64 dma_addr, unsigned long npages,
+                                 unsigned long entry);
+
+#endif
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 38daa453f2e5..0546b8710ce3 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -51,9 +51,33 @@ struct iommu_domain_geometry {
         bool force_aperture;       /* DMA only allowed in mappable range? */
 };
 
+/* Domain feature flags */
+#define __IOMMU_DOMAIN_PAGING   (1U << 0)  /* Support for iommu_map/unmap */
+#define __IOMMU_DOMAIN_DMA_API  (1U << 1)  /* Domain for use in DMA-API
+                                              implementation              */
+#define __IOMMU_DOMAIN_PT       (1U << 2)  /* Domain is identity mapped   */
+
+/*
+ * This are the possible domain-types
+ *
+ *      IOMMU_DOMAIN_BLOCKED    - All DMA is blocked, can be used to isolate
+ *                                devices
+ *      IOMMU_DOMAIN_IDENTITY   - DMA addresses are system physical addresses
+ *      IOMMU_DOMAIN_UNMANAGED  - DMA mappings managed by IOMMU-API user, used
+ *                                for VMs
+ *      IOMMU_DOMAIN_DMA        - Internally used for DMA-API implementations.
+ *                                This flag allows IOMMU drivers to implement
+ *                                certain optimizations for these domains
+ */
+#define IOMMU_DOMAIN_BLOCKED    (0U)
+#define IOMMU_DOMAIN_IDENTITY   (__IOMMU_DOMAIN_PT)
+#define IOMMU_DOMAIN_UNMANAGED  (__IOMMU_DOMAIN_PAGING)
+#define IOMMU_DOMAIN_DMA        (__IOMMU_DOMAIN_PAGING |        \
+                                 __IOMMU_DOMAIN_DMA_API)
+
 struct iommu_domain {
+        unsigned type;
         const struct iommu_ops *ops;
-        void *priv;
         iommu_fault_handler_t handler;
         void *handler_token;
         struct iommu_domain_geometry geometry;
@@ -113,8 +137,11 @@ enum iommu_attr {
  */
 struct iommu_ops {
         bool (*capable)(enum iommu_cap);
-        int (*domain_init)(struct iommu_domain *domain);
-        void (*domain_destroy)(struct iommu_domain *domain);
+
+        /* Domain allocation and freeing by the iommu driver */
+        struct iommu_domain *(*domain_alloc)(unsigned iommu_domain_type);
+        void (*domain_free)(struct iommu_domain *);
+
         int (*attach_dev)(struct iommu_domain *domain, struct device *dev);
         void (*detach_dev)(struct iommu_domain *domain, struct device *dev);
         int (*map)(struct iommu_domain *domain, unsigned long iova,
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 2c5250222278..388e3ae94f7a 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -196,10 +196,8 @@ extern struct resource * __request_region(struct resource *,
 
 /* Compatibility cruft */
 #define release_region(start,n) __release_region(&ioport_resource, (start), (n))
-#define check_mem_region(start,n)       __check_region(&iomem_resource, (start), (n))
 #define release_mem_region(start,n)     __release_region(&iomem_resource, (start), (n))
 
-extern int __check_region(struct resource *, resource_size_t, resource_size_t);
 extern void __release_region(struct resource *, resource_size_t,
                                 resource_size_t);
 #ifdef CONFIG_MEMORY_HOTREMOVE
@@ -207,12 +205,6 @@ extern int release_mem_region_adjustable(struct resource *, resource_size_t,
                                 resource_size_t);
 #endif
 
-static inline int __deprecated check_region(resource_size_t s,
-                                                resource_size_t n)
-{
-        return __check_region(&ioport_resource, s, n);
-}
-
 /* Wrappers for managed devices */
 struct device;
 
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 4d5169f5d7d1..82806c60aa42 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -53,6 +53,10 @@ struct ipv6_devconf {
         __s32           ndisc_notify;
         __s32           suppress_frag_ndisc;
         __s32           accept_ra_mtu;
+        struct ipv6_stable_secret {
+                bool initialized;
+                struct in6_addr secret;
+        } stable_secret;
         void            *sysctl;
 };
 
diff --git a/include/linux/irq.h b/include/linux/irq.h
index d09ec7a1243e..62c6901cab55 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -30,6 +30,7 @@
 struct seq_file;
 struct module;
 struct msi_msg;
+enum irqchip_irq_state;
 
 /*
  * IRQ line status.
@@ -324,6 +325,8 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)
  *                              irq_request_resources
  * @irq_compose_msi_msg:        optional to compose message content for MSI
  * @irq_write_msi_msg:  optional to write message content for MSI
+ * @irq_get_irqchip_state:      return the internal state of an interrupt
+ * @irq_set_irqchip_state:      set the internal state of a interrupt
  * @flags:              chip specific flags
  */
 struct irq_chip {
@@ -363,6 +366,9 @@ struct irq_chip {
         void            (*irq_compose_msi_msg)(struct irq_data *data, struct msi_msg *msg);
         void            (*irq_write_msi_msg)(struct irq_data *data, struct msi_msg *msg);
 
+        int             (*irq_get_irqchip_state)(struct irq_data *data, enum irqchip_irq_state which, bool *state);
+        int             (*irq_set_irqchip_state)(struct irq_data *data, enum irqchip_irq_state which, bool state);
+
         unsigned long   flags;
 };
 
@@ -460,6 +466,7 @@ extern void irq_chip_eoi_parent(struct irq_data *data);
 extern int irq_chip_set_affinity_parent(struct irq_data *data,
                                         const struct cpumask *dest,
                                         bool force);
+extern int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on);
 #endif
 
 /* Handling of unhandled and spurious interrupts: */
diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
index bf3fe719c7ce..47b9ebd4a74f 100644
--- a/include/linux/irq_work.h
+++ b/include/linux/irq_work.h
@@ -38,16 +38,17 @@ bool irq_work_queue(struct irq_work *work);
 bool irq_work_queue_on(struct irq_work *work, int cpu);
 #endif
 
-void irq_work_run(void);
 void irq_work_tick(void);
 void irq_work_sync(struct irq_work *work);
 
 #ifdef CONFIG_IRQ_WORK
 #include <asm/irq_work.h>
 
+void irq_work_run(void);
 bool irq_work_needs_cpu(void);
 #else
 static inline bool irq_work_needs_cpu(void) { return false; }
+static inline void irq_work_run(void) { }
 #endif
 
 #endif /* _LINUX_IRQ_WORK_H */
diff --git a/include/linux/irqchip/arm-gic-acpi.h b/include/linux/irqchip/arm-gic-acpi.h
new file mode 100644
index 000000000000..de3419ed3937
--- /dev/null
+++ b/include/linux/irqchip/arm-gic-acpi.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014, Linaro Ltd.
+ *      Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
+ *
+ * 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 ARM_GIC_ACPI_H_
+#define ARM_GIC_ACPI_H_
+
+#ifdef CONFIG_ACPI
+
+/*
+ * Hard code here, we can not get memory size from MADT (but FDT does),
+ * Actually no need to do that, because this size can be inferred
+ * from GIC spec.
+ */
+#define ACPI_GICV2_DIST_MEM_SIZE        (SZ_4K)
+#define ACPI_GIC_CPU_IF_MEM_SIZE        (SZ_8K)
+
+struct acpi_table_header;
+
+int gic_v2_acpi_init(struct acpi_table_header *table);
+void acpi_gic_init(void);
+#else
+static inline void acpi_gic_init(void) { }
+#endif
+
+#endif /* ARM_GIC_ACPI_H_ */
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
index 800544bc7bfd..ffbc034c8810 100644
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h
@@ -126,8 +126,23 @@
 #define GICR_PROPBASER_WaWb             (5U << 7)
 #define GICR_PROPBASER_RaWaWt           (6U << 7)
 #define GICR_PROPBASER_RaWaWb           (7U << 7)
+#define GICR_PROPBASER_CACHEABILITY_MASK (7U << 7)
 #define GICR_PROPBASER_IDBITS_MASK      (0x1f)
 
+#define GICR_PENDBASER_NonShareable     (0U << 10)
+#define GICR_PENDBASER_InnerShareable   (1U << 10)
+#define GICR_PENDBASER_OuterShareable   (2U << 10)
+#define GICR_PENDBASER_SHAREABILITY_MASK (3UL << 10)
+#define GICR_PENDBASER_nCnB             (0U << 7)
+#define GICR_PENDBASER_nC               (1U << 7)
+#define GICR_PENDBASER_RaWt             (2U << 7)
+#define GICR_PENDBASER_RaWb             (3U << 7)
+#define GICR_PENDBASER_WaWt             (4U << 7)
+#define GICR_PENDBASER_WaWb             (5U << 7)
+#define GICR_PENDBASER_RaWaWt           (6U << 7)
+#define GICR_PENDBASER_RaWaWb           (7U << 7)
+#define GICR_PENDBASER_CACHEABILITY_MASK (7U << 7)
+
 /*
  * Re-Distributor registers, offsets from SGI_base
  */
@@ -166,6 +181,11 @@
 
 #define GITS_TRANSLATER                 0x10040
 
+#define GITS_CTLR_ENABLE                (1U << 0)
+#define GITS_CTLR_QUIESCENT             (1U << 31)
+
+#define GITS_TYPER_DEVBITS_SHIFT        13
+#define GITS_TYPER_DEVBITS(r)           ((((r) >> GITS_TYPER_DEVBITS_SHIFT) & 0x1f) + 1)
 #define GITS_TYPER_PTA                  (1UL << 19)
 
 #define GITS_CBASER_VALID               (1UL << 63)
@@ -177,6 +197,7 @@
 #define GITS_CBASER_WaWb                (5UL << 59)
 #define GITS_CBASER_RaWaWt              (6UL << 59)
 #define GITS_CBASER_RaWaWb              (7UL << 59)
+#define GITS_CBASER_CACHEABILITY_MASK   (7UL << 59)
 #define GITS_CBASER_NonShareable        (0UL << 10)
 #define GITS_CBASER_InnerShareable      (1UL << 10)
 #define GITS_CBASER_OuterShareable      (2UL << 10)
@@ -193,6 +214,7 @@
 #define GITS_BASER_WaWb                 (5UL << 59)
 #define GITS_BASER_RaWaWt               (6UL << 59)
 #define GITS_BASER_RaWaWb               (7UL << 59)
+#define GITS_BASER_CACHEABILITY_MASK    (7UL << 59)
 #define GITS_BASER_TYPE_SHIFT           (56)
 #define GITS_BASER_TYPE(r)              (((r) >> GITS_BASER_TYPE_SHIFT) & 7)
 #define GITS_BASER_ENTRY_SIZE_SHIFT     (48)
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index 71d706d5f169..36ec4ae74634 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -97,6 +97,7 @@ struct device_node;
 
 extern struct irq_chip gic_arch_extn;
 
+void gic_set_irqchip_flags(unsigned long flags);
 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
                     u32 offset, struct device_node *);
 void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);
@@ -115,11 +116,5 @@ int gic_get_cpu_id(unsigned int cpu);
 void gic_migrate_target(unsigned int new_cpu_id);
 unsigned long gic_get_sgir_physaddr(void);
 
-extern const struct irq_domain_ops *gic_routable_irq_domain_ops;
-static inline void __init register_routable_domain_ops
-                                        (const struct irq_domain_ops *ops)
-{
-        gic_routable_irq_domain_ops = ops;
-}
 #endif /* __ASSEMBLY */
 #endif
diff --git a/include/linux/irqchip/irq-crossbar.h b/include/linux/irqchip/irq-crossbar.h
deleted file mode 100644
index e5537b81df8d..000000000000
--- a/include/linux/irqchip/irq-crossbar.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- *  drivers/irqchip/irq-crossbar.h
- *
- *  Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.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.
- *
- */
-int irqcrossbar_init(void);
diff --git a/include/linux/irqchip/mips-gic.h b/include/linux/irqchip/mips-gic.h
index e6a6aac451db..9b1ad3734911 100644
--- a/include/linux/irqchip/mips-gic.h
+++ b/include/linux/irqchip/mips-gic.h
@@ -165,6 +165,8 @@
 #define GIC_VPE_PEND_SWINT0_MSK         (MSK(1) << GIC_VPE_PEND_SWINT0_SHF)
 #define GIC_VPE_PEND_SWINT1_SHF         5
 #define GIC_VPE_PEND_SWINT1_MSK         (MSK(1) << GIC_VPE_PEND_SWINT1_SHF)
+#define GIC_VPE_PEND_FDC_SHF            6
+#define GIC_VPE_PEND_FDC_MSK            (MSK(1) << GIC_VPE_PEND_FDC_SHF)
 
 /* GIC_VPE_RMASK Masks */
 #define GIC_VPE_RMASK_WD_SHF            0
@@ -179,6 +181,8 @@
 #define GIC_VPE_RMASK_SWINT0_MSK        (MSK(1) << GIC_VPE_RMASK_SWINT0_SHF)
 #define GIC_VPE_RMASK_SWINT1_SHF        5
 #define GIC_VPE_RMASK_SWINT1_MSK        (MSK(1) << GIC_VPE_RMASK_SWINT1_SHF)
+#define GIC_VPE_RMASK_FDC_SHF           6
+#define GIC_VPE_RMASK_FDC_MSK           (MSK(1) << GIC_VPE_RMASK_FDC_SHF)
 
 /* GIC_VPE_SMASK Masks */
 #define GIC_VPE_SMASK_WD_SHF            0
@@ -193,6 +197,8 @@
 #define GIC_VPE_SMASK_SWINT0_MSK        (MSK(1) << GIC_VPE_SMASK_SWINT0_SHF)
 #define GIC_VPE_SMASK_SWINT1_SHF        5
 #define GIC_VPE_SMASK_SWINT1_MSK        (MSK(1) << GIC_VPE_SMASK_SWINT1_SHF)
+#define GIC_VPE_SMASK_FDC_SHF           6
+#define GIC_VPE_SMASK_FDC_MSK           (MSK(1) << GIC_VPE_SMASK_FDC_SHF)
 
 /* GIC nomenclature for Core Interrupt Pins. */
 #define GIC_CPU_INT0            0 /* Core Interrupt 2 */
@@ -240,9 +246,12 @@ extern unsigned int gic_get_count_width(void);
 extern cycle_t gic_read_compare(void);
 extern void gic_write_compare(cycle_t cnt);
 extern void gic_write_cpu_compare(cycle_t cnt, int cpu);
+extern void gic_start_count(void);
+extern void gic_stop_count(void);
 extern void gic_send_ipi(unsigned int intr);
 extern unsigned int plat_ipi_call_int_xlate(unsigned int);
 extern unsigned int plat_ipi_resched_int_xlate(unsigned int);
 extern int gic_get_c0_compare_int(void);
 extern int gic_get_c0_perfcount_int(void);
+extern int gic_get_c0_fdc_int(void);
 #endif /* __LINUX_IRQCHIP_MIPS_GIC_H */
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index faf433af425e..dd1109fb241e 100644
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -78,6 +78,7 @@ struct irq_desc {
 #ifdef CONFIG_PM_SLEEP
         unsigned int            nr_actions;
         unsigned int            no_suspend_depth;
+        unsigned int            cond_suspend_depth;
         unsigned int            force_resume_depth;
 #endif
 #ifdef CONFIG_PROC_FS
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index d176d658fe25..5dd1272d1ab2 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -85,7 +85,7 @@
  * The local_irq_*() APIs are equal to the raw_local_irq*()
  * if !TRACE_IRQFLAGS.
  */
-#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
+#ifdef CONFIG_TRACE_IRQFLAGS
 #define local_irq_enable() \
         do { trace_hardirqs_on(); raw_local_irq_enable(); } while (0)
 #define local_irq_disable() \
@@ -107,22 +107,6 @@
                         raw_local_irq_restore(flags);   \
                 }                                       \
         } while (0)
-#define local_save_flags(flags)                         \
-        do {                                            \
-                raw_local_save_flags(flags);            \
-        } while (0)
-
-#define irqs_disabled_flags(flags)                      \
-        ({                                              \
-                raw_irqs_disabled_flags(flags);         \
-        })
-
-#define irqs_disabled()                                 \
-        ({                                              \
-                unsigned long _flags;                   \
-                raw_local_save_flags(_flags);           \
-                raw_irqs_disabled_flags(_flags);        \
-        })
 
 #define safe_halt()                             \
         do {                                    \
@@ -131,7 +115,7 @@
         } while (0)
 
 
-#else /* !CONFIG_TRACE_IRQFLAGS_SUPPORT */
+#else /* !CONFIG_TRACE_IRQFLAGS */
 
 #define local_irq_enable()      do { raw_local_irq_enable(); } while (0)
 #define local_irq_disable()     do { raw_local_irq_disable(); } while (0)
@@ -140,11 +124,28 @@
                 raw_local_irq_save(flags);                      \
         } while (0)
 #define local_irq_restore(flags) do { raw_local_irq_restore(flags); } while (0)
-#define local_save_flags(flags) do { raw_local_save_flags(flags); } while (0)
-#define irqs_disabled()         (raw_irqs_disabled())
-#define irqs_disabled_flags(flags) (raw_irqs_disabled_flags(flags))
 #define safe_halt()             do { raw_safe_halt(); } while (0)
 
+#endif /* CONFIG_TRACE_IRQFLAGS */
+
+#define local_save_flags(flags) raw_local_save_flags(flags)
+
+/*
+ * Some architectures don't define arch_irqs_disabled(), so even if either
+ * definition would be fine we need to use different ones for the time being
+ * to avoid build issues.
+ */
+#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
+#define irqs_disabled()                                 \
+        ({                                              \
+                unsigned long _flags;                   \
+                raw_local_save_flags(_flags);           \
+                raw_irqs_disabled_flags(_flags);        \
+        })
+#else /* !CONFIG_TRACE_IRQFLAGS_SUPPORT */
+#define irqs_disabled() raw_irqs_disabled()
 #endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
 
+#define irqs_disabled_flags(flags) raw_irqs_disabled_flags(flags)
+
 #endif
diff --git a/include/linux/jhash.h b/include/linux/jhash.h
index 47cb09edec1a..348c6f47e4cc 100644
--- a/include/linux/jhash.h
+++ b/include/linux/jhash.h
@@ -145,11 +145,11 @@ static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
 }
 
 
-/* jhash_3words - hash exactly 3, 2 or 1 word(s) */
-static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
+/* __jhash_nwords - hash exactly 3, 2 or 1 word(s) */
+static inline u32 __jhash_nwords(u32 a, u32 b, u32 c, u32 initval)
 {
-        a += JHASH_INITVAL;
-        b += JHASH_INITVAL;
+        a += initval;
+        b += initval;
         c += initval;
 
         __jhash_final(a, b, c);
@@ -157,14 +157,19 @@ static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
         return c;
 }
 
+static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
+{
+        return __jhash_nwords(a, b, c, initval + JHASH_INITVAL + (3 << 2));
+}
+
 static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
 {
-        return jhash_3words(a, b, 0, initval);
+        return __jhash_nwords(a, b, 0, initval + JHASH_INITVAL + (2 << 2));
 }
 
 static inline u32 jhash_1word(u32 a, u32 initval)
 {
-        return jhash_3words(a, 0, 0, initval);
+        return __jhash_nwords(a, 0, 0, initval + JHASH_INITVAL + (1 << 2));
 }
 
 #endif /* _LINUX_JHASH_H */
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 98f923b6a0ea..f4de473f226b 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -45,6 +45,12 @@
  * same as using STATIC_KEY_INIT_FALSE.
  */
 
+#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
+# define HAVE_JUMP_LABEL
+#endif
+
+#ifndef __ASSEMBLY__
+
 #include <linux/types.h>
 #include <linux/compiler.h>
 #include <linux/bug.h>
@@ -55,7 +61,7 @@ extern bool static_key_initialized;
                                     "%s used before call to jump_label_init", \
                                     __func__)
 
-#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
+#ifdef HAVE_JUMP_LABEL
 
 struct static_key {
         atomic_t enabled;
@@ -66,13 +72,18 @@ struct static_key {
 #endif
 };
 
-# include <asm/jump_label.h>
-# define HAVE_JUMP_LABEL
 #else
 struct static_key {
         atomic_t enabled;
 };
-#endif  /* CC_HAVE_ASM_GOTO && CONFIG_JUMP_LABEL */
+#endif  /* HAVE_JUMP_LABEL */
+#endif /* __ASSEMBLY__ */
+
+#ifdef HAVE_JUMP_LABEL
+#include <asm/jump_label.h>
+#endif
+
+#ifndef __ASSEMBLY__
 
 enum jump_label_type {
         JUMP_LABEL_DISABLE = 0,
@@ -203,3 +214,5 @@ static inline bool static_key_enabled(struct static_key *key)
 }
 
 #endif  /* _LINUX_JUMP_LABEL_H */
+
+#endif /* __ASSEMBLY__ */
diff --git a/include/linux/jz4780-nemc.h b/include/linux/jz4780-nemc.h
new file mode 100644
index 000000000000..e7f1cc7a2284
--- /dev/null
+++ b/include/linux/jz4780-nemc.h
@@ -0,0 +1,43 @@
+/*
+ * JZ4780 NAND/external memory controller (NEMC)
+ *
+ * Copyright (c) 2015 Imagination Technologies
+ * Author: Alex Smith <alex@alex-smith.me.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#ifndef __LINUX_JZ4780_NEMC_H__
+#define __LINUX_JZ4780_NEMC_H__
+
+#include <linux/types.h>
+
+struct device;
+
+/*
+ * Number of NEMC banks. Note that there are actually 6, but they are numbered
+ * from 1.
+ */
+#define JZ4780_NEMC_NUM_BANKS   7
+
+/**
+ * enum jz4780_nemc_bank_type - device types which can be connected to a bank
+ * @JZ4780_NEMC_BANK_SRAM: SRAM
+ * @JZ4780_NEMC_BANK_NAND: NAND
+ */
+enum jz4780_nemc_bank_type {
+        JZ4780_NEMC_BANK_SRAM,
+        JZ4780_NEMC_BANK_NAND,
+};
+
+extern unsigned int jz4780_nemc_num_banks(struct device *dev);
+
+extern void jz4780_nemc_set_type(struct device *dev, unsigned int bank,
+                                 enum jz4780_nemc_bank_type type);
+extern void jz4780_nemc_assert(struct device *dev, unsigned int bank,
+                               bool assert);
+
+#endif /* __LINUX_JZ4780_NEMC_H__ */
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index 72ba725ddf9c..5486d777b706 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -5,6 +5,7 @@
 
 struct kmem_cache;
 struct page;
+struct vm_struct;
 
 #ifdef CONFIG_KASAN
 
@@ -43,21 +44,18 @@ void kasan_poison_object_data(struct kmem_cache *cache, void *object);
 
 void kasan_kmalloc_large(const void *ptr, size_t size);
 void kasan_kfree_large(const void *ptr);
+void kasan_kfree(void *ptr);
 void kasan_kmalloc(struct kmem_cache *s, const void *object, size_t size);
 void kasan_krealloc(const void *object, size_t new_size);
 
 void kasan_slab_alloc(struct kmem_cache *s, void *object);
 void kasan_slab_free(struct kmem_cache *s, void *object);
 
-#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)
-
 int kasan_module_alloc(void *addr, size_t size);
-void kasan_module_free(void *addr);
+void kasan_free_shadow(const struct vm_struct *vm);
 
 #else /* CONFIG_KASAN */
 
-#define MODULE_ALIGN 1
-
 static inline void kasan_unpoison_shadow(const void *address, size_t size) {}
 
 static inline void kasan_enable_current(void) {}
@@ -74,6 +72,7 @@ static inline void kasan_poison_object_data(struct kmem_cache *cache,
 
 static inline void kasan_kmalloc_large(void *ptr, size_t size) {}
 static inline void kasan_kfree_large(const void *ptr) {}
+static inline void kasan_kfree(void *ptr) {}
 static inline void kasan_kmalloc(struct kmem_cache *s, const void *object,
                                 size_t size) {}
 static inline void kasan_krealloc(const void *object, size_t new_size) {}
@@ -82,7 +81,7 @@ static inline void kasan_slab_alloc(struct kmem_cache *s, void *object) {}
 static inline void kasan_slab_free(struct kmem_cache *s, void *object) {}
 
 static inline int kasan_module_alloc(void *addr, size_t size) { return 0; }
-static inline void kasan_module_free(void *addr) {}
+static inline void kasan_free_shadow(const struct vm_struct *vm) {}
 
 #endif /* CONFIG_KASAN */
 
diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h
index be342b94c640..b33c7797eb57 100644
--- a/include/linux/kconfig.h
+++ b/include/linux/kconfig.h
@@ -23,14 +23,6 @@
 #define ___config_enabled(__ignored, val, ...) val
 
 /*
- * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
- * 0 otherwise.
- *
- */
-#define IS_ENABLED(option) \
-        (config_enabled(option) || config_enabled(option##_MODULE))
-
-/*
  * IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0
  * otherwise. For boolean options, this is equivalent to
  * IS_ENABLED(CONFIG_FOO).
@@ -43,4 +35,20 @@
  */
 #define IS_MODULE(option) config_enabled(option##_MODULE)
 
+/*
+ * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled
+ * code can call a function defined in code compiled based on CONFIG_FOO.
+ * This is similar to IS_ENABLED(), but returns false when invoked from
+ * built-in code when CONFIG_FOO is set to 'm'.
+ */
+#define IS_REACHABLE(option) (config_enabled(option) || \
+                 (config_enabled(option##_MODULE) && config_enabled(MODULE)))
+
+/*
+ * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
+ * 0 otherwise.
+ */
+#define IS_ENABLED(option) \
+        (IS_BUILTIN(option) || IS_MODULE(option))
+
 #endif /* __LINUX_KCONFIG_H */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d6d630d31ef3..3a5b48e52a9e 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -103,6 +103,18 @@
                 (((__x) - ((__d) / 2)) / (__d));        \
 }                                                       \
 )
+/*
+ * Same as above but for u64 dividends. divisor must be a 32-bit
+ * number.
+ */
+#define DIV_ROUND_CLOSEST_ULL(x, divisor)(              \
+{                                                       \
+        typeof(divisor) __d = divisor;                  \
+        unsigned long long _tmp = (x) + (__d) / 2;      \
+        do_div(_tmp, __d);                              \
+        _tmp;                                           \
+}                                                       \
+)
 
 /*
  * Multiplies an integer by a fraction, while avoiding unnecessary
diff --git a/include/linux/ksm.h b/include/linux/ksm.h
index 3be6bb18562d..7ae216a39c9e 100644
--- a/include/linux/ksm.h
+++ b/include/linux/ksm.h
@@ -35,18 +35,6 @@ static inline void ksm_exit(struct mm_struct *mm)
                 __ksm_exit(mm);
 }
 
-/*
- * A KSM page is one of those write-protected "shared pages" or "merged pages"
- * which KSM maps into multiple mms, wherever identical anonymous page content
- * is found in VM_MERGEABLE vmas.  It's a PageAnon page, pointing not to any
- * anon_vma, but to that page's node of the stable tree.
- */
-static inline int PageKsm(struct page *page)
-{
-        return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) ==
-                                (PAGE_MAPPING_ANON | PAGE_MAPPING_KSM);
-}
-
 static inline struct stable_node *page_stable_node(struct page *page)
 {
         return PageKsm(page) ? page_rmapping(page) : NULL;
@@ -87,11 +75,6 @@ static inline void ksm_exit(struct mm_struct *mm)
 {
 }
 
-static inline int PageKsm(struct page *page)
-{
-        return 0;
-}
-
 #ifdef CONFIG_MMU
 static inline int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
                 unsigned long end, int advice, unsigned long *vm_flags)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index d12b2104d19b..ad45054309a0 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -165,12 +165,12 @@ enum kvm_bus {
         KVM_NR_BUSES
 };
 
-int kvm_io_bus_write(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
+int kvm_io_bus_write(struct kvm_vcpu *vcpu, enum kvm_bus bus_idx, gpa_t addr,
                      int len, const void *val);
-int kvm_io_bus_write_cookie(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
-                            int len, const void *val, long cookie);
-int kvm_io_bus_read(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, int len,
-                    void *val);
+int kvm_io_bus_write_cookie(struct kvm_vcpu *vcpu, enum kvm_bus bus_idx,
+                            gpa_t addr, int len, const void *val, long cookie);
+int kvm_io_bus_read(struct kvm_vcpu *vcpu, enum kvm_bus bus_idx, gpa_t addr,
+                    int len, void *val);
 int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
                             int len, struct kvm_io_device *dev);
 int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
@@ -658,7 +658,6 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
 int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu);
 
 void *kvm_kvzalloc(unsigned long size);
-void kvm_kvfree(const void *addr);
 
 #ifndef __KVM_HAVE_ARCH_VM_ALLOC
 static inline struct kvm *kvm_arch_alloc_vm(void)
@@ -700,6 +699,20 @@ static inline wait_queue_head_t *kvm_arch_vcpu_wq(struct kvm_vcpu *vcpu)
 #endif
 }
 
+#ifdef __KVM_HAVE_ARCH_INTC_INITIALIZED
+/*
+ * returns true if the virtual interrupt controller is initialized and
+ * ready to accept virtual IRQ. On some architectures the virtual interrupt
+ * controller is dynamically instantiated and this is not always true.
+ */
+bool kvm_arch_intc_initialized(struct kvm *kvm);
+#else
+static inline bool kvm_arch_intc_initialized(struct kvm *kvm)
+{
+        return true;
+}
+#endif
+
 int kvm_arch_init_vm(struct kvm *kvm, unsigned long type);
 void kvm_arch_destroy_vm(struct kvm *kvm);
 void kvm_arch_sync_events(struct kvm *kvm);
@@ -766,7 +779,8 @@ static inline void kvm_guest_enter(void)
          * one time slice). Lets treat guest mode as quiescent state, just like
          * we do with user-mode execution.
          */
-        rcu_virt_note_context_switch(smp_processor_id());
+        if (!context_tracking_cpu_is_enabled())
+                rcu_virt_note_context_switch(smp_processor_id());
 }
 
 static inline void kvm_guest_exit(void)
@@ -969,11 +983,16 @@ static inline int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args)
 #endif /* CONFIG_HAVE_KVM_EVENTFD */
 
 #ifdef CONFIG_KVM_APIC_ARCHITECTURE
-static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu)
+static inline bool kvm_vcpu_is_reset_bsp(struct kvm_vcpu *vcpu)
 {
         return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id;
 }
 
+static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu)
+{
+        return (vcpu->arch.apic_base & MSR_IA32_APICBASE_BSP) != 0;
+}
+
 bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu);
 
 #else
diff --git a/include/linux/lcm.h b/include/linux/lcm.h
index 7bf01d779b45..1ce79a7f1daa 100644
--- a/include/linux/lcm.h
+++ b/include/linux/lcm.h
@@ -4,5 +4,6 @@
 #include <linux/compiler.h>
 
 unsigned long lcm(unsigned long a, unsigned long b) __attribute_const__;
+unsigned long lcm_not_zero(unsigned long a, unsigned long b) __attribute_const__;
 
 #endif /* _LCM_H */
diff --git a/include/linux/led-class-flash.h b/include/linux/led-class-flash.h
index 5ba2facd7a51..e97966d1fb8d 100644
--- a/include/linux/led-class-flash.h
+++ b/include/linux/led-class-flash.h
@@ -13,7 +13,6 @@
 #define __LINUX_FLASH_LEDS_H_INCLUDED
 
 #include <linux/leds.h>
-#include <uapi/linux/v4l2-controls.h>
 
 struct device_node;
 struct led_classdev_flash;
@@ -33,7 +32,7 @@ struct led_classdev_flash;
 #define LED_FAULT_LED_OVER_TEMPERATURE  (1 << 8)
 #define LED_NUM_FLASH_FAULTS            9
 
-#define LED_FLASH_MAX_SYSFS_GROUPS 7
+#define LED_FLASH_SYSFS_GROUPS_SIZE     5
 
 struct led_flash_ops {
         /* set flash brightness */
@@ -81,21 +80,7 @@ struct led_classdev_flash {
         struct led_flash_setting timeout;
 
         /* LED Flash class sysfs groups */
-        const struct attribute_group *sysfs_groups[LED_FLASH_MAX_SYSFS_GROUPS];
-
-        /* LEDs available for flash strobe synchronization */
-        struct led_classdev_flash **sync_leds;
-
-        /* Number of LEDs available for flash strobe synchronization */
-        int num_sync_leds;
-
-        /*
-         * The identifier of the sub-led to synchronize the flash strobe with.
-         * Identifiers start from 1, which reflects the first element from the
-         * sync_leds array. 0 means that the flash strobe should not be
-         * synchronized.
-         */
-        u32 sync_led_id;
+        const struct attribute_group *sysfs_groups[LED_FLASH_SYSFS_GROUPS_SIZE];
 };
 
 static inline struct led_classdev_flash *lcdev_to_flcdev(
diff --git a/include/linux/leds.h b/include/linux/leds.h
index f70f84f35674..9a2b000094cf 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -47,7 +47,6 @@ struct led_classdev {
 #define SET_BRIGHTNESS_ASYNC    (1 << 21)
 #define SET_BRIGHTNESS_SYNC     (1 << 22)
 #define LED_DEV_CAP_FLASH       (1 << 23)
-#define LED_DEV_CAP_SYNC_STROBE (1 << 24)
 
         /* Set LED brightness level */
         /* Must not sleep, use a workqueue if needed */
@@ -105,7 +104,11 @@ struct led_classdev {
 
 extern int led_classdev_register(struct device *parent,
                                  struct led_classdev *led_cdev);
+extern int devm_led_classdev_register(struct device *parent,
+                                      struct led_classdev *led_cdev);
 extern void led_classdev_unregister(struct led_classdev *led_cdev);
+extern void devm_led_classdev_unregister(struct device *parent,
+                                         struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 
diff --git a/include/linux/lguest.h b/include/linux/lguest.h
index 9962c6bb1311..6db19f35f7c5 100644
--- a/include/linux/lguest.h
+++ b/include/linux/lguest.h
@@ -61,8 +61,8 @@ struct lguest_data {
         u32 tsc_khz;
 
 /* Fields initialized by the Guest at boot: */
-        /* Instruction range to suppress interrupts even if enabled */
-        unsigned long noirq_start, noirq_end;
+        /* Instruction to suppress interrupts even if enabled */
+        unsigned long noirq_iret;
         /* Address above which page tables are all identical. */
         unsigned long kernel_address;
         /* The vector to try to use for system calls (0x40 or 0x80). */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index fc03efa64ffe..8dad4a307bb8 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -231,7 +231,7 @@ enum {
         ATA_FLAG_SW_ACTIVITY    = (1 << 22), /* driver supports sw activity
                                               * led */
         ATA_FLAG_NO_DIPM        = (1 << 23), /* host not happy with DIPM */
-        ATA_FLAG_LOWTAG         = (1 << 24), /* host wants lowest available tag */
+        ATA_FLAG_SAS_HOST       = (1 << 24), /* SAS host */
 
         /* bits 24:31 of ap->flags are reserved for LLD specific flags */
 
diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h
index 95023fd8b00d..ee6dbb39a809 100644
--- a/include/linux/livepatch.h
+++ b/include/linux/livepatch.h
@@ -123,10 +123,10 @@ struct klp_patch {
         enum klp_state state;
 };
 
-extern int klp_register_patch(struct klp_patch *);
-extern int klp_unregister_patch(struct klp_patch *);
-extern int klp_enable_patch(struct klp_patch *);
-extern int klp_disable_patch(struct klp_patch *);
+int klp_register_patch(struct klp_patch *);
+int klp_unregister_patch(struct klp_patch *);
+int klp_enable_patch(struct klp_patch *);
+int klp_disable_patch(struct klp_patch *);
 
 #endif /* CONFIG_LIVEPATCH */
 
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 74ab23176e9b..066ba4157541 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -531,8 +531,13 @@ do {									\
 # define might_lock_read(lock) do { } while (0)
 #endif
 
-#ifdef CONFIG_PROVE_RCU
+#ifdef CONFIG_LOCKDEP
 void lockdep_rcu_suspicious(const char *file, const int line, const char *s);
+#else
+static inline void
+lockdep_rcu_suspicious(const char *file, const int line, const char *s)
+{
+}
 #endif
 
 #endif /* __LINUX_LOCKDEP_H */
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index e8cc45307f8f..9497ec7c77ea 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -365,6 +365,14 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
 #define __initdata_memblock
 #endif
 
+#ifdef CONFIG_MEMTEST
+extern void early_memtest(phys_addr_t start, phys_addr_t end);
+#else
+static inline void early_memtest(phys_addr_t start, phys_addr_t end)
+{
+}
+#endif
+
 #else
 static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align)
 {
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 8f1a41951df9..6ffa0ac7f7d6 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -192,6 +192,9 @@ extern void get_page_bootmem(unsigned long ingo, struct page *page,
 void get_online_mems(void);
 void put_online_mems(void);
 
+void mem_hotplug_begin(void);
+void mem_hotplug_done(void);
+
 #else /* ! CONFIG_MEMORY_HOTPLUG */
 /*
  * Stub functions for when hotplug is off
@@ -231,6 +234,9 @@ static inline int try_online_node(int nid)
 static inline void get_online_mems(void) {}
 static inline void put_online_mems(void) {}
 
+static inline void mem_hotplug_begin(void) {}
+static inline void mem_hotplug_done(void) {}
+
 #endif /* ! CONFIG_MEMORY_HOTPLUG */
 
 #ifdef CONFIG_MEMORY_HOTREMOVE
diff --git a/include/linux/mempool.h b/include/linux/mempool.h
index 39ed62ab5b8a..69b6951e8fd2 100644
--- a/include/linux/mempool.h
+++ b/include/linux/mempool.h
@@ -29,14 +29,15 @@ extern mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
                         mempool_free_t *free_fn, void *pool_data,
                         gfp_t gfp_mask, int nid);
 
-extern int mempool_resize(mempool_t *pool, int new_min_nr, gfp_t gfp_mask);
+extern int mempool_resize(mempool_t *pool, int new_min_nr);
 extern void mempool_destroy(mempool_t *pool);
 extern void * mempool_alloc(mempool_t *pool, gfp_t gfp_mask);
 extern void mempool_free(void *element, mempool_t *pool);
 
 /*
  * A mempool_alloc_t and mempool_free_t that get the memory from
- * a slab that is passed in through pool_data.
+ * a slab cache that is passed in through pool_data.
+ * Note: the slab cache may not have a ctor function.
  */
 void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data);
 void mempool_free_slab(void *element, void *pool_data);
diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h
index 234c99143bf7..67703f23e7ba 100644
--- a/include/linux/mfd/abx500/ux500_chargalg.h
+++ b/include/linux/mfd/abx500/ux500_chargalg.h
@@ -9,8 +9,13 @@
 
 #include <linux/power_supply.h>
 
-#define psy_to_ux500_charger(x) container_of((x), \
-                struct ux500_charger, psy)
+/*
+ * Valid only for supplies of type:
+ * - POWER_SUPPLY_TYPE_MAINS,
+ * - POWER_SUPPLY_TYPE_USB,
+ * because only them store as drv_data pointer to struct ux500_charger.
+ */
+#define psy_to_ux500_charger(x) power_supply_get_drvdata(psy)
 
 /* Forward declaration */
 struct ux500_charger;
@@ -35,7 +40,7 @@ struct ux500_charger_ops {
  * @power_path          USB power path support
  */
 struct ux500_charger {
-        struct power_supply psy;
+        struct power_supply *psy;
         struct ux500_charger_ops ops;
         int max_out_volt;
         int max_out_curr;
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h
index 910e3aa1e965..16a498f48169 100644
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -24,6 +24,7 @@ enum arizona_type {
         WM5102 = 1,
         WM5110 = 2,
         WM8997 = 3,
+        WM8280 = 4,
 };
 
 #define ARIZONA_IRQ_GP1                    0
@@ -126,7 +127,7 @@ struct arizona {
         struct regmap_irq_chip_data *aod_irq_chip;
         struct regmap_irq_chip_data *irq_chip;
 
-        bool hpdet_magic;
+        bool hpdet_clamp;
         unsigned int hp_ena;
 
         struct mutex clk_lock;
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 4578c72c9b86..1789cb0f4f17 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -11,31 +11,26 @@
 #ifndef _ARIZONA_PDATA_H
 #define _ARIZONA_PDATA_H
 
-#define ARIZONA_GPN_DIR                          0x8000  /* GPN_DIR */
+#include <dt-bindings/mfd/arizona.h>
+
 #define ARIZONA_GPN_DIR_MASK                     0x8000  /* GPN_DIR */
 #define ARIZONA_GPN_DIR_SHIFT                        15  /* GPN_DIR */
 #define ARIZONA_GPN_DIR_WIDTH                         1  /* GPN_DIR */
-#define ARIZONA_GPN_PU                           0x4000  /* GPN_PU */
 #define ARIZONA_GPN_PU_MASK                      0x4000  /* GPN_PU */
 #define ARIZONA_GPN_PU_SHIFT                         14  /* GPN_PU */
 #define ARIZONA_GPN_PU_WIDTH                          1  /* GPN_PU */
-#define ARIZONA_GPN_PD                           0x2000  /* GPN_PD */
 #define ARIZONA_GPN_PD_MASK                      0x2000  /* GPN_PD */
 #define ARIZONA_GPN_PD_SHIFT                         13  /* GPN_PD */
 #define ARIZONA_GPN_PD_WIDTH                          1  /* GPN_PD */
-#define ARIZONA_GPN_LVL                          0x0800  /* GPN_LVL */
 #define ARIZONA_GPN_LVL_MASK                     0x0800  /* GPN_LVL */
 #define ARIZONA_GPN_LVL_SHIFT                        11  /* GPN_LVL */
 #define ARIZONA_GPN_LVL_WIDTH                         1  /* GPN_LVL */
-#define ARIZONA_GPN_POL                          0x0400  /* GPN_POL */
 #define ARIZONA_GPN_POL_MASK                     0x0400  /* GPN_POL */
 #define ARIZONA_GPN_POL_SHIFT                        10  /* GPN_POL */
 #define ARIZONA_GPN_POL_WIDTH                         1  /* GPN_POL */
-#define ARIZONA_GPN_OP_CFG                       0x0200  /* GPN_OP_CFG */
 #define ARIZONA_GPN_OP_CFG_MASK                  0x0200  /* GPN_OP_CFG */
 #define ARIZONA_GPN_OP_CFG_SHIFT                      9  /* GPN_OP_CFG */
 #define ARIZONA_GPN_OP_CFG_WIDTH                      1  /* GPN_OP_CFG */
-#define ARIZONA_GPN_DB                           0x0100  /* GPN_DB */
 #define ARIZONA_GPN_DB_MASK                      0x0100  /* GPN_DB */
 #define ARIZONA_GPN_DB_SHIFT                          8  /* GPN_DB */
 #define ARIZONA_GPN_DB_WIDTH                          1  /* GPN_DB */
@@ -45,23 +40,10 @@
 
 #define ARIZONA_MAX_GPIO 5
 
-#define ARIZONA_32KZ_MCLK1 1
-#define ARIZONA_32KZ_MCLK2 2
-#define ARIZONA_32KZ_NONE  3
-
 #define ARIZONA_MAX_INPUT 4
 
-#define ARIZONA_DMIC_MICVDD   0
-#define ARIZONA_DMIC_MICBIAS1 1
-#define ARIZONA_DMIC_MICBIAS2 2
-#define ARIZONA_DMIC_MICBIAS3 3
-
 #define ARIZONA_MAX_MICBIAS 3
 
-#define ARIZONA_INMODE_DIFF 0
-#define ARIZONA_INMODE_SE   1
-#define ARIZONA_INMODE_DMIC 2
-
 #define ARIZONA_MAX_OUTPUT 6
 
 #define ARIZONA_MAX_AIF 3
@@ -112,7 +94,7 @@ struct arizona_pdata {
         int gpio_base;
 
         /** Pin state for GPIO pins */
-        int gpio_defaults[ARIZONA_MAX_GPIO];
+        unsigned int gpio_defaults[ARIZONA_MAX_GPIO];
 
         /**
          * Maximum number of channels clocks will be generated for,
diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h
index 0e166b92f5b4..324a34683971 100644
--- a/include/linux/mfd/cros_ec.h
+++ b/include/linux/mfd/cros_ec.h
@@ -16,6 +16,7 @@
 #ifndef __LINUX_MFD_CROS_EC_H
 #define __LINUX_MFD_CROS_EC_H
 
+#include <linux/cdev.h>
 #include <linux/notifier.h>
 #include <linux/mfd/cros_ec_commands.h>
 #include <linux/mutex.h>
@@ -38,20 +39,20 @@ enum {
 /*
  * @version: Command version number (often 0)
  * @command: Command to send (EC_CMD_...)
- * @outdata: Outgoing data to EC
  * @outsize: Outgoing length in bytes
- * @indata: Where to put the incoming data from EC
  * @insize: Max number of bytes to accept from EC
  * @result: EC's response to the command (separate from communication failure)
+ * @outdata: Outgoing data to EC
+ * @indata: Where to put the incoming data from EC
  */
 struct cros_ec_command {
         uint32_t version;
         uint32_t command;
-        uint8_t *outdata;
         uint32_t outsize;
-        uint8_t *indata;
         uint32_t insize;
         uint32_t result;
+        uint8_t outdata[EC_PROTO2_MAX_PARAM_SIZE];
+        uint8_t indata[EC_PROTO2_MAX_PARAM_SIZE];
 };
 
 /**
@@ -59,9 +60,17 @@ struct cros_ec_command {
  *
  * @ec_name: name of EC device (e.g. 'chromeos-ec')
  * @phys_name: name of physical comms layer (e.g. 'i2c-4')
- * @dev: Device pointer
+ * @dev: Device pointer for physical comms device
+ * @vdev: Device pointer for virtual comms device
+ * @cdev: Character device structure for virtual comms device
  * @was_wake_device: true if this device was set to wake the system from
  * sleep at the last suspend
+ * @cmd_readmem: direct read of the EC memory-mapped region, if supported
+ *     @offset is within EC_LPC_ADDR_MEMMAP region.
+ *     @bytes: number of bytes to read. zero means "read a string" (including
+ *     the trailing '\0'). At most only EC_MEMMAP_SIZE bytes can be read.
+ *     Caller must ensure that the buffer is large enough for the result when
+ *     reading a string.
  *
  * @priv: Private data
  * @irq: Interrupt to use
@@ -90,8 +99,12 @@ struct cros_ec_device {
         const char *ec_name;
         const char *phys_name;
         struct device *dev;
+        struct device *vdev;
+        struct cdev cdev;
         bool was_wake_device;
         struct class *cros_class;
+        int (*cmd_readmem)(struct cros_ec_device *ec, unsigned int offset,
+                           unsigned int bytes, void *dest);
 
         /* These are used to implement the platform-specific interface */
         void *priv;
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 955dd990beaf..51633ea6f910 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -87,6 +87,7 @@ enum max77693_pmic_reg {
 /* MAX77693 ITORCH register */
 #define TORCH_IOUT1_SHIFT       0
 #define TORCH_IOUT2_SHIFT       4
+#define TORCH_IOUT_MASK(x)      (0xf << (x))
 #define TORCH_IOUT_MIN          15625
 #define TORCH_IOUT_MAX          250000
 #define TORCH_IOUT_STEP         15625
@@ -113,8 +114,8 @@ enum max77693_pmic_reg {
 #define FLASH_EN_FLASH          0x1
 #define FLASH_EN_TORCH          0x2
 #define FLASH_EN_ON             0x3
-#define FLASH_EN_SHIFT(x)       (6 - ((x) - 1) * 2)
-#define TORCH_EN_SHIFT(x)       (2 - ((x) - 1) * 2)
+#define FLASH_EN_SHIFT(x)       (6 - (x) * 2)
+#define TORCH_EN_SHIFT(x)       (2 - (x) * 2)
 
 /* MAX77693 MAX_FLASH1 register */
 #define MAX_FLASH1_MAX_FL_EN    0x80
diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h
index f0b6585cd874..d450f687301b 100644
--- a/include/linux/mfd/max77693.h
+++ b/include/linux/mfd/max77693.h
@@ -30,7 +30,7 @@
 #ifndef __LINUX_MFD_MAX77693_H
 #define __LINUX_MFD_MAX77693_H
 
-/* MAX77686 regulator IDs */
+/* MAX77693 regulator IDs */
 enum max77693_regulators {
         MAX77693_ESAFEOUT1 = 0,
         MAX77693_ESAFEOUT2,
@@ -38,12 +38,6 @@ enum max77693_regulators {
         MAX77693_REG_MAX,
 };
 
-struct max77693_regulator_data {
-        int id;
-        struct regulator_init_data *initdata;
-        struct device_node *of_node;
-};
-
 struct max77693_reg_data {
         u8 addr;
         u8 data;
@@ -87,26 +81,9 @@ enum max77693_led_boost_mode {
         MAX77693_LED_BOOST_FIXED,
 };
 
-struct max77693_led_platform_data {
-        u32 fleds[2];
-        u32 iout_torch[2];
-        u32 iout_flash[2];
-        u32 trigger[2];
-        u32 trigger_type[2];
-        u32 num_leds;
-        u32 boost_mode;
-        u32 flash_timeout;
-        u32 boost_vout;
-        u32 low_vsys;
-};
-
 /* MAX77693 */
 
 struct max77693_platform_data {
-        /* regulator data */
-        struct max77693_regulator_data *regulators;
-        int num_regulators;
-
         /* muic data */
         struct max77693_muic_platform_data *muic_data;
         struct max77693_led_platform_data *led_data;
diff --git a/include/linux/mfd/max77843-private.h b/include/linux/mfd/max77843-private.h
new file mode 100644
index 000000000000..7178ace8379e
--- /dev/null
+++ b/include/linux/mfd/max77843-private.h
@@ -0,0 +1,454 @@
+/*
+ * Common variables for the Maxim MAX77843 driver
+ *
+ * Copyright (C) 2015 Samsung Electronics
+ * Author: Jaewon Kim <jaewon02.kim@samsung.com>
+ * Author: Beomho Seo <beomho.seo@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __MAX77843_PRIVATE_H_
+#define __MAX77843_PRIVATE_H_
+
+#include <linux/i2c.h>
+#include <linux/regmap.h>
+
+#define I2C_ADDR_TOPSYS (0xCC >> 1)
+#define I2C_ADDR_CHG    (0xD2 >> 1)
+#define I2C_ADDR_FG     (0x6C >> 1)
+#define I2C_ADDR_MUIC   (0x4A >> 1)
+
+/* Topsys, Haptic and LED registers */
+enum max77843_sys_reg {
+        MAX77843_SYS_REG_PMICID         = 0x00,
+        MAX77843_SYS_REG_PMICREV        = 0x01,
+        MAX77843_SYS_REG_MAINCTRL1      = 0x02,
+        MAX77843_SYS_REG_INTSRC         = 0x22,
+        MAX77843_SYS_REG_INTSRCMASK     = 0x23,
+        MAX77843_SYS_REG_SYSINTSRC      = 0x24,
+        MAX77843_SYS_REG_SYSINTMASK     = 0x26,
+        MAX77843_SYS_REG_TOPSYS_STAT    = 0x28,
+        MAX77843_SYS_REG_SAFEOUTCTRL    = 0xC6,
+
+        MAX77843_SYS_REG_END,
+};
+
+enum max77843_haptic_reg {
+        MAX77843_HAP_REG_MCONFIG        = 0x10,
+
+        MAX77843_HAP_REG_END,
+};
+
+enum max77843_led_reg {
+        MAX77843_LED_REG_LEDEN          = 0x30,
+        MAX77843_LED_REG_LED0BRT        = 0x31,
+        MAX77843_LED_REG_LED1BRT        = 0x32,
+        MAX77843_LED_REG_LED2BRT        = 0x33,
+        MAX77843_LED_REG_LED3BRT        = 0x34,
+        MAX77843_LED_REG_LEDBLNK        = 0x38,
+        MAX77843_LED_REG_LEDRAMP        = 0x36,
+
+        MAX77843_LED_REG_END,
+};
+
+/* Charger registers */
+enum max77843_charger_reg {
+        MAX77843_CHG_REG_CHG_INT        = 0xB0,
+        MAX77843_CHG_REG_CHG_INT_MASK   = 0xB1,
+        MAX77843_CHG_REG_CHG_INT_OK     = 0xB2,
+        MAX77843_CHG_REG_CHG_DTLS_00    = 0xB3,
+        MAX77843_CHG_REG_CHG_DTLS_01    = 0xB4,
+        MAX77843_CHG_REG_CHG_DTLS_02    = 0xB5,
+        MAX77843_CHG_REG_CHG_CNFG_00    = 0xB7,
+        MAX77843_CHG_REG_CHG_CNFG_01    = 0xB8,
+        MAX77843_CHG_REG_CHG_CNFG_02    = 0xB9,
+        MAX77843_CHG_REG_CHG_CNFG_03    = 0xBA,
+        MAX77843_CHG_REG_CHG_CNFG_04    = 0xBB,
+        MAX77843_CHG_REG_CHG_CNFG_06    = 0xBD,
+        MAX77843_CHG_REG_CHG_CNFG_07    = 0xBE,
+        MAX77843_CHG_REG_CHG_CNFG_09    = 0xC0,
+        MAX77843_CHG_REG_CHG_CNFG_10    = 0xC1,
+        MAX77843_CHG_REG_CHG_CNFG_11    = 0xC2,
+        MAX77843_CHG_REG_CHG_CNFG_12    = 0xC3,
+
+        MAX77843_CHG_REG_END,
+};
+
+/* Fuel gauge registers */
+enum max77843_fuelgauge {
+        MAX77843_FG_REG_STATUS          = 0x00,
+        MAX77843_FG_REG_VALRT_TH        = 0x01,
+        MAX77843_FG_REG_TALRT_TH        = 0x02,
+        MAX77843_FG_REG_SALRT_TH        = 0x03,
+        MAX77843_FG_RATE_AT_RATE        = 0x04,
+        MAX77843_FG_REG_REMCAP_REP      = 0x05,
+        MAX77843_FG_REG_SOCREP          = 0x06,
+        MAX77843_FG_REG_AGE             = 0x07,
+        MAX77843_FG_REG_TEMP            = 0x08,
+        MAX77843_FG_REG_VCELL           = 0x09,
+        MAX77843_FG_REG_CURRENT         = 0x0A,
+        MAX77843_FG_REG_AVG_CURRENT     = 0x0B,
+        MAX77843_FG_REG_SOCMIX          = 0x0D,
+        MAX77843_FG_REG_SOCAV           = 0x0E,
+        MAX77843_FG_REG_REMCAP_MIX      = 0x0F,
+        MAX77843_FG_REG_FULLCAP         = 0x10,
+        MAX77843_FG_REG_AVG_TEMP        = 0x16,
+        MAX77843_FG_REG_CYCLES          = 0x17,
+        MAX77843_FG_REG_AVG_VCELL       = 0x19,
+        MAX77843_FG_REG_CONFIG          = 0x1D,
+        MAX77843_FG_REG_REMCAP_AV       = 0x1F,
+        MAX77843_FG_REG_FULLCAP_NOM     = 0x23,
+        MAX77843_FG_REG_MISCCFG         = 0x2B,
+        MAX77843_FG_REG_RCOMP           = 0x38,
+        MAX77843_FG_REG_FSTAT           = 0x3D,
+        MAX77843_FG_REG_DQACC           = 0x45,
+        MAX77843_FG_REG_DPACC           = 0x46,
+        MAX77843_FG_REG_OCV             = 0xEE,
+        MAX77843_FG_REG_VFOCV           = 0xFB,
+        MAX77843_FG_SOCVF               = 0xFF,
+
+        MAX77843_FG_END,
+};
+
+/* MUIC registers */
+enum max77843_muic_reg {
+        MAX77843_MUIC_REG_ID            = 0x00,
+        MAX77843_MUIC_REG_INT1          = 0x01,
+        MAX77843_MUIC_REG_INT2          = 0x02,
+        MAX77843_MUIC_REG_INT3          = 0x03,
+        MAX77843_MUIC_REG_STATUS1       = 0x04,
+        MAX77843_MUIC_REG_STATUS2       = 0x05,
+        MAX77843_MUIC_REG_STATUS3       = 0x06,
+        MAX77843_MUIC_REG_INTMASK1      = 0x07,
+        MAX77843_MUIC_REG_INTMASK2      = 0x08,
+        MAX77843_MUIC_REG_INTMASK3      = 0x09,
+        MAX77843_MUIC_REG_CDETCTRL1     = 0x0A,
+        MAX77843_MUIC_REG_CDETCTRL2     = 0x0B,
+        MAX77843_MUIC_REG_CONTROL1      = 0x0C,
+        MAX77843_MUIC_REG_CONTROL2      = 0x0D,
+        MAX77843_MUIC_REG_CONTROL3      = 0x0E,
+        MAX77843_MUIC_REG_CONTROL4      = 0x16,
+        MAX77843_MUIC_REG_HVCONTROL1    = 0x17,
+        MAX77843_MUIC_REG_HVCONTROL2    = 0x18,
+
+        MAX77843_MUIC_REG_END,
+};
+
+enum max77843_irq {
+        /* Topsys: SYSTEM */
+        MAX77843_SYS_IRQ_SYSINTSRC_SYSUVLO_INT,
+        MAX77843_SYS_IRQ_SYSINTSRC_SYSOVLO_INT,
+        MAX77843_SYS_IRQ_SYSINTSRC_TSHDN_INT,
+        MAX77843_SYS_IRQ_SYSINTSRC_TM_INT,
+
+        /* Charger: CHG_INT */
+        MAX77843_CHG_IRQ_CHG_INT_BYP_I,
+        MAX77843_CHG_IRQ_CHG_INT_BATP_I,
+        MAX77843_CHG_IRQ_CHG_INT_BAT_I,
+        MAX77843_CHG_IRQ_CHG_INT_CHG_I,
+        MAX77843_CHG_IRQ_CHG_INT_WCIN_I,
+        MAX77843_CHG_IRQ_CHG_INT_CHGIN_I,
+        MAX77843_CHG_IRQ_CHG_INT_AICL_I,
+
+        MAX77843_IRQ_NUM,
+};
+
+enum max77843_irq_muic {
+        /* MUIC: INT1 */
+        MAX77843_MUIC_IRQ_INT1_ADC,
+        MAX77843_MUIC_IRQ_INT1_ADCERROR,
+        MAX77843_MUIC_IRQ_INT1_ADC1K,
+
+        /* MUIC: INT2 */
+        MAX77843_MUIC_IRQ_INT2_CHGTYP,
+        MAX77843_MUIC_IRQ_INT2_CHGDETRUN,
+        MAX77843_MUIC_IRQ_INT2_DCDTMR,
+        MAX77843_MUIC_IRQ_INT2_DXOVP,
+        MAX77843_MUIC_IRQ_INT2_VBVOLT,
+
+        /* MUIC: INT3 */
+        MAX77843_MUIC_IRQ_INT3_VBADC,
+        MAX77843_MUIC_IRQ_INT3_VDNMON,
+        MAX77843_MUIC_IRQ_INT3_DNRES,
+        MAX77843_MUIC_IRQ_INT3_MPNACK,
+        MAX77843_MUIC_IRQ_INT3_MRXBUFOW,
+        MAX77843_MUIC_IRQ_INT3_MRXTRF,
+        MAX77843_MUIC_IRQ_INT3_MRXPERR,
+        MAX77843_MUIC_IRQ_INT3_MRXRDY,
+
+        MAX77843_MUIC_IRQ_NUM,
+};
+
+/* MAX77843 interrupts */
+#define MAX77843_SYS_IRQ_SYSUVLO_INT            BIT(0)
+#define MAX77843_SYS_IRQ_SYSOVLO_INT            BIT(1)
+#define MAX77843_SYS_IRQ_TSHDN_INT              BIT(2)
+#define MAX77843_SYS_IRQ_TM_INT                 BIT(3)
+
+/* MAX77843 MAINCTRL1 register */
+#define MAINCTRL1_BIASEN_SHIFT                  7
+#define MAX77843_MAINCTRL1_BIASEN_MASK          BIT(MAINCTRL1_BIASEN_SHIFT)
+
+/* MAX77843 MCONFIG register */
+#define MCONFIG_MODE_SHIFT                      7
+#define MCONFIG_MEN_SHIFT                       6
+#define MCONFIG_PDIV_SHIFT                      0
+
+#define MAX77843_MCONFIG_MODE_MASK              BIT(MCONFIG_MODE_SHIFT)
+#define MAX77843_MCONFIG_MEN_MASK               BIT(MCONFIG_MEN_SHIFT)
+#define MAX77843_MCONFIG_PDIV_MASK              (0x3 << MCONFIG_PDIV_SHIFT)
+
+/* Max77843 charger insterrupts */
+#define MAX77843_CHG_BYP_I                      BIT(0)
+#define MAX77843_CHG_BATP_I                     BIT(2)
+#define MAX77843_CHG_BAT_I                      BIT(3)
+#define MAX77843_CHG_CHG_I                      BIT(4)
+#define MAX77843_CHG_WCIN_I                     BIT(5)
+#define MAX77843_CHG_CHGIN_I                    BIT(6)
+#define MAX77843_CHG_AICL_I                     BIT(7)
+
+/* MAX77843 CHG_INT_OK register */
+#define MAX77843_CHG_BYP_OK                     BIT(0)
+#define MAX77843_CHG_BATP_OK                    BIT(2)
+#define MAX77843_CHG_BAT_OK                     BIT(3)
+#define MAX77843_CHG_CHG_OK                     BIT(4)
+#define MAX77843_CHG_WCIN_OK                    BIT(5)
+#define MAX77843_CHG_CHGIN_OK                   BIT(6)
+#define MAX77843_CHG_AICL_OK                    BIT(7)
+
+/* MAX77843 CHG_DETAILS_00 register */
+#define MAX77843_CHG_BAT_DTLS                   BIT(0)
+
+/* MAX77843 CHG_DETAILS_01 register */
+#define MAX77843_CHG_DTLS_MASK                  0x0f
+#define MAX77843_CHG_PQ_MODE                    0x00
+#define MAX77843_CHG_CC_MODE                    0x01
+#define MAX77843_CHG_CV_MODE                    0x02
+#define MAX77843_CHG_TO_MODE                    0x03
+#define MAX77843_CHG_DO_MODE                    0x04
+#define MAX77843_CHG_HT_MODE                    0x05
+#define MAX77843_CHG_TF_MODE                    0x06
+#define MAX77843_CHG_TS_MODE                    0x07
+#define MAX77843_CHG_OFF_MODE                   0x08
+
+#define MAX77843_CHG_BAT_DTLS_MASK              0xf0
+#define MAX77843_CHG_NO_BAT                     (0x00 << 4)
+#define MAX77843_CHG_LOW_VOLT_BAT               (0x01 << 4)
+#define MAX77843_CHG_LONG_BAT_TIME              (0x02 << 4)
+#define MAX77843_CHG_OK_BAT                     (0x03 << 4)
+#define MAX77843_CHG_OK_LOW_VOLT_BAT            (0x04 << 4)
+#define MAX77843_CHG_OVER_VOLT_BAT              (0x05 << 4)
+#define MAX77843_CHG_OVER_CURRENT_BAT           (0x06 << 4)
+
+/* MAX77843 CHG_CNFG_00 register */
+#define MAX77843_CHG_DISABLE                    0x00
+#define MAX77843_CHG_ENABLE                     0x05
+#define MAX77843_CHG_MASK                       0x01
+#define MAX77843_CHG_BUCK_MASK                  0x04
+
+/* MAX77843 CHG_CNFG_01 register */
+#define MAX77843_CHG_RESTART_THRESHOLD_100      0x00
+#define MAX77843_CHG_RESTART_THRESHOLD_150      0x10
+#define MAX77843_CHG_RESTART_THRESHOLD_200      0x20
+#define MAX77843_CHG_RESTART_THRESHOLD_DISABLE  0x30
+
+/* MAX77843 CHG_CNFG_02 register */
+#define MAX77843_CHG_FAST_CHG_CURRENT_MIN       100000
+#define MAX77843_CHG_FAST_CHG_CURRENT_MAX       3150000
+#define MAX77843_CHG_FAST_CHG_CURRENT_STEP      50000
+#define MAX77843_CHG_FAST_CHG_CURRENT_MASK      0x3f
+#define MAX77843_CHG_OTG_ILIMIT_500             (0x00 << 6)
+#define MAX77843_CHG_OTG_ILIMIT_900             (0x01 << 6)
+#define MAX77843_CHG_OTG_ILIMIT_1200            (0x02 << 6)
+#define MAX77843_CHG_OTG_ILIMIT_1500            (0x03 << 6)
+#define MAX77843_CHG_OTG_ILIMIT_MASK            0xc0
+
+/* MAX77843 CHG_CNFG_03 register */
+#define MAX77843_CHG_TOP_OFF_CURRENT_MIN        125000
+#define MAX77843_CHG_TOP_OFF_CURRENT_MAX        650000
+#define MAX77843_CHG_TOP_OFF_CURRENT_STEP       75000
+#define MAX77843_CHG_TOP_OFF_CURRENT_MASK       0x07
+
+/* MAX77843 CHG_CNFG_06 register */
+#define MAX77843_CHG_WRITE_CAP_BLOCK            0x10
+#define MAX77843_CHG_WRITE_CAP_UNBLOCK          0x0C
+
+/* MAX77843_CHG_CNFG_09_register */
+#define MAX77843_CHG_INPUT_CURRENT_LIMIT_MIN    100000
+#define MAX77843_CHG_INPUT_CURRENT_LIMIT_MAX    4000000
+#define MAX77843_CHG_INPUT_CURRENT_LIMIT_REF    3367000
+#define MAX77843_CHG_INPUT_CURRENT_LIMIT_STEP   33000
+
+#define MAX77843_MUIC_ADC                       BIT(0)
+#define MAX77843_MUIC_ADCERROR                  BIT(2)
+#define MAX77843_MUIC_ADC1K                     BIT(3)
+
+#define MAX77843_MUIC_CHGTYP                    BIT(0)
+#define MAX77843_MUIC_CHGDETRUN                 BIT(1)
+#define MAX77843_MUIC_DCDTMR                    BIT(2)
+#define MAX77843_MUIC_DXOVP                     BIT(3)
+#define MAX77843_MUIC_VBVOLT                    BIT(4)
+
+#define MAX77843_MUIC_VBADC                     BIT(0)
+#define MAX77843_MUIC_VDNMON                    BIT(1)
+#define MAX77843_MUIC_DNRES                     BIT(2)
+#define MAX77843_MUIC_MPNACK                    BIT(3)
+#define MAX77843_MUIC_MRXBUFOW                  BIT(4)
+#define MAX77843_MUIC_MRXTRF                    BIT(5)
+#define MAX77843_MUIC_MRXPERR                   BIT(6)
+#define MAX77843_MUIC_MRXRDY                    BIT(7)
+
+/* MAX77843 INTSRCMASK register */
+#define MAX77843_INTSRCMASK_CHGR                0
+#define MAX77843_INTSRCMASK_SYS                 1
+#define MAX77843_INTSRCMASK_FG                  2
+#define MAX77843_INTSRCMASK_MUIC                3
+
+#define MAX77843_INTSRCMASK_CHGR_MASK          BIT(MAX77843_INTSRCMASK_CHGR)
+#define MAX77843_INTSRCMASK_SYS_MASK           BIT(MAX77843_INTSRCMASK_SYS)
+#define MAX77843_INTSRCMASK_FG_MASK            BIT(MAX77843_INTSRCMASK_FG)
+#define MAX77843_INTSRCMASK_MUIC_MASK          BIT(MAX77843_INTSRCMASK_MUIC)
+
+#define MAX77843_INTSRC_MASK_MASK \
+        (MAX77843_INTSRCMASK_MUIC_MASK | MAX77843_INTSRCMASK_FG_MASK | \
+        MAX77843_INTSRCMASK_SYS_MASK | MAX77843_INTSRCMASK_CHGR_MASK)
+
+/* MAX77843 STATUS register*/
+#define STATUS1_ADC_SHIFT                       0
+#define STATUS1_ADCERROR_SHIFT                  6
+#define STATUS1_ADC1K_SHIFT                     7
+#define STATUS2_CHGTYP_SHIFT                    0
+#define STATUS2_CHGDETRUN_SHIFT                 3
+#define STATUS2_DCDTMR_SHIFT                    4
+#define STATUS2_DXOVP_SHIFT                     5
+#define STATUS2_VBVOLT_SHIFT                    6
+#define STATUS3_VBADC_SHIFT                     0
+#define STATUS3_VDNMON_SHIFT                    4
+#define STATUS3_DNRES_SHIFT                     5
+#define STATUS3_MPNACK_SHIFT                    6
+
+#define MAX77843_MUIC_STATUS1_ADC_MASK          (0x1f << STATUS1_ADC_SHIFT)
+#define MAX77843_MUIC_STATUS1_ADCERROR_MASK     BIT(STATUS1_ADCERROR_SHIFT)
+#define MAX77843_MUIC_STATUS1_ADC1K_MASK        BIT(STATUS1_ADC1K_SHIFT)
+#define MAX77843_MUIC_STATUS2_CHGTYP_MASK       (0x7 << STATUS2_CHGTYP_SHIFT)
+#define MAX77843_MUIC_STATUS2_CHGDETRUN_MASK    BIT(STATUS2_CHGDETRUN_SHIFT)
+#define MAX77843_MUIC_STATUS2_DCDTMR_MASK       BIT(STATUS2_DCDTMR_SHIFT)
+#define MAX77843_MUIC_STATUS2_DXOVP_MASK        BIT(STATUS2_DXOVP_SHIFT)
+#define MAX77843_MUIC_STATUS2_VBVOLT_MASK       BIT(STATUS2_VBVOLT_SHIFT)
+#define MAX77843_MUIC_STATUS3_VBADC_MASK        (0xf << STATUS3_VBADC_SHIFT)
+#define MAX77843_MUIC_STATUS3_VDNMON_MASK       BIT(STATUS3_VDNMON_SHIFT)
+#define MAX77843_MUIC_STATUS3_DNRES_MASK        BIT(STATUS3_DNRES_SHIFT)
+#define MAX77843_MUIC_STATUS3_MPNACK_MASK       BIT(STATUS3_MPNACK_SHIFT)
+
+/* MAX77843 CONTROL register */
+#define CONTROL1_COMP1SW_SHIFT                  0
+#define CONTROL1_COMP2SW_SHIFT                  3
+#define CONTROL1_IDBEN_SHIFT                    7
+#define CONTROL2_LOWPWR_SHIFT                   0
+#define CONTROL2_ADCEN_SHIFT                    1
+#define CONTROL2_CPEN_SHIFT                     2
+#define CONTROL2_ACC_DET_SHIFT                  5
+#define CONTROL2_USBCPINT_SHIFT                 6
+#define CONTROL2_RCPS_SHIFT                     7
+#define CONTROL3_JIGSET_SHIFT                   0
+#define CONTROL4_ADCDBSET_SHIFT                 0
+#define CONTROL4_USBAUTO_SHIFT                  4
+#define CONTROL4_FCTAUTO_SHIFT                  5
+#define CONTROL4_ADCMODE_SHIFT                  6
+
+#define MAX77843_MUIC_CONTROL1_COMP1SW_MASK     (0x7 << CONTROL1_COMP1SW_SHIFT)
+#define MAX77843_MUIC_CONTROL1_COMP2SW_MASK     (0x7 << CONTROL1_COMP2SW_SHIFT)
+#define MAX77843_MUIC_CONTROL1_IDBEN_MASK       BIT(CONTROL1_IDBEN_SHIFT)
+#define MAX77843_MUIC_CONTROL2_LOWPWR_MASK      BIT(CONTROL2_LOWPWR_SHIFT)
+#define MAX77843_MUIC_CONTROL2_ADCEN_MASK       BIT(CONTROL2_ADCEN_SHIFT)
+#define MAX77843_MUIC_CONTROL2_CPEN_MASK        BIT(CONTROL2_CPEN_SHIFT)
+#define MAX77843_MUIC_CONTROL2_ACC_DET_MASK     BIT(CONTROL2_ACC_DET_SHIFT)
+#define MAX77843_MUIC_CONTROL2_USBCPINT_MASK    BIT(CONTROL2_USBCPINT_SHIFT)
+#define MAX77843_MUIC_CONTROL2_RCPS_MASK        BIT(CONTROL2_RCPS_SHIFT)
+#define MAX77843_MUIC_CONTROL3_JIGSET_MASK      (0x3 << CONTROL3_JIGSET_SHIFT)
+#define MAX77843_MUIC_CONTROL4_ADCDBSET_MASK    (0x3 << CONTROL4_ADCDBSET_SHIFT)
+#define MAX77843_MUIC_CONTROL4_USBAUTO_MASK     BIT(CONTROL4_USBAUTO_SHIFT)
+#define MAX77843_MUIC_CONTROL4_FCTAUTO_MASK     BIT(CONTROL4_FCTAUTO_SHIFT)
+#define MAX77843_MUIC_CONTROL4_ADCMODE_MASK     (0x3 << CONTROL4_ADCMODE_SHIFT)
+
+/* MAX77843 switch port */
+#define COM_OPEN                                0
+#define COM_USB                                 1
+#define COM_AUDIO                               2
+#define COM_UART                                3
+#define COM_AUX_USB                             4
+#define COM_AUX_UART                            5
+
+#define CONTROL1_COM_SW \
+        ((MAX77843_MUIC_CONTROL1_COMP1SW_MASK | \
+         MAX77843_MUIC_CONTROL1_COMP2SW_MASK))
+
+#define CONTROL1_SW_OPEN \
+        ((COM_OPEN << CONTROL1_COMP1SW_SHIFT | \
+         COM_OPEN << CONTROL1_COMP2SW_SHIFT))
+#define CONTROL1_SW_USB \
+        ((COM_USB << CONTROL1_COMP1SW_SHIFT | \
+         COM_USB << CONTROL1_COMP2SW_SHIFT))
+#define CONTROL1_SW_AUDIO \
+        ((COM_AUDIO << CONTROL1_COMP1SW_SHIFT | \
+         COM_AUDIO << CONTROL1_COMP2SW_SHIFT))
+#define CONTROL1_SW_UART \
+        ((COM_UART << CONTROL1_COMP1SW_SHIFT | \
+         COM_UART << CONTROL1_COMP2SW_SHIFT))
+#define CONTROL1_SW_AUX_USB \
+        ((COM_AUX_USB << CONTROL1_COMP1SW_SHIFT | \
+         COM_AUX_USB << CONTROL1_COMP2SW_SHIFT))
+#define CONTROL1_SW_AUX_UART \
+        ((COM_AUX_UART << CONTROL1_COMP1SW_SHIFT | \
+         COM_AUX_UART << CONTROL1_COMP2SW_SHIFT))
+
+#define MAX77843_DISABLE                        0
+#define MAX77843_ENABLE                         1
+
+#define CONTROL4_AUTO_DISABLE \
+        ((MAX77843_DISABLE << CONTROL4_USBAUTO_SHIFT) | \
+        (MAX77843_DISABLE << CONTROL4_FCTAUTO_SHIFT))
+#define CONTROL4_AUTO_ENABLE \
+        ((MAX77843_ENABLE << CONTROL4_USBAUTO_SHIFT) | \
+        (MAX77843_ENABLE << CONTROL4_FCTAUTO_SHIFT))
+
+/* MAX77843 SAFEOUT LDO Control register */
+#define SAFEOUTCTRL_SAFEOUT1_SHIFT              0
+#define SAFEOUTCTRL_SAFEOUT2_SHIFT              2
+#define SAFEOUTCTRL_ENSAFEOUT1_SHIFT            6
+#define SAFEOUTCTRL_ENSAFEOUT2_SHIFT            7
+
+#define MAX77843_REG_SAFEOUTCTRL_ENSAFEOUT1 \
+                BIT(SAFEOUTCTRL_ENSAFEOUT1_SHIFT)
+#define MAX77843_REG_SAFEOUTCTRL_ENSAFEOUT2 \
+                BIT(SAFEOUTCTRL_ENSAFEOUT2_SHIFT)
+#define MAX77843_REG_SAFEOUTCTRL_SAFEOUT1_MASK \
+                (0x3 << SAFEOUTCTRL_SAFEOUT1_SHIFT)
+#define MAX77843_REG_SAFEOUTCTRL_SAFEOUT2_MASK \
+                (0x3 << SAFEOUTCTRL_SAFEOUT2_SHIFT)
+
+struct max77843 {
+        struct device *dev;
+
+        struct i2c_client *i2c;
+        struct i2c_client *i2c_chg;
+        struct i2c_client *i2c_fuel;
+        struct i2c_client *i2c_muic;
+
+        struct regmap *regmap;
+        struct regmap *regmap_chg;
+        struct regmap *regmap_fuel;
+        struct regmap *regmap_muic;
+
+        struct regmap_irq_chip_data *irq_data;
+        struct regmap_irq_chip_data *irq_data_chg;
+        struct regmap_irq_chip_data *irq_data_fuel;
+        struct regmap_irq_chip_data *irq_data_muic;
+
+        int irq;
+};
+#endif /* __MAX77843_H__ */
diff --git a/include/linux/mfd/menelaus.h b/include/linux/mfd/menelaus.h
index f097e89134cb..9e85ac06da89 100644
--- a/include/linux/mfd/menelaus.h
+++ b/include/linux/mfd/menelaus.h
@@ -24,7 +24,6 @@ extern int menelaus_set_vaux(unsigned int mV);
 extern int menelaus_set_vdcdc(int dcdc, unsigned int mV);
 extern int menelaus_set_slot_sel(int enable);
 extern int menelaus_get_slot_pin_states(void);
-extern int menelaus_set_vcore_sw(unsigned int mV);
 extern int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV);
 
 #define EN_VPLL_SLEEP   (1 << 7)
@@ -38,10 +37,4 @@ extern int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV);
 
 extern int menelaus_set_regulator_sleep(int enable, u32 val);
 
-#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_MENELAUS)
-#define omap_has_menelaus()     1
-#else
-#define omap_has_menelaus()     0
-#endif
-
 #endif
diff --git a/include/linux/mfd/mt6397/core.h b/include/linux/mfd/mt6397/core.h
new file mode 100644
index 000000000000..cf5265b0d1c1
--- /dev/null
+++ b/include/linux/mfd/mt6397/core.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Flora Fu, MediaTek
+ *
+ * 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.
+ */
+
+#ifndef __MFD_MT6397_CORE_H__
+#define __MFD_MT6397_CORE_H__
+
+enum mt6397_irq_numbers {
+        MT6397_IRQ_SPKL_AB = 0,
+        MT6397_IRQ_SPKR_AB,
+        MT6397_IRQ_SPKL,
+        MT6397_IRQ_SPKR,
+        MT6397_IRQ_BAT_L,
+        MT6397_IRQ_BAT_H,
+        MT6397_IRQ_FG_BAT_L,
+        MT6397_IRQ_FG_BAT_H,
+        MT6397_IRQ_WATCHDOG,
+        MT6397_IRQ_PWRKEY,
+        MT6397_IRQ_THR_L,
+        MT6397_IRQ_THR_H,
+        MT6397_IRQ_VBATON_UNDET,
+        MT6397_IRQ_BVALID_DET,
+        MT6397_IRQ_CHRDET,
+        MT6397_IRQ_OV,
+        MT6397_IRQ_LDO,
+        MT6397_IRQ_HOMEKEY,
+        MT6397_IRQ_ACCDET,
+        MT6397_IRQ_AUDIO,
+        MT6397_IRQ_RTC,
+        MT6397_IRQ_PWRKEY_RSTB,
+        MT6397_IRQ_HDMI_SIFM,
+        MT6397_IRQ_HDMI_CEC,
+        MT6397_IRQ_VCA15,
+        MT6397_IRQ_VSRMCA15,
+        MT6397_IRQ_VCORE,
+        MT6397_IRQ_VGPU,
+        MT6397_IRQ_VIO18,
+        MT6397_IRQ_VPCA7,
+        MT6397_IRQ_VSRMCA7,
+        MT6397_IRQ_VDRM,
+        MT6397_IRQ_NR,
+};
+
+struct mt6397_chip {
+        struct device *dev;
+        struct regmap *regmap;
+        int irq;
+        struct irq_domain *irq_domain;
+        struct mutex irqlock;
+        u16 irq_masks_cur[2];
+        u16 irq_masks_cache[2];
+};
+
+#endif /* __MFD_MT6397_CORE_H__ */
diff --git a/include/linux/mfd/mt6397/registers.h b/include/linux/mfd/mt6397/registers.h
new file mode 100644
index 000000000000..f23a0a60a877
--- /dev/null
+++ b/include/linux/mfd/mt6397/registers.h
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Flora Fu, MediaTek
+ *
+ * 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.
+ */
+
+#ifndef __MFD_MT6397_REGISTERS_H__
+#define __MFD_MT6397_REGISTERS_H__
+
+/* PMIC Registers */
+#define MT6397_CID                      0x0100
+#define MT6397_TOP_CKPDN                0x0102
+#define MT6397_TOP_CKPDN_SET            0x0104
+#define MT6397_TOP_CKPDN_CLR            0x0106
+#define MT6397_TOP_CKPDN2               0x0108
+#define MT6397_TOP_CKPDN2_SET           0x010A
+#define MT6397_TOP_CKPDN2_CLR           0x010C
+#define MT6397_TOP_GPIO_CKPDN           0x010E
+#define MT6397_TOP_RST_CON              0x0114
+#define MT6397_WRP_CKPDN                0x011A
+#define MT6397_WRP_RST_CON              0x0120
+#define MT6397_TOP_RST_MISC             0x0126
+#define MT6397_TOP_CKCON1               0x0128
+#define MT6397_TOP_CKCON2               0x012A
+#define MT6397_TOP_CKTST1               0x012C
+#define MT6397_TOP_CKTST2               0x012E
+#define MT6397_OC_DEG_EN                0x0130
+#define MT6397_OC_CTL0                  0x0132
+#define MT6397_OC_CTL1                  0x0134
+#define MT6397_OC_CTL2                  0x0136
+#define MT6397_INT_RSV                  0x0138
+#define MT6397_TEST_CON0                0x013A
+#define MT6397_TEST_CON1                0x013C
+#define MT6397_STATUS0                  0x013E
+#define MT6397_STATUS1                  0x0140
+#define MT6397_PGSTATUS                 0x0142
+#define MT6397_CHRSTATUS                0x0144
+#define MT6397_OCSTATUS0                0x0146
+#define MT6397_OCSTATUS1                0x0148
+#define MT6397_OCSTATUS2                0x014A
+#define MT6397_HDMI_PAD_IE              0x014C
+#define MT6397_TEST_OUT_L               0x014E
+#define MT6397_TEST_OUT_H               0x0150
+#define MT6397_TDSEL_CON                0x0152
+#define MT6397_RDSEL_CON                0x0154
+#define MT6397_GPIO_SMT_CON0            0x0156
+#define MT6397_GPIO_SMT_CON1            0x0158
+#define MT6397_GPIO_SMT_CON2            0x015A
+#define MT6397_GPIO_SMT_CON3            0x015C
+#define MT6397_DRV_CON0                 0x015E
+#define MT6397_DRV_CON1                 0x0160
+#define MT6397_DRV_CON2                 0x0162
+#define MT6397_DRV_CON3                 0x0164
+#define MT6397_DRV_CON4                 0x0166
+#define MT6397_DRV_CON5                 0x0168
+#define MT6397_DRV_CON6                 0x016A
+#define MT6397_DRV_CON7                 0x016C
+#define MT6397_DRV_CON8                 0x016E
+#define MT6397_DRV_CON9                 0x0170
+#define MT6397_DRV_CON10                0x0172
+#define MT6397_DRV_CON11                0x0174
+#define MT6397_DRV_CON12                0x0176
+#define MT6397_INT_CON0                 0x0178
+#define MT6397_INT_CON1                 0x017E
+#define MT6397_INT_STATUS0              0x0184
+#define MT6397_INT_STATUS1              0x0186
+#define MT6397_FQMTR_CON0               0x0188
+#define MT6397_FQMTR_CON1               0x018A
+#define MT6397_FQMTR_CON2               0x018C
+#define MT6397_EFUSE_DOUT_0_15          0x01C4
+#define MT6397_EFUSE_DOUT_16_31         0x01C6
+#define MT6397_EFUSE_DOUT_32_47         0x01C8
+#define MT6397_EFUSE_DOUT_48_63         0x01CA
+#define MT6397_SPI_CON                  0x01CC
+#define MT6397_TOP_CKPDN3               0x01CE
+#define MT6397_TOP_CKCON3               0x01D4
+#define MT6397_EFUSE_DOUT_64_79         0x01D6
+#define MT6397_EFUSE_DOUT_80_95         0x01D8
+#define MT6397_EFUSE_DOUT_96_111        0x01DA
+#define MT6397_EFUSE_DOUT_112_127       0x01DC
+#define MT6397_EFUSE_DOUT_128_143       0x01DE
+#define MT6397_EFUSE_DOUT_144_159       0x01E0
+#define MT6397_EFUSE_DOUT_160_175       0x01E2
+#define MT6397_EFUSE_DOUT_176_191       0x01E4
+#define MT6397_EFUSE_DOUT_192_207       0x01E6
+#define MT6397_EFUSE_DOUT_208_223       0x01E8
+#define MT6397_EFUSE_DOUT_224_239       0x01EA
+#define MT6397_EFUSE_DOUT_240_255       0x01EC
+#define MT6397_EFUSE_DOUT_256_271       0x01EE
+#define MT6397_EFUSE_DOUT_272_287       0x01F0
+#define MT6397_EFUSE_DOUT_288_300       0x01F2
+#define MT6397_EFUSE_DOUT_304_319       0x01F4
+#define MT6397_BUCK_CON0                0x0200
+#define MT6397_BUCK_CON1                0x0202
+#define MT6397_BUCK_CON2                0x0204
+#define MT6397_BUCK_CON3                0x0206
+#define MT6397_BUCK_CON4                0x0208
+#define MT6397_BUCK_CON5                0x020A
+#define MT6397_BUCK_CON6                0x020C
+#define MT6397_BUCK_CON7                0x020E
+#define MT6397_BUCK_CON8                0x0210
+#define MT6397_BUCK_CON9                0x0212
+#define MT6397_VCA15_CON0               0x0214
+#define MT6397_VCA15_CON1               0x0216
+#define MT6397_VCA15_CON2               0x0218
+#define MT6397_VCA15_CON3               0x021A
+#define MT6397_VCA15_CON4               0x021C
+#define MT6397_VCA15_CON5               0x021E
+#define MT6397_VCA15_CON6               0x0220
+#define MT6397_VCA15_CON7               0x0222
+#define MT6397_VCA15_CON8               0x0224
+#define MT6397_VCA15_CON9               0x0226
+#define MT6397_VCA15_CON10              0x0228
+#define MT6397_VCA15_CON11              0x022A
+#define MT6397_VCA15_CON12              0x022C
+#define MT6397_VCA15_CON13              0x022E
+#define MT6397_VCA15_CON14              0x0230
+#define MT6397_VCA15_CON15              0x0232
+#define MT6397_VCA15_CON16              0x0234
+#define MT6397_VCA15_CON17              0x0236
+#define MT6397_VCA15_CON18              0x0238
+#define MT6397_VSRMCA15_CON0            0x023A
+#define MT6397_VSRMCA15_CON1            0x023C
+#define MT6397_VSRMCA15_CON2            0x023E
+#define MT6397_VSRMCA15_CON3            0x0240
+#define MT6397_VSRMCA15_CON4            0x0242
+#define MT6397_VSRMCA15_CON5            0x0244
+#define MT6397_VSRMCA15_CON6            0x0246
+#define MT6397_VSRMCA15_CON7            0x0248
+#define MT6397_VSRMCA15_CON8            0x024A
+#define MT6397_VSRMCA15_CON9            0x024C
+#define MT6397_VSRMCA15_CON10           0x024E
+#define MT6397_VSRMCA15_CON11           0x0250
+#define MT6397_VSRMCA15_CON12           0x0252
+#define MT6397_VSRMCA15_CON13           0x0254
+#define MT6397_VSRMCA15_CON14           0x0256
+#define MT6397_VSRMCA15_CON15           0x0258
+#define MT6397_VSRMCA15_CON16           0x025A
+#define MT6397_VSRMCA15_CON17           0x025C
+#define MT6397_VSRMCA15_CON18           0x025E
+#define MT6397_VSRMCA15_CON19           0x0260
+#define MT6397_VSRMCA15_CON20           0x0262
+#define MT6397_VSRMCA15_CON21           0x0264
+#define MT6397_VCORE_CON0               0x0266
+#define MT6397_VCORE_CON1               0x0268
+#define MT6397_VCORE_CON2               0x026A
+#define MT6397_VCORE_CON3               0x026C
+#define MT6397_VCORE_CON4               0x026E
+#define MT6397_VCORE_CON5               0x0270
+#define MT6397_VCORE_CON6               0x0272
+#define MT6397_VCORE_CON7               0x0274
+#define MT6397_VCORE_CON8               0x0276
+#define MT6397_VCORE_CON9               0x0278
+#define MT6397_VCORE_CON10              0x027A
+#define MT6397_VCORE_CON11              0x027C
+#define MT6397_VCORE_CON12              0x027E
+#define MT6397_VCORE_CON13              0x0280
+#define MT6397_VCORE_CON14              0x0282
+#define MT6397_VCORE_CON15              0x0284
+#define MT6397_VCORE_CON16              0x0286
+#define MT6397_VCORE_CON17              0x0288
+#define MT6397_VCORE_CON18              0x028A
+#define MT6397_VGPU_CON0                0x028C
+#define MT6397_VGPU_CON1                0x028E
+#define MT6397_VGPU_CON2                0x0290
+#define MT6397_VGPU_CON3                0x0292
+#define MT6397_VGPU_CON4                0x0294
+#define MT6397_VGPU_CON5                0x0296
+#define MT6397_VGPU_CON6                0x0298
+#define MT6397_VGPU_CON7                0x029A
+#define MT6397_VGPU_CON8                0x029C
+#define MT6397_VGPU_CON9                0x029E
+#define MT6397_VGPU_CON10               0x02A0
+#define MT6397_VGPU_CON11               0x02A2
+#define MT6397_VGPU_CON12               0x02A4
+#define MT6397_VGPU_CON13               0x02A6
+#define MT6397_VGPU_CON14               0x02A8
+#define MT6397_VGPU_CON15               0x02AA
+#define MT6397_VGPU_CON16               0x02AC
+#define MT6397_VGPU_CON17               0x02AE
+#define MT6397_VGPU_CON18               0x02B0
+#define MT6397_VIO18_CON0               0x0300
+#define MT6397_VIO18_CON1               0x0302
+#define MT6397_VIO18_CON2               0x0304
+#define MT6397_VIO18_CON3               0x0306
+#define MT6397_VIO18_CON4               0x0308
+#define MT6397_VIO18_CON5               0x030A
+#define MT6397_VIO18_CON6               0x030C
+#define MT6397_VIO18_CON7               0x030E
+#define MT6397_VIO18_CON8               0x0310
+#define MT6397_VIO18_CON9               0x0312
+#define MT6397_VIO18_CON10              0x0314
+#define MT6397_VIO18_CON11              0x0316
+#define MT6397_VIO18_CON12              0x0318
+#define MT6397_VIO18_CON13              0x031A
+#define MT6397_VIO18_CON14              0x031C
+#define MT6397_VIO18_CON15              0x031E
+#define MT6397_VIO18_CON16              0x0320
+#define MT6397_VIO18_CON17              0x0322
+#define MT6397_VIO18_CON18              0x0324
+#define MT6397_VPCA7_CON0               0x0326
+#define MT6397_VPCA7_CON1               0x0328
+#define MT6397_VPCA7_CON2               0x032A
+#define MT6397_VPCA7_CON3               0x032C
+#define MT6397_VPCA7_CON4               0x032E
+#define MT6397_VPCA7_CON5               0x0330
+#define MT6397_VPCA7_CON6               0x0332
+#define MT6397_VPCA7_CON7               0x0334
+#define MT6397_VPCA7_CON8               0x0336
+#define MT6397_VPCA7_CON9               0x0338
+#define MT6397_VPCA7_CON10              0x033A
+#define MT6397_VPCA7_CON11              0x033C
+#define MT6397_VPCA7_CON12              0x033E
+#define MT6397_VPCA7_CON13              0x0340
+#define MT6397_VPCA7_CON14              0x0342
+#define MT6397_VPCA7_CON15              0x0344
+#define MT6397_VPCA7_CON16              0x0346
+#define MT6397_VPCA7_CON17              0x0348
+#define MT6397_VPCA7_CON18              0x034A
+#define MT6397_VSRMCA7_CON0             0x034C
+#define MT6397_VSRMCA7_CON1             0x034E
+#define MT6397_VSRMCA7_CON2             0x0350
+#define MT6397_VSRMCA7_CON3             0x0352
+#define MT6397_VSRMCA7_CON4             0x0354
+#define MT6397_VSRMCA7_CON5             0x0356
+#define MT6397_VSRMCA7_CON6             0x0358
+#define MT6397_VSRMCA7_CON7             0x035A
+#define MT6397_VSRMCA7_CON8             0x035C
+#define MT6397_VSRMCA7_CON9             0x035E
+#define MT6397_VSRMCA7_CON10            0x0360
+#define MT6397_VSRMCA7_CON11            0x0362
+#define MT6397_VSRMCA7_CON12            0x0364
+#define MT6397_VSRMCA7_CON13            0x0366
+#define MT6397_VSRMCA7_CON14            0x0368
+#define MT6397_VSRMCA7_CON15            0x036A
+#define MT6397_VSRMCA7_CON16            0x036C
+#define MT6397_VSRMCA7_CON17            0x036E
+#define MT6397_VSRMCA7_CON18            0x0370
+#define MT6397_VSRMCA7_CON19            0x0372
+#define MT6397_VSRMCA7_CON20            0x0374
+#define MT6397_VSRMCA7_CON21            0x0376
+#define MT6397_VDRM_CON0                0x0378
+#define MT6397_VDRM_CON1                0x037A
+#define MT6397_VDRM_CON2                0x037C
+#define MT6397_VDRM_CON3                0x037E
+#define MT6397_VDRM_CON4                0x0380
+#define MT6397_VDRM_CON5                0x0382
+#define MT6397_VDRM_CON6                0x0384
+#define MT6397_VDRM_CON7                0x0386
+#define MT6397_VDRM_CON8                0x0388
+#define MT6397_VDRM_CON9                0x038A
+#define MT6397_VDRM_CON10               0x038C
+#define MT6397_VDRM_CON11               0x038E
+#define MT6397_VDRM_CON12               0x0390
+#define MT6397_VDRM_CON13               0x0392
+#define MT6397_VDRM_CON14               0x0394
+#define MT6397_VDRM_CON15               0x0396
+#define MT6397_VDRM_CON16               0x0398
+#define MT6397_VDRM_CON17               0x039A
+#define MT6397_VDRM_CON18               0x039C
+#define MT6397_BUCK_K_CON0              0x039E
+#define MT6397_BUCK_K_CON1              0x03A0
+#define MT6397_ANALDO_CON0              0x0400
+#define MT6397_ANALDO_CON1              0x0402
+#define MT6397_ANALDO_CON2              0x0404
+#define MT6397_ANALDO_CON3              0x0406
+#define MT6397_ANALDO_CON4              0x0408
+#define MT6397_ANALDO_CON5              0x040A
+#define MT6397_ANALDO_CON6              0x040C
+#define MT6397_ANALDO_CON7              0x040E
+#define MT6397_DIGLDO_CON0              0x0410
+#define MT6397_DIGLDO_CON1              0x0412
+#define MT6397_DIGLDO_CON2              0x0414
+#define MT6397_DIGLDO_CON3              0x0416
+#define MT6397_DIGLDO_CON4              0x0418
+#define MT6397_DIGLDO_CON5              0x041A
+#define MT6397_DIGLDO_CON6              0x041C
+#define MT6397_DIGLDO_CON7              0x041E
+#define MT6397_DIGLDO_CON8              0x0420
+#define MT6397_DIGLDO_CON9              0x0422
+#define MT6397_DIGLDO_CON10             0x0424
+#define MT6397_DIGLDO_CON11             0x0426
+#define MT6397_DIGLDO_CON12             0x0428
+#define MT6397_DIGLDO_CON13             0x042A
+#define MT6397_DIGLDO_CON14             0x042C
+#define MT6397_DIGLDO_CON15             0x042E
+#define MT6397_DIGLDO_CON16             0x0430
+#define MT6397_DIGLDO_CON17             0x0432
+#define MT6397_DIGLDO_CON18             0x0434
+#define MT6397_DIGLDO_CON19             0x0436
+#define MT6397_DIGLDO_CON20             0x0438
+#define MT6397_DIGLDO_CON21             0x043A
+#define MT6397_DIGLDO_CON22             0x043C
+#define MT6397_DIGLDO_CON23             0x043E
+#define MT6397_DIGLDO_CON24             0x0440
+#define MT6397_DIGLDO_CON25             0x0442
+#define MT6397_DIGLDO_CON26             0x0444
+#define MT6397_DIGLDO_CON27             0x0446
+#define MT6397_DIGLDO_CON28             0x0448
+#define MT6397_DIGLDO_CON29             0x044A
+#define MT6397_DIGLDO_CON30             0x044C
+#define MT6397_DIGLDO_CON31             0x044E
+#define MT6397_DIGLDO_CON32             0x0450
+#define MT6397_DIGLDO_CON33             0x045A
+#define MT6397_SPK_CON0                 0x0600
+#define MT6397_SPK_CON1                 0x0602
+#define MT6397_SPK_CON2                 0x0604
+#define MT6397_SPK_CON3                 0x0606
+#define MT6397_SPK_CON4                 0x0608
+#define MT6397_SPK_CON5                 0x060A
+#define MT6397_SPK_CON6                 0x060C
+#define MT6397_SPK_CON7                 0x060E
+#define MT6397_SPK_CON8                 0x0610
+#define MT6397_SPK_CON9                 0x0612
+#define MT6397_SPK_CON10                0x0614
+#define MT6397_SPK_CON11                0x0616
+#define MT6397_AUDDAC_CON0              0x0700
+#define MT6397_AUDBUF_CFG0              0x0702
+#define MT6397_AUDBUF_CFG1              0x0704
+#define MT6397_AUDBUF_CFG2              0x0706
+#define MT6397_AUDBUF_CFG3              0x0708
+#define MT6397_AUDBUF_CFG4              0x070A
+#define MT6397_IBIASDIST_CFG0           0x070C
+#define MT6397_AUDACCDEPOP_CFG0         0x070E
+#define MT6397_AUD_IV_CFG0              0x0710
+#define MT6397_AUDCLKGEN_CFG0           0x0712
+#define MT6397_AUDLDO_CFG0              0x0714
+#define MT6397_AUDLDO_CFG1              0x0716
+#define MT6397_AUDNVREGGLB_CFG0         0x0718
+#define MT6397_AUD_NCP0                 0x071A
+#define MT6397_AUDPREAMP_CON0           0x071C
+#define MT6397_AUDADC_CON0              0x071E
+#define MT6397_AUDADC_CON1              0x0720
+#define MT6397_AUDADC_CON2              0x0722
+#define MT6397_AUDADC_CON3              0x0724
+#define MT6397_AUDADC_CON4              0x0726
+#define MT6397_AUDADC_CON5              0x0728
+#define MT6397_AUDADC_CON6              0x072A
+#define MT6397_AUDDIGMI_CON0            0x072C
+#define MT6397_AUDLSBUF_CON0            0x072E
+#define MT6397_AUDLSBUF_CON1            0x0730
+#define MT6397_AUDENCSPARE_CON0         0x0732
+#define MT6397_AUDENCCLKSQ_CON0         0x0734
+#define MT6397_AUDPREAMPGAIN_CON0       0x0736
+#define MT6397_ZCD_CON0                 0x0738
+#define MT6397_ZCD_CON1                 0x073A
+#define MT6397_ZCD_CON2                 0x073C
+#define MT6397_ZCD_CON3                 0x073E
+#define MT6397_ZCD_CON4                 0x0740
+#define MT6397_ZCD_CON5                 0x0742
+#define MT6397_NCP_CLKDIV_CON0          0x0744
+#define MT6397_NCP_CLKDIV_CON1          0x0746
+
+#endif /* __MFD_MT6397_REGISTERS_H__ */
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index fb0390a1a498..bb270bd03eed 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -117,6 +117,7 @@ struct palmas_pmic_driver_data {
         int ldo_begin;
         int ldo_end;
         int max_reg;
+        bool has_regen3;
         struct palmas_regs_info *palmas_regs_info;
         struct of_regulator_match *palmas_matches;
         struct palmas_sleep_requestor_info *sleep_req_info;
@@ -2999,6 +3000,9 @@ enum usb_irq_events {
 #define PALMAS_GPADC_TRIM15                                     0x0E
 #define PALMAS_GPADC_TRIM16                                     0x0F
 
+/* TPS659038 regen2_ctrl offset iss different from palmas */
+#define TPS659038_REGEN2_CTRL                                   0x12
+
 /* TPS65917 Interrupt registers */
 
 /* Registers for function INTERRUPT */
diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
index fb09312d854b..441b6ee72691 100644
--- a/include/linux/mfd/rk808.h
+++ b/include/linux/mfd/rk808.h
@@ -156,6 +156,9 @@ enum rk808_reg {
 #define BUCK2_RATE_MASK         (3 << 3)
 #define MASK_ALL        0xff
 
+#define BUCK_UV_ACT_MASK        0x0f
+#define BUCK_UV_ACT_DISABLE     0
+
 #define SWITCH2_EN      BIT(6)
 #define SWITCH1_EN      BIT(5)
 #define DEV_OFF_RST     BIT(3)
diff --git a/include/linux/mfd/rt5033.h b/include/linux/mfd/rt5033.h
index 010cff49a98e..6cff5cf458d2 100644
--- a/include/linux/mfd/rt5033.h
+++ b/include/linux/mfd/rt5033.h
@@ -39,7 +39,7 @@ struct rt5033_battery {
         struct i2c_client       *client;
         struct rt5033_dev       *rt5033;
         struct regmap           *regmap;
-        struct power_supply     psy;
+        struct power_supply     *psy;
 };
 
 /* RT5033 charger platform data */
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
index 0c12628e91c6..ff843e7ca23d 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/mfd/rtsx_pci.h
@@ -28,74 +28,72 @@
 
 #define MAX_RW_REG_CNT                  1024
 
-/* PCI Operation Register Address */
 #define RTSX_HCBAR                      0x00
 #define RTSX_HCBCTLR                    0x04
+#define   STOP_CMD                      (0x01 << 28)
+#define   READ_REG_CMD                  0
+#define   WRITE_REG_CMD                 1
+#define   CHECK_REG_CMD                 2
+
 #define RTSX_HDBAR                      0x08
+#define   SG_INT                        0x04
+#define   SG_END                        0x02
+#define   SG_VALID                      0x01
+#define   SG_NO_OP                      0x00
+#define   SG_TRANS_DATA                 (0x02 << 4)
+#define   SG_LINK_DESC                  (0x03 << 4)
 #define RTSX_HDBCTLR                    0x0C
+#define   SDMA_MODE                     0x00
+#define   ADMA_MODE                     (0x02 << 26)
+#define   STOP_DMA                      (0x01 << 28)
+#define   TRIG_DMA                      (0x01 << 31)
+
 #define RTSX_HAIMR                      0x10
-#define RTSX_BIPR                       0x14
-#define RTSX_BIER                       0x18
+#define   HAIMR_TRANS_START             (0x01 << 31)
+#define   HAIMR_READ                    0x00
+#define   HAIMR_WRITE                   (0x01 << 30)
+#define   HAIMR_READ_START              (HAIMR_TRANS_START | HAIMR_READ)
+#define   HAIMR_WRITE_START             (HAIMR_TRANS_START | HAIMR_WRITE)
+#define   HAIMR_TRANS_END                       (HAIMR_TRANS_START)
 
-/* Host command buffer control register */
-#define STOP_CMD                        (0x01 << 28)
-
-/* Host data buffer control register */
-#define SDMA_MODE                       0x00
-#define ADMA_MODE                       (0x02 << 26)
-#define STOP_DMA                        (0x01 << 28)
-#define TRIG_DMA                        (0x01 << 31)
-
-/* Host access internal memory register */
-#define HAIMR_TRANS_START               (0x01 << 31)
-#define HAIMR_READ                      0x00
-#define HAIMR_WRITE                     (0x01 << 30)
-#define HAIMR_READ_START                (HAIMR_TRANS_START | HAIMR_READ)
-#define HAIMR_WRITE_START               (HAIMR_TRANS_START | HAIMR_WRITE)
-#define HAIMR_TRANS_END                 (HAIMR_TRANS_START)
-
-/* Bus interrupt pending register */
-#define CMD_DONE_INT                    (1 << 31)
-#define DATA_DONE_INT                   (1 << 30)
-#define TRANS_OK_INT                    (1 << 29)
-#define TRANS_FAIL_INT                  (1 << 28)
-#define XD_INT                          (1 << 27)
-#define MS_INT                          (1 << 26)
-#define SD_INT                          (1 << 25)
-#define GPIO0_INT                       (1 << 24)
-#define OC_INT                          (1 << 23)
-#define SD_WRITE_PROTECT                (1 << 19)
-#define XD_EXIST                        (1 << 18)
-#define MS_EXIST                        (1 << 17)
-#define SD_EXIST                        (1 << 16)
-#define DELINK_INT                      GPIO0_INT
-#define MS_OC_INT                       (1 << 23)
-#define SD_OC_INT                       (1 << 22)
+#define RTSX_BIPR                       0x14
+#define   CMD_DONE_INT                  (1 << 31)
+#define   DATA_DONE_INT                 (1 << 30)
+#define   TRANS_OK_INT                  (1 << 29)
+#define   TRANS_FAIL_INT                (1 << 28)
+#define   XD_INT                        (1 << 27)
+#define   MS_INT                        (1 << 26)
+#define   SD_INT                        (1 << 25)
+#define   GPIO0_INT                     (1 << 24)
+#define   OC_INT                        (1 << 23)
+#define   SD_WRITE_PROTECT              (1 << 19)
+#define   XD_EXIST                      (1 << 18)
+#define   MS_EXIST                      (1 << 17)
+#define   SD_EXIST                      (1 << 16)
+#define   DELINK_INT                    GPIO0_INT
+#define   MS_OC_INT                     (1 << 23)
+#define   SD_OC_INT                     (1 << 22)
 
 #define CARD_INT                (XD_INT | MS_INT | SD_INT)
 #define NEED_COMPLETE_INT       (DATA_DONE_INT | TRANS_OK_INT | TRANS_FAIL_INT)
 #define RTSX_INT                (CMD_DONE_INT | NEED_COMPLETE_INT | \
                                         CARD_INT | GPIO0_INT | OC_INT)
-
 #define CARD_EXIST              (XD_EXIST | MS_EXIST | SD_EXIST)
 
-/* Bus interrupt enable register */
-#define CMD_DONE_INT_EN         (1 << 31)
-#define DATA_DONE_INT_EN        (1 << 30)
-#define TRANS_OK_INT_EN         (1 << 29)
-#define TRANS_FAIL_INT_EN       (1 << 28)
-#define XD_INT_EN               (1 << 27)
-#define MS_INT_EN               (1 << 26)
-#define SD_INT_EN               (1 << 25)
-#define GPIO0_INT_EN            (1 << 24)
-#define OC_INT_EN               (1 << 23)
-#define DELINK_INT_EN           GPIO0_INT_EN
-#define MS_OC_INT_EN            (1 << 23)
-#define SD_OC_INT_EN            (1 << 22)
-
-#define READ_REG_CMD            0
-#define WRITE_REG_CMD           1
-#define CHECK_REG_CMD           2
+#define RTSX_BIER                       0x18
+#define   CMD_DONE_INT_EN               (1 << 31)
+#define   DATA_DONE_INT_EN              (1 << 30)
+#define   TRANS_OK_INT_EN               (1 << 29)
+#define   TRANS_FAIL_INT_EN             (1 << 28)
+#define   XD_INT_EN                     (1 << 27)
+#define   MS_INT_EN                     (1 << 26)
+#define   SD_INT_EN                     (1 << 25)
+#define   GPIO0_INT_EN                  (1 << 24)
+#define   OC_INT_EN                     (1 << 23)
+#define   DELINK_INT_EN                 GPIO0_INT_EN
+#define   MS_OC_INT_EN                  (1 << 23)
+#define   SD_OC_INT_EN                  (1 << 22)
+
 
 /*
  * macros for easy use
@@ -125,423 +123,68 @@
 #define rtsx_pci_write_config_dword(pcr, where, val) \
         pci_write_config_dword((pcr)->pci, where, val)
 
-#define STATE_TRANS_NONE        0
-#define STATE_TRANS_CMD         1
-#define STATE_TRANS_BUF         2
-#define STATE_TRANS_SG          3
-
-#define TRANS_NOT_READY         0
-#define TRANS_RESULT_OK         1
-#define TRANS_RESULT_FAIL       2
-#define TRANS_NO_DEVICE         3
-
-#define RTSX_RESV_BUF_LEN       4096
-#define HOST_CMDS_BUF_LEN       1024
-#define HOST_SG_TBL_BUF_LEN     (RTSX_RESV_BUF_LEN - HOST_CMDS_BUF_LEN)
-#define HOST_SG_TBL_ITEMS       (HOST_SG_TBL_BUF_LEN / 8)
-#define MAX_SG_ITEM_LEN         0x80000
-
-#define HOST_TO_DEVICE          0
-#define DEVICE_TO_HOST          1
-
-#define RTSX_PHASE_MAX          32
-#define RX_TUNING_CNT           3
-
-/* SG descriptor */
-#define SG_INT                  0x04
-#define SG_END                  0x02
-#define SG_VALID                0x01
-
-#define SG_NO_OP                0x00
-#define SG_TRANS_DATA           (0x02 << 4)
-#define SG_LINK_DESC            (0x03 << 4)
-
-/* Output voltage */
-#define OUTPUT_3V3              0
-#define OUTPUT_1V8              1
-
-/* Card Clock Enable Register */
-#define SD_CLK_EN                       0x04
-#define MS_CLK_EN                       0x08
-
-/* Card Select Register */
-#define SD_MOD_SEL                      2
-#define MS_MOD_SEL                      3
-
-/* Card Output Enable Register */
-#define SD_OUTPUT_EN                    0x04
-#define MS_OUTPUT_EN                    0x08
-
-/* CARD_SHARE_MODE */
-#define CARD_SHARE_MASK                 0x0F
-#define CARD_SHARE_MULTI_LUN            0x00
-#define CARD_SHARE_NORMAL               0x00
-#define CARD_SHARE_48_SD                0x04
-#define CARD_SHARE_48_MS                0x08
-/* CARD_SHARE_MODE for barossa */
-#define CARD_SHARE_BAROSSA_SD           0x01
-#define CARD_SHARE_BAROSSA_MS           0x02
-
-/* CARD_DRIVE_SEL */
-#define MS_DRIVE_8mA                    (0x01 << 6)
-#define MMC_DRIVE_8mA                   (0x01 << 4)
-#define XD_DRIVE_8mA                    (0x01 << 2)
-#define GPIO_DRIVE_8mA                  0x01
-#define RTS5209_CARD_DRIVE_DEFAULT      (MS_DRIVE_8mA | MMC_DRIVE_8mA |\
-                                                XD_DRIVE_8mA | GPIO_DRIVE_8mA)
-#define RTL8411_CARD_DRIVE_DEFAULT      (MS_DRIVE_8mA | MMC_DRIVE_8mA |\
-                                                XD_DRIVE_8mA)
-#define RTSX_CARD_DRIVE_DEFAULT         (MS_DRIVE_8mA | GPIO_DRIVE_8mA)
+#define STATE_TRANS_NONE                0
+#define STATE_TRANS_CMD                 1
+#define STATE_TRANS_BUF                 2
+#define STATE_TRANS_SG                  3
 
-/* SD30_DRIVE_SEL */
-#define DRIVER_TYPE_A                   0x05
-#define DRIVER_TYPE_B                   0x03
-#define DRIVER_TYPE_C                   0x02
-#define DRIVER_TYPE_D                   0x01
-#define CFG_DRIVER_TYPE_A               0x02
-#define CFG_DRIVER_TYPE_B               0x03
-#define CFG_DRIVER_TYPE_C               0x01
-#define CFG_DRIVER_TYPE_D               0x00
-
-/* FPDCTL */
-#define SSC_POWER_DOWN                  0x01
-#define SD_OC_POWER_DOWN                0x02
-#define ALL_POWER_DOWN                  0x07
-#define OC_POWER_DOWN                   0x06
-
-/* CLK_CTL */
-#define CHANGE_CLK                      0x01
-
-/* LDO_CTL */
-#define BPP_ASIC_1V7                    0x00
-#define BPP_ASIC_1V8                    0x01
-#define BPP_ASIC_1V9                    0x02
-#define BPP_ASIC_2V0                    0x03
-#define BPP_ASIC_2V7                    0x04
-#define BPP_ASIC_2V8                    0x05
-#define BPP_ASIC_3V2                    0x06
-#define BPP_ASIC_3V3                    0x07
-#define BPP_REG_TUNED18                 0x07
-#define BPP_TUNED18_SHIFT_8402          5
-#define BPP_TUNED18_SHIFT_8411          4
-#define BPP_PAD_MASK                    0x04
-#define BPP_PAD_3V3                     0x04
-#define BPP_PAD_1V8                     0x00
-#define BPP_LDO_POWB                    0x03
-#define BPP_LDO_ON                      0x00
-#define BPP_LDO_SUSPEND                 0x02
-#define BPP_LDO_OFF                     0x03
-
-/* CD_PAD_CTL */
-#define CD_DISABLE_MASK                 0x07
-#define MS_CD_DISABLE                   0x04
-#define SD_CD_DISABLE                   0x02
-#define XD_CD_DISABLE                   0x01
-#define CD_DISABLE                      0x07
-#define CD_ENABLE                       0x00
-#define MS_CD_EN_ONLY                   0x03
-#define SD_CD_EN_ONLY                   0x05
-#define XD_CD_EN_ONLY                   0x06
-#define FORCE_CD_LOW_MASK               0x38
-#define FORCE_CD_XD_LOW                 0x08
-#define FORCE_CD_SD_LOW                 0x10
-#define FORCE_CD_MS_LOW                 0x20
-#define CD_AUTO_DISABLE                 0x40
-
-/* SD_STAT1 */
-#define SD_CRC7_ERR                     0x80
-#define SD_CRC16_ERR                    0x40
-#define SD_CRC_WRITE_ERR                0x20
-#define SD_CRC_WRITE_ERR_MASK           0x1C
-#define GET_CRC_TIME_OUT                0x02
-#define SD_TUNING_COMPARE_ERR           0x01
-
-/* SD_STAT2 */
-#define SD_RSP_80CLK_TIMEOUT            0x01
-
-/* SD_BUS_STAT */
-#define SD_CLK_TOGGLE_EN                0x80
-#define SD_CLK_FORCE_STOP               0x40
-#define SD_DAT3_STATUS                  0x10
-#define SD_DAT2_STATUS                  0x08
-#define SD_DAT1_STATUS                  0x04
-#define SD_DAT0_STATUS                  0x02
-#define SD_CMD_STATUS                   0x01
-
-/* SD_PAD_CTL */
-#define SD_IO_USING_1V8                 0x80
-#define SD_IO_USING_3V3                 0x7F
-#define TYPE_A_DRIVING                  0x00
-#define TYPE_B_DRIVING                  0x01
-#define TYPE_C_DRIVING                  0x02
-#define TYPE_D_DRIVING                  0x03
-
-/* SD_SAMPLE_POINT_CTL */
-#define DDR_FIX_RX_DAT                  0x00
-#define DDR_VAR_RX_DAT                  0x80
-#define DDR_FIX_RX_DAT_EDGE             0x00
-#define DDR_FIX_RX_DAT_14_DELAY         0x40
-#define DDR_FIX_RX_CMD                  0x00
-#define DDR_VAR_RX_CMD                  0x20
-#define DDR_FIX_RX_CMD_POS_EDGE         0x00
-#define DDR_FIX_RX_CMD_14_DELAY         0x10
-#define SD20_RX_POS_EDGE                0x00
-#define SD20_RX_14_DELAY                0x08
-#define SD20_RX_SEL_MASK                0x08
+#define TRANS_NOT_READY                 0
+#define TRANS_RESULT_OK                 1
+#define TRANS_RESULT_FAIL               2
+#define TRANS_NO_DEVICE                 3
 
-/* SD_PUSH_POINT_CTL */
-#define DDR_FIX_TX_CMD_DAT              0x00
-#define DDR_VAR_TX_CMD_DAT              0x80
-#define DDR_FIX_TX_DAT_14_TSU           0x00
-#define DDR_FIX_TX_DAT_12_TSU           0x40
-#define DDR_FIX_TX_CMD_NEG_EDGE         0x00
-#define DDR_FIX_TX_CMD_14_AHEAD         0x20
-#define SD20_TX_NEG_EDGE                0x00
-#define SD20_TX_14_AHEAD                0x10
-#define SD20_TX_SEL_MASK                0x10
-#define DDR_VAR_SDCLK_POL_SWAP          0x01
-
-/* SD_TRANSFER */
-#define SD_TRANSFER_START               0x80
-#define SD_TRANSFER_END                 0x40
-#define SD_STAT_IDLE                    0x20
-#define SD_TRANSFER_ERR                 0x10
-/* SD Transfer Mode definition */
-#define SD_TM_NORMAL_WRITE              0x00
-#define SD_TM_AUTO_WRITE_3              0x01
-#define SD_TM_AUTO_WRITE_4              0x02
-#define SD_TM_AUTO_READ_3               0x05
-#define SD_TM_AUTO_READ_4               0x06
-#define SD_TM_CMD_RSP                   0x08
-#define SD_TM_AUTO_WRITE_1              0x09
-#define SD_TM_AUTO_WRITE_2              0x0A
-#define SD_TM_NORMAL_READ               0x0C
-#define SD_TM_AUTO_READ_1               0x0D
-#define SD_TM_AUTO_READ_2               0x0E
-#define SD_TM_AUTO_TUNING               0x0F
-
-/* SD_VPTX_CTL / SD_VPRX_CTL */
-#define PHASE_CHANGE                    0x80
-#define PHASE_NOT_RESET                 0x40
-
-/* SD_DCMPS_TX_CTL / SD_DCMPS_RX_CTL */
-#define DCMPS_CHANGE                    0x80
-#define DCMPS_CHANGE_DONE               0x40
-#define DCMPS_ERROR                     0x20
-#define DCMPS_CURRENT_PHASE             0x1F
-
-/* SD Configure 1 Register */
-#define SD_CLK_DIVIDE_0                 0x00
-#define SD_CLK_DIVIDE_256               0xC0
-#define SD_CLK_DIVIDE_128               0x80
-#define SD_BUS_WIDTH_1BIT               0x00
-#define SD_BUS_WIDTH_4BIT               0x01
-#define SD_BUS_WIDTH_8BIT               0x02
-#define SD_ASYNC_FIFO_NOT_RST           0x10
-#define SD_20_MODE                      0x00
-#define SD_DDR_MODE                     0x04
-#define SD_30_MODE                      0x08
-
-#define SD_CLK_DIVIDE_MASK              0xC0
-
-/* SD_CMD_STATE */
-#define SD_CMD_IDLE                     0x80
-
-/* SD_DATA_STATE */
-#define SD_DATA_IDLE                    0x80
-
-/* DCM_DRP_CTL */
-#define DCM_RESET                       0x08
-#define DCM_LOCKED                      0x04
-#define DCM_208M                        0x00
-#define DCM_TX                          0x01
-#define DCM_RX                          0x02
-
-/* DCM_DRP_TRIG */
-#define DRP_START                       0x80
-#define DRP_DONE                        0x40
-
-/* DCM_DRP_CFG */
-#define DRP_WRITE                       0x80
-#define DRP_READ                        0x00
-#define DCM_WRITE_ADDRESS_50            0x50
-#define DCM_WRITE_ADDRESS_51            0x51
-#define DCM_READ_ADDRESS_00             0x00
-#define DCM_READ_ADDRESS_51             0x51
-
-/* IRQSTAT0 */
-#define DMA_DONE_INT                    0x80
-#define SUSPEND_INT                     0x40
-#define LINK_RDY_INT                    0x20
-#define LINK_DOWN_INT                   0x10
-
-/* DMACTL */
-#define DMA_RST                         0x80
-#define DMA_BUSY                        0x04
-#define DMA_DIR_TO_CARD                 0x00
-#define DMA_DIR_FROM_CARD               0x02
-#define DMA_EN                          0x01
-#define DMA_128                         (0 << 4)
-#define DMA_256                         (1 << 4)
-#define DMA_512                         (2 << 4)
-#define DMA_1024                        (3 << 4)
-#define DMA_PACK_SIZE_MASK              0x30
-
-/* SSC_CTL1 */
-#define SSC_RSTB                        0x80
-#define SSC_8X_EN                       0x40
-#define SSC_FIX_FRAC                    0x20
-#define SSC_SEL_1M                      0x00
-#define SSC_SEL_2M                      0x08
-#define SSC_SEL_4M                      0x10
-#define SSC_SEL_8M                      0x18
-
-/* SSC_CTL2 */
-#define SSC_DEPTH_MASK                  0x07
-#define SSC_DEPTH_DISALBE               0x00
-#define SSC_DEPTH_4M                    0x01
-#define SSC_DEPTH_2M                    0x02
-#define SSC_DEPTH_1M                    0x03
-#define SSC_DEPTH_500K                  0x04
-#define SSC_DEPTH_250K                  0x05
-
-/* System Clock Control Register */
-#define CLK_LOW_FREQ                    0x01
-
-/* System Clock Divider Register */
-#define CLK_DIV_1                       0x01
-#define CLK_DIV_2                       0x02
-#define CLK_DIV_4                       0x03
-#define CLK_DIV_8                       0x04
-
-/* MS_CFG */
-#define SAMPLE_TIME_RISING              0x00
-#define SAMPLE_TIME_FALLING             0x80
-#define PUSH_TIME_DEFAULT               0x00
-#define PUSH_TIME_ODD                   0x40
-#define NO_EXTEND_TOGGLE                0x00
-#define EXTEND_TOGGLE_CHK               0x20
-#define MS_BUS_WIDTH_1                  0x00
-#define MS_BUS_WIDTH_4                  0x10
-#define MS_BUS_WIDTH_8                  0x18
-#define MS_2K_SECTOR_MODE               0x04
-#define MS_512_SECTOR_MODE              0x00
-#define MS_TOGGLE_TIMEOUT_EN            0x00
-#define MS_TOGGLE_TIMEOUT_DISEN         0x01
-#define MS_NO_CHECK_INT                 0x02
+#define RTSX_RESV_BUF_LEN               4096
+#define HOST_CMDS_BUF_LEN               1024
+#define HOST_SG_TBL_BUF_LEN             (RTSX_RESV_BUF_LEN - HOST_CMDS_BUF_LEN)
+#define HOST_SG_TBL_ITEMS               (HOST_SG_TBL_BUF_LEN / 8)
+#define MAX_SG_ITEM_LEN                 0x80000
+#define HOST_TO_DEVICE                  0
+#define DEVICE_TO_HOST                  1
 
-/* MS_TRANS_CFG */
-#define WAIT_INT                        0x80
-#define NO_WAIT_INT                     0x00
-#define NO_AUTO_READ_INT_REG            0x00
-#define AUTO_READ_INT_REG               0x40
-#define MS_CRC16_ERR                    0x20
-#define MS_RDY_TIMEOUT                  0x10
-#define MS_INT_CMDNK                    0x08
-#define MS_INT_BREQ                     0x04
-#define MS_INT_ERR                      0x02
-#define MS_INT_CED                      0x01
-
-/* MS_TRANSFER */
-#define MS_TRANSFER_START               0x80
-#define MS_TRANSFER_END                 0x40
-#define MS_TRANSFER_ERR                 0x20
-#define MS_BS_STATE                     0x10
-#define MS_TM_READ_BYTES                0x00
-#define MS_TM_NORMAL_READ               0x01
-#define MS_TM_WRITE_BYTES               0x04
-#define MS_TM_NORMAL_WRITE              0x05
-#define MS_TM_AUTO_READ                 0x08
-#define MS_TM_AUTO_WRITE                0x0C
-
-/* SD Configure 2 Register */
-#define SD_CALCULATE_CRC7               0x00
-#define SD_NO_CALCULATE_CRC7            0x80
-#define SD_CHECK_CRC16                  0x00
-#define SD_NO_CHECK_CRC16               0x40
-#define SD_NO_CHECK_WAIT_CRC_TO         0x20
-#define SD_WAIT_BUSY_END                0x08
-#define SD_NO_WAIT_BUSY_END             0x00
-#define SD_CHECK_CRC7                   0x00
-#define SD_NO_CHECK_CRC7                0x04
-#define SD_RSP_LEN_0                    0x00
-#define SD_RSP_LEN_6                    0x01
-#define SD_RSP_LEN_17                   0x02
-/* SD/MMC Response Type Definition */
-#define SD_RSP_TYPE_R0                  0x04
-#define SD_RSP_TYPE_R1                  0x01
-#define SD_RSP_TYPE_R1b                 0x09
-#define SD_RSP_TYPE_R2                  0x02
-#define SD_RSP_TYPE_R3                  0x05
-#define SD_RSP_TYPE_R4                  0x05
-#define SD_RSP_TYPE_R5                  0x01
-#define SD_RSP_TYPE_R6                  0x01
-#define SD_RSP_TYPE_R7                  0x01
-
-/* SD_CONFIGURE3 */
-#define SD_RSP_80CLK_TIMEOUT_EN         0x01
-
-/* Card Transfer Reset Register */
-#define SPI_STOP                        0x01
-#define XD_STOP                         0x02
-#define SD_STOP                         0x04
-#define MS_STOP                         0x08
-#define SPI_CLR_ERR                     0x10
-#define XD_CLR_ERR                      0x20
-#define SD_CLR_ERR                      0x40
-#define MS_CLR_ERR                      0x80
-
-/* Card Data Source Register */
-#define PINGPONG_BUFFER                 0x01
-#define RING_BUFFER                     0x00
-
-/* Card Power Control Register */
-#define PMOS_STRG_MASK                  0x10
-#define PMOS_STRG_800mA                 0x10
-#define PMOS_STRG_400mA                 0x00
-#define SD_POWER_OFF                    0x03
-#define SD_PARTIAL_POWER_ON             0x01
-#define SD_POWER_ON                     0x00
-#define SD_POWER_MASK                   0x03
-#define MS_POWER_OFF                    0x0C
-#define MS_PARTIAL_POWER_ON             0x04
-#define MS_POWER_ON                     0x00
-#define MS_POWER_MASK                   0x0C
-#define BPP_POWER_OFF                   0x0F
-#define BPP_POWER_5_PERCENT_ON          0x0E
-#define BPP_POWER_10_PERCENT_ON         0x0C
-#define BPP_POWER_15_PERCENT_ON         0x08
-#define BPP_POWER_ON                    0x00
-#define BPP_POWER_MASK                  0x0F
-#define SD_VCC_PARTIAL_POWER_ON         0x02
-#define SD_VCC_POWER_ON                 0x00
-
-/* PWR_GATE_CTRL */
-#define PWR_GATE_EN                     0x01
-#define LDO3318_PWR_MASK                0x06
-#define LDO_ON                          0x00
-#define LDO_SUSPEND                     0x04
-#define LDO_OFF                         0x06
-
-/* CARD_CLK_SOURCE */
-#define CRC_FIX_CLK                     (0x00 << 0)
-#define CRC_VAR_CLK0                    (0x01 << 0)
-#define CRC_VAR_CLK1                    (0x02 << 0)
-#define SD30_FIX_CLK                    (0x00 << 2)
-#define SD30_VAR_CLK0                   (0x01 << 2)
-#define SD30_VAR_CLK1                   (0x02 << 2)
-#define SAMPLE_FIX_CLK                  (0x00 << 4)
-#define SAMPLE_VAR_CLK0                 (0x01 << 4)
-#define SAMPLE_VAR_CLK1                 (0x02 << 4)
-
-/* HOST_SLEEP_STATE */
-#define HOST_ENTER_S1                   1
-#define HOST_ENTER_S3                   2
+#define OUTPUT_3V3                      0
+#define OUTPUT_1V8                      1
+
+#define RTSX_PHASE_MAX                  32
+#define RX_TUNING_CNT                   3
 
 #define MS_CFG                          0xFD40
+#define   SAMPLE_TIME_RISING            0x00
+#define   SAMPLE_TIME_FALLING           0x80
+#define   PUSH_TIME_DEFAULT             0x00
+#define   PUSH_TIME_ODD                 0x40
+#define   NO_EXTEND_TOGGLE              0x00
+#define   EXTEND_TOGGLE_CHK             0x20
+#define   MS_BUS_WIDTH_1                0x00
+#define   MS_BUS_WIDTH_4                0x10
+#define   MS_BUS_WIDTH_8                0x18
+#define   MS_2K_SECTOR_MODE             0x04
+#define   MS_512_SECTOR_MODE            0x00
+#define   MS_TOGGLE_TIMEOUT_EN          0x00
+#define   MS_TOGGLE_TIMEOUT_DISEN       0x01
+#define MS_NO_CHECK_INT                 0x02
 #define MS_TPC                          0xFD41
 #define MS_TRANS_CFG                    0xFD42
+#define   WAIT_INT                      0x80
+#define   NO_WAIT_INT                   0x00
+#define   NO_AUTO_READ_INT_REG          0x00
+#define   AUTO_READ_INT_REG             0x40
+#define   MS_CRC16_ERR                  0x20
+#define   MS_RDY_TIMEOUT                0x10
+#define   MS_INT_CMDNK                  0x08
+#define   MS_INT_BREQ                   0x04
+#define   MS_INT_ERR                    0x02
+#define   MS_INT_CED                    0x01
 #define MS_TRANSFER                     0xFD43
+#define   MS_TRANSFER_START             0x80
+#define   MS_TRANSFER_END               0x40
+#define   MS_TRANSFER_ERR               0x20
+#define   MS_BS_STATE                   0x10
+#define   MS_TM_READ_BYTES              0x00
+#define   MS_TM_NORMAL_READ             0x01
+#define   MS_TM_WRITE_BYTES             0x04
+#define   MS_TM_NORMAL_WRITE            0x05
+#define   MS_TM_AUTO_READ               0x08
+#define   MS_TM_AUTO_WRITE              0x0C
 #define MS_INT_REG                      0xFD44
 #define MS_BYTE_CNT                     0xFD45
 #define MS_SECTOR_CNT_L                 0xFD46
@@ -549,14 +192,90 @@
 #define MS_DBUS_H                       0xFD48
 
 #define SD_CFG1                         0xFDA0
+#define   SD_CLK_DIVIDE_0               0x00
+#define   SD_CLK_DIVIDE_256             0xC0
+#define   SD_CLK_DIVIDE_128             0x80
+#define   SD_BUS_WIDTH_1BIT             0x00
+#define   SD_BUS_WIDTH_4BIT             0x01
+#define   SD_BUS_WIDTH_8BIT             0x02
+#define   SD_ASYNC_FIFO_NOT_RST         0x10
+#define   SD_20_MODE                    0x00
+#define   SD_DDR_MODE                   0x04
+#define   SD_30_MODE                    0x08
+#define   SD_CLK_DIVIDE_MASK            0xC0
 #define SD_CFG2                         0xFDA1
+#define   SD_CALCULATE_CRC7             0x00
+#define   SD_NO_CALCULATE_CRC7          0x80
+#define   SD_CHECK_CRC16                0x00
+#define   SD_NO_CHECK_CRC16             0x40
+#define   SD_NO_CHECK_WAIT_CRC_TO       0x20
+#define   SD_WAIT_BUSY_END              0x08
+#define   SD_NO_WAIT_BUSY_END           0x00
+#define   SD_CHECK_CRC7                 0x00
+#define   SD_NO_CHECK_CRC7              0x04
+#define   SD_RSP_LEN_0                  0x00
+#define   SD_RSP_LEN_6                  0x01
+#define   SD_RSP_LEN_17                 0x02
+#define   SD_RSP_TYPE_R0                0x04
+#define   SD_RSP_TYPE_R1                0x01
+#define   SD_RSP_TYPE_R1b               0x09
+#define   SD_RSP_TYPE_R2                0x02
+#define   SD_RSP_TYPE_R3                0x05
+#define   SD_RSP_TYPE_R4                0x05
+#define   SD_RSP_TYPE_R5                0x01
+#define   SD_RSP_TYPE_R6                0x01
+#define   SD_RSP_TYPE_R7                0x01
 #define SD_CFG3                         0xFDA2
+#define   SD_RSP_80CLK_TIMEOUT_EN       0x01
+
 #define SD_STAT1                        0xFDA3
+#define   SD_CRC7_ERR                   0x80
+#define   SD_CRC16_ERR                  0x40
+#define   SD_CRC_WRITE_ERR              0x20
+#define   SD_CRC_WRITE_ERR_MASK         0x1C
+#define   GET_CRC_TIME_OUT              0x02
+#define   SD_TUNING_COMPARE_ERR         0x01
 #define SD_STAT2                        0xFDA4
+#define   SD_RSP_80CLK_TIMEOUT          0x01
+
 #define SD_BUS_STAT                     0xFDA5
+#define   SD_CLK_TOGGLE_EN              0x80
+#define   SD_CLK_FORCE_STOP             0x40
+#define   SD_DAT3_STATUS                0x10
+#define   SD_DAT2_STATUS                0x08
+#define   SD_DAT1_STATUS                0x04
+#define   SD_DAT0_STATUS                0x02
+#define   SD_CMD_STATUS                 0x01
 #define SD_PAD_CTL                      0xFDA6
+#define   SD_IO_USING_1V8               0x80
+#define   SD_IO_USING_3V3               0x7F
+#define   TYPE_A_DRIVING                0x00
+#define   TYPE_B_DRIVING                0x01
+#define   TYPE_C_DRIVING                0x02
+#define   TYPE_D_DRIVING                0x03
 #define SD_SAMPLE_POINT_CTL             0xFDA7
+#define   DDR_FIX_RX_DAT                0x00
+#define   DDR_VAR_RX_DAT                0x80
+#define   DDR_FIX_RX_DAT_EDGE           0x00
+#define   DDR_FIX_RX_DAT_14_DELAY       0x40
+#define   DDR_FIX_RX_CMD                0x00
+#define   DDR_VAR_RX_CMD                0x20
+#define   DDR_FIX_RX_CMD_POS_EDGE       0x00
+#define   DDR_FIX_RX_CMD_14_DELAY       0x10
+#define   SD20_RX_POS_EDGE              0x00
+#define   SD20_RX_14_DELAY              0x08
+#define SD20_RX_SEL_MASK                0x08
 #define SD_PUSH_POINT_CTL               0xFDA8
+#define   DDR_FIX_TX_CMD_DAT            0x00
+#define   DDR_VAR_TX_CMD_DAT            0x80
+#define   DDR_FIX_TX_DAT_14_TSU         0x00
+#define   DDR_FIX_TX_DAT_12_TSU         0x40
+#define   DDR_FIX_TX_CMD_NEG_EDGE       0x00
+#define   DDR_FIX_TX_CMD_14_AHEAD       0x20
+#define   SD20_TX_NEG_EDGE              0x00
+#define   SD20_TX_14_AHEAD              0x10
+#define   SD20_TX_SEL_MASK              0x10
+#define   DDR_VAR_SDCLK_POL_SWAP        0x01
 #define SD_CMD0                         0xFDA9
 #define   SD_CMD_START                  0x40
 #define SD_CMD1                         0xFDAA
@@ -569,60 +288,203 @@
 #define SD_BLOCK_CNT_L                  0xFDB1
 #define SD_BLOCK_CNT_H                  0xFDB2
 #define SD_TRANSFER                     0xFDB3
+#define   SD_TRANSFER_START             0x80
+#define   SD_TRANSFER_END               0x40
+#define   SD_STAT_IDLE                  0x20
+#define   SD_TRANSFER_ERR               0x10
+#define   SD_TM_NORMAL_WRITE            0x00
+#define   SD_TM_AUTO_WRITE_3            0x01
+#define   SD_TM_AUTO_WRITE_4            0x02
+#define   SD_TM_AUTO_READ_3             0x05
+#define   SD_TM_AUTO_READ_4             0x06
+#define   SD_TM_CMD_RSP                 0x08
+#define   SD_TM_AUTO_WRITE_1            0x09
+#define   SD_TM_AUTO_WRITE_2            0x0A
+#define   SD_TM_NORMAL_READ             0x0C
+#define   SD_TM_AUTO_READ_1             0x0D
+#define   SD_TM_AUTO_READ_2             0x0E
+#define   SD_TM_AUTO_TUNING             0x0F
 #define SD_CMD_STATE                    0xFDB5
+#define   SD_CMD_IDLE                   0x80
+
 #define SD_DATA_STATE                   0xFDB6
+#define   SD_DATA_IDLE                  0x80
 
 #define SRCTL                           0xFC13
 
-#define DCM_DRP_CTL                     0xFC23
-#define DCM_DRP_TRIG                    0xFC24
-#define DCM_DRP_CFG                     0xFC25
-#define DCM_DRP_WR_DATA_L               0xFC26
-#define DCM_DRP_WR_DATA_H               0xFC27
-#define DCM_DRP_RD_DATA_L               0xFC28
-#define DCM_DRP_RD_DATA_H               0xFC29
+#define DCM_DRP_CTL                     0xFC23
+#define   DCM_RESET                     0x08
+#define   DCM_LOCKED                    0x04
+#define   DCM_208M                      0x00
+#define   DCM_TX                        0x01
+#define   DCM_RX                        0x02
+#define DCM_DRP_TRIG                    0xFC24
+#define   DRP_START                     0x80
+#define   DRP_DONE                      0x40
+#define DCM_DRP_CFG                     0xFC25
+#define   DRP_WRITE                     0x80
+#define   DRP_READ                      0x00
+#define   DCM_WRITE_ADDRESS_50          0x50
+#define   DCM_WRITE_ADDRESS_51          0x51
+#define   DCM_READ_ADDRESS_00           0x00
+#define   DCM_READ_ADDRESS_51           0x51
+#define DCM_DRP_WR_DATA_L               0xFC26
+#define DCM_DRP_WR_DATA_H               0xFC27
+#define DCM_DRP_RD_DATA_L               0xFC28
+#define DCM_DRP_RD_DATA_H               0xFC29
 #define SD_VPCLK0_CTL                   0xFC2A
 #define SD_VPCLK1_CTL                   0xFC2B
 #define SD_DCMPS0_CTL                   0xFC2C
 #define SD_DCMPS1_CTL                   0xFC2D
 #define SD_VPTX_CTL                     SD_VPCLK0_CTL
 #define SD_VPRX_CTL                     SD_VPCLK1_CTL
+#define   PHASE_CHANGE                  0x80
+#define   PHASE_NOT_RESET               0x40
 #define SD_DCMPS_TX_CTL                 SD_DCMPS0_CTL
 #define SD_DCMPS_RX_CTL                 SD_DCMPS1_CTL
+#define   DCMPS_CHANGE                  0x80
+#define   DCMPS_CHANGE_DONE             0x40
+#define   DCMPS_ERROR                   0x20
+#define   DCMPS_CURRENT_PHASE           0x1F
 #define CARD_CLK_SOURCE                 0xFC2E
-
+#define   CRC_FIX_CLK                   (0x00 << 0)
+#define   CRC_VAR_CLK0                  (0x01 << 0)
+#define   CRC_VAR_CLK1                  (0x02 << 0)
+#define   SD30_FIX_CLK                  (0x00 << 2)
+#define   SD30_VAR_CLK0                 (0x01 << 2)
+#define   SD30_VAR_CLK1                 (0x02 << 2)
+#define   SAMPLE_FIX_CLK                (0x00 << 4)
+#define   SAMPLE_VAR_CLK0               (0x01 << 4)
+#define   SAMPLE_VAR_CLK1               (0x02 << 4)
 #define CARD_PWR_CTL                    0xFD50
+#define   PMOS_STRG_MASK                0x10
+#define   PMOS_STRG_800mA               0x10
+#define   PMOS_STRG_400mA               0x00
+#define   SD_POWER_OFF                  0x03
+#define   SD_PARTIAL_POWER_ON           0x01
+#define   SD_POWER_ON                   0x00
+#define   SD_POWER_MASK                 0x03
+#define   MS_POWER_OFF                  0x0C
+#define   MS_PARTIAL_POWER_ON           0x04
+#define   MS_POWER_ON                   0x00
+#define   MS_POWER_MASK                 0x0C
+#define   BPP_POWER_OFF                 0x0F
+#define   BPP_POWER_5_PERCENT_ON        0x0E
+#define   BPP_POWER_10_PERCENT_ON       0x0C
+#define   BPP_POWER_15_PERCENT_ON       0x08
+#define   BPP_POWER_ON                  0x00
+#define   BPP_POWER_MASK                0x0F
+#define   SD_VCC_PARTIAL_POWER_ON       0x02
+#define   SD_VCC_POWER_ON               0x00
 #define CARD_CLK_SWITCH                 0xFD51
 #define RTL8411B_PACKAGE_MODE           0xFD51
 #define CARD_SHARE_MODE                 0xFD52
+#define   CARD_SHARE_MASK               0x0F
+#define   CARD_SHARE_MULTI_LUN          0x00
+#define   CARD_SHARE_NORMAL             0x00
+#define   CARD_SHARE_48_SD              0x04
+#define   CARD_SHARE_48_MS              0x08
+#define   CARD_SHARE_BAROSSA_SD         0x01
+#define   CARD_SHARE_BAROSSA_MS         0x02
 #define CARD_DRIVE_SEL                  0xFD53
+#define   MS_DRIVE_8mA                  (0x01 << 6)
+#define   MMC_DRIVE_8mA                 (0x01 << 4)
+#define   XD_DRIVE_8mA                  (0x01 << 2)
+#define   GPIO_DRIVE_8mA                0x01
+#define RTS5209_CARD_DRIVE_DEFAULT      (MS_DRIVE_8mA | MMC_DRIVE_8mA |\
+                                        XD_DRIVE_8mA | GPIO_DRIVE_8mA)
+#define RTL8411_CARD_DRIVE_DEFAULT      (MS_DRIVE_8mA | MMC_DRIVE_8mA |\
+                                        XD_DRIVE_8mA)
+#define RTSX_CARD_DRIVE_DEFAULT         (MS_DRIVE_8mA | GPIO_DRIVE_8mA)
+
 #define CARD_STOP                       0xFD54
+#define   SPI_STOP                      0x01
+#define   XD_STOP                       0x02
+#define   SD_STOP                       0x04
+#define   MS_STOP                       0x08
+#define   SPI_CLR_ERR                   0x10
+#define   XD_CLR_ERR                    0x20
+#define   SD_CLR_ERR                    0x40
+#define   MS_CLR_ERR                    0x80
 #define CARD_OE                         0xFD55
+#define   SD_OUTPUT_EN                  0x04
+#define   MS_OUTPUT_EN                  0x08
 #define CARD_AUTO_BLINK                 0xFD56
 #define CARD_GPIO_DIR                   0xFD57
 #define CARD_GPIO                       0xFD58
 #define CARD_DATA_SOURCE                0xFD5B
+#define   PINGPONG_BUFFER               0x01
+#define   RING_BUFFER                   0x00
 #define SD30_CLK_DRIVE_SEL              0xFD5A
+#define   DRIVER_TYPE_A                 0x05
+#define   DRIVER_TYPE_B                 0x03
+#define   DRIVER_TYPE_C                 0x02
+#define   DRIVER_TYPE_D                 0x01
 #define CARD_SELECT                     0xFD5C
+#define   SD_MOD_SEL                    2
+#define   MS_MOD_SEL                    3
 #define SD30_DRIVE_SEL                  0xFD5E
+#define   CFG_DRIVER_TYPE_A             0x02
+#define   CFG_DRIVER_TYPE_B             0x03
+#define   CFG_DRIVER_TYPE_C             0x01
+#define   CFG_DRIVER_TYPE_D             0x00
 #define SD30_CMD_DRIVE_SEL              0xFD5E
 #define SD30_DAT_DRIVE_SEL              0xFD5F
 #define CARD_CLK_EN                     0xFD69
+#define   SD_CLK_EN                     0x04
+#define   MS_CLK_EN                     0x08
 #define SDIO_CTRL                       0xFD6B
 #define CD_PAD_CTL                      0xFD73
-
+#define   CD_DISABLE_MASK               0x07
+#define   MS_CD_DISABLE                 0x04
+#define   SD_CD_DISABLE                 0x02
+#define   XD_CD_DISABLE                 0x01
+#define   CD_DISABLE                    0x07
+#define   CD_ENABLE                     0x00
+#define   MS_CD_EN_ONLY                 0x03
+#define   SD_CD_EN_ONLY                 0x05
+#define   XD_CD_EN_ONLY                 0x06
+#define   FORCE_CD_LOW_MASK             0x38
+#define   FORCE_CD_XD_LOW               0x08
+#define   FORCE_CD_SD_LOW               0x10
+#define   FORCE_CD_MS_LOW               0x20
+#define   CD_AUTO_DISABLE               0x40
 #define FPDCTL                          0xFC00
+#define   SSC_POWER_DOWN                0x01
+#define   SD_OC_POWER_DOWN              0x02
+#define   ALL_POWER_DOWN                0x07
+#define   OC_POWER_DOWN                 0x06
 #define PDINFO                          0xFC01
 
 #define CLK_CTL                         0xFC02
+#define   CHANGE_CLK                    0x01
+#define   CLK_LOW_FREQ                  0x01
+
 #define CLK_DIV                         0xFC03
+#define   CLK_DIV_1                     0x01
+#define   CLK_DIV_2                     0x02
+#define   CLK_DIV_4                     0x03
+#define   CLK_DIV_8                     0x04
 #define CLK_SEL                         0xFC04
 
 #define SSC_DIV_N_0                     0xFC0F
 #define SSC_DIV_N_1                     0xFC10
 #define SSC_CTL1                        0xFC11
+#define    SSC_RSTB                     0x80
+#define    SSC_8X_EN                    0x40
+#define    SSC_FIX_FRAC                 0x20
+#define    SSC_SEL_1M                   0x00
+#define    SSC_SEL_2M                   0x08
+#define    SSC_SEL_4M                   0x10
+#define    SSC_SEL_8M                   0x18
 #define SSC_CTL2                        0xFC12
-
+#define    SSC_DEPTH_MASK               0x07
+#define    SSC_DEPTH_DISALBE            0x00
+#define    SSC_DEPTH_4M                 0x01
+#define    SSC_DEPTH_2M                 0x02
+#define    SSC_DEPTH_1M                 0x03
+#define    SSC_DEPTH_500K               0x04
+#define    SSC_DEPTH_250K               0x05
 #define RCCTL                           0xFC14
 
 #define FPGA_PULL_CTL                   0xFC1D
@@ -630,6 +492,24 @@
 #define GPIO_CTL                        0xFC1F
 
 #define LDO_CTL                         0xFC1E
+#define   BPP_ASIC_1V7                  0x00
+#define   BPP_ASIC_1V8                  0x01
+#define   BPP_ASIC_1V9                  0x02
+#define   BPP_ASIC_2V0                  0x03
+#define   BPP_ASIC_2V7                  0x04
+#define   BPP_ASIC_2V8                  0x05
+#define   BPP_ASIC_3V2                  0x06
+#define   BPP_ASIC_3V3                  0x07
+#define   BPP_REG_TUNED18               0x07
+#define   BPP_TUNED18_SHIFT_8402        5
+#define   BPP_TUNED18_SHIFT_8411        4
+#define   BPP_PAD_MASK                  0x04
+#define   BPP_PAD_3V3                   0x04
+#define   BPP_PAD_1V8                   0x00
+#define   BPP_LDO_POWB                  0x03
+#define   BPP_LDO_ON                    0x00
+#define   BPP_LDO_SUSPEND               0x02
+#define   BPP_LDO_OFF                   0x03
 #define SYS_VER                         0xFC32
 
 #define CARD_PULL_CTL1                  0xFD60
@@ -642,6 +522,10 @@
 /* PCI Express Related Registers */
 #define IRQEN0                          0xFE20
 #define IRQSTAT0                        0xFE21
+#define    DMA_DONE_INT                 0x80
+#define    SUSPEND_INT                  0x40
+#define    LINK_RDY_INT                 0x20
+#define    LINK_DOWN_INT                0x10
 #define IRQEN1                          0xFE22
 #define IRQSTAT1                        0xFE23
 #define TLPRIEN                         0xFE24
@@ -653,6 +537,16 @@
 #define DMATC2                          0xFE2A
 #define DMATC3                          0xFE2B
 #define DMACTL                          0xFE2C
+#define   DMA_RST                       0x80
+#define   DMA_BUSY                      0x04
+#define   DMA_DIR_TO_CARD               0x00
+#define   DMA_DIR_FROM_CARD             0x02
+#define   DMA_EN                        0x01
+#define   DMA_128                       (0 << 4)
+#define   DMA_256                       (1 << 4)
+#define   DMA_512                       (2 << 4)
+#define   DMA_1024                      (3 << 4)
+#define   DMA_PACK_SIZE_MASK            0x30
 #define BCTL                            0xFE2D
 #define RBBC0                           0xFE2E
 #define RBBC1                           0xFE2F
@@ -678,14 +572,21 @@
 #define MSGTXDATA2                      0xFE46
 #define MSGTXDATA3                      0xFE47
 #define MSGTXCTL                        0xFE48
-#define PETXCFG                         0xFE49
 #define LTR_CTL                         0xFE4A
 #define OBFF_CFG                        0xFE4C
 
 #define CDRESUMECTL                     0xFE52
 #define WAKE_SEL_CTL                    0xFE54
+#define PCLK_CTL                        0xFE55
+#define   PCLK_MODE_SEL                 0x20
 #define PME_FORCE_CTL                   0xFE56
+
 #define ASPM_FORCE_CTL                  0xFE57
+#define   FORCE_ASPM_CTL0               0x10
+#define   FORCE_ASPM_VAL_MASK           0x03
+#define   FORCE_ASPM_L1_EN              0x02
+#define   FORCE_ASPM_L0_EN              0x01
+#define   FORCE_ASPM_NO_ASPM            0x00
 #define PM_CLK_FORCE_CTL                0xFE58
 #define FUNC_FORCE_CTL                  0xFE59
 #define PERST_GLITCH_WIDTH              0xFE5C
@@ -693,19 +594,36 @@
 #define RESET_LOAD_REG                  0xFE5E
 #define EFUSE_CONTENT                   0xFE5F
 #define HOST_SLEEP_STATE                0xFE60
-#define SDIO_CFG                        0xFE70
+#define   HOST_ENTER_S1                 1
+#define   HOST_ENTER_S3                 2
 
+#define SDIO_CFG                        0xFE70
+#define PM_EVENT_DEBUG                  0xFE71
+#define   PME_DEBUG_0                   0x08
 #define NFTS_TX_CTRL                    0xFE72
 
 #define PWR_GATE_CTRL                   0xFE75
+#define   PWR_GATE_EN                   0x01
+#define   LDO3318_PWR_MASK              0x06
+#define   LDO_ON                        0x00
+#define   LDO_SUSPEND                   0x04
+#define   LDO_OFF                       0x06
 #define PWD_SUSPEND_EN                  0xFE76
 #define LDO_PWR_SEL                     0xFE78
 
+#define L1SUB_CONFIG1                   0xFE8D
+#define L1SUB_CONFIG2                   0xFE8E
+#define   L1SUB_AUTO_CFG                0x02
+#define L1SUB_CONFIG3                   0xFE8F
+
 #define DUMMY_REG_RESET_0               0xFE90
 
 #define AUTOLOAD_CFG_BASE               0xFF00
+#define PETXCFG                         0xFF03
 
 #define PM_CTRL1                        0xFF44
+#define   CD_RESUME_EN_MASK             0xF0
+
 #define PM_CTRL2                        0xFF45
 #define PM_CTRL3                        0xFF46
 #define   SDIO_SEND_PME_EN              0x80
@@ -726,18 +644,125 @@
 #define IMAGE_FLAG_ADDR0                0xCE80
 #define IMAGE_FLAG_ADDR1                0xCE81
 
+#define RREF_CFG                        0xFF6C
+#define   RREF_VBGSEL_MASK              0x38
+#define   RREF_VBGSEL_1V25              0x28
+
+#define OOBS_CONFIG                     0xFF6E
+#define   OOBS_AUTOK_DIS                0x80
+#define   OOBS_VAL_MASK                 0x1F
+
+#define LDO_DV18_CFG                    0xFF70
+#define   LDO_DV18_SR_MASK              0xC0
+#define   LDO_DV18_SR_DF                0x40
+
+#define LDO_CONFIG2                     0xFF71
+#define   LDO_D3318_MASK                0x07
+#define   LDO_D3318_33V                 0x07
+#define   LDO_D3318_18V                 0x02
+
+#define LDO_VCC_CFG0                    0xFF72
+#define   LDO_VCC_LMTVTH_MASK           0x30
+#define   LDO_VCC_LMTVTH_2A             0x10
+
+#define LDO_VCC_CFG1                    0xFF73
+#define   LDO_VCC_REF_TUNE_MASK         0x30
+#define   LDO_VCC_REF_1V2               0x20
+#define   LDO_VCC_TUNE_MASK             0x07
+#define   LDO_VCC_1V8                   0x04
+#define   LDO_VCC_3V3                   0x07
+#define   LDO_VCC_LMT_EN                0x08
+
+#define LDO_VIO_CFG                     0xFF75
+#define   LDO_VIO_SR_MASK               0xC0
+#define   LDO_VIO_SR_DF                 0x40
+#define   LDO_VIO_REF_TUNE_MASK         0x30
+#define   LDO_VIO_REF_1V2               0x20
+#define   LDO_VIO_TUNE_MASK             0x07
+#define   LDO_VIO_1V7                   0x03
+#define   LDO_VIO_1V8                   0x04
+#define   LDO_VIO_3V3                   0x07
+
+#define LDO_DV12S_CFG                   0xFF76
+#define   LDO_REF12_TUNE_MASK           0x18
+#define   LDO_REF12_TUNE_DF             0x10
+#define   LDO_D12_TUNE_MASK             0x07
+#define   LDO_D12_TUNE_DF               0x04
+
+#define LDO_AV12S_CFG                   0xFF77
+#define   LDO_AV12S_TUNE_MASK           0x07
+#define   LDO_AV12S_TUNE_DF             0x04
+
+#define SD40_LDO_CTL1                   0xFE7D
+#define   SD40_VIO_TUNE_MASK            0x70
+#define   SD40_VIO_TUNE_1V7             0x30
+#define   SD_VIO_LDO_1V8                0x40
+#define   SD_VIO_LDO_3V3                0x70
+
 /* Phy register */
 #define PHY_PCR                         0x00
+#define   PHY_PCR_FORCE_CODE            0xB000
+#define   PHY_PCR_OOBS_CALI_50          0x0800
+#define   PHY_PCR_OOBS_VCM_08           0x0200
+#define   PHY_PCR_OOBS_SEN_90           0x0040
+#define   PHY_PCR_RSSI_EN               0x0002
+#define   PHY_PCR_RX10K                 0x0001
+
 #define PHY_RCR0                        0x01
 #define PHY_RCR1                        0x02
+#define   PHY_RCR1_ADP_TIME_4           0x0400
+#define   PHY_RCR1_VCO_COARSE           0x001F
+#define PHY_SSCCR2                      0x02
+#define   PHY_SSCCR2_PLL_NCODE          0x0A00
+#define   PHY_SSCCR2_TIME0              0x001C
+#define   PHY_SSCCR2_TIME2_WIDTH        0x0003
+
 #define PHY_RCR2                        0x03
+#define   PHY_RCR2_EMPHASE_EN           0x8000
+#define   PHY_RCR2_NADJR                0x4000
+#define   PHY_RCR2_CDR_SR_2             0x0100
+#define   PHY_RCR2_FREQSEL_12           0x0040
+#define   PHY_RCR2_CDR_SC_12P           0x0010
+#define   PHY_RCR2_CALIB_LATE           0x0002
+#define PHY_SSCCR3                      0x03
+#define   PHY_SSCCR3_STEP_IN            0x2740
+#define   PHY_SSCCR3_CHECK_DELAY        0x0008
+#define _PHY_ANA03                      0x03
+#define   _PHY_ANA03_TIMER_MAX          0x2700
+#define   _PHY_ANA03_OOBS_DEB_EN        0x0040
+#define   _PHY_CMU_DEBUG_EN             0x0008
+
 #define PHY_RTCR                        0x04
 #define PHY_RDR                         0x05
+#define   PHY_RDR_RXDSEL_1_9            0x4000
+#define   PHY_SSC_AUTO_PWD              0x0600
 #define PHY_TCR0                        0x06
 #define PHY_TCR1                        0x07
 #define PHY_TUNE                        0x08
+#define   PHY_TUNE_TUNEREF_1_0          0x4000
+#define   PHY_TUNE_VBGSEL_1252          0x0C00
+#define   PHY_TUNE_SDBUS_33             0x0200
+#define   PHY_TUNE_TUNED18              0x01C0
+#define   PHY_TUNE_TUNED12              0X0020
+#define   PHY_TUNE_TUNEA12              0x0004
+#define   PHY_TUNE_VOLTAGE_MASK         0xFC3F
+#define   PHY_TUNE_VOLTAGE_3V3          0x03C0
+#define   PHY_TUNE_D18_1V8              0x0100
+#define   PHY_TUNE_D18_1V7              0x0080
+#define PHY_ANA08                       0x08
+#define   PHY_ANA08_RX_EQ_DCGAIN        0x5000
+#define   PHY_ANA08_SEL_RX_EN           0x0400
+#define   PHY_ANA08_RX_EQ_VAL           0x03C0
+#define   PHY_ANA08_SCP                 0x0020
+#define   PHY_ANA08_SEL_IPI             0x0004
+
 #define PHY_IMR                         0x09
 #define PHY_BPCR                        0x0A
+#define   PHY_BPCR_IBRXSEL              0x0400
+#define   PHY_BPCR_IBTXSEL              0x0100
+#define   PHY_BPCR_IB_FILTER            0x0080
+#define   PHY_BPCR_CMIRROR_EN           0x0040
+
 #define PHY_BIST                        0x0B
 #define PHY_RAW_L                       0x0C
 #define PHY_RAW_H                       0x0D
@@ -745,6 +770,7 @@
 #define PHY_HOST_CLK_CTRL               0x0F
 #define PHY_DMR                         0x10
 #define PHY_BACR                        0x11
+#define   PHY_BACR_BASIC_MASK           0xFFF3
 #define PHY_IER                         0x12
 #define PHY_BCSR                        0x13
 #define PHY_BPR                         0x14
@@ -752,80 +778,70 @@
 #define PHY_BPNR                        0x16
 #define PHY_BRNR2                       0x17
 #define PHY_BENR                        0x18
-#define PHY_REG_REV                     0x19
+#define PHY_REV                         0x19
+#define   PHY_REV_RESV                  0xE000
+#define   PHY_REV_RXIDLE_LATCHED        0x1000
+#define   PHY_REV_P1_EN                 0x0800
+#define   PHY_REV_RXIDLE_EN             0x0400
+#define   PHY_REV_CLKREQ_TX_EN          0x0200
+#define   PHY_REV_CLKREQ_RX_EN          0x0100
+#define   PHY_REV_CLKREQ_DT_1_0         0x0040
+#define   PHY_REV_STOP_CLKRD            0x0020
+#define   PHY_REV_RX_PWST               0x0008
+#define   PHY_REV_STOP_CLKWR            0x0004
+#define _PHY_REV0                       0x19
+#define   _PHY_REV0_FILTER_OUT          0x3800
+#define   _PHY_REV0_CDR_BYPASS_PFD      0x0100
+#define   _PHY_REV0_CDR_RX_IDLE_BYPASS  0x0002
+
 #define PHY_FLD0                        0x1A
+#define PHY_ANA1A                       0x1A
+#define   PHY_ANA1A_TXR_LOOPBACK        0x2000
+#define   PHY_ANA1A_RXT_BIST            0x0500
+#define   PHY_ANA1A_TXR_BIST            0x0040
+#define   PHY_ANA1A_REV                 0x0006
 #define PHY_FLD1                        0x1B
 #define PHY_FLD2                        0x1C
 #define PHY_FLD3                        0x1D
+#define   PHY_FLD3_TIMER_4              0x0800
+#define   PHY_FLD3_TIMER_6              0x0020
+#define   PHY_FLD3_RXDELINK             0x0004
+#define PHY_ANA1D                       0x1D
+#define   PHY_ANA1D_DEBUG_ADDR          0x0004
+#define _PHY_FLD0                       0x1D
+#define   _PHY_FLD0_CLK_REQ_20C         0x8000
+#define   _PHY_FLD0_RX_IDLE_EN          0x1000
+#define   _PHY_FLD0_BIT_ERR_RSTN        0x0800
+#define   _PHY_FLD0_BER_COUNT           0x01E0
+#define   _PHY_FLD0_BER_TIMER           0x001E
+#define   _PHY_FLD0_CHECK_EN            0x0001
+
 #define PHY_FLD4                        0x1E
+#define   PHY_FLD4_FLDEN_SEL            0x4000
+#define   PHY_FLD4_REQ_REF              0x2000
+#define   PHY_FLD4_RXAMP_OFF            0x1000
+#define   PHY_FLD4_REQ_ADDA             0x0800
+#define   PHY_FLD4_BER_COUNT            0x00E0
+#define   PHY_FLD4_BER_TIMER            0x000A
+#define   PHY_FLD4_BER_CHK_EN           0x0001
+#define PHY_DIG1E                       0x1E
+#define   PHY_DIG1E_REV                 0x4000
+#define   PHY_DIG1E_D0_X_D1             0x1000
+#define   PHY_DIG1E_RX_ON_HOST          0x0800
+#define   PHY_DIG1E_RCLK_REF_HOST       0x0400
+#define   PHY_DIG1E_RCLK_TX_EN_KEEP     0x0040
+#define   PHY_DIG1E_RCLK_TX_TERM_KEEP   0x0020
+#define   PHY_DIG1E_RCLK_RX_EIDLE_ON    0x0010
+#define   PHY_DIG1E_TX_TERM_KEEP        0x0008
+#define   PHY_DIG1E_RX_TERM_KEEP        0x0004
+#define   PHY_DIG1E_TX_EN_KEEP          0x0002
+#define   PHY_DIG1E_RX_EN_KEEP          0x0001
 #define PHY_DUM_REG                     0x1F
 
-#define LCTLR                           0x80
-#define   LCTLR_EXT_SYNC                0x80
-#define   LCTLR_COMMON_CLOCK_CFG        0x40
-#define   LCTLR_RETRAIN_LINK            0x20
-#define   LCTLR_LINK_DISABLE            0x10
-#define   LCTLR_RCB                     0x08
-#define   LCTLR_RESERVED                0x04
-#define   LCTLR_ASPM_CTL_MASK           0x03
-
 #define PCR_SETTING_REG1                0x724
 #define PCR_SETTING_REG2                0x814
 #define PCR_SETTING_REG3                0x747
 
-/* Phy bits */
-#define PHY_PCR_FORCE_CODE                      0xB000
-#define PHY_PCR_OOBS_CALI_50                    0x0800
-#define PHY_PCR_OOBS_VCM_08                     0x0200
-#define PHY_PCR_OOBS_SEN_90                     0x0040
-#define PHY_PCR_RSSI_EN                         0x0002
-
-#define PHY_RCR1_ADP_TIME                       0x0100
-#define PHY_RCR1_VCO_COARSE                     0x001F
-
-#define PHY_RCR2_EMPHASE_EN                     0x8000
-#define PHY_RCR2_NADJR                          0x4000
-#define PHY_RCR2_CDR_CP_10                      0x0400
-#define PHY_RCR2_CDR_SR_2                       0x0100
-#define PHY_RCR2_FREQSEL_12                     0x0040
-#define PHY_RCR2_CPADJEN                        0x0020
-#define PHY_RCR2_CDR_SC_8                       0x0008
-#define PHY_RCR2_CALIB_LATE                     0x0002
-
-#define PHY_RDR_RXDSEL_1_9                      0x4000
-
-#define PHY_TUNE_TUNEREF_1_0                    0x4000
-#define PHY_TUNE_VBGSEL_1252                    0x0C00
-#define PHY_TUNE_SDBUS_33                       0x0200
-#define PHY_TUNE_TUNED18                        0x01C0
-#define PHY_TUNE_TUNED12                        0X0020
-
-#define PHY_BPCR_IBRXSEL                        0x0400
-#define PHY_BPCR_IBTXSEL                        0x0100
-#define PHY_BPCR_IB_FILTER                      0x0080
-#define PHY_BPCR_CMIRROR_EN                     0x0040
-
-#define PHY_REG_REV_RESV                        0xE000
-#define PHY_REG_REV_RXIDLE_LATCHED              0x1000
-#define PHY_REG_REV_P1_EN                       0x0800
-#define PHY_REG_REV_RXIDLE_EN                   0x0400
-#define PHY_REG_REV_CLKREQ_DLY_TIMER_1_0        0x0040
-#define PHY_REG_REV_STOP_CLKRD                  0x0020
-#define PHY_REG_REV_RX_PWST                     0x0008
-#define PHY_REG_REV_STOP_CLKWR                  0x0004
-
-#define PHY_FLD3_TIMER_4                        0x7800
-#define PHY_FLD3_TIMER_6                        0x00E0
-#define PHY_FLD3_RXDELINK                       0x0004
-
-#define PHY_FLD4_FLDEN_SEL                      0x4000
-#define PHY_FLD4_REQ_REF                        0x2000
-#define PHY_FLD4_RXAMP_OFF                      0x1000
-#define PHY_FLD4_REQ_ADDA                       0x0800
-#define PHY_FLD4_BER_COUNT                      0x00E0
-#define PHY_FLD4_BER_TIMER                      0x000A
-#define PHY_FLD4_BER_CHK_EN                     0x0001
-
 #define rtsx_pci_init_cmd(pcr)          ((pcr)->ci = 0)
 
 struct rtsx_pcr;
@@ -835,6 +851,8 @@ struct pcr_handle {
 };
 
 struct pcr_ops {
+        int (*write_phy)(struct rtsx_pcr *pcr, u8 addr, u16 val);
+        int (*read_phy)(struct rtsx_pcr *pcr, u8 addr, u16 *val);
         int             (*extra_init_hw)(struct rtsx_pcr *pcr);
         int             (*optimize_phy)(struct rtsx_pcr *pcr);
         int             (*turn_on_led)(struct rtsx_pcr *pcr);
@@ -856,6 +874,7 @@ enum PDEV_STAT  {PDEV_STAT_IDLE, PDEV_STAT_RUN};
 struct rtsx_pcr {
         struct pci_dev                  *pci;
         unsigned int                    id;
+        int                             pcie_cap;
 
         /* pci resources */
         unsigned long                   addr;
@@ -928,6 +947,8 @@ struct rtsx_pcr {
         const struct pcr_ops            *ops;
         enum PDEV_STAT                  state;
 
+        u16                             reg_pm_ctrl3;
+
         int                             num_slots;
         struct rtsx_slot                *slots;
 };
@@ -935,6 +956,10 @@ struct rtsx_pcr {
 #define CHK_PCI_PID(pcr, pid)           ((pcr)->pci->device == (pid))
 #define PCI_VID(pcr)                    ((pcr)->pci->vendor)
 #define PCI_PID(pcr)                    ((pcr)->pci->device)
+#define is_version(pcr, pid, ver)                               \
+        (CHK_PCI_PID(pcr, pid) && (pcr)->ic_version == (ver))
+#define pcr_dbg(pcr, fmt, arg...)                               \
+        dev_dbg(&(pcr)->pci->dev, fmt, ##arg)
 
 #define SDR104_PHASE(val)               ((val) & 0xFF)
 #define SDR50_PHASE(val)                (((val) >> 8) & 0xFF)
@@ -1004,4 +1029,17 @@ static inline void rtsx_pci_write_be32(struct rtsx_pcr *pcr, u16 reg, u32 val)
         rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, reg + 3, 0xFF, val);
 }
 
+static inline int rtsx_pci_update_phy(struct rtsx_pcr *pcr, u8 addr,
+        u16 mask, u16 append)
+{
+        int err;
+        u16 val;
+
+        err = rtsx_pci_read_phy_register(pcr, addr, &val);
+        if (err < 0)
+                return err;
+
+        return rtsx_pci_write_phy_register(pcr, addr, (val & mask) | append);
+}
+
 #endif
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index 3fdb7cfbffb3..75115384f3fc 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -58,13 +58,7 @@ enum sec_device_type {
  * @irq_base:           Base IRQ number for device, required for IRQs
  * @irq:                Generic IRQ number for device
  * @irq_data:           Runtime data structure for IRQ controller
- * @ono:                Power onoff IRQ number for s5m87xx
  * @wakeup:             Whether or not this is a wakeup device
- * @wtsr_smpl:          Whether or not to enable in RTC driver the Watchdog
- *                      Timer Software Reset (registers set to default value
- *                      after PWRHOLD falling) and Sudden Momentary Power Loss
- *                      (PMIC will enter power on sequence after short drop in
- *                      VBATT voltage).
  */
 struct sec_pmic_dev {
         struct device *dev;
@@ -77,9 +71,7 @@ struct sec_pmic_dev {
         int irq;
         struct regmap_irq_chip_data *irq_data;
 
-        int ono;
         bool wakeup;
-        bool wtsr_smpl;
 };
 
 int sec_irq_init(struct sec_pmic_dev *sec_pmic);
@@ -95,7 +87,6 @@ struct sec_platform_data {
         int                             irq_base;
         int                             (*cfg_pmic_irq)(void);
 
-        int                             ono;
         bool                            wakeup;
         bool                            buck_voltage_lock;
 
diff --git a/include/linux/mfd/samsung/irq.h b/include/linux/mfd/samsung/irq.h
index f35af7361b60..667aa40486dd 100644
--- a/include/linux/mfd/samsung/irq.h
+++ b/include/linux/mfd/samsung/irq.h
@@ -74,8 +74,8 @@ enum s2mps11_irq {
         S2MPS11_IRQ_MRB,
 
         S2MPS11_IRQ_RTC60S,
-        S2MPS11_IRQ_RTCA0,
         S2MPS11_IRQ_RTCA1,
+        S2MPS11_IRQ_RTCA0,
         S2MPS11_IRQ_SMPL,
         S2MPS11_IRQ_RTC1S,
         S2MPS11_IRQ_WTSR,
diff --git a/include/linux/mfd/samsung/rtc.h b/include/linux/mfd/samsung/rtc.h
index b6401e7661c7..29c30ac36020 100644
--- a/include/linux/mfd/samsung/rtc.h
+++ b/include/linux/mfd/samsung/rtc.h
@@ -105,6 +105,8 @@ enum s2mps_rtc_reg {
 #define S5M_RTC_UDR_MASK        (1 << S5M_RTC_UDR_SHIFT)
 #define S2MPS_RTC_WUDR_SHIFT    4
 #define S2MPS_RTC_WUDR_MASK     (1 << S2MPS_RTC_WUDR_SHIFT)
+#define S2MPS13_RTC_AUDR_SHIFT  1
+#define S2MPS13_RTC_AUDR_MASK   (1 << S2MPS13_RTC_AUDR_SHIFT)
 #define S2MPS_RTC_RUDR_SHIFT    0
 #define S2MPS_RTC_RUDR_MASK     (1 << S2MPS_RTC_RUDR_SHIFT)
 #define RTC_TCON_SHIFT          1
diff --git a/include/linux/mfd/sky81452.h b/include/linux/mfd/sky81452.h
new file mode 100644
index 000000000000..b0925fa3e9ef
--- /dev/null
+++ b/include/linux/mfd/sky81452.h
@@ -0,0 +1,31 @@
+/*
+ * sky81452.h   SKY81452 MFD driver
+ *
+ * Copyright 2014 Skyworks Solutions Inc.
+ * Author : Gyungoh Yoo <jack.yoo@skyworksinc.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _SKY81452_H
+#define _SKY81452_H
+
+#include <linux/platform_data/sky81452-backlight.h>
+#include <linux/regulator/machine.h>
+
+struct sky81452_platform_data {
+        struct sky81452_bl_platform_data *bl_pdata;
+        struct regulator_init_data *regulator_init_data;
+};
+
+#endif
diff --git a/include/linux/mfd/stw481x.h b/include/linux/mfd/stw481x.h
index eda121556e5d..833074b766bd 100644
--- a/include/linux/mfd/stw481x.h
+++ b/include/linux/mfd/stw481x.h
@@ -41,15 +41,11 @@
 
 /**
  * struct stw481x - state holder for the Stw481x drivers
- * @mutex: mutex to serialize I2C accesses
  * @i2c_client: corresponding I2C client
- * @regulator: regulator device for regulator children
  * @map: regmap handle to access device registers
  */
 struct stw481x {
-        struct mutex            lock;
         struct i2c_client       *client;
-        struct regulator_dev    *vmmc_regulator;
         struct regmap           *map;
 };
 
diff --git a/include/linux/mfd/syscon/atmel-st.h b/include/linux/mfd/syscon/atmel-st.h
new file mode 100644
index 000000000000..8acf1ec1fa32
--- /dev/null
+++ b/include/linux/mfd/syscon/atmel-st.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2005 Ivan Kokshaysky
+ * Copyright (C) SAN People
+ *
+ * System Timer (ST) - System peripherals registers.
+ * Based on AT91RM9200 datasheet revision E.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _LINUX_MFD_SYSCON_ATMEL_ST_H
+#define _LINUX_MFD_SYSCON_ATMEL_ST_H
+
+#include <linux/bitops.h>
+
+#define AT91_ST_CR      0x00    /* Control Register */
+#define         AT91_ST_WDRST   BIT(0)  /* Watchdog Timer Restart */
+
+#define AT91_ST_PIMR    0x04    /* Period Interval Mode Register */
+#define         AT91_ST_PIV     0xffff  /* Period Interval Value */
+
+#define AT91_ST_WDMR    0x08    /* Watchdog Mode Register */
+#define         AT91_ST_WDV     0xffff  /* Watchdog Counter Value */
+#define         AT91_ST_RSTEN   BIT(16) /* Reset Enable */
+#define         AT91_ST_EXTEN   BIT(17) /* External Signal Assertion Enable */
+
+#define AT91_ST_RTMR    0x0c    /* Real-time Mode Register */
+#define         AT91_ST_RTPRES  0xffff  /* Real-time Prescalar Value */
+
+#define AT91_ST_SR      0x10    /* Status Register */
+#define         AT91_ST_PITS    BIT(0)  /* Period Interval Timer Status */
+#define         AT91_ST_WDOVF   BIT(1)  /* Watchdog Overflow */
+#define         AT91_ST_RTTINC  BIT(2)  /* Real-time Timer Increment */
+#define         AT91_ST_ALMS    BIT(3)  /* Alarm Status */
+
+#define AT91_ST_IER     0x14    /* Interrupt Enable Register */
+#define AT91_ST_IDR     0x18    /* Interrupt Disable Register */
+#define AT91_ST_IMR     0x1c    /* Interrupt Mask Register */
+
+#define AT91_ST_RTAR    0x20    /* Real-time Alarm Register */
+#define         AT91_ST_ALMV    0xfffff /* Alarm Value */
+
+#define AT91_ST_CRTR    0x24    /* Current Real-time Register */
+#define         AT91_ST_CRTV    0xfffff /* Current Real-Time Value */
+
+#endif /* _LINUX_MFD_SYSCON_ATMEL_ST_H */
diff --git a/include/linux/mfd/syscon/exynos5-pmu.h b/include/linux/mfd/syscon/exynos5-pmu.h
index 00ef24bf6ede..9352adc95de6 100644
--- a/include/linux/mfd/syscon/exynos5-pmu.h
+++ b/include/linux/mfd/syscon/exynos5-pmu.h
@@ -36,6 +36,9 @@
 #define EXYNOS5420_MTCADC_PHY_CONTROL           (0x724)
 #define EXYNOS5420_DPTX_PHY_CONTROL             (0x728)
 
+/* Exynos5433 specific register definitions */
+#define EXYNOS5433_USBHOST30_PHY_CONTROL        (0x728)
+
 #define EXYNOS5_PHY_ENABLE                      BIT(0)
 
 #define EXYNOS5_MIPI_PHY_S_RESETN               BIT(1)
diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
index c877cad61a13..d16f4c82c568 100644
--- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
@@ -207,6 +207,7 @@
 #define IMX6Q_GPR3_LVDS0_MUX_CTL_IPU1_DI1       (0x1 << 6)
 #define IMX6Q_GPR3_LVDS0_MUX_CTL_IPU2_DI0       (0x2 << 6)
 #define IMX6Q_GPR3_LVDS0_MUX_CTL_IPU2_DI1       (0x3 << 6)
+#define IMX6Q_GPR3_MIPI_MUX_CTL_SHIFT           4
 #define IMX6Q_GPR3_MIPI_MUX_CTL_MASK            (0x3 << 4)
 #define IMX6Q_GPR3_MIPI_MUX_CTL_IPU1_DI0        (0x0 << 4)
 #define IMX6Q_GPR3_MIPI_MUX_CTL_IPU1_DI1        (0x1 << 4)
diff --git a/include/linux/mfd/tc3589x.h b/include/linux/mfd/tc3589x.h
index c203c9c56776..468c31a27fcf 100644
--- a/include/linux/mfd/tc3589x.h
+++ b/include/linux/mfd/tc3589x.h
@@ -140,36 +140,13 @@ extern int tc3589x_set_bits(struct tc3589x *tc3589x, u8 reg, u8 mask, u8 val);
 #define TC_KPD_DEBOUNCE_PERIOD  0xA3
 #define TC_KPD_SETTLE_TIME      0xA3
 
-/**
- * struct tc35893_platform_data - data structure for platform specific data
- * @keymap_data:        matrix scan code table for keycodes
- * @krow:               mask for available rows, value is 0xFF
- * @kcol:               mask for available columns, value is 0xFF
- * @debounce_period:    platform specific debounce time
- * @settle_time:        platform specific settle down time
- * @irqtype:            type of interrupt, falling or rising edge
- * @enable_wakeup:      specifies if keypad event can wake up system from sleep
- * @no_autorepeat:      flag for auto repetition
- */
-struct tc3589x_keypad_platform_data {
-        const struct matrix_keymap_data *keymap_data;
-        u8                      krow;
-        u8                      kcol;
-        u8                      debounce_period;
-        u8                      settle_time;
-        unsigned long           irqtype;
-        bool                    enable_wakeup;
-        bool                    no_autorepeat;
-};
 
 /**
  * struct tc3589x_platform_data - TC3589x platform data
  * @block: bitmask of blocks to enable (use TC3589x_BLOCK_*)
- * @keypad: keypad-specific platform data
  */
 struct tc3589x_platform_data {
         unsigned int block;
-        const struct tc3589x_keypad_platform_data *keypad;
 };
 
 #endif
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index 3f4e994ace2b..1fd50dcfe47c 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -128,6 +128,7 @@
 
 /* Sequencer Status */
 #define SEQ_STATUS BIT(5)
+#define CHARGE_STEP             0x11
 
 #define ADC_CLK                 3000000
 #define TOTAL_STEPS             16
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index 605812820e48..24b86d538e88 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -111,6 +111,8 @@ struct dma_chan;
  * data for the MMC controller
  */
 struct tmio_mmc_data {
+        void                            *chan_priv_tx;
+        void                            *chan_priv_rx;
         unsigned int                    hclk;
         unsigned long                   capabilities;
         unsigned long                   capabilities2;
diff --git a/include/linux/mfd/wm8350/supply.h b/include/linux/mfd/wm8350/supply.h
index 2b9479310bbd..8dc93673e34a 100644
--- a/include/linux/mfd/wm8350/supply.h
+++ b/include/linux/mfd/wm8350/supply.h
@@ -123,9 +123,9 @@ struct wm8350_charger_policy {
 
 struct wm8350_power {
         struct platform_device *pdev;
-        struct power_supply battery;
-        struct power_supply usb;
-        struct power_supply ac;
+        struct power_supply *battery;
+        struct power_supply *usb;
+        struct power_supply *ac;
         struct wm8350_charger_policy *policy;
 
         int rev_g_coeff;
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 78baed5f2952..cac1c0904d5f 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -69,7 +69,6 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping,
 extern bool pmd_trans_migrating(pmd_t pmd);
 extern int migrate_misplaced_page(struct page *page,
                                   struct vm_area_struct *vma, int node);
-extern bool migrate_ratelimited(int node);
 #else
 static inline bool pmd_trans_migrating(pmd_t pmd)
 {
@@ -80,10 +79,6 @@ static inline int migrate_misplaced_page(struct page *page,
 {
         return -EAGAIN; /* can't migrate now */
 }
-static inline bool migrate_ratelimited(int node)
-{
-        return false;
-}
 #endif /* CONFIG_NUMA_BALANCING */
 
 #if defined(CONFIG_NUMA_BALANCING) && defined(CONFIG_TRANSPARENT_HUGEPAGE)
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index ee80dd7d9f60..819077c32690 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -52,6 +52,7 @@
 #define MISC_DYNAMIC_MINOR      255
 
 struct device;
+struct attribute_group;
 
 struct miscdevice  {
         int minor;
@@ -60,6 +61,7 @@ struct miscdevice  {
         struct list_head list;
         struct device *parent;
         struct device *this_device;
+        const struct attribute_group **groups;
         const char *nodename;
         umode_t mode;
 };
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 7b6d4e9ff603..f62e7cf227c6 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -68,6 +68,8 @@ enum {
         MLX4_CMD_UNMAP_ICM_AUX   = 0xffb,
         MLX4_CMD_SET_ICM_SIZE    = 0xffd,
         MLX4_CMD_ACCESS_REG      = 0x3b,
+        MLX4_CMD_ALLOCATE_VPP    = 0x80,
+        MLX4_CMD_SET_VPORT_QOS   = 0x81,
 
         /*master notify fw on finish for slave's flr*/
         MLX4_CMD_INFORM_FLR_DONE = 0x5b,
@@ -163,6 +165,9 @@ enum {
         MLX4_QP_FLOW_STEERING_ATTACH = 0x65,
         MLX4_QP_FLOW_STEERING_DETACH = 0x66,
         MLX4_FLOW_STEERING_IB_UC_QP_RANGE = 0x64,
+
+        /* Update and read QCN parameters */
+        MLX4_CMD_CONGESTION_CTRL_OPCODE = 0x68,
 };
 
 enum {
@@ -183,7 +188,14 @@ enum {
 };
 
 enum {
-        /* set port opcode modifiers */
+        /* Set port opcode modifiers */
+        MLX4_SET_PORT_IB_OPCODE         = 0x0,
+        MLX4_SET_PORT_ETH_OPCODE        = 0x1,
+        MLX4_SET_PORT_BEACON_OPCODE     = 0x4,
+};
+
+enum {
+        /* Set port Ethernet input modifiers */
         MLX4_SET_PORT_GENERAL   = 0x0,
         MLX4_SET_PORT_RQP_CALC  = 0x1,
         MLX4_SET_PORT_MAC_TABLE = 0x2,
@@ -233,6 +245,16 @@ struct mlx4_config_dev_params {
         u8      rx_csum_flags_port_2;
 };
 
+enum mlx4_en_congestion_control_algorithm {
+        MLX4_CTRL_ALGO_802_1_QAU_REACTION_POINT = 0,
+};
+
+enum mlx4_en_congestion_control_opmod {
+        MLX4_CONGESTION_CONTROL_GET_PARAMS,
+        MLX4_CONGESTION_CONTROL_GET_STATISTICS,
+        MLX4_CONGESTION_CONTROL_SET_PARAMS = 4,
+};
+
 struct mlx4_dev;
 
 struct mlx4_cmd_mailbox {
@@ -281,6 +303,8 @@ void mlx4_free_cmd_mailbox(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbo
 u32 mlx4_comm_get_version(void);
 int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac);
 int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos);
+int mlx4_set_vf_rate(struct mlx4_dev *dev, int port, int vf, int min_tx_rate,
+                     int max_tx_rate);
 int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting);
 int mlx4_get_vf_config(struct mlx4_dev *dev, int port, int vf, struct ifla_vf_info *ivf);
 int mlx4_set_vf_link_state(struct mlx4_dev *dev, int port, int vf, int link_state);
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index e4ebff7e9d02..83e80ab94500 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -49,8 +49,6 @@
 #define MSIX_LEGACY_SZ          4
 #define MIN_MSIX_P_PORT         5
 
-#define MLX4_NUM_UP                     8
-#define MLX4_NUM_TC                     8
 #define MLX4_MAX_100M_UNITS_VAL         255     /*
                                                  * work around: can't set values
                                                  * greater then this value when
@@ -174,6 +172,7 @@ enum {
         MLX4_DEV_CAP_FLAG_VEP_UC_STEER  = 1LL << 41,
         MLX4_DEV_CAP_FLAG_VEP_MC_STEER  = 1LL << 42,
         MLX4_DEV_CAP_FLAG_COUNTERS      = 1LL << 48,
+        MLX4_DEV_CAP_FLAG_RSS_IP_FRAG   = 1LL << 52,
         MLX4_DEV_CAP_FLAG_SET_ETH_SCHED = 1LL << 53,
         MLX4_DEV_CAP_FLAG_SENSE_SUPPORT = 1LL << 55,
         MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV = 1LL << 59,
@@ -203,7 +202,14 @@ enum {
         MLX4_DEV_CAP_FLAG2_80_VFS               = 1LL <<  18,
         MLX4_DEV_CAP_FLAG2_FS_A0                = 1LL <<  19,
         MLX4_DEV_CAP_FLAG2_RECOVERABLE_ERROR_EVENT = 1LL << 20,
-        MLX4_DEV_CAP_FLAG2_PORT_REMAP           = 1LL <<  21
+        MLX4_DEV_CAP_FLAG2_PORT_REMAP           = 1LL <<  21,
+        MLX4_DEV_CAP_FLAG2_QCN                  = 1LL <<  22,
+        MLX4_DEV_CAP_FLAG2_QP_RATE_LIMIT        = 1LL <<  23,
+        MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN         = 1LL <<  24,
+        MLX4_DEV_CAP_FLAG2_QOS_VPP              = 1LL <<  25,
+        MLX4_DEV_CAP_FLAG2_ETS_CFG              = 1LL <<  26,
+        MLX4_DEV_CAP_FLAG2_PORT_BEACON          = 1LL <<  27,
+        MLX4_DEV_CAP_FLAG2_IGNORE_FCS           = 1LL <<  28,
 };
 
 enum {
@@ -449,6 +455,21 @@ enum mlx4_module_id {
         MLX4_MODULE_ID_QSFP28           = 0x11,
 };
 
+enum { /* rl */
+        MLX4_QP_RATE_LIMIT_NONE         = 0,
+        MLX4_QP_RATE_LIMIT_KBS          = 1,
+        MLX4_QP_RATE_LIMIT_MBS          = 2,
+        MLX4_QP_RATE_LIMIT_GBS          = 3
+};
+
+struct mlx4_rate_limit_caps {
+        u16     num_rates; /* Number of different rates */
+        u8      min_unit;
+        u16     min_val;
+        u8      max_unit;
+        u16     max_val;
+};
+
 static inline u64 mlx4_fw_ver(u64 major, u64 minor, u64 subminor)
 {
         return (major << 32) | (minor << 16) | subminor;
@@ -564,6 +585,7 @@ struct mlx4_caps {
         u32                     dmfs_high_rate_qpn_base;
         u32                     dmfs_high_rate_qpn_range;
         u32                     vf_caps;
+        struct mlx4_rate_limit_caps rl_caps;
 };
 
 struct mlx4_buf_list {
@@ -982,6 +1004,11 @@ static inline int mlx4_is_slave(struct mlx4_dev *dev)
         return dev->flags & MLX4_FLAG_SLAVE;
 }
 
+static inline int mlx4_is_eth(struct mlx4_dev *dev, int port)
+{
+        return dev->caps.port_type[port] == MLX4_PORT_TYPE_IB ? 0 : 1;
+}
+
 int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct,
                    struct mlx4_buf *buf, gfp_t gfp);
 void mlx4_buf_free(struct mlx4_dev *dev, int size, struct mlx4_buf *buf);
@@ -1282,14 +1309,13 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac);
 void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac);
 int mlx4_get_base_qpn(struct mlx4_dev *dev, u8 port);
 int __mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac);
-void mlx4_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap);
 int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
                           u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx);
 int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
                            u8 promisc);
-int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc);
-int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,
-                u8 *pg, u16 *ratelimit);
+int mlx4_SET_PORT_BEACON(struct mlx4_dev *dev, u8 port, u16 time);
+int mlx4_SET_PORT_fcs_check(struct mlx4_dev *dev, u8 port,
+                            u8 ignore_fcs_value);
 int mlx4_SET_PORT_VXLAN(struct mlx4_dev *dev, u8 port, u8 steering, int enable);
 int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx);
 int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
@@ -1319,6 +1345,10 @@ int mlx4_wol_write(struct mlx4_dev *dev, u64 config, int port);
 int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx);
 void mlx4_counter_free(struct mlx4_dev *dev, u32 idx);
 
+void mlx4_set_admin_guid(struct mlx4_dev *dev, __be64 guid, int entry,
+                         int port);
+__be64 mlx4_get_admin_guid(struct mlx4_dev *dev, int entry, int port);
+void mlx4_set_random_admin_guid(struct mlx4_dev *dev, int entry, int port);
 int mlx4_flow_attach(struct mlx4_dev *dev,
                      struct mlx4_net_trans_rule *rule, u64 *reg_id);
 int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id);
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 2bbc62aa818a..6fed539e5456 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -207,14 +207,17 @@ struct mlx4_qp_context {
         __be32                  msn;
         __be16                  rq_wqe_counter;
         __be16                  sq_wqe_counter;
-        u32                     reserved3[2];
+        u32                     reserved3;
+        __be16                  rate_limit_params;
+        u8                      reserved4;
+        u8                      qos_vport;
         __be32                  param3;
         __be32                  nummmcpeers_basemkey;
         u8                      log_page_size;
-        u8                      reserved4[2];
+        u8                      reserved5[2];
         u8                      mtt_base_addr_h;
         __be32                  mtt_base_addr_l;
-        u32                     reserved5[10];
+        u32                     reserved6[10];
 };
 
 struct mlx4_update_qp_context {
@@ -229,6 +232,8 @@ struct mlx4_update_qp_context {
 enum {
         MLX4_UPD_QP_MASK_PM_STATE       = 32,
         MLX4_UPD_QP_MASK_VSD            = 33,
+        MLX4_UPD_QP_MASK_QOS_VPP        = 34,
+        MLX4_UPD_QP_MASK_RATE_LIMIT     = 35,
 };
 
 enum {
@@ -427,8 +432,10 @@ struct mlx4_wqe_inline_seg {
 
 enum mlx4_update_qp_attr {
         MLX4_UPDATE_QP_SMAC             = 1 << 0,
-        MLX4_UPDATE_QP_VSD              = 1 << 2,
-        MLX4_UPDATE_QP_SUPPORTED_ATTRS  = (1 << 2) - 1
+        MLX4_UPDATE_QP_VSD              = 1 << 1,
+        MLX4_UPDATE_QP_RATE_LIMIT       = 1 << 2,
+        MLX4_UPDATE_QP_QOS_VPORT        = 1 << 3,
+        MLX4_UPDATE_QP_SUPPORTED_ATTRS  = (1 << 4) - 1
 };
 
 enum mlx4_update_qp_params_flags {
@@ -437,7 +444,10 @@ enum mlx4_update_qp_params_flags {
 
 struct mlx4_update_qp_params {
         u8      smac_index;
+        u8      qos_vport;
         u32     flags;
+        u16     rate_unit;
+        u16     rate_val;
 };
 
 int mlx4_update_qp(struct mlx4_dev *dev, u32 qpn,
diff --git a/include/linux/mlx5/cmd.h b/include/linux/mlx5/cmd.h
index 2826a4b6071e..68cd08f02c2f 100644
--- a/include/linux/mlx5/cmd.h
+++ b/include/linux/mlx5/cmd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/include/linux/mlx5/cq.h b/include/linux/mlx5/cq.h
index f6b17ac601bd..2695ced222df 100644
--- a/include/linux/mlx5/cq.h
+++ b/include/linux/mlx5/cq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -137,14 +137,15 @@ enum {
 
 static inline void mlx5_cq_arm(struct mlx5_core_cq *cq, u32 cmd,
                                void __iomem *uar_page,
-                               spinlock_t *doorbell_lock)
+                               spinlock_t *doorbell_lock,
+                               u32 cons_index)
 {
         __be32 doorbell[2];
         u32 sn;
         u32 ci;
 
         sn = cq->arm_sn & 3;
-        ci = cq->cons_index & 0xffffff;
+        ci = cons_index & 0xffffff;
 
         *cq->arm_db = cpu_to_be32(sn << 28 | cmd | ci);
 
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 4e5bd813bb9a..abf65c790421 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/include/linux/mlx5/doorbell.h b/include/linux/mlx5/doorbell.h
index 163a818411e7..afc78a3f4462 100644
--- a/include/linux/mlx5/doorbell.h
+++ b/include/linux/mlx5/doorbell.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 166d9315fe4b..9a90e7523dc2 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -232,6 +232,9 @@ struct mlx5_cmd_stats {
 };
 
 struct mlx5_cmd {
+        void           *cmd_alloc_buf;
+        dma_addr_t      alloc_dma;
+        int             alloc_size;
         void           *cmd_buf;
         dma_addr_t      dma;
         u16             cmdif_rev;
@@ -407,7 +410,7 @@ struct mlx5_core_srq {
 struct mlx5_eq_table {
         void __iomem           *update_ci;
         void __iomem           *update_arm_ci;
-        struct list_head       *comp_eq_head;
+        struct list_head        comp_eqs_list;
         struct mlx5_eq          pages_eq;
         struct mlx5_eq          async_eq;
         struct mlx5_eq          cmd_eq;
@@ -722,6 +725,7 @@ int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx,
 int mlx5_destroy_unmap_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq);
 int mlx5_start_eqs(struct mlx5_core_dev *dev);
 int mlx5_stop_eqs(struct mlx5_core_dev *dev);
+int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn, int *irqn);
 int mlx5_core_attach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, u32 qpn);
 int mlx5_core_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, u32 qpn);
 
@@ -777,14 +781,22 @@ enum {
         MAX_MR_CACHE_ENTRIES    = 16,
 };
 
+enum {
+        MLX5_INTERFACE_PROTOCOL_IB  = 0,
+        MLX5_INTERFACE_PROTOCOL_ETH = 1,
+};
+
 struct mlx5_interface {
         void *                  (*add)(struct mlx5_core_dev *dev);
         void                    (*remove)(struct mlx5_core_dev *dev, void *context);
         void                    (*event)(struct mlx5_core_dev *dev, void *context,
                                          enum mlx5_dev_event event, unsigned long param);
+        void *                  (*get_dev)(void *context);
+        int                     protocol;
         struct list_head        list;
 };
 
+void *mlx5_get_protocol_dev(struct mlx5_core_dev *mdev, int protocol);
 int mlx5_register_interface(struct mlx5_interface *intf);
 void mlx5_unregister_interface(struct mlx5_interface *intf);
 
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 5f48b8f592c5..cb3ad17edd1f 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Mellanox Technologies inc.  All rights reserved.
+ * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index 61f7a342d1bf..310b5f7fd6ae 100644
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/include/linux/mlx5/srq.h b/include/linux/mlx5/srq.h
index e1a363a33663..f43ed054a3e0 100644
--- a/include/linux/mlx5/srq.h
+++ b/include/linux/mlx5/srq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 47a93928b90f..0755b9fd03a7 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -251,6 +251,9 @@ struct vm_operations_struct {
          * writable, if an error is returned it will cause a SIGBUS */
         int (*page_mkwrite)(struct vm_area_struct *vma, struct vm_fault *vmf);
 
+        /* same as page_mkwrite when using VM_PFNMAP|VM_MIXEDMAP */
+        int (*pfn_mkwrite)(struct vm_area_struct *vma, struct vm_fault *vmf);
+
         /* called by access_process_vm when get_user_pages() fails, typically
          * for use by special VMAs that can switch between memory and hardware
          */
@@ -494,15 +497,6 @@ static inline int page_count(struct page *page)
         return atomic_read(&compound_head(page)->_count);
 }
 
-#ifdef CONFIG_HUGETLB_PAGE
-extern int PageHeadHuge(struct page *page_head);
-#else /* CONFIG_HUGETLB_PAGE */
-static inline int PageHeadHuge(struct page *page_head)
-{
-        return 0;
-}
-#endif /* CONFIG_HUGETLB_PAGE */
-
 static inline bool __compound_tail_refcounted(struct page *page)
 {
         return !PageSlab(page) && !PageHeadHuge(page);
@@ -571,53 +565,6 @@ static inline void init_page_count(struct page *page)
         atomic_set(&page->_count, 1);
 }
 
-/*
- * PageBuddy() indicate that the page is free and in the buddy system
- * (see mm/page_alloc.c).
- *
- * PAGE_BUDDY_MAPCOUNT_VALUE must be <= -2 but better not too close to
- * -2 so that an underflow of the page_mapcount() won't be mistaken
- * for a genuine PAGE_BUDDY_MAPCOUNT_VALUE. -128 can be created very
- * efficiently by most CPU architectures.
- */
-#define PAGE_BUDDY_MAPCOUNT_VALUE (-128)
-
-static inline int PageBuddy(struct page *page)
-{
-        return atomic_read(&page->_mapcount) == PAGE_BUDDY_MAPCOUNT_VALUE;
-}
-
-static inline void __SetPageBuddy(struct page *page)
-{
-        VM_BUG_ON_PAGE(atomic_read(&page->_mapcount) != -1, page);
-        atomic_set(&page->_mapcount, PAGE_BUDDY_MAPCOUNT_VALUE);
-}
-
-static inline void __ClearPageBuddy(struct page *page)
-{
-        VM_BUG_ON_PAGE(!PageBuddy(page), page);
-        atomic_set(&page->_mapcount, -1);
-}
-
-#define PAGE_BALLOON_MAPCOUNT_VALUE (-256)
-
-static inline int PageBalloon(struct page *page)
-{
-        return atomic_read(&page->_mapcount) == PAGE_BALLOON_MAPCOUNT_VALUE;
-}
-
-static inline void __SetPageBalloon(struct page *page)
-{
-        VM_BUG_ON_PAGE(atomic_read(&page->_mapcount) != -1, page);
-        atomic_set(&page->_mapcount, PAGE_BALLOON_MAPCOUNT_VALUE);
-}
-
-static inline void __ClearPageBalloon(struct page *page)
-{
-        VM_BUG_ON_PAGE(!PageBalloon(page), page);
-        atomic_set(&page->_mapcount, -1);
-}
-
 void put_page(struct page *page);
 void put_pages_list(struct list_head *pages);
 
@@ -1006,34 +953,10 @@ void page_address_init(void);
 #define page_address_init()  do { } while(0)
 #endif
 
-/*
- * On an anonymous page mapped into a user virtual memory area,
- * page->mapping points to its anon_vma, not to a struct address_space;
- * with the PAGE_MAPPING_ANON bit set to distinguish it.  See rmap.h.
- *
- * On an anonymous page in a VM_MERGEABLE area, if CONFIG_KSM is enabled,
- * the PAGE_MAPPING_KSM bit may be set along with the PAGE_MAPPING_ANON bit;
- * and then page->mapping points, not to an anon_vma, but to a private
- * structure which KSM associates with that merged page.  See ksm.h.
- *
- * PAGE_MAPPING_KSM without PAGE_MAPPING_ANON is currently never used.
- *
- * Please note that, confusingly, "page_mapping" refers to the inode
- * address_space which maps the page from disk; whereas "page_mapped"
- * refers to user virtual address space into which the page is mapped.
- */
-#define PAGE_MAPPING_ANON       1
-#define PAGE_MAPPING_KSM        2
-#define PAGE_MAPPING_FLAGS      (PAGE_MAPPING_ANON | PAGE_MAPPING_KSM)
-
+extern void *page_rmapping(struct page *page);
+extern struct anon_vma *page_anon_vma(struct page *page);
 extern struct address_space *page_mapping(struct page *page);
 
-/* Neutral page->mapping pointer to address_space or anon_vma or other */
-static inline void *page_rmapping(struct page *page)
-{
-        return (void *)((unsigned long)page->mapping & ~PAGE_MAPPING_FLAGS);
-}
-
 extern struct address_space *__page_file_mapping(struct page *);
 
 static inline
@@ -1045,11 +968,6 @@ struct address_space *page_file_mapping(struct page *page)
         return page->mapping;
 }
 
-static inline int PageAnon(struct page *page)
-{
-        return ((unsigned long)page->mapping & PAGE_MAPPING_ANON) != 0;
-}
-
 /*
  * Return the pagecache index of the passed page.  Regular pagecache pages
  * use ->index whereas swapcache pages use ->private
@@ -1294,9 +1212,11 @@ int __set_page_dirty_no_writeback(struct page *page);
 int redirty_page_for_writepage(struct writeback_control *wbc,
                                 struct page *page);
 void account_page_dirtied(struct page *page, struct address_space *mapping);
+void account_page_cleaned(struct page *page, struct address_space *mapping);
 int set_page_dirty(struct page *page);
 int set_page_dirty_lock(struct page *page);
 int clear_page_dirty_for_io(struct page *page);
+
 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
 
 /* Is the vma a continuation of the stack vma above it? */
@@ -1973,10 +1893,10 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
 static inline unsigned long
 vm_unmapped_area(struct vm_unmapped_area_info *info)
 {
-        if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
-                return unmapped_area(info);
-        else
+        if (info->flags & VM_UNMAPPED_AREA_TOPDOWN)
                 return unmapped_area_topdown(info);
+        else
+                return unmapped_area(info);
 }
 
 /* truncate.c */
@@ -2109,7 +2029,7 @@ static inline struct page *follow_page(struct vm_area_struct *vma,
 #define FOLL_FORCE      0x10    /* get_user_pages read/write w/o permission */
 #define FOLL_NOWAIT     0x20    /* if a disk transfer is needed, start the IO
                                  * and return without waiting upon it */
-#define FOLL_MLOCK      0x40    /* mark page as mlocked */
+#define FOLL_POPULATE   0x40    /* fault in page */
 #define FOLL_SPLIT      0x80    /* don't return transhuge pages, split them */
 #define FOLL_HWPOISON   0x100   /* check page is hwpoisoned */
 #define FOLL_NUMA       0x200   /* force NUMA hinting page fault */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 199a03aab8dc..8d37e26a1007 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -364,7 +364,9 @@ struct mm_struct {
         atomic_t mm_users;                      /* How many users with user space? */
         atomic_t mm_count;                      /* How many references to "struct mm_struct" (users count as 1) */
         atomic_long_t nr_ptes;                  /* PTE page table pages */
+#if CONFIG_PGTABLE_LEVELS > 2
         atomic_long_t nr_pmds;                  /* PMD page table pages */
+#endif
         int map_count;                          /* number of VMAs */
 
         spinlock_t page_table_lock;             /* Protects page tables and some counters */
@@ -427,7 +429,7 @@ struct mm_struct {
 #endif
 
         /* store ref to file /proc/<pid>/exe symlink points to */
-        struct file *exe_file;
+        struct file __rcu *exe_file;
 #ifdef CONFIG_MMU_NOTIFIER
         struct mmu_notifier_mm *mmu_notifier_mm;
 #endif
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index a6cf4c063e4e..19f0175c0afa 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -512,8 +512,18 @@ static inline int mmc_card_broken_irq_polling(const struct mmc_card *c)
 
 #define mmc_dev_to_card(d)      container_of(d, struct mmc_card, dev)
 
-extern int mmc_register_driver(struct device_driver *);
-extern void mmc_unregister_driver(struct device_driver *);
+/*
+ * MMC device driver (e.g., Flash card, I/O card...)
+ */
+struct mmc_driver {
+        struct device_driver drv;
+        int (*probe)(struct mmc_card *);
+        void (*remove)(struct mmc_card *);
+        void (*shutdown)(struct mmc_card *);
+};
+
+extern int mmc_register_driver(struct mmc_driver *);
+extern void mmc_unregister_driver(struct mmc_driver *);
 
 extern void mmc_fixup_device(struct mmc_card *card,
                              const struct mmc_fixup *table);
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 160448f920ac..de722d4e9d61 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -79,7 +79,7 @@ struct mmc_command {
 #define mmc_cmd_type(cmd)       ((cmd)->flags & MMC_CMD_MASK)
 
         unsigned int            retries;        /* max number of retries */
-        unsigned int            error;          /* command error */
+        int                     error;          /* command error */
 
 /*
  * Standard errno values are used for errors, but some have specific
@@ -108,7 +108,7 @@ struct mmc_data {
         unsigned int            timeout_clks;   /* data timeout (in clocks) */
         unsigned int            blksz;          /* data block size */
         unsigned int            blocks;         /* number of blocks */
-        unsigned int            error;          /* data error */
+        int                     error;          /* data error */
         unsigned int            flags;
 
 #define MMC_DATA_WRITE  (1 << 8)
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 471fb3116dbe..12111993a317 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -44,6 +44,7 @@ struct mmc_data;
  * struct dw_mci - MMC controller state shared between all slots
  * @lock: Spinlock protecting the queue and associated data.
  * @regs: Pointer to MMIO registers.
+ * @fifo_reg: Pointer to MMIO registers for data FIFO
  * @sg: Scatterlist entry currently being processed by PIO code, if any.
  * @sg_miter: PIO mapping scatterlist iterator.
  * @cur_slot: The slot which is currently using the controller.
@@ -79,7 +80,6 @@ struct mmc_data;
  * @current_speed: Configured rate of the controller.
  * @num_slots: Number of slots available.
  * @verid: Denote Version ID.
- * @data_offset: Set the offset of DATA register according to VERID.
  * @dev: Device associated with the MMC controller.
  * @pdata: Platform data associated with the MMC controller.
  * @drv_data: Driver specific data for identified variant of the controller
@@ -132,6 +132,7 @@ struct dw_mci {
         spinlock_t              lock;
         spinlock_t              irq_lock;
         void __iomem            *regs;
+        void __iomem            *fifo_reg;
 
         struct scatterlist      *sg;
         struct sg_mapping_iter  sg_miter;
@@ -172,7 +173,6 @@ struct dw_mci {
         u32                     num_slots;
         u32                     fifoth_val;
         u16                     verid;
-        u16                     data_offset;
         struct device           *dev;
         struct dw_mci_board     *pdata;
         const struct dw_mci_drv_data    *drv_data;
@@ -202,6 +202,8 @@ struct dw_mci {
         int                     irq;
 
         int                     sdio_id0;
+
+        struct timer_list       cmd11_timer;
 };
 
 /* DMA ops for Internal/External DMAC interface */
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 0c8cbe5d1550..b5bedaec6223 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -80,12 +80,6 @@ struct mmc_ios {
 
 struct mmc_host_ops {
         /*
-         * 'enable' is called when the host is claimed and 'disable' is called
-         * when the host is released. 'enable' and 'disable' are deprecated.
-         */
-        int (*enable)(struct mmc_host *host);
-        int (*disable)(struct mmc_host *host);
-        /*
          * It is optional for the host to implement pre_req and post_req in
          * order to support double buffering of requests (prepare one
          * request while another request is active).
diff --git a/include/linux/mmc/sdhci-spear.h b/include/linux/mmc/sdhci-spear.h
deleted file mode 100644
index 8cc095a76cf8..000000000000
--- a/include/linux/mmc/sdhci-spear.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * include/linux/mmc/sdhci-spear.h
- *
- * SDHCI declarations specific to ST SPEAr platform
- *
- * Copyright (C) 2010 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef LINUX_MMC_SDHCI_SPEAR_H
-#define LINUX_MMC_SDHCI_SPEAR_H
-
-#include <linux/platform_device.h>
-/*
- * struct sdhci_plat_data: spear sdhci platform data structure
- *
- * card_int_gpio: gpio pin used for card detection
- */
-struct sdhci_plat_data {
-        int card_int_gpio;
-};
-
-/* This function is used to set platform_data field of pdev->dev */
-static inline void
-sdhci_set_plat_data(struct platform_device *pdev, struct sdhci_plat_data *data)
-{
-        pdev->dev.platform_data = data;
-}
-
-#endif /* LINUX_MMC_SDHCI_SPEAR_H */
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
deleted file mode 100644
index c3e3db196738..000000000000
--- a/include/linux/mmc/sdhci.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- *  linux/include/linux/mmc/sdhci.h - Secure Digital Host Controller Interface
- *
- *  Copyright (C) 2005-2008 Pierre Ossman, 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 as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- */
-#ifndef LINUX_MMC_SDHCI_H
-#define LINUX_MMC_SDHCI_H
-
-#include <linux/scatterlist.h>
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <linux/io.h>
-#include <linux/mmc/host.h>
-
-struct sdhci_host_next {
-        unsigned int    sg_count;
-        s32             cookie;
-};
-
-struct sdhci_host {
-        /* Data set by hardware interface driver */
-        const char *hw_name;    /* Hardware bus name */
-
-        unsigned int quirks;    /* Deviations from spec. */
-
-/* Controller doesn't honor resets unless we touch the clock register */
-#define SDHCI_QUIRK_CLOCK_BEFORE_RESET                  (1<<0)
-/* Controller has bad caps bits, but really supports DMA */
-#define SDHCI_QUIRK_FORCE_DMA                           (1<<1)
-/* Controller doesn't like to be reset when there is no card inserted. */
-#define SDHCI_QUIRK_NO_CARD_NO_RESET                    (1<<2)
-/* Controller doesn't like clearing the power reg before a change */
-#define SDHCI_QUIRK_SINGLE_POWER_WRITE                  (1<<3)
-/* Controller has flaky internal state so reset it on each ios change */
-#define SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS               (1<<4)
-/* Controller has an unusable DMA engine */
-#define SDHCI_QUIRK_BROKEN_DMA                          (1<<5)
-/* Controller has an unusable ADMA engine */
-#define SDHCI_QUIRK_BROKEN_ADMA                         (1<<6)
-/* Controller can only DMA from 32-bit aligned addresses */
-#define SDHCI_QUIRK_32BIT_DMA_ADDR                      (1<<7)
-/* Controller can only DMA chunk sizes that are a multiple of 32 bits */
-#define SDHCI_QUIRK_32BIT_DMA_SIZE                      (1<<8)
-/* Controller can only ADMA chunks that are a multiple of 32 bits */
-#define SDHCI_QUIRK_32BIT_ADMA_SIZE                     (1<<9)
-/* Controller needs to be reset after each request to stay stable */
-#define SDHCI_QUIRK_RESET_AFTER_REQUEST                 (1<<10)
-/* Controller needs voltage and power writes to happen separately */
-#define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER             (1<<11)
-/* Controller provides an incorrect timeout value for transfers */
-#define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL                  (1<<12)
-/* Controller has an issue with buffer bits for small transfers */
-#define SDHCI_QUIRK_BROKEN_SMALL_PIO                    (1<<13)
-/* Controller does not provide transfer-complete interrupt when not busy */
-#define SDHCI_QUIRK_NO_BUSY_IRQ                         (1<<14)
-/* Controller has unreliable card detection */
-#define SDHCI_QUIRK_BROKEN_CARD_DETECTION               (1<<15)
-/* Controller reports inverted write-protect state */
-#define SDHCI_QUIRK_INVERTED_WRITE_PROTECT              (1<<16)
-/* Controller does not like fast PIO transfers */
-#define SDHCI_QUIRK_PIO_NEEDS_DELAY                     (1<<18)
-/* Controller has to be forced to use block size of 2048 bytes */
-#define SDHCI_QUIRK_FORCE_BLK_SZ_2048                   (1<<20)
-/* Controller cannot do multi-block transfers */
-#define SDHCI_QUIRK_NO_MULTIBLOCK                       (1<<21)
-/* Controller can only handle 1-bit data transfers */
-#define SDHCI_QUIRK_FORCE_1_BIT_DATA                    (1<<22)
-/* Controller needs 10ms delay between applying power and clock */
-#define SDHCI_QUIRK_DELAY_AFTER_POWER                   (1<<23)
-/* Controller uses SDCLK instead of TMCLK for data timeouts */
-#define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK             (1<<24)
-/* Controller reports wrong base clock capability */
-#define SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN               (1<<25)
-/* Controller cannot support End Attribute in NOP ADMA descriptor */
-#define SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC               (1<<26)
-/* Controller is missing device caps. Use caps provided by host */
-#define SDHCI_QUIRK_MISSING_CAPS                        (1<<27)
-/* Controller uses Auto CMD12 command to stop the transfer */
-#define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12              (1<<28)
-/* Controller doesn't have HISPD bit field in HI-SPEED SD card */
-#define SDHCI_QUIRK_NO_HISPD_BIT                        (1<<29)
-/* Controller treats ADMA descriptors with length 0000h incorrectly */
-#define SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC            (1<<30)
-/* The read-only detection via SDHCI_PRESENT_STATE register is unstable */
-#define SDHCI_QUIRK_UNSTABLE_RO_DETECT                  (1<<31)
-
-        unsigned int quirks2;   /* More deviations from spec. */
-
-#define SDHCI_QUIRK2_HOST_OFF_CARD_ON                   (1<<0)
-#define SDHCI_QUIRK2_HOST_NO_CMD23                      (1<<1)
-/* The system physically doesn't support 1.8v, even if the host does */
-#define SDHCI_QUIRK2_NO_1_8_V                           (1<<2)
-#define SDHCI_QUIRK2_PRESET_VALUE_BROKEN                (1<<3)
-#define SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON               (1<<4)
-/* Controller has a non-standard host control register */
-#define SDHCI_QUIRK2_BROKEN_HOST_CONTROL                (1<<5)
-/* Controller does not support HS200 */
-#define SDHCI_QUIRK2_BROKEN_HS200                       (1<<6)
-/* Controller does not support DDR50 */
-#define SDHCI_QUIRK2_BROKEN_DDR50                       (1<<7)
-/* Stop command (CMD12) can set Transfer Complete when not using MMC_RSP_BUSY */
-#define SDHCI_QUIRK2_STOP_WITH_TC                       (1<<8)
-/* Controller does not support 64-bit DMA */
-#define SDHCI_QUIRK2_BROKEN_64_BIT_DMA                  (1<<9)
-/* need clear transfer mode register before send cmd */
-#define SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD  (1<<10)
-/* Capability register bit-63 indicates HS400 support */
-#define SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400               (1<<11)
-/* forced tuned clock */
-#define SDHCI_QUIRK2_TUNING_WORK_AROUND                 (1<<12)
-/* disable the block count for single block transactions */
-#define SDHCI_QUIRK2_SUPPORT_SINGLE                     (1<<13)
-
-        int irq;                /* Device IRQ */
-        void __iomem *ioaddr;   /* Mapped address */
-
-        const struct sdhci_ops *ops;    /* Low level hw interface */
-
-        /* Internal data */
-        struct mmc_host *mmc;   /* MMC structure */
-        u64 dma_mask;           /* custom DMA mask */
-
-#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
-        struct led_classdev led;        /* LED control */
-        char led_name[32];
-#endif
-
-        spinlock_t lock;        /* Mutex */
-
-        int flags;              /* Host attributes */
-#define SDHCI_USE_SDMA          (1<<0)  /* Host is SDMA capable */
-#define SDHCI_USE_ADMA          (1<<1)  /* Host is ADMA capable */
-#define SDHCI_REQ_USE_DMA       (1<<2)  /* Use DMA for this req. */
-#define SDHCI_DEVICE_DEAD       (1<<3)  /* Device unresponsive */
-#define SDHCI_SDR50_NEEDS_TUNING (1<<4) /* SDR50 needs tuning */
-#define SDHCI_NEEDS_RETUNING    (1<<5)  /* Host needs retuning */
-#define SDHCI_AUTO_CMD12        (1<<6)  /* Auto CMD12 support */
-#define SDHCI_AUTO_CMD23        (1<<7)  /* Auto CMD23 support */
-#define SDHCI_PV_ENABLED        (1<<8)  /* Preset value enabled */
-#define SDHCI_SDIO_IRQ_ENABLED  (1<<9)  /* SDIO irq enabled */
-#define SDHCI_SDR104_NEEDS_TUNING (1<<10)       /* SDR104/HS200 needs tuning */
-#define SDHCI_USING_RETUNING_TIMER (1<<11)      /* Host is using a retuning timer for the card */
-#define SDHCI_USE_64_BIT_DMA    (1<<12) /* Use 64-bit DMA */
-#define SDHCI_HS400_TUNING      (1<<13) /* Tuning for HS400 */
-
-        unsigned int version;   /* SDHCI spec. version */
-
-        unsigned int max_clk;   /* Max possible freq (MHz) */
-        unsigned int timeout_clk;       /* Timeout freq (KHz) */
-        unsigned int clk_mul;   /* Clock Muliplier value */
-
-        unsigned int clock;     /* Current clock (MHz) */
-        u8 pwr;                 /* Current voltage */
-
-        bool runtime_suspended; /* Host is runtime suspended */
-        bool bus_on;            /* Bus power prevents runtime suspend */
-        bool preset_enabled;    /* Preset is enabled */
-
-        struct mmc_request *mrq;        /* Current request */
-        struct mmc_command *cmd;        /* Current command */
-        struct mmc_data *data;  /* Current data request */
-        unsigned int data_early:1;      /* Data finished before cmd */
-        unsigned int busy_handle:1;     /* Handling the order of Busy-end */
-
-        struct sg_mapping_iter sg_miter;        /* SG state for PIO */
-        unsigned int blocks;    /* remaining PIO blocks */
-
-        int sg_count;           /* Mapped sg entries */
-
-        void *adma_table;       /* ADMA descriptor table */
-        void *align_buffer;     /* Bounce buffer */
-
-        size_t adma_table_sz;   /* ADMA descriptor table size */
-        size_t align_buffer_sz; /* Bounce buffer size */
-
-        dma_addr_t adma_addr;   /* Mapped ADMA descr. table */
-        dma_addr_t align_addr;  /* Mapped bounce buffer */
-
-        unsigned int desc_sz;   /* ADMA descriptor size */
-        unsigned int align_sz;  /* ADMA alignment */
-        unsigned int align_mask;        /* ADMA alignment mask */
-
-        struct tasklet_struct finish_tasklet;   /* Tasklet structures */
-
-        struct timer_list timer;        /* Timer for timeouts */
-
-        u32 caps;               /* Alternative CAPABILITY_0 */
-        u32 caps1;              /* Alternative CAPABILITY_1 */
-
-        unsigned int            ocr_avail_sdio; /* OCR bit masks */
-        unsigned int            ocr_avail_sd;
-        unsigned int            ocr_avail_mmc;
-        u32 ocr_mask;           /* available voltages */
-
-        unsigned                timing;         /* Current timing */
-
-        u32                     thread_isr;
-
-        /* cached registers */
-        u32                     ier;
-
-        wait_queue_head_t       buf_ready_int;  /* Waitqueue for Buffer Read Ready interrupt */
-        unsigned int            tuning_done;    /* Condition flag set when CMD19 succeeds */
-
-        unsigned int            tuning_count;   /* Timer count for re-tuning */
-        unsigned int            tuning_mode;    /* Re-tuning mode supported by host */
-#define SDHCI_TUNING_MODE_1     0
-        struct timer_list       tuning_timer;   /* Timer for tuning */
-
-        struct sdhci_host_next  next_data;
-        unsigned long private[0] ____cacheline_aligned;
-};
-#endif /* LINUX_MMC_SDHCI_H */
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 996807963716..83430f2ea757 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -33,6 +33,8 @@
 #define SDIO_DEVICE_ID_BROADCOM_43341           0xa94d
 #define SDIO_DEVICE_ID_BROADCOM_4335_4339       0x4335
 #define SDIO_DEVICE_ID_BROADCOM_43362           0xa962
+#define SDIO_DEVICE_ID_BROADCOM_43430           0xa9a6
+#define SDIO_DEVICE_ID_BROADCOM_4345            0x4345
 #define SDIO_DEVICE_ID_BROADCOM_4354            0x4354
 
 #define SDIO_VENDOR_ID_INTEL                    0x0089
diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h
index da77e5e2041d..95d6f0314a7d 100644
--- a/include/linux/mmc/sh_mobile_sdhi.h
+++ b/include/linux/mmc/sh_mobile_sdhi.h
@@ -7,14 +7,4 @@
 #define SH_MOBILE_SDHI_IRQ_SDCARD       "sdcard"
 #define SH_MOBILE_SDHI_IRQ_SDIO         "sdio"
 
-struct sh_mobile_sdhi_info {
-        int dma_slave_tx;
-        int dma_slave_rx;
-        unsigned long tmio_flags;
-        unsigned long tmio_caps;
-        unsigned long tmio_caps2;
-        u32 tmio_ocr_mask;      /* available MMC voltages */
-        unsigned int cd_gpio;
-};
-
 #endif /* LINUX_MMC_SH_MOBILE_SDHI_H */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index f279d9c158cd..54d74f6eb233 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -474,16 +474,15 @@ struct zone {
         unsigned long           wait_table_bits;
 
         ZONE_PADDING(_pad1_)
-
-        /* Write-intensive fields used from the page allocator */
-        spinlock_t              lock;
-
         /* free areas of different sizes */
         struct free_area        free_area[MAX_ORDER];
 
         /* zone flags, see below */
         unsigned long           flags;
 
+        /* Write-intensive fields used from the page allocator */
+        spinlock_t              lock;
+
         ZONE_PADDING(_pad2_)
 
         /* Write-intensive fields used by page reclaim */
@@ -843,16 +842,16 @@ static inline int populated_zone(struct zone *zone)
 
 extern int movable_zone;
 
+#ifdef CONFIG_HIGHMEM
 static inline int zone_movable_is_highmem(void)
 {
-#if defined(CONFIG_HIGHMEM) && defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP)
+#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
         return movable_zone == ZONE_HIGHMEM;
-#elif defined(CONFIG_HIGHMEM)
-        return (ZONE_MOVABLE - 1) == ZONE_HIGHMEM;
 #else
-        return 0;
+        return (ZONE_MOVABLE - 1) == ZONE_HIGHMEM;
 #endif
 }
+#endif
 
 static inline int is_highmem_idx(enum zone_type idx)
 {
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index e530533b94be..3bfd56778c29 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -546,6 +546,14 @@ struct amba_id {
         void                    *data;
 };
 
+/**
+ * struct mips_cdmm_device_id - identifies devices in MIPS CDMM bus
+ * @type:       Device type identifier.
+ */
+struct mips_cdmm_device_id {
+        __u8    type;
+};
+
 /*
  * Match x86 CPUs for CPU specific drivers.
  * See documentation of "x86_match_cpu" for details.
diff --git a/include/linux/module.h b/include/linux/module.h
index 42999fe2dbd0..c883b86ea964 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -338,12 +338,18 @@ struct module {
 #ifdef CONFIG_EVENT_TRACING
         struct ftrace_event_call **trace_events;
         unsigned int num_trace_events;
+        struct trace_enum_map **trace_enums;
+        unsigned int num_trace_enums;
 #endif
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
         unsigned int num_ftrace_callsites;
         unsigned long *ftrace_callsites;
 #endif
 
+#ifdef CONFIG_LIVEPATCH
+        bool klp_alive;
+#endif
+
 #ifdef CONFIG_MODULE_UNLOAD
         /* What modules depend on me? */
         struct list_head source_list;
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
index f7556261fe3c..4d0cb9bba93e 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -84,4 +84,12 @@ void module_arch_cleanup(struct module *mod);
 
 /* Any cleanup before freeing mod->module_init */
 void module_arch_freeing_init(struct module *mod);
+
+#ifdef CONFIG_KASAN
+#include <linux/kasan.h>
+#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)
+#else
+#define MODULE_ALIGN PAGE_SIZE
+#endif
+
 #endif
diff --git a/include/linux/mount.h b/include/linux/mount.h
index c2c561dc0114..f822c3c11377 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -61,6 +61,7 @@ struct mnt_namespace;
 #define MNT_DOOMED              0x1000000
 #define MNT_SYNC_UMOUNT         0x2000000
 #define MNT_MARKED              0x4000000
+#define MNT_UMOUNT              0x8000000
 
 struct vfsmount {
         struct dentry *mnt_root;        /* root of the mounted tree */
@@ -92,6 +93,6 @@ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
 extern void mnt_set_expiry(struct vfsmount *mnt, struct list_head *expiry_list);
 extern void mark_mounts_for_expiry(struct list_head *mounts);
 
-extern dev_t name_to_dev_t(char *name);
+extern dev_t name_to_dev_t(const char *name);
 
 #endif /* _LINUX_MOUNT_H */
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index 5f487d776411..29975c73a953 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -77,7 +77,7 @@
 /* ensure we never evaluate anything shorted than an unsigned long
  * to zero, and ensure we'll never miss the end of an comparison (bjd) */
 
-#define map_calc_words(map) ((map_bankwidth(map) + (sizeof(unsigned long)-1))/ sizeof(unsigned long))
+#define map_calc_words(map) ((map_bankwidth(map) + (sizeof(unsigned long)-1)) / sizeof(unsigned long))
 
 #ifdef CONFIG_MTD_MAP_BANK_WIDTH_8
 # ifdef map_bankwidth
@@ -181,7 +181,7 @@ static inline int map_bankwidth_supported(int w)
         }
 }
 
-#define MAX_MAP_LONGS ( ((MAX_MAP_BANKWIDTH*8) + BITS_PER_LONG - 1) / BITS_PER_LONG )
+#define MAX_MAP_LONGS (((MAX_MAP_BANKWIDTH * 8) + BITS_PER_LONG - 1) / BITS_PER_LONG)
 
 typedef union {
         unsigned long x[MAX_MAP_LONGS];
@@ -264,20 +264,22 @@ void unregister_mtd_chip_driver(struct mtd_chip_driver *);
 struct mtd_info *do_map_probe(const char *name, struct map_info *map);
 void map_destroy(struct mtd_info *mtd);
 
-#define ENABLE_VPP(map) do { if(map->set_vpp) map->set_vpp(map, 1); } while(0)
-#define DISABLE_VPP(map) do { if(map->set_vpp) map->set_vpp(map, 0); } while(0)
+#define ENABLE_VPP(map) do { if (map->set_vpp) map->set_vpp(map, 1); } while (0)
+#define DISABLE_VPP(map) do { if (map->set_vpp) map->set_vpp(map, 0); } while (0)
 
 #define INVALIDATE_CACHED_RANGE(map, from, size) \
-        do { if(map->inval_cache) map->inval_cache(map, from, size); } while(0)
+        do { if (map->inval_cache) map->inval_cache(map, from, size); } while (0)
 
 
 static inline int map_word_equal(struct map_info *map, map_word val1, map_word val2)
 {
         int i;
-        for (i=0; i<map_words(map); i++) {
+
+        for (i = 0; i < map_words(map); i++) {
                 if (val1.x[i] != val2.x[i])
                         return 0;
         }
+
         return 1;
 }
 
@@ -286,9 +288,9 @@ static inline map_word map_word_and(struct map_info *map, map_word val1, map_wor
         map_word r;
         int i;
 
-        for (i=0; i<map_words(map); i++) {
+        for (i = 0; i < map_words(map); i++)
                 r.x[i] = val1.x[i] & val2.x[i];
-        }
+
         return r;
 }
 
@@ -297,9 +299,9 @@ static inline map_word map_word_clr(struct map_info *map, map_word val1, map_wor
         map_word r;
         int i;
 
-        for (i=0; i<map_words(map); i++) {
+        for (i = 0; i < map_words(map); i++)
                 r.x[i] = val1.x[i] & ~val2.x[i];
-        }
+
         return r;
 }
 
@@ -308,22 +310,33 @@ static inline map_word map_word_or(struct map_info *map, map_word val1, map_word
         map_word r;
         int i;
 
-        for (i=0; i<map_words(map); i++) {
+        for (i = 0; i < map_words(map); i++)
                 r.x[i] = val1.x[i] | val2.x[i];
-        }
+
         return r;
 }
 
-#define map_word_andequal(m, a, b, z) map_word_equal(m, z, map_word_and(m, a, b))
+static inline int map_word_andequal(struct map_info *map, map_word val1, map_word val2, map_word val3)
+{
+        int i;
+
+        for (i = 0; i < map_words(map); i++) {
+                if ((val1.x[i] & val2.x[i]) != val3.x[i])
+                        return 0;
+        }
+
+        return 1;
+}
 
 static inline int map_word_bitsset(struct map_info *map, map_word val1, map_word val2)
 {
         int i;
 
-        for (i=0; i<map_words(map); i++) {
+        for (i = 0; i < map_words(map); i++) {
                 if (val1.x[i] & val2.x[i])
                         return 1;
         }
+
         return 0;
 }
 
@@ -355,14 +368,16 @@ static inline map_word map_word_load_partial(struct map_info *map, map_word orig
 
         if (map_bankwidth_is_large(map)) {
                 char *dest = (char *)&orig;
+
                 memcpy(dest+start, buf, len);
         } else {
-                for (i=start; i < start+len; i++) {
+                for (i = start; i < start+len; i++) {
                         int bitpos;
+
 #ifdef __LITTLE_ENDIAN
-                        bitpos = i*8;
+                        bitpos = i * 8;
 #else /* __BIG_ENDIAN */
-                        bitpos = (map_bankwidth(map)-1-i)*8;
+                        bitpos = (map_bankwidth(map) - 1 - i) * 8;
 #endif
                         orig.x[0] &= ~(0xff << bitpos);
                         orig.x[0] |= (unsigned long)buf[i-start] << bitpos;
@@ -384,9 +399,10 @@ static inline map_word map_word_ff(struct map_info *map)
 
         if (map_bankwidth(map) < MAP_FF_LIMIT) {
                 int bw = 8 * map_bankwidth(map);
+
                 r.x[0] = (1UL << bw) - 1;
         } else {
-                for (i=0; i<map_words(map); i++)
+                for (i = 0; i < map_words(map); i++)
                         r.x[i] = ~0UL;
         }
         return r;
@@ -407,7 +423,7 @@ static inline map_word inline_map_read(struct map_info *map, unsigned long ofs)
                 r.x[0] = __raw_readq(map->virt + ofs);
 #endif
         else if (map_bankwidth_is_large(map))
-                memcpy_fromio(r.x, map->virt+ofs, map->bankwidth);
+                memcpy_fromio(r.x, map->virt + ofs, map->bankwidth);
         else
                 BUG();
 
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 4720b86ee73d..e5409524bb0a 100644
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -155,6 +155,8 @@ enum spi_nor_option_flags {
  * @write:              [DRIVER-SPECIFIC] write data to the SPI NOR
  * @erase:              [DRIVER-SPECIFIC] erase a sector of the SPI NOR
  *                      at the offset @offs
+ * @lock:               [FLASH-SPECIFIC] lock a region of the SPI NOR
+ * @unlock:             [FLASH-SPECIFIC] unlock a region of the SPI NOR
  * @priv:               the private data
  */
 struct spi_nor {
@@ -189,6 +191,9 @@ struct spi_nor {
                         size_t len, size_t *retlen, const u_char *write_buf);
         int (*erase)(struct spi_nor *nor, loff_t offs);
 
+        int (*flash_lock)(struct spi_nor *nor, loff_t ofs, uint64_t len);
+        int (*flash_unlock)(struct spi_nor *nor, loff_t ofs, uint64_t len);
+
         void *priv;
 };
 
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
deleted file mode 100644
index f62f78aef4ac..000000000000
--- a/include/linux/nbd.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 1999 Copyright (C) Pavel Machek, pavel@ucw.cz. This code is GPL.
- * 1999/11/04 Copyright (C) 1999 VMware, Inc. (Regis "HPReg" Duchesne)
- *            Made nbd_end_request() use the io_request_lock
- * 2001 Copyright (C) Steven Whitehouse
- *            New nbd_end_request() for compatibility with new linux block
- *            layer code.
- * 2003/06/24 Louis D. Langholtz <ldl@aros.net>
- *            Removed unneeded blksize_bits field from nbd_device struct.
- *            Cleanup PARANOIA usage & code.
- * 2004/02/19 Paul Clements
- *            Removed PARANOIA, plus various cleanup and comments
- */
-#ifndef LINUX_NBD_H
-#define LINUX_NBD_H
-
-
-#include <linux/wait.h>
-#include <linux/mutex.h>
-#include <uapi/linux/nbd.h>
-
-struct request;
-
-struct nbd_device {
-        int flags;
-        int harderror;          /* Code of hard error                   */
-        struct socket * sock;   /* If == NULL, device is not ready, yet */
-        int magic;
-
-        spinlock_t queue_lock;
-        struct list_head queue_head;    /* Requests waiting result */
-        struct request *active_req;
-        wait_queue_head_t active_wq;
-        struct list_head waiting_queue; /* Requests to be sent */
-        wait_queue_head_t waiting_wq;
-
-        struct mutex tx_lock;
-        struct gendisk *disk;
-        int blksize;
-        u64 bytesize;
-        pid_t pid; /* pid of nbd-client, if attached */
-        int xmit_timeout;
-        int disconnect; /* a disconnect has been requested by user */
-};
-
-#endif
diff --git a/include/linux/net.h b/include/linux/net.h
index 17d83393afcc..738ea48be889 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -120,7 +120,6 @@ struct socket {
 
 struct vm_area_struct;
 struct page;
-struct kiocb;
 struct sockaddr;
 struct msghdr;
 struct module;
@@ -162,8 +161,8 @@ struct proto_ops {
         int             (*compat_getsockopt)(struct socket *sock, int level,
                                       int optname, char __user *optval, int __user *optlen);
 #endif
-        int             (*sendmsg)   (struct kiocb *iocb, struct socket *sock,
-                                      struct msghdr *m, size_t total_len);
+        int             (*sendmsg)   (struct socket *sock, struct msghdr *m,
+                                      size_t total_len);
         /* Notes for implementing recvmsg:
          * ===============================
          * msg->msg_namelen should get updated by the recvmsg handlers
@@ -172,9 +171,8 @@ struct proto_ops {
          * handlers can assume that msg.msg_name is either NULL or has
          * a minimum size of sizeof(struct sockaddr_storage).
          */
-        int             (*recvmsg)   (struct kiocb *iocb, struct socket *sock,
-                                      struct msghdr *m, size_t total_len,
-                                      int flags);
+        int             (*recvmsg)   (struct socket *sock, struct msghdr *m,
+                                      size_t total_len, int flags);
         int             (*mmap)      (struct file *file, struct socket *sock,
                                       struct vm_area_struct * vma);
         ssize_t         (*sendpage)  (struct socket *sock, struct page *page,
@@ -213,7 +211,7 @@ int sock_create(int family, int type, int proto, struct socket **res);
 int sock_create_kern(int family, int type, int proto, struct socket **res);
 int sock_create_lite(int family, int type, int proto, struct socket **res);
 void sock_release(struct socket *sock);
-int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len);
+int sock_sendmsg(struct socket *sock, struct msghdr *msg);
 int sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
                  int flags);
 struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5897b4ea5a3f..bcbde799ec69 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -261,7 +261,6 @@ struct header_ops {
                            unsigned short type, const void *daddr,
                            const void *saddr, unsigned int len);
         int     (*parse)(const struct sk_buff *skb, unsigned char *haddr);
-        int     (*rebuild)(struct sk_buff *skb);
         int     (*cache)(const struct neighbour *neigh, struct hh_cache *hh, __be16 type);
         void    (*cache_update)(struct hh_cache *hh,
                                 const struct net_device *dev,
@@ -588,6 +587,7 @@ struct netdev_queue {
 #ifdef CONFIG_BQL
         struct dql              dql;
 #endif
+        unsigned long           tx_maxrate;
 } ____cacheline_aligned_in_smp;
 
 static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
@@ -795,7 +795,10 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
  * netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb,
  *                               struct net_device *dev);
  *      Called when a packet needs to be transmitted.
- *      Must return NETDEV_TX_OK , NETDEV_TX_BUSY.
+ *      Returns NETDEV_TX_OK.  Can return NETDEV_TX_BUSY, but you should stop
+ *      the queue before that can happen; it's for obsolete devices and weird
+ *      corner cases, but the stack really does a non-trivial amount
+ *      of useless work if you return NETDEV_TX_BUSY.
  *        (can also return NETDEV_TX_LOCKED iff NETIF_F_LLTX)
  *      Required can not be NULL.
  *
@@ -875,6 +878,11 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
  * int (*ndo_set_vf_link_state)(struct net_device *dev, int vf, int link_state);
  * int (*ndo_set_vf_port)(struct net_device *dev, int vf,
  *                        struct nlattr *port[]);
+ *
+ *      Enable or disable the VF ability to query its RSS Redirection Table and
+ *      Hash Key. This is needed since on some devices VF share this information
+ *      with PF and querying it may adduce a theoretical security risk.
+ * int (*ndo_set_vf_rss_query_en)(struct net_device *dev, int vf, bool setting);
  * int (*ndo_get_vf_port)(struct net_device *dev, int vf, struct sk_buff *skb);
  * int (*ndo_setup_tc)(struct net_device *dev, u8 tc)
  *      Called to setup 'tc' number of traffic classes in the net device. This
@@ -965,9 +973,12 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
  *      Used to add FDB entries to dump requests. Implementers should add
  *      entries to skb and update idx with the number of entries.
  *
- * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh)
+ * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh,
+ *                           u16 flags)
  * int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq,
  *                           struct net_device *dev, u32 filter_mask)
+ * int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh,
+ *                           u16 flags);
  *
  * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier);
  *      Called to change device carrier. Soft-devices (like dummy, team, etc)
@@ -1023,15 +1034,12 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
  *      be otherwise expressed by feature flags. The check is called with
  *      the set of features that the stack has calculated and it returns
  *      those the driver believes to be appropriate.
- *
- * int (*ndo_switch_parent_id_get)(struct net_device *dev,
- *                                 struct netdev_phys_item_id *psid);
- *      Called to get an ID of the switch chip this port is part of.
- *      If driver implements this, it indicates that it represents a port
- *      of a switch chip.
- * int (*ndo_switch_port_stp_update)(struct net_device *dev, u8 state);
- *      Called to notify switch device port of bridge port STP
- *      state change.
+ * int (*ndo_set_tx_maxrate)(struct net_device *dev,
+ *                           int queue_index, u32 maxrate);
+ *      Called when a user wants to set a max-rate limitation of specific
+ *      TX queue.
+ * int (*ndo_get_iflink)(const struct net_device *dev);
+ *      Called to get the iflink value of this device.
  */
 struct net_device_ops {
         int                     (*ndo_init)(struct net_device *dev);
@@ -1096,6 +1104,9 @@ struct net_device_ops {
                                                    struct nlattr *port[]);
         int                     (*ndo_get_vf_port)(struct net_device *dev,
                                                    int vf, struct sk_buff *skb);
+        int                     (*ndo_set_vf_rss_query_en)(
+                                                   struct net_device *dev,
+                                                   int vf, bool setting);
         int                     (*ndo_setup_tc)(struct net_device *dev, u8 tc);
 #if IS_ENABLED(CONFIG_FCOE)
         int                     (*ndo_fcoe_enable)(struct net_device *dev);
@@ -1169,6 +1180,8 @@ struct net_device_ops {
                                                       bool new_carrier);
         int                     (*ndo_get_phys_port_id)(struct net_device *dev,
                                                         struct netdev_phys_item_id *ppid);
+        int                     (*ndo_get_phys_port_name)(struct net_device *dev,
+                                                          char *name, size_t len);
         void                    (*ndo_add_vxlan_port)(struct  net_device *dev,
                                                       sa_family_t sa_family,
                                                       __be16 port);
@@ -1188,12 +1201,10 @@ struct net_device_ops {
         netdev_features_t       (*ndo_features_check) (struct sk_buff *skb,
                                                        struct net_device *dev,
                                                        netdev_features_t features);
-#ifdef CONFIG_NET_SWITCHDEV
-        int                     (*ndo_switch_parent_id_get)(struct net_device *dev,
-                                                            struct netdev_phys_item_id *psid);
-        int                     (*ndo_switch_port_stp_update)(struct net_device *dev,
-                                                              u8 state);
-#endif
+        int                     (*ndo_set_tx_maxrate)(struct net_device *dev,
+                                                      int queue_index,
+                                                      u32 maxrate);
+        int                     (*ndo_get_iflink)(const struct net_device *dev);
 };
 
 /**
@@ -1302,6 +1313,8 @@ enum netdev_priv_flags {
  *      @base_addr:     Device I/O address
  *      @irq:           Device IRQ number
  *
+ *      @carrier_changes:       Stats to monitor carrier on<->off transitions
+ *
  *      @state:         Generic network queuing layer state, see netdev_state_t
  *      @dev_list:      The global list of network devices
  *      @napi_list:     List entry, that is used for polling napi devices
@@ -1325,7 +1338,7 @@ enum netdev_priv_flags {
  *      @mpls_features: Mask of features inheritable by MPLS
  *
  *      @ifindex:       interface index
- *      @iflink:        unique device identifier
+ *      @group:         The group, that the device belongs to
  *
  *      @stats:         Statistics struct, which was left as a legacy, use
  *                      rtnl_link_stats64 instead
@@ -1335,8 +1348,6 @@ enum netdev_priv_flags {
  *      @tx_dropped:    Dropped packets by core network,
  *                      do not use this in drivers
  *
- *      @carrier_changes:       Stats to monitor carrier on<->off transitions
- *
  *      @wireless_handlers:     List of functions to handle Wireless Extensions,
  *                              instead of ioctl,
  *                              see <net/iw_handler.h> for details.
@@ -1345,8 +1356,7 @@ enum netdev_priv_flags {
  *      @netdev_ops:    Includes several pointers to callbacks,
  *                      if one wants to override the ndo_*() functions
  *      @ethtool_ops:   Management operations
- *      @fwd_ops:       Management operations
- *      @header_ops:    Includes callbacks for creating,parsing,rebuilding,etc
+ *      @header_ops:    Includes callbacks for creating,parsing,caching,etc
  *                      of Layer 2 headers.
  *
  *      @flags:         Interface flags (a la BSD)
@@ -1380,14 +1390,14 @@ enum netdev_priv_flags {
  *      @dev_port:              Used to differentiate devices that share
  *                              the same function
  *      @addr_list_lock:        XXX: need comments on this one
- *      @uc:                    unicast mac addresses
- *      @mc:                    multicast mac addresses
- *      @dev_addrs:             list of device hw addresses
- *      @queues_kset:           Group of all Kobjects in the Tx and RX queues
  *      @uc_promisc:            Counter, that indicates, that promiscuous mode
  *                              has been enabled due to the need to listen to
  *                              additional unicast addresses in a device that
  *                              does not implement ndo_set_rx_mode()
+ *      @uc:                    unicast mac addresses
+ *      @mc:                    multicast mac addresses
+ *      @dev_addrs:             list of device hw addresses
+ *      @queues_kset:           Group of all Kobjects in the Tx and RX queues
  *      @promiscuity:           Number of times, the NIC is told to work in
  *                              Promiscuous mode, if it becomes 0 the NIC will
  *                              exit from working in Promiscuous mode
@@ -1417,6 +1427,12 @@ enum netdev_priv_flags {
  *      @ingress_queue:         XXX: need comments on this one
  *      @broadcast:             hw bcast address
  *
+ *      @rx_cpu_rmap:   CPU reverse-mapping for RX completion interrupts,
+ *                      indexed by RX queue number. Assigned by driver.
+ *                      This must only be set if the ndo_rx_flow_steer
+ *                      operation is defined
+ *      @index_hlist:           Device index hash chain
+ *
  *      @_tx:                   Array of TX queues
  *      @num_tx_queues:         Number of TX queues allocated at alloc_netdev_mq() time
  *      @real_num_tx_queues:    Number of TX queues currently active in device
@@ -1426,11 +1442,6 @@ enum netdev_priv_flags {
  *
  *      @xps_maps:      XXX: need comments on this one
  *
- *      @rx_cpu_rmap:   CPU reverse-mapping for RX completion interrupts,
- *                      indexed by RX queue number. Assigned by driver.
- *                      This must only be set if the ndo_rx_flow_steer
- *                      operation is defined
- *
  *      @trans_start:           Time (in jiffies) of last Tx
  *      @watchdog_timeo:        Represents the timeout that is used by
  *                              the watchdog ( see dev_watchdog() )
@@ -1438,7 +1449,6 @@ enum netdev_priv_flags {
  *
  *      @pcpu_refcnt:           Number of references to this device
  *      @todo_list:             Delayed register/unregister
- *      @index_hlist:           Device index hash chain
  *      @link_watch_list:       XXX: need comments on this one
  *
  *      @reg_state:             Register/unregister state machine
@@ -1486,7 +1496,6 @@ enum netdev_priv_flags {
  *
  *      @qdisc_tx_busylock:     XXX: need comments on this one
  *
- *      @group:         The group, that the device belongs to
  *      @pm_qos_req:    Power Management QoS object
  *
  *      FIXME: cleanup struct net_device such that network protocol info
@@ -1506,6 +1515,8 @@ struct net_device {
         unsigned long           base_addr;
         int                     irq;
 
+        atomic_t                carrier_changes;
+
         /*
          *      Some hardware also needs these fields (state,dev_list,
          *      napi_list,unreg_list,close_list) but they are not
@@ -1539,22 +1550,22 @@ struct net_device {
         netdev_features_t       mpls_features;
 
         int                     ifindex;
-        int                     iflink;
+        int                     group;
 
         struct net_device_stats stats;
 
         atomic_long_t           rx_dropped;
         atomic_long_t           tx_dropped;
 
-        atomic_t                carrier_changes;
-
 #ifdef CONFIG_WIRELESS_EXT
         const struct iw_handler_def *   wireless_handlers;
         struct iw_public_data * wireless_data;
 #endif
         const struct net_device_ops *netdev_ops;
         const struct ethtool_ops *ethtool_ops;
-        const struct forwarding_accel_ops *fwd_ops;
+#ifdef CONFIG_NET_SWITCHDEV
+        const struct swdev_ops *swdev_ops;
+#endif
 
         const struct header_ops *header_ops;
 
@@ -1585,6 +1596,8 @@ struct net_device {
         unsigned short          dev_id;
         unsigned short          dev_port;
         spinlock_t              addr_list_lock;
+        unsigned char           name_assign_type;
+        bool                    uc_promisc;
         struct netdev_hw_addr_list      uc;
         struct netdev_hw_addr_list      mc;
         struct netdev_hw_addr_list      dev_addrs;
@@ -1592,10 +1605,6 @@ struct net_device {
 #ifdef CONFIG_SYSFS
         struct kset             *queues_kset;
 #endif
-
-        unsigned char           name_assign_type;
-
-        bool                    uc_promisc;
         unsigned int            promiscuity;
         unsigned int            allmulti;
 
@@ -1642,7 +1651,10 @@ struct net_device {
 
         struct netdev_queue __rcu *ingress_queue;
         unsigned char           broadcast[MAX_ADDR_LEN];
-
+#ifdef CONFIG_RFS_ACCEL
+        struct cpu_rmap         *rx_cpu_rmap;
+#endif
+        struct hlist_node       index_hlist;
 
 /*
  * Cache lines mostly used on transmit path
@@ -1653,13 +1665,11 @@ struct net_device {
         struct Qdisc            *qdisc;
         unsigned long           tx_queue_len;
         spinlock_t              tx_global_lock;
+        int                     watchdog_timeo;
 
 #ifdef CONFIG_XPS
         struct xps_dev_maps __rcu *xps_maps;
 #endif
-#ifdef CONFIG_RFS_ACCEL
-        struct cpu_rmap         *rx_cpu_rmap;
-#endif
 
         /* These may be needed for future network-power-down code. */
 
@@ -1669,13 +1679,11 @@ struct net_device {
          */
         unsigned long           trans_start;
 
-        int                     watchdog_timeo;
         struct timer_list       watchdog_timer;
 
         int __percpu            *pcpu_refcnt;
         struct list_head        todo_list;
 
-        struct hlist_node       index_hlist;
         struct list_head        link_watch_list;
 
         enum { NETREG_UNINITIALIZED=0,
@@ -1699,9 +1707,7 @@ struct net_device {
         struct netpoll_info __rcu       *npinfo;
 #endif
 
-#ifdef CONFIG_NET_NS
-        struct net              *nd_net;
-#endif
+        possible_net_t                  nd_net;
 
         /* mid-layer private */
         union {
@@ -1742,8 +1748,6 @@ struct net_device {
 #endif
         struct phy_device *phydev;
         struct lock_class_key *qdisc_tx_busylock;
-        int group;
-        struct pm_qos_request   pm_qos_req;
 };
 #define to_net_dev(d) container_of(d, struct net_device, dev)
 
@@ -1841,10 +1845,7 @@ struct net *dev_net(const struct net_device *dev)
 static inline
 void dev_net_set(struct net_device *dev, struct net *net)
 {
-#ifdef CONFIG_NET_NS
-        release_net(dev->nd_net);
-        dev->nd_net = hold_net(net);
-#endif
+        write_pnet(&dev->nd_net, net);
 }
 
 static inline bool netdev_uses_dsa(struct net_device *dev)
@@ -2156,6 +2157,7 @@ void __dev_remove_pack(struct packet_type *pt);
 void dev_add_offload(struct packet_offload *po);
 void dev_remove_offload(struct packet_offload *po);
 
+int dev_get_iflink(const struct net_device *dev);
 struct net_device *__dev_get_by_flags(struct net *net, unsigned short flags,
                                       unsigned short mask);
 struct net_device *dev_get_by_name(struct net *net, const char *name);
@@ -2164,9 +2166,14 @@ struct net_device *__dev_get_by_name(struct net *net, const char *name);
 int dev_alloc_name(struct net_device *dev, const char *name);
 int dev_open(struct net_device *dev);
 int dev_close(struct net_device *dev);
+int dev_close_many(struct list_head *head, bool unlink);
 void dev_disable_lro(struct net_device *dev);
-int dev_loopback_xmit(struct sk_buff *newskb);
-int dev_queue_xmit(struct sk_buff *skb);
+int dev_loopback_xmit(struct sock *sk, struct sk_buff *newskb);
+int dev_queue_xmit_sk(struct sock *sk, struct sk_buff *skb);
+static inline int dev_queue_xmit(struct sk_buff *skb)
+{
+        return dev_queue_xmit_sk(skb->sk, skb);
+}
 int dev_queue_xmit_accel(struct sk_buff *skb, void *accel_priv);
 int register_netdevice(struct net_device *dev);
 void unregister_netdevice_queue(struct net_device *dev, struct list_head *head);
@@ -2182,6 +2189,12 @@ void netdev_freemem(struct net_device *dev);
 void synchronize_net(void);
 int init_dummy_netdev(struct net_device *dev);
 
+DECLARE_PER_CPU(int, xmit_recursion);
+static inline int dev_recursion_level(void)
+{
+        return this_cpu_read(xmit_recursion);
+}
+
 struct net_device *dev_get_by_index(struct net *net, int ifindex);
 struct net_device *__dev_get_by_index(struct net *net, int ifindex);
 struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
@@ -2342,6 +2355,7 @@ struct gro_remcsum {
 
 static inline void skb_gro_remcsum_init(struct gro_remcsum *grc)
 {
+        grc->offset = 0;
         grc->delta = 0;
 }
 
@@ -2399,15 +2413,6 @@ static inline int dev_parse_header(const struct sk_buff *skb,
         return dev->header_ops->parse(skb, haddr);
 }
 
-static inline int dev_rebuild_header(struct sk_buff *skb)
-{
-        const struct net_device *dev = skb->dev;
-
-        if (!dev->header_ops || !dev->header_ops->rebuild)
-                return 0;
-        return dev->header_ops->rebuild(skb);
-}
-
 typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len);
 int register_gifconf(unsigned int family, gifconf_func_t *gifconf);
 static inline int unregister_gifconf(unsigned int family)
@@ -2929,7 +2934,11 @@ static inline void dev_consume_skb_any(struct sk_buff *skb)
 
 int netif_rx(struct sk_buff *skb);
 int netif_rx_ni(struct sk_buff *skb);
-int netif_receive_skb(struct sk_buff *skb);
+int netif_receive_skb_sk(struct sock *sk, struct sk_buff *skb);
+static inline int netif_receive_skb(struct sk_buff *skb)
+{
+        return netif_receive_skb_sk(skb->sk, skb);
+}
 gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb);
 void napi_gro_flush(struct napi_struct *napi, bool flush_old);
 struct sk_buff *napi_get_frags(struct napi_struct *napi);
@@ -2965,6 +2974,8 @@ int dev_set_mac_address(struct net_device *, struct sockaddr *);
 int dev_change_carrier(struct net_device *, bool new_carrier);
 int dev_get_phys_port_id(struct net_device *dev,
                          struct netdev_phys_item_id *ppid);
+int dev_get_phys_port_name(struct net_device *dev,
+                           char *name, size_t len);
 struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev);
 struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
                                     struct netdev_queue *txq, int *ret);
@@ -3669,6 +3680,9 @@ void netdev_change_features(struct net_device *dev);
 void netif_stacked_transfer_operstate(const struct net_device *rootdev,
                                         struct net_device *dev);
 
+netdev_features_t passthru_features_check(struct sk_buff *skb,
+                                          struct net_device *dev,
+                                          netdev_features_t features);
 netdev_features_t netif_skb_features(struct sk_buff *skb);
 
 static inline bool net_gso_ok(netdev_features_t features, int gso_type)
@@ -3699,7 +3713,7 @@ static inline bool skb_gso_ok(struct sk_buff *skb, netdev_features_t features)
                (!skb_has_frag_list(skb) || (features & NETIF_F_FRAGLIST));
 }
 
-static inline bool netif_needs_gso(struct net_device *dev, struct sk_buff *skb,
+static inline bool netif_needs_gso(struct sk_buff *skb,
                                    netdev_features_t features)
 {
         return skb_is_gso(skb) && (!skb_gso_ok(skb, features) ||
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 2517ece98820..63560d0a8dfe 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -44,11 +44,39 @@ int netfilter_init(void);
 struct sk_buff;
 
 struct nf_hook_ops;
+
+struct sock;
+
+struct nf_hook_state {
+        unsigned int hook;
+        int thresh;
+        u_int8_t pf;
+        struct net_device *in;
+        struct net_device *out;
+        struct sock *sk;
+        int (*okfn)(struct sock *, struct sk_buff *);
+};
+
+static inline void nf_hook_state_init(struct nf_hook_state *p,
+                                      unsigned int hook,
+                                      int thresh, u_int8_t pf,
+                                      struct net_device *indev,
+                                      struct net_device *outdev,
+                                      struct sock *sk,
+                                      int (*okfn)(struct sock *, struct sk_buff *))
+{
+        p->hook = hook;
+        p->thresh = thresh;
+        p->pf = pf;
+        p->in = indev;
+        p->out = outdev;
+        p->sk = sk;
+        p->okfn = okfn;
+}
+
 typedef unsigned int nf_hookfn(const struct nf_hook_ops *ops,
                                struct sk_buff *skb,
-                               const struct net_device *in,
-                               const struct net_device *out,
-                               int (*okfn)(struct sk_buff *));
+                               const struct nf_hook_state *state);
 
 struct nf_hook_ops {
         struct list_head list;
@@ -118,9 +146,7 @@ static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook)
 }
 #endif
 
-int nf_hook_slow(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
-                 struct net_device *indev, struct net_device *outdev,
-                 int (*okfn)(struct sk_buff *), int thresh);
+int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state);
 
 /**
  *      nf_hook_thresh - call a netfilter hook
@@ -130,21 +156,29 @@ int nf_hook_slow(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
  *      value indicates the packet has been consumed by the hook.
  */
 static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
+                                 struct sock *sk,
                                  struct sk_buff *skb,
                                  struct net_device *indev,
                                  struct net_device *outdev,
-                                 int (*okfn)(struct sk_buff *), int thresh)
+                                 int (*okfn)(struct sock *, struct sk_buff *),
+                                 int thresh)
 {
-        if (nf_hooks_active(pf, hook))
-                return nf_hook_slow(pf, hook, skb, indev, outdev, okfn, thresh);
+        if (nf_hooks_active(pf, hook)) {
+                struct nf_hook_state state;
+
+                nf_hook_state_init(&state, hook, thresh, pf,
+                                   indev, outdev, sk, okfn);
+                return nf_hook_slow(skb, &state);
+        }
         return 1;
 }
 
-static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
-                          struct net_device *indev, struct net_device *outdev,
-                          int (*okfn)(struct sk_buff *))
+static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sock *sk,
+                          struct sk_buff *skb, struct net_device *indev,
+                          struct net_device *outdev,
+                          int (*okfn)(struct sock *, struct sk_buff *))
 {
-        return nf_hook_thresh(pf, hook, skb, indev, outdev, okfn, INT_MIN);
+        return nf_hook_thresh(pf, hook, sk, skb, indev, outdev, okfn, INT_MIN);
 }
                    
 /* Activate hook; either okfn or kfree_skb called, unless a hook
@@ -165,35 +199,36 @@ static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
 */
 
 static inline int
-NF_HOOK_THRESH(uint8_t pf, unsigned int hook, struct sk_buff *skb,
-               struct net_device *in, struct net_device *out,
-               int (*okfn)(struct sk_buff *), int thresh)
+NF_HOOK_THRESH(uint8_t pf, unsigned int hook, struct sock *sk,
+               struct sk_buff *skb, struct net_device *in,
+               struct net_device *out,
+               int (*okfn)(struct sock *, struct sk_buff *), int thresh)
 {
-        int ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, thresh);
+        int ret = nf_hook_thresh(pf, hook, sk, skb, in, out, okfn, thresh);
         if (ret == 1)
-                ret = okfn(skb);
+                ret = okfn(sk, skb);
         return ret;
 }
 
 static inline int
-NF_HOOK_COND(uint8_t pf, unsigned int hook, struct sk_buff *skb,
-             struct net_device *in, struct net_device *out,
-             int (*okfn)(struct sk_buff *), bool cond)
+NF_HOOK_COND(uint8_t pf, unsigned int hook, struct sock *sk,
+             struct sk_buff *skb, struct net_device *in, struct net_device *out,
+             int (*okfn)(struct sock *, struct sk_buff *), bool cond)
 {
         int ret;
 
         if (!cond ||
-            ((ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, INT_MIN)) == 1))
-                ret = okfn(skb);
+            ((ret = nf_hook_thresh(pf, hook, sk, skb, in, out, okfn, INT_MIN)) == 1))
+                ret = okfn(sk, skb);
         return ret;
 }
 
 static inline int
-NF_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb,
+NF_HOOK(uint8_t pf, unsigned int hook, struct sock *sk, struct sk_buff *skb,
         struct net_device *in, struct net_device *out,
-        int (*okfn)(struct sk_buff *))
+        int (*okfn)(struct sock *, struct sk_buff *))
 {
-        return NF_HOOK_THRESH(pf, hook, skb, in, out, okfn, INT_MIN);
+        return NF_HOOK_THRESH(pf, hook, sk, skb, in, out, okfn, INT_MIN);
 }
 
 /* Call setsockopt() */
@@ -293,19 +328,21 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)
 }
 
 #else /* !CONFIG_NETFILTER */
-#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb)
-#define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond) (okfn)(skb)
+#define NF_HOOK(pf, hook, sk, skb, indev, outdev, okfn) (okfn)(sk, skb)
+#define NF_HOOK_COND(pf, hook, sk, skb, indev, outdev, okfn, cond) (okfn)(sk, skb)
 static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
+                                 struct sock *sk,
                                  struct sk_buff *skb,
                                  struct net_device *indev,
                                  struct net_device *outdev,
-                                 int (*okfn)(struct sk_buff *), int thresh)
+                                 int (*okfn)(struct sock *sk, struct sk_buff *), int thresh)
 {
-        return okfn(skb);
+        return okfn(sk, skb);
 }
-static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
-                          struct net_device *indev, struct net_device *outdev,
-                          int (*okfn)(struct sk_buff *))
+static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sock *sk,
+                          struct sk_buff *skb, struct net_device *indev,
+                          struct net_device *outdev,
+                          int (*okfn)(struct sock *, struct sk_buff *))
 {
         return 1;
 }
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index f1606fa6132d..34b172301558 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -483,7 +483,7 @@ static inline int nla_put_ipaddr4(struct sk_buff *skb, int type, __be32 ipaddr)
 
         if (!__nested)
                 return -EMSGSIZE;
-        ret = nla_put_net32(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);
+        ret = nla_put_in_addr(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);
         if (!ret)
                 ipset_nest_end(skb, __nested);
         return ret;
@@ -497,8 +497,7 @@ static inline int nla_put_ipaddr6(struct sk_buff *skb, int type,
 
         if (!__nested)
                 return -EMSGSIZE;
-        ret = nla_put(skb, IPSET_ATTR_IPADDR_IPV6,
-                      sizeof(struct in6_addr), ipaddrptr);
+        ret = nla_put_in6_addr(skb, IPSET_ATTR_IPADDR_IPV6, ipaddrptr);
         if (!ret)
                 ipset_nest_end(skb, __nested);
         return ret;
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index cfb7191e6efa..c22a7fb8d0df 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -54,8 +54,7 @@ extern struct xt_table *arpt_register_table(struct net *net,
 extern void arpt_unregister_table(struct xt_table *table);
 extern unsigned int arpt_do_table(struct sk_buff *skb,
                                   unsigned int hook,
-                                  const struct net_device *in,
-                                  const struct net_device *out,
+                                  const struct nf_hook_state *state,
                                   struct xt_table *table);
 
 #ifdef CONFIG_COMPAT
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index c755e4971fa3..ab8f76dba668 100644
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -2,7 +2,7 @@
 #define __LINUX_BRIDGE_NETFILTER_H
 
 #include <uapi/linux/netfilter_bridge.h>
-
+#include <linux/skbuff.h>
 
 enum nf_br_hook_priorities {
         NF_BR_PRI_FIRST = INT_MIN,
@@ -17,110 +17,48 @@ enum nf_br_hook_priorities {
 
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
 
-#define BRNF_PKT_TYPE                   0x01
 #define BRNF_BRIDGED_DNAT               0x02
-#define BRNF_BRIDGED                    0x04
 #define BRNF_NF_BRIDGE_PREROUTING       0x08
-#define BRNF_8021Q                      0x10
-#define BRNF_PPPoE                      0x20
 
-static inline unsigned int nf_bridge_encap_header_len(const struct sk_buff *skb)
+static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)
 {
-        switch (skb->protocol) {
-        case __cpu_to_be16(ETH_P_8021Q):
-                return VLAN_HLEN;
-        case __cpu_to_be16(ETH_P_PPP_SES):
+        if (skb->nf_bridge->orig_proto == BRNF_PROTO_PPPOE)
                 return PPPOE_SES_HLEN;
-        default:
-                return 0;
-        }
+        return 0;
 }
 
-static inline void nf_bridge_update_protocol(struct sk_buff *skb)
-{
-        if (skb->nf_bridge->mask & BRNF_8021Q)
-                skb->protocol = htons(ETH_P_8021Q);
-        else if (skb->nf_bridge->mask & BRNF_PPPoE)
-                skb->protocol = htons(ETH_P_PPP_SES);
-}
+int br_handle_frame_finish(struct sock *sk, struct sk_buff *skb);
 
-/* Fill in the header for fragmented IP packets handled by
- * the IPv4 connection tracking code.
- *
- * Only used in br_forward.c
- */
-static inline int nf_bridge_copy_header(struct sk_buff *skb)
+static inline void br_drop_fake_rtable(struct sk_buff *skb)
 {
-        int err;
-        unsigned int header_size;
-
-        nf_bridge_update_protocol(skb);
-        header_size = ETH_HLEN + nf_bridge_encap_header_len(skb);
-        err = skb_cow_head(skb, header_size);
-        if (err)
-                return err;
+        struct dst_entry *dst = skb_dst(skb);
 
-        skb_copy_to_linear_data_offset(skb, -header_size,
-                                       skb->nf_bridge->data, header_size);
-        __skb_push(skb, nf_bridge_encap_header_len(skb));
-        return 0;
+        if (dst && (dst->flags & DST_FAKE_RTABLE))
+                skb_dst_drop(skb);
 }
 
-static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb)
+static inline int nf_bridge_get_physinif(const struct sk_buff *skb)
 {
-        if (skb->nf_bridge &&
-            skb->nf_bridge->mask & (BRNF_BRIDGED | BRNF_BRIDGED_DNAT))
-                return nf_bridge_copy_header(skb);
-        return 0;
+        return skb->nf_bridge ? skb->nf_bridge->physindev->ifindex : 0;
 }
 
-static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)
+static inline int nf_bridge_get_physoutif(const struct sk_buff *skb)
 {
-        if (unlikely(skb->nf_bridge->mask & BRNF_PPPoE))
-                return PPPOE_SES_HLEN;
-        return 0;
+        return skb->nf_bridge ? skb->nf_bridge->physoutdev->ifindex : 0;
 }
 
-int br_handle_frame_finish(struct sk_buff *skb);
-/* Only used in br_device.c */
-static inline int br_nf_pre_routing_finish_bridge_slow(struct sk_buff *skb)
+static inline struct net_device *
+nf_bridge_get_physindev(const struct sk_buff *skb)
 {
-        struct nf_bridge_info *nf_bridge = skb->nf_bridge;
-
-        skb_pull(skb, ETH_HLEN);
-        nf_bridge->mask ^= BRNF_BRIDGED_DNAT;
-        skb_copy_to_linear_data_offset(skb, -(ETH_HLEN-ETH_ALEN),
-                                       skb->nf_bridge->data, ETH_HLEN-ETH_ALEN);
-        skb->dev = nf_bridge->physindev;
-        return br_handle_frame_finish(skb);
+        return skb->nf_bridge ? skb->nf_bridge->physindev : NULL;
 }
 
-/* This is called by the IP fragmenting code and it ensures there is
- * enough room for the encapsulating header (if there is one). */
-static inline unsigned int nf_bridge_pad(const struct sk_buff *skb)
+static inline struct net_device *
+nf_bridge_get_physoutdev(const struct sk_buff *skb)
 {
-        if (skb->nf_bridge)
-                return nf_bridge_encap_header_len(skb);
-        return 0;
+        return skb->nf_bridge ? skb->nf_bridge->physoutdev : NULL;
 }
-
-struct bridge_skb_cb {
-        union {
-                __be32 ipv4;
-        } daddr;
-};
-
-static inline void br_drop_fake_rtable(struct sk_buff *skb)
-{
-        struct dst_entry *dst = skb_dst(skb);
-
-        if (dst && (dst->flags & DST_FAKE_RTABLE))
-                skb_dst_drop(skb);
-}
-
 #else
-#define nf_bridge_maybe_copy_header(skb)        (0)
-#define nf_bridge_pad(skb)                      (0)
 #define br_drop_fake_rtable(skb)                do { } while (0)
 #endif /* CONFIG_BRIDGE_NETFILTER */
 
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index 34e7a2b7f867..f1bd3962e6b6 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -12,9 +12,10 @@
 #ifndef __LINUX_BRIDGE_EFF_H
 #define __LINUX_BRIDGE_EFF_H
 
+#include <linux/if.h>
+#include <linux/if_ether.h>
 #include <uapi/linux/netfilter_bridge/ebtables.h>
 
-
 /* return values for match() functions */
 #define EBT_MATCH 0
 #define EBT_NOMATCH 1
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 901e84db847d..4073510da485 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -65,8 +65,7 @@ struct ipt_error {
 extern void *ipt_alloc_initial_table(const struct xt_table *);
 extern unsigned int ipt_do_table(struct sk_buff *skb,
                                  unsigned int hook,
-                                 const struct net_device *in,
-                                 const struct net_device *out,
+                                 const struct nf_hook_state *state,
                                  struct xt_table *table);
 
 #ifdef CONFIG_COMPAT
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 610208b18c05..b40d2b635778 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -31,8 +31,7 @@ extern struct xt_table *ip6t_register_table(struct net *net,
 extern void ip6t_unregister_table(struct net *net, struct xt_table *table);
 extern unsigned int ip6t_do_table(struct sk_buff *skb,
                                   unsigned int hook,
-                                  const struct net_device *in,
-                                  const struct net_device *out,
+                                  const struct nf_hook_state *state,
                                   struct xt_table *table);
 
 /* Check for an extension */
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 02fc86d2348e..6835c1279df7 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -134,7 +134,7 @@ struct netlink_callback {
 
 struct netlink_notify {
         struct net *net;
-        int portid;
+        u32 portid;
         int protocol;
 };
 
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index ed43cb74b11d..32201c269890 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -16,6 +16,13 @@
 #include <linux/uidgid.h>
 #include <uapi/linux/nfs4.h>
 
+enum nfs4_acl_whotype {
+        NFS4_ACL_WHO_NAMED = 0,
+        NFS4_ACL_WHO_OWNER,
+        NFS4_ACL_WHO_GROUP,
+        NFS4_ACL_WHO_EVERYONE,
+};
+
 struct nfs4_ace {
         uint32_t        type;
         uint32_t        flag;
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 2f77e0c651c8..b95f914ce083 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -343,6 +343,7 @@ extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *,
 extern int nfs_refresh_inode(struct inode *, struct nfs_fattr *);
 extern int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr);
 extern int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fattr *fattr);
+extern int nfs_post_op_update_inode_force_wcc_locked(struct inode *inode, struct nfs_fattr *fattr);
 extern int nfs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *);
 extern void nfs_access_set_mask(struct nfs_access_entry *, u32);
@@ -355,8 +356,9 @@ extern int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode);
 extern int nfs_revalidate_inode_rcu(struct nfs_server *server, struct inode *inode);
 extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);
 extern int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping);
+extern int nfs_revalidate_mapping_protected(struct inode *inode, struct address_space *mapping);
 extern int nfs_setattr(struct dentry *, struct iattr *);
-extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr);
+extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, struct nfs_fattr *);
 extern void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr,
                                 struct nfs4_label *label);
 extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
@@ -369,6 +371,7 @@ extern struct nfs_lock_context *nfs_get_lock_context(struct nfs_open_context *ct
 extern void nfs_put_lock_context(struct nfs_lock_context *l_ctx);
 extern u64 nfs_compat_user_ino64(u64 fileid);
 extern void nfs_fattr_init(struct nfs_fattr *fattr);
+extern void nfs_fattr_set_barrier(struct nfs_fattr *fattr);
 extern unsigned long nfs_inc_attr_generation_counter(void);
 
 extern struct nfs_fattr *nfs_alloc_fattr(void);
@@ -444,13 +447,12 @@ static inline struct rpc_cred *nfs_file_cred(struct file *file)
 /*
  * linux/fs/nfs/direct.c
  */
-extern ssize_t nfs_direct_IO(int, struct kiocb *, struct iov_iter *, loff_t);
+extern ssize_t nfs_direct_IO(struct kiocb *, struct iov_iter *, loff_t);
 extern ssize_t nfs_file_direct_read(struct kiocb *iocb,
                         struct iov_iter *iter,
                         loff_t pos);
 extern ssize_t nfs_file_direct_write(struct kiocb *iocb,
-                        struct iov_iter *iter,
-                        loff_t pos);
+                        struct iov_iter *iter);
 
 /*
  * linux/fs/nfs/dir.c
@@ -509,6 +511,7 @@ extern int  nfs_updatepage(struct file *, struct page *, unsigned int, unsigned
  * Try to write back everything synchronously (but check the
  * return value!)
  */
+extern int nfs_sync_inode(struct inode *inode);
 extern int nfs_wb_all(struct inode *inode);
 extern int nfs_wb_page(struct inode *inode, struct page* page);
 extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
deleted file mode 100644
index 333844e38f66..000000000000
--- a/include/linux/nfs_idmap.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * include/linux/nfs_idmap.h
- *
- *  UID and GID to name mapping for clients.
- *
- *  Copyright (c) 2002 The Regents of the University of Michigan.
- *  All rights reserved.
- *
- *  Marius Aamodt Eriksen <marius@umich.edu>
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the University nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef NFS_IDMAP_H
-#define NFS_IDMAP_H
-
-#include <linux/uidgid.h>
-#include <uapi/linux/nfs_idmap.h>
-
-
-/* Forward declaration to make this header independent of others */
-struct nfs_client;
-struct nfs_server;
-struct nfs_fattr;
-struct nfs4_string;
-
-#if IS_ENABLED(CONFIG_NFS_V4)
-int nfs_idmap_init(void);
-void nfs_idmap_quit(void);
-#else
-static inline int nfs_idmap_init(void)
-{
-        return 0;
-}
-
-static inline void nfs_idmap_quit(void)
-{}
-#endif
-
-int nfs_idmap_new(struct nfs_client *);
-void nfs_idmap_delete(struct nfs_client *);
-
-void nfs_fattr_init_names(struct nfs_fattr *fattr,
-                struct nfs4_string *owner_name,
-                struct nfs4_string *group_name);
-void nfs_fattr_free_names(struct nfs_fattr *);
-void nfs_fattr_map_and_free_names(struct nfs_server *, struct nfs_fattr *);
-
-int nfs_map_name_to_uid(const struct nfs_server *, const char *, size_t, kuid_t *);
-int nfs_map_group_to_gid(const struct nfs_server *, const char *, size_t, kgid_t *);
-int nfs_map_uid_to_name(const struct nfs_server *, kuid_t, char *, size_t);
-int nfs_map_gid_to_group(const struct nfs_server *, kgid_t, char *, size_t);
-
-int nfs_map_string_to_numeric(const char *name, size_t namelen, __u32 *res);
-
-extern unsigned int nfs_idmap_cache_timeout;
-#endif /* NFS_IDMAP_H */
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 4cb3eaa89cf7..93ab6071bbe9 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -255,11 +255,13 @@ struct nfs4_layoutget {
 struct nfs4_getdeviceinfo_args {
         struct nfs4_sequence_args seq_args;
         struct pnfs_device *pdev;
+        __u32 notify_types;
 };
 
 struct nfs4_getdeviceinfo_res {
         struct nfs4_sequence_res seq_res;
         struct pnfs_device *pdev;
+        __u32 notification;
 };
 
 struct nfs4_layoutcommit_args {
@@ -1271,11 +1273,15 @@ struct nfs42_falloc_args {
         nfs4_stateid                     falloc_stateid;
         u64                              falloc_offset;
         u64                              falloc_length;
+        const u32                       *falloc_bitmask;
 };
 
 struct nfs42_falloc_res {
         struct nfs4_sequence_res        seq_res;
         unsigned int                    status;
+
+        struct nfs_fattr                *falloc_fattr;
+        const struct nfs_server         *falloc_server;
 };
 
 struct nfs42_seek_args {
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 9b2022ab4d85..3d46fb4708e0 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -25,16 +25,11 @@ static inline void touch_nmi_watchdog(void)
 #endif
 
 #if defined(CONFIG_HARDLOCKUP_DETECTOR)
-extern void watchdog_enable_hardlockup_detector(bool val);
-extern bool watchdog_hardlockup_detector_is_enabled(void);
+extern void hardlockup_detector_disable(void);
 #else
-static inline void watchdog_enable_hardlockup_detector(bool val)
+static inline void hardlockup_detector_disable(void)
 {
 }
-static inline bool watchdog_hardlockup_detector_is_enabled(void)
-{
-        return true;
-}
 #endif
 
 /*
@@ -68,12 +63,20 @@ static inline bool trigger_allbutself_cpu_backtrace(void)
 #ifdef CONFIG_LOCKUP_DETECTOR
 int hw_nmi_is_cpu_stuck(struct pt_regs *);
 u64 hw_nmi_get_sample_period(int watchdog_thresh);
+extern int nmi_watchdog_enabled;
+extern int soft_watchdog_enabled;
 extern int watchdog_user_enabled;
 extern int watchdog_thresh;
 extern int sysctl_softlockup_all_cpu_backtrace;
 struct ctl_table;
-extern int proc_dowatchdog(struct ctl_table *, int ,
-                           void __user *, size_t *, loff_t *);
+extern int proc_watchdog(struct ctl_table *, int ,
+                         void __user *, size_t *, loff_t *);
+extern int proc_nmi_watchdog(struct ctl_table *, int ,
+                             void __user *, size_t *, loff_t *);
+extern int proc_soft_watchdog(struct ctl_table *, int ,
+                              void __user *, size_t *, loff_t *);
+extern int proc_watchdog_thresh(struct ctl_table *, int ,
+                                void __user *, size_t *, loff_t *);
 #endif
 
 #ifdef CONFIG_HAVE_ACPI_APEI_NMI
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 0adad4a5419b..8dbd05e70f09 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -117,8 +117,9 @@ struct nvme_ns {
 
         unsigned ns_id;
         int lba_shift;
-        int ms;
-        int pi_type;
+        u16 ms;
+        bool ext;
+        u8 pi_type;
         u64 mode_select_num_blocks;
         u32 mode_select_block_len;
 };
diff --git a/include/linux/of.h b/include/linux/of.h
index dfde07e77a63..ddeaae6d2083 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -305,6 +305,7 @@ extern int of_property_read_string_helper(struct device_node *np,
 extern int of_device_is_compatible(const struct device_node *device,
                                    const char *);
 extern bool of_device_is_available(const struct device_node *device);
+extern bool of_device_is_big_endian(const struct device_node *device);
 extern const void *of_get_property(const struct device_node *node,
                                 const char *name,
                                 int *lenp);
@@ -332,6 +333,7 @@ extern int of_count_phandle_with_args(const struct device_node *np,
 
 extern void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align));
 extern int of_alias_get_id(struct device_node *np, const char *stem);
+extern int of_alias_get_highest_id(const char *stem);
 
 extern int of_machine_is_compatible(const char *compat);
 
@@ -466,6 +468,11 @@ static inline bool of_device_is_available(const struct device_node *device)
         return false;
 }
 
+static inline bool of_device_is_big_endian(const struct device_node *device)
+{
+        return false;
+}
+
 static inline struct property *of_find_property(const struct device_node *np,
                                                 const char *name,
                                                 int *lenp)
@@ -594,6 +601,11 @@ static inline int of_alias_get_id(struct device_node *np, const char *stem)
         return -ENOSYS;
 }
 
+static inline int of_alias_get_highest_id(const char *stem)
+{
+        return -ENOSYS;
+}
+
 static inline int of_machine_is_compatible(const char *compat)
 {
         return 0;
@@ -616,6 +628,38 @@ static inline const char *of_prop_next_string(struct property *prop,
         return NULL;
 }
 
+static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
+{
+        return 0;
+}
+
+static inline int of_node_test_and_set_flag(struct device_node *n,
+                                            unsigned long flag)
+{
+        return 0;
+}
+
+static inline void of_node_set_flag(struct device_node *n, unsigned long flag)
+{
+}
+
+static inline void of_node_clear_flag(struct device_node *n, unsigned long flag)
+{
+}
+
+static inline int of_property_check_flag(struct property *p, unsigned long flag)
+{
+        return 0;
+}
+
+static inline void of_property_set_flag(struct property *p, unsigned long flag)
+{
+}
+
+static inline void of_property_clear_flag(struct property *p, unsigned long flag)
+{
+}
+
 #define of_match_ptr(_ptr)      NULL
 #define of_match_node(_matches, _node)  NULL
 #endif /* CONFIG_OF */
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index ef370210ffb2..22801b10cef5 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -53,6 +53,7 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
         return of_node_get(cpu_dev->of_node);
 }
 
+void of_dma_configure(struct device *dev, struct device_node *np);
 #else /* CONFIG_OF */
 
 static inline int of_driver_match_device(struct device *dev,
@@ -90,6 +91,8 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
 {
         return NULL;
 }
+static inline void of_dma_configure(struct device *dev, struct device_node *np)
+{}
 #endif /* CONFIG_OF */
 
 #endif /* _LINUX_OF_DEVICE_H */
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index 0ff360d5b3b3..587ee507965d 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -33,6 +33,8 @@ extern void *of_fdt_get_property(const void *blob,
 extern int of_fdt_is_compatible(const void *blob,
                                 unsigned long node,
                                 const char *compat);
+extern bool of_fdt_is_big_endian(const void *blob,
+                                 unsigned long node);
 extern int of_fdt_match(const void *blob, unsigned long node,
                         const char *const *compat);
 extern void of_fdt_unflatten_tree(unsigned long *blob,
diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h
index befef42e015b..7bc92e050608 100644
--- a/include/linux/of_graph.h
+++ b/include/linux/of_graph.h
@@ -14,6 +14,8 @@
 #ifndef __LINUX_OF_GRAPH_H
 #define __LINUX_OF_GRAPH_H
 
+#include <linux/types.h>
+
 /**
  * struct of_endpoint - the OF graph endpoint data structure
  * @port: identifier (value of reg property) of a port this endpoint belongs to
@@ -26,9 +28,21 @@ struct of_endpoint {
         const struct device_node *local_node;
 };
 
+/**
+ * for_each_endpoint_of_node - iterate over every endpoint in a device node
+ * @parent: parent device node containing ports and endpoints
+ * @child: loop variable pointing to the current endpoint node
+ *
+ * When breaking out of the loop, of_node_put(child) has to be called manually.
+ */
+#define for_each_endpoint_of_node(parent, child) \
+        for (child = of_graph_get_next_endpoint(parent, NULL); child != NULL; \
+             child = of_graph_get_next_endpoint(parent, child))
+
 #ifdef CONFIG_OF
 int of_graph_parse_endpoint(const struct device_node *node,
                                 struct of_endpoint *endpoint);
+struct device_node *of_graph_get_port_by_id(struct device_node *node, u32 id);
 struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
                                         struct device_node *previous);
 struct device_node *of_graph_get_remote_port_parent(
@@ -42,6 +56,12 @@ static inline int of_graph_parse_endpoint(const struct device_node *node,
         return -ENOSYS;
 }
 
+static inline struct device_node *of_graph_get_port_by_id(
+                                        struct device_node *node, u32 id)
+{
+        return NULL;
+}
+
 static inline struct device_node *of_graph_get_next_endpoint(
                                         const struct device_node *parent,
                                         struct device_node *previous)
diff --git a/include/linux/of_iommu.h b/include/linux/of_iommu.h
index 16c75547d725..ffbe4707d4aa 100644
--- a/include/linux/of_iommu.h
+++ b/include/linux/of_iommu.h
@@ -12,7 +12,8 @@ extern int of_get_dma_window(struct device_node *dn, const char *prefix,
                              size_t *size);
 
 extern void of_iommu_init(void);
-extern struct iommu_ops *of_iommu_configure(struct device *dev);
+extern struct iommu_ops *of_iommu_configure(struct device *dev,
+                                        struct device_node *master_np);
 
 #else
 
@@ -24,7 +25,8 @@ static inline int of_get_dma_window(struct device_node *dn, const char *prefix,
 }
 
 static inline void of_iommu_init(void) { }
-static inline struct iommu_ops *of_iommu_configure(struct device *dev)
+static inline struct iommu_ops *of_iommu_configure(struct device *dev,
+                                         struct device_node *master_np)
 {
         return NULL;
 }
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index bfec136a6d1e..d884929a7747 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -37,8 +37,6 @@ extern int of_irq_parse_one(struct device_node *device, int index,
 extern unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data);
 extern int of_irq_to_resource(struct device_node *dev, int index,
                               struct resource *r);
-extern int of_irq_to_resource_table(struct device_node *dev,
-                struct resource *res, int nr_irqs);
 
 extern void of_irq_init(const struct of_device_id *matches);
 
@@ -46,6 +44,8 @@ extern void of_irq_init(const struct of_device_id *matches);
 extern int of_irq_count(struct device_node *dev);
 extern int of_irq_get(struct device_node *dev, int index);
 extern int of_irq_get_byname(struct device_node *dev, const char *name);
+extern int of_irq_to_resource_table(struct device_node *dev,
+                struct resource *res, int nr_irqs);
 #else
 static inline int of_irq_count(struct device_node *dev)
 {
@@ -59,6 +59,11 @@ static inline int of_irq_get_byname(struct device_node *dev, const char *name)
 {
         return 0;
 }
+static inline int of_irq_to_resource_table(struct device_node *dev,
+                                           struct resource *res, int nr_irqs)
+{
+        return 0;
+}
 #endif
 
 #if defined(CONFIG_OF)
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index d449018d0726..8f2237eb3485 100644
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h
@@ -24,6 +24,7 @@ struct phy_device *of_phy_attach(struct net_device *dev,
                                  phy_interface_t iface);
 
 extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np);
+extern int of_mdio_parse_addr(struct device *dev, const struct device_node *np);
 
 #else /* CONFIG_OF */
 static inline int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
@@ -60,6 +61,12 @@ static inline struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np)
 {
         return NULL;
 }
+
+static inline int of_mdio_parse_addr(struct device *dev,
+                                     const struct device_node *np)
+{
+        return -ENOSYS;
+}
 #endif /* CONFIG_OF */
 
 #if defined(CONFIG_OF) && defined(CONFIG_FIXED_PHY)
diff --git a/include/linux/of_net.h b/include/linux/of_net.h
index 34597c8c1a4c..9cd72aab76fe 100644
--- a/include/linux/of_net.h
+++ b/include/linux/of_net.h
@@ -9,8 +9,11 @@
 
 #ifdef CONFIG_OF_NET
 #include <linux/of.h>
+
+struct net_device;
 extern int of_get_phy_mode(struct device_node *np);
 extern const void *of_get_mac_address(struct device_node *np);
+extern struct net_device *of_find_net_device_by_node(struct device_node *np);
 #else
 static inline int of_get_phy_mode(struct device_node *np)
 {
@@ -21,6 +24,11 @@ static inline const void *of_get_mac_address(struct device_node *np)
 {
         return NULL;
 }
+
+static inline struct net_device *of_find_net_device_by_node(struct device_node *np)
+{
+        return NULL;
+}
 #endif
 
 #endif /* __LINUX_OF_NET_H */
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index ce0e5abeb454..29fd3fe1c035 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -16,6 +16,7 @@ int of_pci_get_devfn(struct device_node *np);
 int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
 int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
 int of_get_pci_domain_nr(struct device_node *node);
+void of_pci_dma_configure(struct pci_dev *pci_dev);
 #else
 static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)
 {
@@ -50,6 +51,8 @@ of_get_pci_domain_nr(struct device_node *node)
 {
         return -1;
 }
+
+static inline void of_pci_dma_configure(struct pci_dev *pci_dev) { }
 #endif
 
 #if defined(CONFIG_OF_ADDRESS)
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 8a860f096c35..611a691145c4 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -84,7 +84,7 @@ static inline int of_platform_populate(struct device_node *root,
 static inline void of_platform_depopulate(struct device *parent) { }
 #endif
 
-#ifdef CONFIG_OF_DYNAMIC
+#if defined(CONFIG_OF_DYNAMIC) && defined(CONFIG_OF_ADDRESS)
 extern void of_platform_register_reconfig_notifier(void);
 #else
 static inline void of_platform_register_reconfig_notifier(void) { }
diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h
index c2080eebbb47..7dee00143afd 100644
--- a/include/linux/omap-gpmc.h
+++ b/include/linux/omap-gpmc.h
@@ -163,7 +163,8 @@ extern unsigned int gpmc_ticks_to_ns(unsigned int ticks);
 
 extern void gpmc_cs_write_reg(int cs, int idx, u32 val);
 extern int gpmc_calc_divider(unsigned int sync_clk);
-extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t);
+extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t,
+                               const struct gpmc_settings *s);
 extern int gpmc_cs_program_settings(int cs, struct gpmc_settings *p);
 extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base);
 extern void gpmc_cs_free(int cs);
diff --git a/include/linux/oom.h b/include/linux/oom.h
index d5771bed59c9..44b2f6f7bbd8 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -66,7 +66,8 @@ extern bool oom_zonelist_trylock(struct zonelist *zonelist, gfp_t gfp_flags);
 extern void oom_zonelist_unlock(struct zonelist *zonelist, gfp_t gfp_flags);
 
 extern void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,
-                               int order, const nodemask_t *nodemask);
+                               int order, const nodemask_t *nodemask,
+                               struct mem_cgroup *memcg);
 
 extern enum oom_scan_t oom_scan_process_thread(struct task_struct *task,
                 unsigned long totalpages, const nodemask_t *nodemask,
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 5ed7bdaf22d5..f34e040b34e9 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -289,6 +289,47 @@ PAGEFLAG_FALSE(HWPoison)
 #define __PG_HWPOISON 0
 #endif
 
+/*
+ * On an anonymous page mapped into a user virtual memory area,
+ * page->mapping points to its anon_vma, not to a struct address_space;
+ * with the PAGE_MAPPING_ANON bit set to distinguish it.  See rmap.h.
+ *
+ * On an anonymous page in a VM_MERGEABLE area, if CONFIG_KSM is enabled,
+ * the PAGE_MAPPING_KSM bit may be set along with the PAGE_MAPPING_ANON bit;
+ * and then page->mapping points, not to an anon_vma, but to a private
+ * structure which KSM associates with that merged page.  See ksm.h.
+ *
+ * PAGE_MAPPING_KSM without PAGE_MAPPING_ANON is currently never used.
+ *
+ * Please note that, confusingly, "page_mapping" refers to the inode
+ * address_space which maps the page from disk; whereas "page_mapped"
+ * refers to user virtual address space into which the page is mapped.
+ */
+#define PAGE_MAPPING_ANON       1
+#define PAGE_MAPPING_KSM        2
+#define PAGE_MAPPING_FLAGS      (PAGE_MAPPING_ANON | PAGE_MAPPING_KSM)
+
+static inline int PageAnon(struct page *page)
+{
+        return ((unsigned long)page->mapping & PAGE_MAPPING_ANON) != 0;
+}
+
+#ifdef CONFIG_KSM
+/*
+ * A KSM page is one of those write-protected "shared pages" or "merged pages"
+ * which KSM maps into multiple mms, wherever identical anonymous page content
+ * is found in VM_MERGEABLE vmas.  It's a PageAnon page, pointing not to any
+ * anon_vma, but to that page's node of the stable tree.
+ */
+static inline int PageKsm(struct page *page)
+{
+        return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) ==
+                                (PAGE_MAPPING_ANON | PAGE_MAPPING_KSM);
+}
+#else
+TESTPAGEFLAG_FALSE(Ksm)
+#endif
+
 u64 stable_page_flags(struct page *page);
 
 static inline int PageUptodate(struct page *page)
@@ -328,8 +369,6 @@ static inline void SetPageUptodate(struct page *page)
 
 CLEARPAGEFLAG(Uptodate, uptodate)
 
-extern void cancel_dirty_page(struct page *page, unsigned int account_size);
-
 int test_clear_page_writeback(struct page *page);
 int __test_set_page_writeback(struct page *page, bool keep_write);
 
@@ -428,6 +467,21 @@ static inline void ClearPageCompound(struct page *page)
 
 #endif /* !PAGEFLAGS_EXTENDED */
 
+#ifdef CONFIG_HUGETLB_PAGE
+int PageHuge(struct page *page);
+int PageHeadHuge(struct page *page);
+bool page_huge_active(struct page *page);
+#else
+TESTPAGEFLAG_FALSE(Huge)
+TESTPAGEFLAG_FALSE(HeadHuge)
+
+static inline bool page_huge_active(struct page *page)
+{
+        return 0;
+}
+#endif
+
+
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 /*
  * PageHuge() only returns true for hugetlbfs pages, but not for
@@ -482,6 +536,53 @@ static inline int PageTransTail(struct page *page)
 #endif
 
 /*
+ * PageBuddy() indicate that the page is free and in the buddy system
+ * (see mm/page_alloc.c).
+ *
+ * PAGE_BUDDY_MAPCOUNT_VALUE must be <= -2 but better not too close to
+ * -2 so that an underflow of the page_mapcount() won't be mistaken
+ * for a genuine PAGE_BUDDY_MAPCOUNT_VALUE. -128 can be created very
+ * efficiently by most CPU architectures.
+ */
+#define PAGE_BUDDY_MAPCOUNT_VALUE (-128)
+
+static inline int PageBuddy(struct page *page)
+{
+        return atomic_read(&page->_mapcount) == PAGE_BUDDY_MAPCOUNT_VALUE;
+}
+
+static inline void __SetPageBuddy(struct page *page)
+{
+        VM_BUG_ON_PAGE(atomic_read(&page->_mapcount) != -1, page);
+        atomic_set(&page->_mapcount, PAGE_BUDDY_MAPCOUNT_VALUE);
+}
+
+static inline void __ClearPageBuddy(struct page *page)
+{
+        VM_BUG_ON_PAGE(!PageBuddy(page), page);
+        atomic_set(&page->_mapcount, -1);
+}
+
+#define PAGE_BALLOON_MAPCOUNT_VALUE (-256)
+
+static inline int PageBalloon(struct page *page)
+{
+        return atomic_read(&page->_mapcount) == PAGE_BALLOON_MAPCOUNT_VALUE;
+}
+
+static inline void __SetPageBalloon(struct page *page)
+{
+        VM_BUG_ON_PAGE(atomic_read(&page->_mapcount) != -1, page);
+        atomic_set(&page->_mapcount, PAGE_BALLOON_MAPCOUNT_VALUE);
+}
+
+static inline void __ClearPageBalloon(struct page *page)
+{
+        VM_BUG_ON_PAGE(!PageBalloon(page), page);
+        atomic_set(&page->_mapcount, -1);
+}
+
+/*
  * If network-based swap is enabled, sl*b must keep track of whether pages
  * were allocated from pfmemalloc reserves.
  */
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 24c7728ca681..a965efa52152 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -77,6 +77,11 @@ static inline void acpiphp_remove_slots(struct pci_bus *bus) { }
 static inline void acpiphp_check_host_bridge(struct acpi_device *adev) { }
 #endif
 
+extern const u8 pci_acpi_dsm_uuid[];
+#define DEVICE_LABEL_DSM        0x07
+#define RESET_DELAY_DSM         0x08
+#define FUNCTION_DELAY_DSM      0x09
+
 #else   /* CONFIG_ACPI */
 static inline void acpi_pci_add_bus(struct pci_bus *bus) { }
 static inline void acpi_pci_remove_bus(struct pci_bus *bus) { }
diff --git a/include/linux/pci-aspm.h b/include/linux/pci-aspm.h
index 8af4610c2e41..207c561fb40e 100644
--- a/include/linux/pci-aspm.h
+++ b/include/linux/pci-aspm.h
@@ -29,7 +29,6 @@ void pcie_aspm_pm_state_change(struct pci_dev *pdev);
 void pcie_aspm_powersave_config_link(struct pci_dev *pdev);
 void pci_disable_link_state(struct pci_dev *pdev, int state);
 void pci_disable_link_state_locked(struct pci_dev *pdev, int state);
-void pcie_clear_aspm(struct pci_bus *bus);
 void pcie_no_aspm(void);
 #else
 static inline void pcie_aspm_init_link_state(struct pci_dev *pdev)
@@ -47,9 +46,6 @@ static inline void pcie_aspm_powersave_config_link(struct pci_dev *pdev)
 static inline void pci_disable_link_state(struct pci_dev *pdev, int state)
 {
 }
-static inline void pcie_clear_aspm(struct pci_bus *bus)
-{
-}
 static inline void pcie_no_aspm(void)
 {
 }
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 211e9da8a7d7..353db8dc4c6e 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -406,6 +406,7 @@ struct pci_host_bridge {
         struct list_head windows;       /* resource_entry */
         void (*release_fn)(struct pci_host_bridge *);
         void *release_data;
+        unsigned int ignore_reset_delay:1;      /* for entire hierarchy */
 };
 
 #define to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev)
@@ -510,6 +511,9 @@ static inline struct pci_dev *pci_upstream_bridge(struct pci_dev *dev)
         return dev->bus->self;
 }
 
+struct device *pci_get_host_bridge_device(struct pci_dev *dev);
+void pci_put_host_bridge_device(struct device *dev);
+
 #ifdef CONFIG_PCI_MSI
 static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev)
 {
@@ -1174,6 +1178,7 @@ unsigned char pci_bus_max_busnr(struct pci_bus *bus);
 void pci_setup_bridge(struct pci_bus *bus);
 resource_size_t pcibios_window_alignment(struct pci_bus *bus,
                                          unsigned long type);
+resource_size_t pcibios_iov_resource_alignment(struct pci_dev *dev, int resno);
 
 #define PCI_VGA_STATE_CHANGE_BRIDGE (1 << 0)
 #define PCI_VGA_STATE_CHANGE_DECODES (1 << 1)
@@ -1669,13 +1674,25 @@ int pci_ext_cfg_avail(void);
 void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
 
 #ifdef CONFIG_PCI_IOV
+int pci_iov_virtfn_bus(struct pci_dev *dev, int id);
+int pci_iov_virtfn_devfn(struct pci_dev *dev, int id);
+
 int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
 void pci_disable_sriov(struct pci_dev *dev);
 int pci_num_vf(struct pci_dev *dev);
 int pci_vfs_assigned(struct pci_dev *dev);
 int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
 int pci_sriov_get_totalvfs(struct pci_dev *dev);
+resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno);
 #else
+static inline int pci_iov_virtfn_bus(struct pci_dev *dev, int id)
+{
+        return -ENOSYS;
+}
+static inline int pci_iov_virtfn_devfn(struct pci_dev *dev, int id)
+{
+        return -ENOSYS;
+}
 static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
 { return -ENODEV; }
 static inline void pci_disable_sriov(struct pci_dev *dev) { }
@@ -1686,6 +1703,8 @@ static inline int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs)
 { return 0; }
 static inline int pci_sriov_get_totalvfs(struct pci_dev *dev)
 { return 0; }
+static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno)
+{ return 0; }
 #endif
 
 #if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e63c02a93f6b..38cff8f6716d 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2315,6 +2315,8 @@
 #define PCI_VENDOR_ID_CENATEK           0x16CA
 #define PCI_DEVICE_ID_CENATEK_IDE       0x0001
 
+#define PCI_VENDOR_ID_SYNOPSYS          0x16c3
+
 #define PCI_VENDOR_ID_VITESSE           0x1725
 #define PCI_DEVICE_ID_VITESSE_VSC7174   0x7174
 
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 2b621982938d..61992cf2e977 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -53,6 +53,7 @@ struct perf_guest_info_callbacks {
 #include <linux/sysfs.h>
 #include <linux/perf_regs.h>
 #include <linux/workqueue.h>
+#include <linux/cgroup.h>
 #include <asm/local.h>
 
 struct perf_callchain_entry {
@@ -118,10 +119,19 @@ struct hw_perf_event {
                         struct hrtimer  hrtimer;
                 };
                 struct { /* tracepoint */
-                        struct task_struct      *tp_target;
                         /* for tp_event->class */
                         struct list_head        tp_list;
                 };
+                struct { /* intel_cqm */
+                        int                     cqm_state;
+                        int                     cqm_rmid;
+                        struct list_head        cqm_events_entry;
+                        struct list_head        cqm_groups_entry;
+                        struct list_head        cqm_group_entry;
+                };
+                struct { /* itrace */
+                        int                     itrace_started;
+                };
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
                 struct { /* breakpoint */
                         /*
@@ -129,12 +139,12 @@ struct hw_perf_event {
                          * problem hw_breakpoint has with context
                          * creation and event initalization.
                          */
-                        struct task_struct              *bp_target;
                         struct arch_hw_breakpoint       info;
                         struct list_head                bp_list;
                 };
 #endif
         };
+        struct task_struct              *target;
         int                             state;
         local64_t                       prev_count;
         u64                             sample_period;
@@ -166,6 +176,11 @@ struct perf_event;
  * pmu::capabilities flags
  */
 #define PERF_PMU_CAP_NO_INTERRUPT               0x01
+#define PERF_PMU_CAP_NO_NMI                     0x02
+#define PERF_PMU_CAP_AUX_NO_SG                  0x04
+#define PERF_PMU_CAP_AUX_SW_DOUBLEBUF           0x08
+#define PERF_PMU_CAP_EXCLUSIVE                  0x10
+#define PERF_PMU_CAP_ITRACE                     0x20
 
 /**
  * struct pmu - generic performance monitoring unit
@@ -186,6 +201,7 @@ struct pmu {
 
         int * __percpu                  pmu_disable_count;
         struct perf_cpu_context * __percpu pmu_cpu_context;
+        atomic_t                        exclusive_cnt; /* < 0: cpu; > 0: tsk */
         int                             task_ctx_nr;
         int                             hrtimer_interval_ms;
 
@@ -262,9 +278,32 @@ struct pmu {
         int (*event_idx)                (struct perf_event *event); /*optional */
 
         /*
-         * flush branch stack on context-switches (needed in cpu-wide mode)
+         * context-switches callback
+         */
+        void (*sched_task)              (struct perf_event_context *ctx,
+                                        bool sched_in);
+        /*
+         * PMU specific data size
+         */
+        size_t                          task_ctx_size;
+
+
+        /*
+         * Return the count value for a counter.
+         */
+        u64 (*count)                    (struct perf_event *event); /*optional*/
+
+        /*
+         * Set up pmu-private data structures for an AUX area
          */
-        void (*flush_branch_stack)      (void);
+        void *(*setup_aux)              (int cpu, void **pages,
+                                         int nr_pages, bool overwrite);
+                                        /* optional */
+
+        /*
+         * Free pmu-private AUX data structures
+         */
+        void (*free_aux)                (void *aux); /* optional */
 };
 
 /**
@@ -300,6 +339,7 @@ struct swevent_hlist {
 #define PERF_ATTACH_CONTEXT     0x01
 #define PERF_ATTACH_GROUP       0x02
 #define PERF_ATTACH_TASK        0x04
+#define PERF_ATTACH_TASK_DATA   0x08
 
 struct perf_cgroup;
 struct ring_buffer;
@@ -438,6 +478,7 @@ struct perf_event {
         struct pid_namespace            *ns;
         u64                             id;
 
+        u64                             (*clock)(void);
         perf_overflow_handler_t         overflow_handler;
         void                            *overflow_handler_context;
 
@@ -504,7 +545,7 @@ struct perf_event_context {
         u64                             generation;
         int                             pin_count;
         int                             nr_cgroups;      /* cgroup evts */
-        int                             nr_branch_stack; /* branch_stack evt */
+        void                            *task_ctx_data; /* pmu specific data */
         struct rcu_head                 rcu_head;
 
         struct delayed_work             orphans_remove;
@@ -536,12 +577,52 @@ struct perf_output_handle {
         struct ring_buffer              *rb;
         unsigned long                   wakeup;
         unsigned long                   size;
-        void                            *addr;
+        union {
+                void                    *addr;
+                unsigned long           head;
+        };
         int                             page;
 };
 
+#ifdef CONFIG_CGROUP_PERF
+
+/*
+ * perf_cgroup_info keeps track of time_enabled for a cgroup.
+ * This is a per-cpu dynamically allocated data structure.
+ */
+struct perf_cgroup_info {
+        u64                             time;
+        u64                             timestamp;
+};
+
+struct perf_cgroup {
+        struct cgroup_subsys_state      css;
+        struct perf_cgroup_info __percpu *info;
+};
+
+/*
+ * Must ensure cgroup is pinned (css_get) before calling
+ * this function. In other words, we cannot call this function
+ * if there is no cgroup event for the current CPU context.
+ */
+static inline struct perf_cgroup *
+perf_cgroup_from_task(struct task_struct *task)
+{
+        return container_of(task_css(task, perf_event_cgrp_id),
+                            struct perf_cgroup, css);
+}
+#endif /* CONFIG_CGROUP_PERF */
+
 #ifdef CONFIG_PERF_EVENTS
 
+extern void *perf_aux_output_begin(struct perf_output_handle *handle,
+                                   struct perf_event *event);
+extern void perf_aux_output_end(struct perf_output_handle *handle,
+                                unsigned long size, bool truncated);
+extern int perf_aux_output_skip(struct perf_output_handle *handle,
+                                unsigned long size);
+extern void *perf_get_aux(struct perf_output_handle *handle);
+
 extern int perf_pmu_register(struct pmu *pmu, const char *name, int type);
 extern void perf_pmu_unregister(struct pmu *pmu);
 
@@ -558,6 +639,8 @@ extern void perf_event_delayed_put(struct task_struct *task);
 extern void perf_event_print_debug(void);
 extern void perf_pmu_disable(struct pmu *pmu);
 extern void perf_pmu_enable(struct pmu *pmu);
+extern void perf_sched_cb_dec(struct pmu *pmu);
+extern void perf_sched_cb_inc(struct pmu *pmu);
 extern int perf_event_task_disable(void);
 extern int perf_event_task_enable(void);
 extern int perf_event_refresh(struct perf_event *event, int refresh);
@@ -731,6 +814,11 @@ static inline void perf_event_task_sched_out(struct task_struct *prev,
                 __perf_event_task_sched_out(prev, next);
 }
 
+static inline u64 __perf_event_count(struct perf_event *event)
+{
+        return local64_read(&event->count) + atomic64_read(&event->child_count);
+}
+
 extern void perf_event_mmap(struct vm_area_struct *vma);
 extern struct perf_guest_info_callbacks *perf_guest_cbs;
 extern int perf_register_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks);
@@ -800,6 +888,16 @@ static inline bool has_branch_stack(struct perf_event *event)
         return event->attr.sample_type & PERF_SAMPLE_BRANCH_STACK;
 }
 
+static inline bool needs_branch_stack(struct perf_event *event)
+{
+        return event->attr.branch_sample_type != 0;
+}
+
+static inline bool has_aux(struct perf_event *event)
+{
+        return event->pmu->setup_aux;
+}
+
 extern int perf_output_begin(struct perf_output_handle *handle,
                              struct perf_event *event, unsigned int size);
 extern void perf_output_end(struct perf_output_handle *handle);
@@ -815,6 +913,17 @@ extern void perf_event_disable(struct perf_event *event);
 extern int __perf_event_disable(void *info);
 extern void perf_event_task_tick(void);
 #else /* !CONFIG_PERF_EVENTS: */
+static inline void *
+perf_aux_output_begin(struct perf_output_handle *handle,
+                      struct perf_event *event)                         { return NULL; }
+static inline void
+perf_aux_output_end(struct perf_output_handle *handle, unsigned long size,
+                    bool truncated)                                     { }
+static inline int
+perf_aux_output_skip(struct perf_output_handle *handle,
+                     unsigned long size)                                { return -EINVAL; }
+static inline void *
+perf_get_aux(struct perf_output_handle *handle)                         { return NULL; }
 static inline void
 perf_event_task_sched_in(struct task_struct *prev,
                          struct task_struct *task)                      { }
diff --git a/include/linux/personality.h b/include/linux/personality.h
index 646c0a7d50fa..aeb7892b2468 100644
--- a/include/linux/personality.h
+++ b/include/linux/personality.h
@@ -3,52 +3,14 @@
 
 #include <uapi/linux/personality.h>
 
-
-/*
- * Handling of different ABIs (personalities).
- */
-
-struct exec_domain;
-struct pt_regs;
-
-extern int              register_exec_domain(struct exec_domain *);
-extern int              unregister_exec_domain(struct exec_domain *);
-extern int              __set_personality(unsigned int);
-
-
-/*
- * Description of an execution domain.
- * 
- * The first two members are refernced from assembly source
- * and should stay where they are unless explicitly needed.
- */
-typedef void (*handler_t)(int, struct pt_regs *);
-
-struct exec_domain {
-        const char              *name;          /* name of the execdomain */
-        handler_t               handler;        /* handler for syscalls */
-        unsigned char           pers_low;       /* lowest personality */
-        unsigned char           pers_high;      /* highest personality */
-        unsigned long           *signal_map;    /* signal mapping */
-        unsigned long           *signal_invmap; /* reverse signal mapping */
-        struct map_segment      *err_map;       /* error mapping */
-        struct map_segment      *socktype_map;  /* socket type mapping */
-        struct map_segment      *sockopt_map;   /* socket option mapping */
-        struct map_segment      *af_map;        /* address family mapping */
-        struct module           *module;        /* module context of the ed. */
-        struct exec_domain      *next;          /* linked list (internal) */
-};
-
 /*
  * Return the base personality without flags.
  */
 #define personality(pers)       (pers & PER_MASK)
 
-
 /*
  * Change personality of the currently running process.
  */
-#define set_personality(pers) \
-        ((current->personality == (pers)) ? 0 : __set_personality(pers))
+#define set_personality(pers)   (current->personality = (pers))
 
 #endif /* _LINUX_PERSONALITY_H */
diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
index 7e75bfe37cc7..fe5732d53eda 100644
--- a/include/linux/phy_fixed.h
+++ b/include/linux/phy_fixed.h
@@ -21,6 +21,9 @@ extern void fixed_phy_del(int phy_addr);
 extern int fixed_phy_set_link_update(struct phy_device *phydev,
                         int (*link_update)(struct net_device *,
                                            struct fixed_phy_status *));
+extern int fixed_phy_update_state(struct phy_device *phydev,
+                           const struct fixed_phy_status *status,
+                           const struct fixed_phy_status *changed);
 #else
 static inline int fixed_phy_add(unsigned int irq, int phy_id,
                                 struct fixed_phy_status *status)
@@ -43,6 +46,12 @@ static inline int fixed_phy_set_link_update(struct phy_device *phydev,
 {
         return -ENODEV;
 }
+static inline int fixed_phy_update_state(struct phy_device *phydev,
+                           const struct fixed_phy_status *status,
+                           const struct fixed_phy_status *changed)
+{
+        return -ENODEV;
+}
 #endif /* CONFIG_FIXED_PHY */
 
 #endif /* __PHY_FIXED_H */
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 72c0415d6c21..18eccefea06e 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -82,7 +82,7 @@ static inline int pinctrl_gpio_direction_output(unsigned gpio)
 
 static inline struct pinctrl * __must_check pinctrl_get(struct device *dev)
 {
-        return ERR_PTR(-ENOSYS);
+        return NULL;
 }
 
 static inline void pinctrl_put(struct pinctrl *p)
@@ -93,7 +93,7 @@ static inline struct pinctrl_state * __must_check pinctrl_lookup_state(
                                                         struct pinctrl *p,
                                                         const char *name)
 {
-        return ERR_PTR(-ENOSYS);
+        return NULL;
 }
 
 static inline int pinctrl_select_state(struct pinctrl *p,
@@ -104,7 +104,7 @@ static inline int pinctrl_select_state(struct pinctrl *p,
 
 static inline struct pinctrl * __must_check devm_pinctrl_get(struct device *dev)
 {
-        return ERR_PTR(-ENOSYS);
+        return NULL;
 }
 
 static inline void devm_pinctrl_put(struct pinctrl *p)
diff --git a/include/linux/platform_data/dma-hsu.h b/include/linux/platform_data/dma-hsu.h
new file mode 100644
index 000000000000..8a1f6a4920b2
--- /dev/null
+++ b/include/linux/platform_data/dma-hsu.h
@@ -0,0 +1,25 @@
+/*
+ * Driver for the High Speed UART DMA
+ *
+ * Copyright (C) 2015 Intel Corporation
+ *
+ * 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 _PLATFORM_DATA_DMA_HSU_H
+#define _PLATFORM_DATA_DMA_HSU_H
+
+#include <linux/device.h>
+
+struct hsu_dma_slave {
+        struct device   *dma_dev;
+        int             chan_id;
+};
+
+struct hsu_dma_platform_data {
+        unsigned short  nr_channels;
+};
+
+#endif /* _PLATFORM_DATA_DMA_HSU_H */
diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h
index eabac4e2fc99..2d08816720f6 100644
--- a/include/linux/platform_data/dma-imx-sdma.h
+++ b/include/linux/platform_data/dma-imx-sdma.h
@@ -48,6 +48,9 @@ struct sdma_script_start_addrs {
         s32 ssish_2_mcu_addr;
         s32 hdmi_dma_addr;
         /* End of v2 array */
+        s32 zcanfd_2_mcu_addr;
+        s32 zqspi_2_mcu_addr;
+        /* End of v3 array */
 };
 
 /**
diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h
index 67bbcf0785f6..8e981be2e2c2 100644
--- a/include/linux/platform_data/hsmmc-omap.h
+++ b/include/linux/platform_data/hsmmc-omap.h
@@ -55,9 +55,6 @@ struct omap_hsmmc_platform_data {
         u32 caps;       /* Used for the MMC driver on 2430 and later */
         u32 pm_caps;    /* PM capabilities of the mmc */
 
-        /* switch pin can be for card detect (default) or card cover */
-        unsigned cover:1;
-
         /* use the internal clock */
         unsigned internal_clock:1;
 
@@ -73,7 +70,8 @@ struct omap_hsmmc_platform_data {
 #define HSMMC_HAS_HSPE_SUPPORT  (1 << 2)
         unsigned features;
 
-        int switch_pin;                 /* gpio (card detect) */
+        int gpio_cd;                    /* gpio (card detect) */
+        int gpio_cod;                   /* gpio (cover detect) */
         int gpio_wp;                    /* gpio (write protect) */
 
         int (*set_power)(struct device *dev, int power_on, int vdd);
diff --git a/include/linux/platform_data/i2c-davinci.h b/include/linux/platform_data/i2c-davinci.h
index 2312d197dfb7..89fd34727a24 100644
--- a/include/linux/platform_data/i2c-davinci.h
+++ b/include/linux/platform_data/i2c-davinci.h
@@ -18,6 +18,7 @@ struct davinci_i2c_platform_data {
         unsigned int    bus_delay;      /* post-transaction delay (usec) */
         unsigned int    sda_pin;        /* GPIO pin ID to use for SDA */
         unsigned int    scl_pin;        /* GPIO pin ID to use for SCL */
+        bool            has_pfunc;      /*chip has a ICPFUNC register */
 };
 
 /* for board setup code */
diff --git a/include/linux/platform_data/mmc-msm_sdcc.h b/include/linux/platform_data/mmc-msm_sdcc.h
deleted file mode 100644
index 55aa873c9396..000000000000
--- a/include/linux/platform_data/mmc-msm_sdcc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __MMC_MSM_SDCC_H
-#define __MMC_MSM_SDCC_H
-
-#include <linux/mmc/host.h>
-#include <linux/mmc/card.h>
-#include <linux/mmc/sdio_func.h>
-
-struct msm_mmc_gpio {
-        unsigned no;
-        const char *name;
-};
-
-struct msm_mmc_gpio_data {
-        struct msm_mmc_gpio *gpio;
-        u8 size;
-};
-
-struct msm_mmc_platform_data {
-        unsigned int ocr_mask;                  /* available voltages */
-        u32 (*translate_vdd)(struct device *, unsigned int);
-        unsigned int (*status)(struct device *);
-        int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
-        struct msm_mmc_gpio_data *gpio_data;
-        void (*init_card)(struct mmc_card *card);
-};
-
-#endif
diff --git a/include/linux/platform_data/msm_serial_hs.h b/include/linux/platform_data/msm_serial_hs.h
deleted file mode 100644
index 98a2046f8b31..000000000000
--- a/include/linux/platform_data/msm_serial_hs.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2008 Google, Inc.
- * Author: Nick Pelly <npelly@google.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
-
-#ifndef __ASM_ARCH_MSM_SERIAL_HS_H
-#define __ASM_ARCH_MSM_SERIAL_HS_H
-
-#include <linux/serial_core.h>
-
-/* API to request the uart clock off or on for low power management
- * Clients should call request_clock_off() when no uart data is expected,
- * and must call request_clock_on() before any further uart data can be
- * received. */
-extern void msm_hs_request_clock_off(struct uart_port *uport);
-extern void msm_hs_request_clock_on(struct uart_port *uport);
-
-/**
- * struct msm_serial_hs_platform_data
- * @rx_wakeup_irq: Rx activity irq
- * @rx_to_inject: extra character to be inserted to Rx tty on wakeup
- * @inject_rx: 1 = insert rx_to_inject. 0 = do not insert extra character
- * @exit_lpm_cb: function called before every Tx transaction
- *
- * This is an optional structure required for UART Rx GPIO IRQ based
- * wakeup from low power state. UART wakeup can be triggered by RX activity
- * (using a wakeup GPIO on the UART RX pin). This should only be used if
- * there is not a wakeup GPIO on the UART CTS, and the first RX byte is
- * known (eg., with the Bluetooth Texas Instruments HCILL protocol),
- * since the first RX byte will always be lost. RTS will be asserted even
- * while the UART is clocked off in this mode of operation.
- */
-struct msm_serial_hs_platform_data {
-        int rx_wakeup_irq;
-        unsigned char inject_rx_on_wakeup;
-        char rx_to_inject;
-        void (*exit_lpm_cb)(struct uart_port *);
-};
-
-#endif
diff --git a/include/linux/platform_data/nxp-nci.h b/include/linux/platform_data/nxp-nci.h
new file mode 100644
index 000000000000..d6ed28679bb2
--- /dev/null
+++ b/include/linux/platform_data/nxp-nci.h
@@ -0,0 +1,27 @@
+/*
+ * Generic platform data for the NXP NCI NFC chips.
+ *
+ * Copyright (C) 2014  NXP Semiconductors  All rights reserved.
+ *
+ * Authors: Clément Perrochaud <clement.perrochaud@nxp.com>
+ *
+ * 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 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.
+ */
+
+#ifndef _NXP_NCI_H_
+#define _NXP_NCI_H_
+
+struct nxp_nci_nfc_platform_data {
+        unsigned int gpio_en;
+        unsigned int gpio_fw;
+        unsigned int irq;
+};
+
+#endif /* _NXP_NCI_H_ */
diff --git a/include/linux/platform_data/serial-imx.h b/include/linux/platform_data/serial-imx.h
index 3cc2e3c40914..a938eba2f18e 100644
--- a/include/linux/platform_data/serial-imx.h
+++ b/include/linux/platform_data/serial-imx.h
@@ -20,14 +20,9 @@
 #define ASMARM_ARCH_UART_H
 
 #define IMXUART_HAVE_RTSCTS (1<<0)
-#define IMXUART_IRDA        (1<<1)
 
 struct imxuart_platform_data {
         unsigned int flags;
-        void (*irda_enable)(int enable);
-        unsigned int irda_inv_rx:1;
-        unsigned int irda_inv_tx:1;
-        unsigned short transceiver_delay;
 };
 
 #endif
diff --git a/include/linux/platform_data/sky81452-backlight.h b/include/linux/platform_data/sky81452-backlight.h
new file mode 100644
index 000000000000..1231e9bb00f1
--- /dev/null
+++ b/include/linux/platform_data/sky81452-backlight.h
@@ -0,0 +1,46 @@
+/*
+ * sky81452.h   SKY81452 backlight driver
+ *
+ * Copyright 2014 Skyworks Solutions Inc.
+ * Author : Gyungoh Yoo <jack.yoo@skyworksinc.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _SKY81452_BACKLIGHT_H
+#define _SKY81452_BACKLIGHT_H
+
+/**
+ * struct sky81452_platform_data
+ * @name:       backlight driver name.
+                If it is not defined, default name is lcd-backlight.
+ * @gpio_enable:GPIO number which control EN pin
+ * @enable:     Enable mask for current sink channel 1, 2, 3, 4, 5 and 6.
+ * @ignore_pwm: true if DPWMI should be ignored.
+ * @dpwm_mode:  true is DPWM dimming mode, otherwise Analog dimming mode.
+ * @phase_shift:true is phase shift mode.
+ * @short_detecion_threshold:   It should be one of 4, 5, 6 and 7V.
+ * @boost_current_limit:        It should be one of 2300, 2750mA.
+ */
+struct sky81452_bl_platform_data {
+        const char *name;
+        int gpio_enable;
+        unsigned int enable;
+        bool ignore_pwm;
+        bool dpwm_mode;
+        bool phase_shift;
+        unsigned int short_detection_threshold;
+        unsigned int boost_current_limit;
+};
+
+#endif
diff --git a/include/linux/platform_data/tpm_stm_st33.h b/include/linux/platform_data/st33zp24.h
index ff75310c0f47..817dfdb37885 100644
--- a/include/linux/platform_data/tpm_stm_st33.h
+++ b/include/linux/platform_data/st33zp24.h
@@ -1,6 +1,6 @@
 /*
- * STMicroelectronics TPM I2C Linux driver for TPM ST33ZP24
- * Copyright (C) 2009, 2010  STMicroelectronics
+ * STMicroelectronics TPM Linux driver for TPM 1.2 ST33ZP24
+ * Copyright (C) 2009 - 2015  STMicroelectronics
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,20 +14,9 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * STMicroelectronics version 1.2.0, Copyright (C) 2010
- * STMicroelectronics comes with ABSOLUTELY NO WARRANTY.
- * This is free software, and you are welcome to redistribute it
- * under certain conditions.
- *
- * @Author: Christophe RICARD tpmsupport@st.com
- *
- * @File: stm_st33_tpm.h
- *
- * @Date: 09/15/2010
  */
-#ifndef __STM_ST33_TPM_H__
-#define __STM_ST33_TPM_H__
+#ifndef __ST33ZP24_H__
+#define __ST33ZP24_H__
 
 #define TPM_ST33_I2C                    "st33zp24-i2c"
 #define TPM_ST33_SPI                    "st33zp24-spi"
@@ -36,4 +25,4 @@ struct st33zp24_platform_data {
         int io_lpcpd;
 };
 
-#endif /* __STM_ST33_TPM_H__ */
+#endif /* __ST33ZP24_H__ */
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index ae4882ca4a64..58f1e75ba105 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -59,7 +59,7 @@ extern int platform_add_devices(struct platform_device **, int);
 
 struct platform_device_info {
                 struct device *parent;
-                struct acpi_dev_node acpi_node;
+                struct fwnode_handle *fwnode;
 
                 const char *name;
                 int id;
diff --git a/include/linux/resume-trace.h b/include/linux/pm-trace.h
index f31db2368782..ecbde7a5548e 100644
--- a/include/linux/resume-trace.h
+++ b/include/linux/pm-trace.h
@@ -1,8 +1,8 @@
-#ifndef RESUME_TRACE_H
-#define RESUME_TRACE_H
+#ifndef PM_TRACE_H
+#define PM_TRACE_H
 
 #ifdef CONFIG_PM_TRACE
-#include <asm/resume-trace.h>
+#include <asm/pm-trace.h>
 #include <linux/types.h>
 
 extern int pm_trace_enabled;
@@ -14,7 +14,7 @@ static inline int pm_trace_is_enabled(void)
 
 struct device;
 extern void set_trace_device(struct device *);
-extern void generate_resume_trace(const void *tracedata, unsigned int user);
+extern void generate_pm_trace(const void *tracedata, unsigned int user);
 extern int show_trace_dev_match(char *buf, size_t size);
 
 #define TRACE_DEVICE(dev) do { \
@@ -28,6 +28,7 @@ static inline int pm_trace_is_enabled(void) { return 0; }
 
 #define TRACE_DEVICE(dev) do { } while (0)
 #define TRACE_RESUME(dev) do { } while (0)
+#define TRACE_SUSPEND(dev) do { } while (0)
 
 #endif
 
diff --git a/include/linux/pm.h b/include/linux/pm.h
index e2f1be6dd9dd..2d29c64f8fb1 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -603,10 +603,18 @@ extern void dev_pm_put_subsys_data(struct device *dev);
  * Power domains provide callbacks that are executed during system suspend,
  * hibernation, system resume and during runtime PM transitions along with
  * subsystem-level and driver-level callbacks.
+ *
+ * @detach: Called when removing a device from the domain.
+ * @activate: Called before executing probe routines for bus types and drivers.
+ * @sync: Called after successful driver probe.
+ * @dismiss: Called after unsuccessful driver probe and after driver removal.
  */
 struct dev_pm_domain {
         struct dev_pm_ops       ops;
         void (*detach)(struct device *dev, bool power_off);
+        int (*activate)(struct device *dev);
+        void (*sync)(struct device *dev);
+        void (*dismiss)(struct device *dev);
 };
 
 /*
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 080e778118ba..681ccb053f72 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -127,7 +127,7 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev)
         return to_gpd_data(dev->power.subsys_data->domain_data);
 }
 
-extern struct generic_pm_domain *dev_to_genpd(struct device *dev);
+extern struct generic_pm_domain *pm_genpd_lookup_dev(struct device *dev);
 extern int __pm_genpd_add_device(struct generic_pm_domain *genpd,
                                  struct device *dev,
                                  struct gpd_timing_data *td);
@@ -163,9 +163,9 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev)
 {
         return ERR_PTR(-ENOSYS);
 }
-static inline struct generic_pm_domain *dev_to_genpd(struct device *dev)
+static inline struct generic_pm_domain *pm_genpd_lookup_dev(struct device *dev)
 {
-        return ERR_PTR(-ENOSYS);
+        return NULL;
 }
 static inline int __pm_genpd_add_device(struct generic_pm_domain *genpd,
                                         struct device *dev,
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 6512e9cbc6d5..5df733b8f704 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -510,4 +510,16 @@ static inline void pnp_unregister_driver(struct pnp_driver *drv) { }
 
 #endif /* CONFIG_PNP */
 
+/**
+ * module_pnp_driver() - Helper macro for registering a PnP driver
+ * @__pnp_driver: pnp_driver struct
+ *
+ * Helper macro for PnP drivers which do not do anything special in module
+ * init/exit. This eliminates a lot of boilerplate. Each module may only
+ * use this macro once, and calling it replaces module_init() and module_exit()
+ */
+#define module_pnp_driver(__pnp_driver) \
+        module_driver(__pnp_driver, pnp_register_driver, \
+                                    pnp_unregister_driver)
+
 #endif /* _LINUX_PNP_H */
diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
index 416ebeb6ee1e..eadf28cb2fc9 100644
--- a/include/linux/power/charger-manager.h
+++ b/include/linux/power/charger-manager.h
@@ -242,7 +242,8 @@ struct charger_manager {
         int emergency_stop;
 
         char psy_name_buf[PSY_NAME_MAX + 1];
-        struct power_supply charger_psy;
+        struct power_supply_desc charger_psy_desc;
+        struct power_supply *charger_psy;
 
         u64 charging_start_time;
         u64 charging_end_time;
diff --git a/include/linux/power/max17042_battery.h b/include/linux/power/max17042_battery.h
index 89dd84f47c6e..cf112b4075c8 100644
--- a/include/linux/power/max17042_battery.h
+++ b/include/linux/power/max17042_battery.h
@@ -126,7 +126,14 @@ enum max17047_register {
         MAX17047_QRTbl30        = 0x42,
 };
 
-enum max170xx_chip_type {MAX17042, MAX17047};
+enum max170xx_chip_type {
+        MAXIM_DEVICE_TYPE_UNKNOWN       = 0,
+        MAXIM_DEVICE_TYPE_MAX17042,
+        MAXIM_DEVICE_TYPE_MAX17047,
+        MAXIM_DEVICE_TYPE_MAX17050,
+
+        MAXIM_DEVICE_TYPE_NUM
+};
 
 /*
  * used for setting a register to a desired value
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 096dbced02ac..75a1dd8dc56e 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -13,6 +13,7 @@
 #ifndef __LINUX_POWER_SUPPLY_H__
 #define __LINUX_POWER_SUPPLY_H__
 
+#include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/leds.h>
 #include <linux/spinlock.h>
@@ -173,22 +174,32 @@ union power_supply_propval {
         const char *strval;
 };
 
-struct device;
 struct device_node;
+struct power_supply;
 
-struct power_supply {
-        const char *name;
-        enum power_supply_type type;
-        enum power_supply_property *properties;
-        size_t num_properties;
+/* Run-time specific power supply configuration */
+struct power_supply_config {
+        struct device_node *of_node;
+        /* Driver private data */
+        void *drv_data;
 
         char **supplied_to;
         size_t num_supplicants;
+};
 
-        char **supplied_from;
-        size_t num_supplies;
-        struct device_node *of_node;
+/* Description of power supply */
+struct power_supply_desc {
+        const char *name;
+        enum power_supply_type type;
+        enum power_supply_property *properties;
+        size_t num_properties;
 
+        /*
+         * Functions for drivers implementing power supply class.
+         * These shouldn't be called directly by other drivers for accessing
+         * this power supply. Instead use power_supply_*() functions (for
+         * example power_supply_get_property()).
+         */
         int (*get_property)(struct power_supply *psy,
                             enum power_supply_property psp,
                             union power_supply_propval *val);
@@ -208,12 +219,27 @@ struct power_supply {
         bool no_thermal;
         /* For APM emulation, think legacy userspace. */
         int use_for_apm;
+};
+
+struct power_supply {
+        const struct power_supply_desc *desc;
+
+        char **supplied_to;
+        size_t num_supplicants;
+
+        char **supplied_from;
+        size_t num_supplies;
+        struct device_node *of_node;
+
+        /* Driver private data */
+        void *drv_data;
 
         /* private */
-        struct device *dev;
+        struct device dev;
         struct work_struct changed_work;
         spinlock_t changed_lock;
         bool changed;
+        atomic_t use_cnt;
 #ifdef CONFIG_THERMAL
         struct thermal_zone_device *tzd;
         struct thermal_cooling_device *tcd;
@@ -256,6 +282,7 @@ extern struct atomic_notifier_head power_supply_notifier;
 extern int power_supply_reg_notifier(struct notifier_block *nb);
 extern void power_supply_unreg_notifier(struct notifier_block *nb);
 extern struct power_supply *power_supply_get_by_name(const char *name);
+extern void power_supply_put(struct power_supply *psy);
 #ifdef CONFIG_OF
 extern struct power_supply *power_supply_get_by_phandle(struct device_node *np,
                                                         const char *property);
@@ -274,13 +301,36 @@ extern int power_supply_is_system_supplied(void);
 static inline int power_supply_is_system_supplied(void) { return -ENOSYS; }
 #endif
 
-extern int power_supply_register(struct device *parent,
-                                 struct power_supply *psy);
-extern int power_supply_register_no_ws(struct device *parent,
-                                 struct power_supply *psy);
+extern int power_supply_get_property(struct power_supply *psy,
+                            enum power_supply_property psp,
+                            union power_supply_propval *val);
+extern int power_supply_set_property(struct power_supply *psy,
+                            enum power_supply_property psp,
+                            const union power_supply_propval *val);
+extern int power_supply_property_is_writeable(struct power_supply *psy,
+                                        enum power_supply_property psp);
+extern void power_supply_external_power_changed(struct power_supply *psy);
+
+extern struct power_supply *__must_check
+power_supply_register(struct device *parent,
+                                 const struct power_supply_desc *desc,
+                                 const struct power_supply_config *cfg);
+extern struct power_supply *__must_check
+power_supply_register_no_ws(struct device *parent,
+                                 const struct power_supply_desc *desc,
+                                 const struct power_supply_config *cfg);
+extern struct power_supply *__must_check
+devm_power_supply_register(struct device *parent,
+                                 const struct power_supply_desc *desc,
+                                 const struct power_supply_config *cfg);
+extern struct power_supply *__must_check
+devm_power_supply_register_no_ws(struct device *parent,
+                                 const struct power_supply_desc *desc,
+                                 const struct power_supply_config *cfg);
 extern void power_supply_unregister(struct power_supply *psy);
 extern int power_supply_powers(struct power_supply *psy, struct device *dev);
 
+extern void *power_supply_get_drvdata(struct power_supply *psy);
 /* For APM emulation, think legacy userspace. */
 extern struct class *power_supply_class;
 
diff --git a/include/linux/printk.h b/include/linux/printk.h
index baa3f97d8ce8..9b30871c9149 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -255,6 +255,11 @@ extern asmlinkage void dump_stack(void) __cold;
         printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_info(fmt, ...) \
         printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
+/*
+ * Like KERN_CONT, pr_cont() should only be used when continuing
+ * a line with no newline ('\n') enclosed. Otherwise it defaults
+ * back to KERN_DEFAULT.
+ */
 #define pr_cont(fmt, ...) \
         printk(KERN_CONT fmt, ##__VA_ARGS__)
 
diff --git a/include/linux/property.h b/include/linux/property.h
index a6a3d98bd7e9..de8bdf417a35 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -13,6 +13,7 @@
 #ifndef _LINUX_PROPERTY_H_
 #define _LINUX_PROPERTY_H_
 
+#include <linux/fwnode.h>
 #include <linux/types.h>
 
 struct device;
@@ -40,16 +41,6 @@ int device_property_read_string_array(struct device *dev, const char *propname,
 int device_property_read_string(struct device *dev, const char *propname,
                                 const char **val);
 
-enum fwnode_type {
-        FWNODE_INVALID = 0,
-        FWNODE_OF,
-        FWNODE_ACPI,
-};
-
-struct fwnode_handle {
-        enum fwnode_type type;
-};
-
 bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname);
 int fwnode_property_read_u8_array(struct fwnode_handle *fwnode,
                                   const char *propname, u8 *val,
@@ -140,4 +131,37 @@ static inline int fwnode_property_read_u64(struct fwnode_handle *fwnode,
         return fwnode_property_read_u64_array(fwnode, propname, val, 1);
 }
 
+/**
+ * struct property_entry - "Built-in" device property representation.
+ * @name: Name of the property.
+ * @type: Type of the property.
+ * @nval: Number of items of type @type making up the value.
+ * @value: Value of the property (an array of @nval items of type @type).
+ */
+struct property_entry {
+        const char *name;
+        enum dev_prop_type type;
+        size_t nval;
+        union {
+                void *raw_data;
+                u8 *u8_data;
+                u16 *u16_data;
+                u32 *u32_data;
+                u64 *u64_data;
+                const char **str;
+        } value;
+};
+
+/**
+ * struct property_set - Collection of "built-in" device properties.
+ * @fwnode: Handle to be pointed to by the fwnode field of struct device.
+ * @properties: Array of properties terminated with a null entry.
+ */
+struct property_set {
+        struct fwnode_handle fwnode;
+        struct property_entry *properties;
+};
+
+void device_add_property_set(struct device *dev, struct property_set *pset);
+
 #endif /* _LINUX_PROPERTY_H_ */
diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index 8884f6e507f7..8e7a25b068b0 100644
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -40,6 +40,7 @@ enum pstore_type_id {
         PSTORE_TYPE_PPC_OF      = 5,
         PSTORE_TYPE_PPC_COMMON  = 6,
         PSTORE_TYPE_PMSG        = 7,
+        PSTORE_TYPE_PPC_OPAL    = 8,
         PSTORE_TYPE_UNKNOWN     = 255
 };
 
diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h
index 0d8ff3fb84ba..b8b73066d137 100644
--- a/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
@@ -64,11 +64,11 @@ struct ptp_clock_request {
  * @adjtime:  Shifts the time of the hardware clock.
  *            parameter delta: Desired change in nanoseconds.
  *
- * @gettime:  Reads the current time from the hardware clock.
- *            parameter ts: Holds the result.
+ * @gettime64:  Reads the current time from the hardware clock.
+ *              parameter ts: Holds the result.
  *
- * @settime:  Set the current time on the hardware clock.
- *            parameter ts: Time value to set.
+ * @settime64:  Set the current time on the hardware clock.
+ *              parameter ts: Time value to set.
  *
  * @enable:   Request driver to enable or disable an ancillary feature.
  *            parameter request: Desired resource to enable or disable.
@@ -104,8 +104,8 @@ struct ptp_clock_info {
         struct ptp_pin_desc *pin_config;
         int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta);
         int (*adjtime)(struct ptp_clock_info *ptp, s64 delta);
-        int (*gettime)(struct ptp_clock_info *ptp, struct timespec *ts);
-        int (*settime)(struct ptp_clock_info *ptp, const struct timespec *ts);
+        int (*gettime64)(struct ptp_clock_info *ptp, struct timespec64 *ts);
+        int (*settime64)(struct ptp_clock_info *p, const struct timespec64 *ts);
         int (*enable)(struct ptp_clock_info *ptp,
                       struct ptp_clock_request *request, int on);
         int (*verify)(struct ptp_clock_info *ptp, unsigned int pin,
diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
new file mode 100644
index 000000000000..d7a974d5f57c
--- /dev/null
+++ b/include/linux/qcom_scm.h
@@ -0,0 +1,28 @@
+/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Linaro Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
+ */
+#ifndef __QCOM_SCM_H
+#define __QCOM_SCM_H
+
+extern int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus);
+extern int qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus);
+
+#define QCOM_SCM_CPU_PWR_DOWN_L2_ON     0x0
+#define QCOM_SCM_CPU_PWR_DOWN_L2_OFF    0x1
+
+extern void qcom_scm_cpu_power_down(u32 flags);
+
+#define QCOM_SCM_VERSION(major, minor) (((major) << 16) | ((minor) & 0xFF))
+
+extern u32 qcom_scm_get_version(void);
+
+#endif
diff --git a/include/linux/quota.h b/include/linux/quota.h
index d534e8ed308a..b2505acfd3c0 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -50,6 +50,7 @@
 
 #undef USRQUOTA
 #undef GRPQUOTA
+#undef PRJQUOTA
 enum quota_type {
         USRQUOTA = 0,           /* element used for user quotas */
         GRPQUOTA = 1,           /* element used for group quotas */
@@ -319,6 +320,7 @@ struct dquot_operations {
         /* get reserved quota for delayed alloc, value returned is managed by
          * quota code only */
         qsize_t *(*get_reserved_space) (struct inode *);
+        int (*get_projid) (struct inode *, kprojid_t *);/* Get project ID */
 };
 
 struct path;
@@ -344,7 +346,10 @@ struct qc_dqblk {
         int d_rt_spc_warns;     /* # warnings issued wrt RT space */
 };
 
-/* Field specifiers for ->set_dqblk() in struct qc_dqblk */
+/*
+ * Field specifiers for ->set_dqblk() in struct qc_dqblk and also for
+ * ->set_info() in struct qc_info
+ */
 #define QC_INO_SOFT     (1<<0)
 #define QC_INO_HARD     (1<<1)
 #define QC_SPC_SOFT     (1<<2)
@@ -365,6 +370,51 @@ struct qc_dqblk {
 #define QC_INO_COUNT    (1<<13)
 #define QC_RT_SPACE     (1<<14)
 #define QC_ACCT_MASK (QC_SPACE | QC_INO_COUNT | QC_RT_SPACE)
+#define QC_FLAGS        (1<<15)
+
+#define QCI_SYSFILE             (1 << 0)        /* Quota file is hidden from userspace */
+#define QCI_ROOT_SQUASH         (1 << 1)        /* Root squash turned on */
+#define QCI_ACCT_ENABLED        (1 << 2)        /* Quota accounting enabled */
+#define QCI_LIMITS_ENFORCED     (1 << 3)        /* Quota limits enforced */
+
+/* Structures for communicating via ->get_state */
+struct qc_type_state {
+        unsigned int flags;             /* Flags QCI_* */
+        unsigned int spc_timelimit;     /* Time after which space softlimit is
+                                         * enforced */
+        unsigned int ino_timelimit;     /* Ditto for inode softlimit */
+        unsigned int rt_spc_timelimit;  /* Ditto for real-time space */
+        unsigned int spc_warnlimit;     /* Limit for number of space warnings */
+        unsigned int ino_warnlimit;     /* Ditto for inodes */
+        unsigned int rt_spc_warnlimit;  /* Ditto for real-time space */
+        unsigned long long ino;         /* Inode number of quota file */
+        blkcnt_t blocks;                /* Number of 512-byte blocks in the file */
+        blkcnt_t nextents;              /* Number of extents in the file */
+};
+
+struct qc_state {
+        unsigned int s_incoredqs;       /* Number of dquots in core */
+        /*
+         * Per quota type information. The array should really have
+         * max(MAXQUOTAS, XQM_MAXQUOTAS) entries. BUILD_BUG_ON in
+         * quota_getinfo() makes sure XQM_MAXQUOTAS is large enough.  Once VFS
+         * supports project quotas, this can be changed to MAXQUOTAS
+         */
+        struct qc_type_state s_state[XQM_MAXQUOTAS];
+};
+
+/* Structure for communicating via ->set_info */
+struct qc_info {
+        int i_fieldmask;        /* mask of fields to change in ->set_info() */
+        unsigned int i_flags;           /* Flags QCI_* */
+        unsigned int i_spc_timelimit;   /* Time after which space softlimit is
+                                         * enforced */
+        unsigned int i_ino_timelimit;   /* Ditto for inode softlimit */
+        unsigned int i_rt_spc_timelimit;/* Ditto for real-time space */
+        unsigned int i_spc_warnlimit;   /* Limit for number of space warnings */
+        unsigned int i_ino_warnlimit;   /* Limit for number of inode warnings */
+        unsigned int i_rt_spc_warnlimit;        /* Ditto for real-time space */
+};
 
 /* Operations handling requests from userspace */
 struct quotactl_ops {
@@ -373,12 +423,10 @@ struct quotactl_ops {
         int (*quota_enable)(struct super_block *, unsigned int);
         int (*quota_disable)(struct super_block *, unsigned int);
         int (*quota_sync)(struct super_block *, int);
-        int (*get_info)(struct super_block *, int, struct if_dqinfo *);
-        int (*set_info)(struct super_block *, int, struct if_dqinfo *);
+        int (*set_info)(struct super_block *, int, struct qc_info *);
         int (*get_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
         int (*set_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
-        int (*get_xstate)(struct super_block *, struct fs_quota_stat *);
-        int (*get_xstatev)(struct super_block *, struct fs_quota_statv *);
+        int (*get_state)(struct super_block *, struct qc_state *);
         int (*rm_xquota)(struct super_block *, unsigned int);
 };
 
@@ -389,7 +437,19 @@ struct quota_format_type {
         struct quota_format_type *qf_next;
 };
 
-/* Quota state flags - they actually come in two flavors - for users and groups */
+/**
+ * Quota state flags - they actually come in two flavors - for users and groups.
+ *
+ * Actual typed flags layout:
+ *                              USRQUOTA        GRPQUOTA
+ *  DQUOT_USAGE_ENABLED         0x0001          0x0002
+ *  DQUOT_LIMITS_ENABLED        0x0004          0x0008
+ *  DQUOT_SUSPENDED             0x0010          0x0020
+ *
+ * Following bits are used for non-typed flags:
+ *  DQUOT_QUOTA_SYS_FILE        0x0040
+ *  DQUOT_NEGATIVE_USAGE        0x0080
+ */
 enum {
         _DQUOT_USAGE_ENABLED = 0,               /* Track disk usage for users */
         _DQUOT_LIMITS_ENABLED,                  /* Enforce quota limits for users */
@@ -398,9 +458,9 @@ enum {
                                                  * memory to turn them on */
         _DQUOT_STATE_FLAGS
 };
-#define DQUOT_USAGE_ENABLED     (1 << _DQUOT_USAGE_ENABLED)
-#define DQUOT_LIMITS_ENABLED    (1 << _DQUOT_LIMITS_ENABLED)
-#define DQUOT_SUSPENDED         (1 << _DQUOT_SUSPENDED)
+#define DQUOT_USAGE_ENABLED     (1 << _DQUOT_USAGE_ENABLED * MAXQUOTAS)
+#define DQUOT_LIMITS_ENABLED    (1 << _DQUOT_LIMITS_ENABLED * MAXQUOTAS)
+#define DQUOT_SUSPENDED         (1 << _DQUOT_SUSPENDED * MAXQUOTAS)
 #define DQUOT_STATE_FLAGS       (DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED | \
                                  DQUOT_SUSPENDED)
 /* Other quota flags */
@@ -414,15 +474,21 @@ enum {
                                                  */
 #define DQUOT_NEGATIVE_USAGE    (1 << (DQUOT_STATE_LAST + 1))
                                                /* Allow negative quota usage */
-
 static inline unsigned int dquot_state_flag(unsigned int flags, int type)
 {
-        return flags << _DQUOT_STATE_FLAGS * type;
+        return flags << type;
 }
 
 static inline unsigned int dquot_generic_flag(unsigned int flags, int type)
 {
-        return (flags >> _DQUOT_STATE_FLAGS * type) & DQUOT_STATE_FLAGS;
+        return (flags >> type) & DQUOT_STATE_FLAGS;
+}
+
+/* Bitmap of quota types where flag is set in flags */
+static __always_inline unsigned dquot_state_types(unsigned flags, unsigned flag)
+{
+        BUILD_BUG_ON_NOT_POWER_OF_2(flag);
+        return (flags / flag) & ((1 << MAXQUOTAS) - 1);
 }
 
 #ifdef CONFIG_QUOTA_NETLINK_INTERFACE
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index df73258cca47..77ca6601ff25 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -95,8 +95,8 @@ int dquot_quota_on_mount(struct super_block *sb, char *qf_name,
 int dquot_quota_off(struct super_block *sb, int type);
 int dquot_writeback_dquots(struct super_block *sb, int type);
 int dquot_quota_sync(struct super_block *sb, int type);
-int dquot_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
-int dquot_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
+int dquot_get_state(struct super_block *sb, struct qc_state *state);
+int dquot_set_dqinfo(struct super_block *sb, int type, struct qc_info *ii);
 int dquot_get_dqblk(struct super_block *sb, struct kqid id,
                 struct qc_dqblk *di);
 int dquot_set_dqblk(struct super_block *sb, struct kqid id,
@@ -134,10 +134,7 @@ static inline bool sb_has_quota_suspended(struct super_block *sb, int type)
 
 static inline unsigned sb_any_quota_suspended(struct super_block *sb)
 {
-        unsigned type, tmsk = 0;
-        for (type = 0; type < MAXQUOTAS; type++)
-                tmsk |= sb_has_quota_suspended(sb, type) << type;
-        return tmsk;
+        return dquot_state_types(sb_dqopt(sb)->flags, DQUOT_SUSPENDED);
 }
 
 /* Does kernel know about any quota information for given sb + type? */
@@ -149,10 +146,7 @@ static inline bool sb_has_quota_loaded(struct super_block *sb, int type)
 
 static inline unsigned sb_any_quota_loaded(struct super_block *sb)
 {
-        unsigned type, tmsk = 0;
-        for (type = 0; type < MAXQUOTAS; type++)
-                tmsk |= sb_has_quota_loaded(sb, type) << type;
-        return  tmsk;
+        return dquot_state_types(sb_dqopt(sb)->flags, DQUOT_USAGE_ENABLED);
 }
 
 static inline bool sb_has_quota_active(struct super_block *sb, int type)
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 73069cb6c54a..a7a06d1dcf9c 100644
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -72,6 +72,7 @@ extern const char raid6_empty_zero_page[PAGE_SIZE];
 /* Routine choices */
 struct raid6_calls {
         void (*gen_syndrome)(int, size_t, void **);
+        void (*xor_syndrome)(int, int, int, size_t, void **);
         int  (*valid)(void);    /* Returns 1 if this routine set is usable */
         const char *name;       /* Name of this routine set */
         int prefer;             /* Has special performance attribute */
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 78097491cd99..573a5afd5ed8 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -48,6 +48,26 @@
 
 extern int rcu_expedited; /* for sysctl */
 
+#ifdef CONFIG_TINY_RCU
+/* Tiny RCU doesn't expedite, as its purpose in life is instead to be tiny. */
+static inline bool rcu_gp_is_expedited(void)  /* Internal RCU use. */
+{
+        return false;
+}
+
+static inline void rcu_expedite_gp(void)
+{
+}
+
+static inline void rcu_unexpedite_gp(void)
+{
+}
+#else /* #ifdef CONFIG_TINY_RCU */
+bool rcu_gp_is_expedited(void);  /* Internal RCU use. */
+void rcu_expedite_gp(void);
+void rcu_unexpedite_gp(void);
+#endif /* #else #ifdef CONFIG_TINY_RCU */
+
 enum rcutorture_type {
         RCU_FLAVOR,
         RCU_BH_FLAVOR,
@@ -195,6 +215,15 @@ void call_rcu_sched(struct rcu_head *head,
 
 void synchronize_sched(void);
 
+/*
+ * Structure allowing asynchronous waiting on RCU.
+ */
+struct rcu_synchronize {
+        struct rcu_head head;
+        struct completion completion;
+};
+void wakeme_after_rcu(struct rcu_head *head);
+
 /**
  * call_rcu_tasks() - Queue an RCU for invocation task-based grace period
  * @head: structure to be used for queueing the RCU updates.
@@ -258,6 +287,7 @@ static inline int rcu_preempt_depth(void)
 
 /* Internal to kernel */
 void rcu_init(void);
+void rcu_end_inkernel_boot(void);
 void rcu_sched_qs(void);
 void rcu_bh_qs(void);
 void rcu_check_callbacks(int user);
@@ -266,6 +296,8 @@ void rcu_idle_enter(void);
 void rcu_idle_exit(void);
 void rcu_irq_enter(void);
 void rcu_irq_exit(void);
+int rcu_cpu_notify(struct notifier_block *self,
+                   unsigned long action, void *hcpu);
 
 #ifdef CONFIG_RCU_STALL_COMMON
 void rcu_sysrq_start(void);
@@ -720,7 +752,7 @@ static inline void rcu_preempt_sleep_check(void)
  * annotated as __rcu.
  */
 #define rcu_dereference_check(p, c) \
-        __rcu_dereference_check((p), rcu_read_lock_held() || (c), __rcu)
+        __rcu_dereference_check((p), (c) || rcu_read_lock_held(), __rcu)
 
 /**
  * rcu_dereference_bh_check() - rcu_dereference_bh with debug checking
@@ -730,7 +762,7 @@ static inline void rcu_preempt_sleep_check(void)
  * This is the RCU-bh counterpart to rcu_dereference_check().
  */
 #define rcu_dereference_bh_check(p, c) \
-        __rcu_dereference_check((p), rcu_read_lock_bh_held() || (c), __rcu)
+        __rcu_dereference_check((p), (c) || rcu_read_lock_bh_held(), __rcu)
 
 /**
  * rcu_dereference_sched_check() - rcu_dereference_sched with debug checking
@@ -740,7 +772,7 @@ static inline void rcu_preempt_sleep_check(void)
  * This is the RCU-sched counterpart to rcu_dereference_check().
  */
 #define rcu_dereference_sched_check(p, c) \
-        __rcu_dereference_check((p), rcu_read_lock_sched_held() || (c), \
+        __rcu_dereference_check((p), (c) || rcu_read_lock_sched_held(), \
                                 __rcu)
 
 #define rcu_dereference_raw(p) rcu_dereference_check(p, 1) /*@@@ needed? @@@*/
@@ -933,9 +965,9 @@ static inline void rcu_read_unlock(void)
 {
         rcu_lockdep_assert(rcu_is_watching(),
                            "rcu_read_unlock() used illegally while idle");
-        rcu_lock_release(&rcu_lock_map);
         __release(RCU);
         __rcu_read_unlock();
+        rcu_lock_release(&rcu_lock_map); /* Keep acq info for rls diags. */
 }
 
 /**
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 67fc8fcdc4b0..a7ff409f386d 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -70,7 +70,8 @@ void ctrl_alt_del(void);
 #define POWEROFF_CMD_PATH_LEN   256
 extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN];
 
-extern int orderly_poweroff(bool force);
+extern void orderly_poweroff(bool force);
+extern void orderly_reboot(void);
 
 /*
  * Emergency restart, callable from an interrupt handler.
diff --git a/include/linux/regulator/act8865.h b/include/linux/regulator/act8865.h
index b6c4909b33af..15fa8f2d35c9 100644
--- a/include/linux/regulator/act8865.h
+++ b/include/linux/regulator/act8865.h
@@ -19,6 +19,19 @@
 #include <linux/regulator/machine.h>
 
 enum {
+        ACT8600_ID_DCDC1,
+        ACT8600_ID_DCDC2,
+        ACT8600_ID_DCDC3,
+        ACT8600_ID_SUDCDC4,
+        ACT8600_ID_LDO5,
+        ACT8600_ID_LDO6,
+        ACT8600_ID_LDO7,
+        ACT8600_ID_LDO8,
+        ACT8600_ID_LDO9,
+        ACT8600_ID_LDO10,
+};
+
+enum {
         ACT8865_ID_DCDC1,
         ACT8865_ID_DCDC2,
         ACT8865_ID_DCDC3,
@@ -46,6 +59,7 @@ enum {
 };
 
 enum {
+        ACT8600,
         ACT8865,
         ACT8846,
 };
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index d17e1ff7ad01..f8a689ed62a5 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -114,7 +114,7 @@ struct regmap;
 #define REGULATOR_EVENT_OVER_TEMP               0x10
 #define REGULATOR_EVENT_FORCE_DISABLE           0x20
 #define REGULATOR_EVENT_VOLTAGE_CHANGE          0x40
-#define REGULATOR_EVENT_DISABLE                 0x80
+#define REGULATOR_EVENT_DISABLE                 0x80
 #define REGULATOR_EVENT_PRE_VOLTAGE_CHANGE      0x100
 #define REGULATOR_EVENT_ABORT_VOLTAGE_CHANGE    0x200
 #define REGULATOR_EVENT_PRE_DISABLE             0x400
@@ -238,7 +238,7 @@ int regulator_get_current_limit(struct regulator *regulator);
 
 int regulator_set_mode(struct regulator *regulator, unsigned int mode);
 unsigned int regulator_get_mode(struct regulator *regulator);
-int regulator_set_optimum_mode(struct regulator *regulator, int load_uA);
+int regulator_set_load(struct regulator *regulator, int load_uA);
 
 int regulator_allow_bypass(struct regulator *regulator, bool allow);
 
@@ -252,8 +252,12 @@ int regulator_list_hardware_vsel(struct regulator *regulator,
 /* regulator notifier block */
 int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb);
+int devm_regulator_register_notifier(struct regulator *regulator,
+                                     struct notifier_block *nb);
 int regulator_unregister_notifier(struct regulator *regulator,
                                 struct notifier_block *nb);
+void devm_regulator_unregister_notifier(struct regulator *regulator,
+                                        struct notifier_block *nb);
 
 /* driver data - core doesn't touch */
 void *regulator_get_drvdata(struct regulator *regulator);
@@ -479,8 +483,7 @@ static inline unsigned int regulator_get_mode(struct regulator *regulator)
         return REGULATOR_MODE_NORMAL;
 }
 
-static inline int regulator_set_optimum_mode(struct regulator *regulator,
-                                        int load_uA)
+static inline int regulator_set_load(struct regulator *regulator, int load_uA)
 {
         return REGULATOR_MODE_NORMAL;
 }
@@ -515,12 +518,24 @@ static inline int regulator_register_notifier(struct regulator *regulator,
         return 0;
 }
 
+static inline int devm_regulator_register_notifier(struct regulator *regulator,
+                                                   struct notifier_block *nb)
+{
+        return 0;
+}
+
 static inline int regulator_unregister_notifier(struct regulator *regulator,
                                 struct notifier_block *nb)
 {
         return 0;
 }
 
+static inline int devm_regulator_unregister_notifier(struct regulator *regulator,
+                                                     struct notifier_block *nb)
+{
+        return 0;
+}
+
 static inline void *regulator_get_drvdata(struct regulator *regulator)
 {
         return NULL;
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index d4ad5b5a02bb..fffa688ac3a7 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -98,6 +98,7 @@ struct regulator_linear_range {
  *      REGULATOR_STATUS value (or negative errno)
  * @get_optimum_mode: Get the most efficient operating mode for the regulator
  *                    when running with the specified parameters.
+ * @set_load: Set the load for the regulator.
  *
  * @set_bypass: Set the regulator in bypass mode.
  * @get_bypass: Get the regulator bypass mode state.
@@ -167,6 +168,8 @@ struct regulator_ops {
         /* get most efficient regulator operating mode for load */
         unsigned int (*get_optimum_mode) (struct regulator_dev *, int input_uV,
                                           int output_uV, int load_uA);
+        /* set the load on the regulator */
+        int (*set_load)(struct regulator_dev *, int load_uA);
 
         /* control and report on bypass mode */
         int (*set_bypass)(struct regulator_dev *dev, bool enable);
@@ -316,7 +319,7 @@ struct regulator_desc {
  * @driver_data: private regulator data
  * @of_node: OpenFirmware node to parse for device tree bindings (may be
  *           NULL).
- * @regmap: regmap to use for core regmap helpers if dev_get_regulator() is
+ * @regmap: regmap to use for core regmap helpers if dev_get_regmap() is
  *          insufficient.
  * @ena_gpio_initialized: GPIO controlling regulator enable was properly
  *                        initialized, meaning that >= 0 is a valid gpio
@@ -367,6 +370,7 @@ struct regulator_dev {
         struct device dev;
         struct regulation_constraints *constraints;
         struct regulator *supply;       /* for tree */
+        const char *supply_name;
         struct regmap *regmap;
 
         struct delayed_work disable_work;
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 9e7e745dac55..78b8a9b9d40a 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -404,6 +404,7 @@ enum rproc_crash_type {
  * @table_ptr: pointer to the resource table in effect
  * @cached_table: copy of the resource table
  * @table_csum: checksum of the resource table
+ * @has_iommu: flag to indicate if remote processor is behind an MMU
  */
 struct rproc {
         struct klist_node node;
@@ -435,6 +436,7 @@ struct rproc {
         struct resource_table *table_ptr;
         struct resource_table *cached_table;
         u32 table_csum;
+        bool has_iommu;
 };
 
 /* we currently support only two vrings per rvdev */
diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h
index 58851275fed9..e23d242d1230 100644
--- a/include/linux/rhashtable.h
+++ b/include/linux/rhashtable.h
@@ -1,14 +1,13 @@
 /*
  * Resizable, Scalable, Concurrent Hash Table
  *
- * Copyright (c) 2014 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2015 Herbert Xu <herbert@gondor.apana.org.au>
+ * Copyright (c) 2014-2015 Thomas Graf <tgraf@suug.ch>
  * Copyright (c) 2008-2014 Patrick McHardy <kaber@trash.net>
  *
- * Based on the following paper by Josh Triplett, Paul E. McKenney
- * and Jonathan Walpole:
- * https://www.usenix.org/legacy/event/atc11/tech/final_files/Triplett.pdf
- *
  * Code partially derived from nft_hash
+ * Rewritten with rehash code from br_multicast plus single list
+ * pointer as suggested by Josh Triplett
  *
  * 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
@@ -19,9 +18,12 @@
 #define _LINUX_RHASHTABLE_H
 
 #include <linux/compiler.h>
+#include <linux/errno.h>
+#include <linux/jhash.h>
 #include <linux/list_nulls.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
+#include <linux/rcupdate.h>
 
 /*
  * The end of the chain is marked with a special nulls marks which has
@@ -42,6 +44,9 @@
 #define RHT_HASH_BITS           27
 #define RHT_BASE_SHIFT          RHT_HASH_BITS
 
+/* Base bits plus 1 bit for nulls marker */
+#define RHT_HASH_RESERVED_SPACE (RHT_BASE_BITS + 1)
+
 struct rhash_head {
         struct rhash_head __rcu         *next;
 };
@@ -49,19 +54,43 @@ struct rhash_head {
 /**
  * struct bucket_table - Table of hash buckets
  * @size: Number of hash buckets
+ * @rehash: Current bucket being rehashed
+ * @hash_rnd: Random seed to fold into hash
  * @locks_mask: Mask to apply before accessing locks[]
  * @locks: Array of spinlocks protecting individual buckets
+ * @walkers: List of active walkers
+ * @rcu: RCU structure for freeing the table
+ * @future_tbl: Table under construction during rehashing
  * @buckets: size * hash buckets
  */
 struct bucket_table {
-        size_t                          size;
-        unsigned int                    locks_mask;
-        spinlock_t                      *locks;
-        struct rhash_head __rcu         *buckets[];
+        unsigned int            size;
+        unsigned int            rehash;
+        u32                     hash_rnd;
+        unsigned int            locks_mask;
+        spinlock_t              *locks;
+        struct list_head        walkers;
+        struct rcu_head         rcu;
+
+        struct bucket_table __rcu *future_tbl;
+
+        struct rhash_head __rcu *buckets[] ____cacheline_aligned_in_smp;
+};
+
+/**
+ * struct rhashtable_compare_arg - Key for the function rhashtable_compare
+ * @ht: Hash table
+ * @key: Key to compare against
+ */
+struct rhashtable_compare_arg {
+        struct rhashtable *ht;
+        const void *key;
 };
 
 typedef u32 (*rht_hashfn_t)(const void *data, u32 len, u32 seed);
-typedef u32 (*rht_obj_hashfn_t)(const void *data, u32 seed);
+typedef u32 (*rht_obj_hashfn_t)(const void *data, u32 len, u32 seed);
+typedef int (*rht_obj_cmpfn_t)(struct rhashtable_compare_arg *arg,
+                               const void *obj);
 
 struct rhashtable;
 
@@ -71,70 +100,62 @@ struct rhashtable;
  * @key_len: Length of key
  * @key_offset: Offset of key in struct to be hashed
  * @head_offset: Offset of rhash_head in struct to be hashed
- * @hash_rnd: Seed to use while hashing
- * @max_shift: Maximum number of shifts while expanding
- * @min_shift: Minimum number of shifts while shrinking
+ * @max_size: Maximum size while expanding
+ * @min_size: Minimum size while shrinking
  * @nulls_base: Base value to generate nulls marker
+ * @insecure_elasticity: Set to true to disable chain length checks
+ * @automatic_shrinking: Enable automatic shrinking of tables
  * @locks_mul: Number of bucket locks to allocate per cpu (default: 128)
- * @hashfn: Function to hash key
+ * @hashfn: Hash function (default: jhash2 if !(key_len % 4), or jhash)
  * @obj_hashfn: Function to hash object
- * @grow_decision: If defined, may return true if table should expand
- * @shrink_decision: If defined, may return true if table should shrink
- *
- * Note: when implementing the grow and shrink decision function, min/max
- * shift must be enforced, otherwise, resizing watermarks they set may be
- * useless.
+ * @obj_cmpfn: Function to compare key with object
  */
 struct rhashtable_params {
         size_t                  nelem_hint;
         size_t                  key_len;
         size_t                  key_offset;
         size_t                  head_offset;
-        u32                     hash_rnd;
-        size_t                  max_shift;
-        size_t                  min_shift;
+        unsigned int            max_size;
+        unsigned int            min_size;
         u32                     nulls_base;
+        bool                    insecure_elasticity;
+        bool                    automatic_shrinking;
         size_t                  locks_mul;
         rht_hashfn_t            hashfn;
         rht_obj_hashfn_t        obj_hashfn;
-        bool                    (*grow_decision)(const struct rhashtable *ht,
-                                                 size_t new_size);
-        bool                    (*shrink_decision)(const struct rhashtable *ht,
-                                                   size_t new_size);
+        rht_obj_cmpfn_t         obj_cmpfn;
 };
 
 /**
  * struct rhashtable - Hash table handle
  * @tbl: Bucket table
- * @future_tbl: Table under construction during expansion/shrinking
  * @nelems: Number of elements in table
- * @shift: Current size (1 << shift)
+ * @key_len: Key length for hashfn
+ * @elasticity: Maximum chain length before rehash
  * @p: Configuration parameters
  * @run_work: Deferred worker to expand/shrink asynchronously
  * @mutex: Mutex to protect current/future table swapping
- * @walkers: List of active walkers
- * @being_destroyed: True if table is set up for destruction
+ * @lock: Spin lock to protect walker list
  */
 struct rhashtable {
         struct bucket_table __rcu       *tbl;
-        struct bucket_table __rcu       *future_tbl;
         atomic_t                        nelems;
-        atomic_t                        shift;
+        unsigned int                    key_len;
+        unsigned int                    elasticity;
         struct rhashtable_params        p;
         struct work_struct              run_work;
         struct mutex                    mutex;
-        struct list_head                walkers;
-        bool                            being_destroyed;
+        spinlock_t                      lock;
 };
 
 /**
  * struct rhashtable_walker - Hash table walker
  * @list: List entry on list of walkers
- * @resize: Resize event occured
+ * @tbl: The table that we were walking over
  */
 struct rhashtable_walker {
         struct list_head list;
-        bool resize;
+        struct bucket_table *tbl;
 };
 
 /**
@@ -171,6 +192,118 @@ static inline unsigned long rht_get_nulls_value(const struct rhash_head *ptr)
         return ((unsigned long) ptr) >> 1;
 }
 
+static inline void *rht_obj(const struct rhashtable *ht,
+                            const struct rhash_head *he)
+{
+        return (char *)he - ht->p.head_offset;
+}
+
+static inline unsigned int rht_bucket_index(const struct bucket_table *tbl,
+                                            unsigned int hash)
+{
+        return (hash >> RHT_HASH_RESERVED_SPACE) & (tbl->size - 1);
+}
+
+static inline unsigned int rht_key_hashfn(
+        struct rhashtable *ht, const struct bucket_table *tbl,
+        const void *key, const struct rhashtable_params params)
+{
+        unsigned int hash;
+
+        /* params must be equal to ht->p if it isn't constant. */
+        if (!__builtin_constant_p(params.key_len))
+                hash = ht->p.hashfn(key, ht->key_len, tbl->hash_rnd);
+        else if (params.key_len) {
+                unsigned int key_len = params.key_len;
+
+                if (params.hashfn)
+                        hash = params.hashfn(key, key_len, tbl->hash_rnd);
+                else if (key_len & (sizeof(u32) - 1))
+                        hash = jhash(key, key_len, tbl->hash_rnd);
+                else
+                        hash = jhash2(key, key_len / sizeof(u32),
+                                      tbl->hash_rnd);
+        } else {
+                unsigned int key_len = ht->p.key_len;
+
+                if (params.hashfn)
+                        hash = params.hashfn(key, key_len, tbl->hash_rnd);
+                else
+                        hash = jhash(key, key_len, tbl->hash_rnd);
+        }
+
+        return rht_bucket_index(tbl, hash);
+}
+
+static inline unsigned int rht_head_hashfn(
+        struct rhashtable *ht, const struct bucket_table *tbl,
+        const struct rhash_head *he, const struct rhashtable_params params)
+{
+        const char *ptr = rht_obj(ht, he);
+
+        return likely(params.obj_hashfn) ?
+               rht_bucket_index(tbl, params.obj_hashfn(ptr, params.key_len ?:
+                                                            ht->p.key_len,
+                                                       tbl->hash_rnd)) :
+               rht_key_hashfn(ht, tbl, ptr + params.key_offset, params);
+}
+
+/**
+ * rht_grow_above_75 - returns true if nelems > 0.75 * table-size
+ * @ht:         hash table
+ * @tbl:        current table
+ */
+static inline bool rht_grow_above_75(const struct rhashtable *ht,
+                                     const struct bucket_table *tbl)
+{
+        /* Expand table when exceeding 75% load */
+        return atomic_read(&ht->nelems) > (tbl->size / 4 * 3) &&
+               (!ht->p.max_size || tbl->size < ht->p.max_size);
+}
+
+/**
+ * rht_shrink_below_30 - returns true if nelems < 0.3 * table-size
+ * @ht:         hash table
+ * @tbl:        current table
+ */
+static inline bool rht_shrink_below_30(const struct rhashtable *ht,
+                                       const struct bucket_table *tbl)
+{
+        /* Shrink table beneath 30% load */
+        return atomic_read(&ht->nelems) < (tbl->size * 3 / 10) &&
+               tbl->size > ht->p.min_size;
+}
+
+/**
+ * rht_grow_above_100 - returns true if nelems > table-size
+ * @ht:         hash table
+ * @tbl:        current table
+ */
+static inline bool rht_grow_above_100(const struct rhashtable *ht,
+                                      const struct bucket_table *tbl)
+{
+        return atomic_read(&ht->nelems) > tbl->size;
+}
+
+/* The bucket lock is selected based on the hash and protects mutations
+ * on a group of hash buckets.
+ *
+ * A maximum of tbl->size/2 bucket locks is allocated. This ensures that
+ * a single lock always covers both buckets which may both contains
+ * entries which link to the same bucket of the old table during resizing.
+ * This allows to simplify the locking as locking the bucket in both
+ * tables during resize always guarantee protection.
+ *
+ * IMPORTANT: When holding the bucket lock of both the old and new table
+ * during expansions and shrinking, the old bucket lock must always be
+ * acquired first.
+ */
+static inline spinlock_t *rht_bucket_lock(const struct bucket_table *tbl,
+                                          unsigned int hash)
+{
+        return &tbl->locks[hash & tbl->locks_mask];
+}
+
 #ifdef CONFIG_PROVE_LOCKING
 int lockdep_rht_mutex_is_held(struct rhashtable *ht);
 int lockdep_rht_bucket_is_held(const struct bucket_table *tbl, u32 hash);
@@ -187,26 +320,13 @@ static inline int lockdep_rht_bucket_is_held(const struct bucket_table *tbl,
 }
 #endif /* CONFIG_PROVE_LOCKING */
 
-int rhashtable_init(struct rhashtable *ht, struct rhashtable_params *params);
-
-void rhashtable_insert(struct rhashtable *ht, struct rhash_head *node);
-bool rhashtable_remove(struct rhashtable *ht, struct rhash_head *node);
+int rhashtable_init(struct rhashtable *ht,
+                    const struct rhashtable_params *params);
 
-bool rht_grow_above_75(const struct rhashtable *ht, size_t new_size);
-bool rht_shrink_below_30(const struct rhashtable *ht, size_t new_size);
-
-int rhashtable_expand(struct rhashtable *ht);
-int rhashtable_shrink(struct rhashtable *ht);
-
-void *rhashtable_lookup(struct rhashtable *ht, const void *key);
-void *rhashtable_lookup_compare(struct rhashtable *ht, const void *key,
-                                bool (*compare)(void *, void *), void *arg);
-
-bool rhashtable_lookup_insert(struct rhashtable *ht, struct rhash_head *obj);
-bool rhashtable_lookup_compare_insert(struct rhashtable *ht,
-                                      struct rhash_head *obj,
-                                      bool (*compare)(void *, void *),
-                                      void *arg);
+int rhashtable_insert_slow(struct rhashtable *ht, const void *key,
+                           struct rhash_head *obj,
+                           struct bucket_table *old_tbl);
+int rhashtable_insert_rehash(struct rhashtable *ht);
 
 int rhashtable_walk_init(struct rhashtable *ht, struct rhashtable_iter *iter);
 void rhashtable_walk_exit(struct rhashtable_iter *iter);
@@ -214,6 +334,9 @@ int rhashtable_walk_start(struct rhashtable_iter *iter) __acquires(RCU);
 void *rhashtable_walk_next(struct rhashtable_iter *iter);
 void rhashtable_walk_stop(struct rhashtable_iter *iter) __releases(RCU);
 
+void rhashtable_free_and_destroy(struct rhashtable *ht,
+                                 void (*free_fn)(void *ptr, void *arg),
+                                 void *arg);
 void rhashtable_destroy(struct rhashtable *ht);
 
 #define rht_dereference(p, ht) \
@@ -364,4 +487,316 @@ void rhashtable_destroy(struct rhashtable *ht);
         rht_for_each_entry_rcu_continue(tpos, pos, (tbl)->buckets[hash],\
                                         tbl, hash, member)
 
+static inline int rhashtable_compare(struct rhashtable_compare_arg *arg,
+                                     const void *obj)
+{
+        struct rhashtable *ht = arg->ht;
+        const char *ptr = obj;
+
+        return memcmp(ptr + ht->p.key_offset, arg->key, ht->p.key_len);
+}
+
+/**
+ * rhashtable_lookup_fast - search hash table, inlined version
+ * @ht:         hash table
+ * @key:        the pointer to the key
+ * @params:     hash table parameters
+ *
+ * Computes the hash value for the key and traverses the bucket chain looking
+ * for a entry with an identical key. The first matching entry is returned.
+ *
+ * Returns the first entry on which the compare function returned true.
+ */
+static inline void *rhashtable_lookup_fast(
+        struct rhashtable *ht, const void *key,
+        const struct rhashtable_params params)
+{
+        struct rhashtable_compare_arg arg = {
+                .ht = ht,
+                .key = key,
+        };
+        const struct bucket_table *tbl;
+        struct rhash_head *he;
+        unsigned int hash;
+
+        rcu_read_lock();
+
+        tbl = rht_dereference_rcu(ht->tbl, ht);
+restart:
+        hash = rht_key_hashfn(ht, tbl, key, params);
+        rht_for_each_rcu(he, tbl, hash) {
+                if (params.obj_cmpfn ?
+                    params.obj_cmpfn(&arg, rht_obj(ht, he)) :
+                    rhashtable_compare(&arg, rht_obj(ht, he)))
+                        continue;
+                rcu_read_unlock();
+                return rht_obj(ht, he);
+        }
+
+        /* Ensure we see any new tables. */
+        smp_rmb();
+
+        tbl = rht_dereference_rcu(tbl->future_tbl, ht);
+        if (unlikely(tbl))
+                goto restart;
+        rcu_read_unlock();
+
+        return NULL;
+}
+
+/* Internal function, please use rhashtable_insert_fast() instead */
+static inline int __rhashtable_insert_fast(
+        struct rhashtable *ht, const void *key, struct rhash_head *obj,
+        const struct rhashtable_params params)
+{
+        struct rhashtable_compare_arg arg = {
+                .ht = ht,
+                .key = key,
+        };
+        struct bucket_table *tbl, *new_tbl;
+        struct rhash_head *head;
+        spinlock_t *lock;
+        unsigned int elasticity;
+        unsigned int hash;
+        int err;
+
+restart:
+        rcu_read_lock();
+
+        tbl = rht_dereference_rcu(ht->tbl, ht);
+
+        /* All insertions must grab the oldest table containing
+         * the hashed bucket that is yet to be rehashed.
+         */
+        for (;;) {
+                hash = rht_head_hashfn(ht, tbl, obj, params);
+                lock = rht_bucket_lock(tbl, hash);
+                spin_lock_bh(lock);
+
+                if (tbl->rehash <= hash)
+                        break;
+
+                spin_unlock_bh(lock);
+                tbl = rht_dereference_rcu(tbl->future_tbl, ht);
+        }
+
+        new_tbl = rht_dereference_rcu(tbl->future_tbl, ht);
+        if (unlikely(new_tbl)) {
+                err = rhashtable_insert_slow(ht, key, obj, new_tbl);
+                if (err == -EAGAIN)
+                        goto slow_path;
+                goto out;
+        }
+
+        if (unlikely(rht_grow_above_100(ht, tbl))) {
+slow_path:
+                spin_unlock_bh(lock);
+                err = rhashtable_insert_rehash(ht);
+                rcu_read_unlock();
+                if (err)
+                        return err;
+
+                goto restart;
+        }
+
+        err = -EEXIST;
+        elasticity = ht->elasticity;
+        rht_for_each(head, tbl, hash) {
+                if (key &&
+                    unlikely(!(params.obj_cmpfn ?
+                               params.obj_cmpfn(&arg, rht_obj(ht, head)) :
+                               rhashtable_compare(&arg, rht_obj(ht, head)))))
+                        goto out;
+                if (!--elasticity)
+                        goto slow_path;
+        }
+
+        err = 0;
+
+        head = rht_dereference_bucket(tbl->buckets[hash], tbl, hash);
+
+        RCU_INIT_POINTER(obj->next, head);
+
+        rcu_assign_pointer(tbl->buckets[hash], obj);
+
+        atomic_inc(&ht->nelems);
+        if (rht_grow_above_75(ht, tbl))
+                schedule_work(&ht->run_work);
+
+out:
+        spin_unlock_bh(lock);
+        rcu_read_unlock();
+
+        return err;
+}
+
+/**
+ * rhashtable_insert_fast - insert object into hash table
+ * @ht:         hash table
+ * @obj:        pointer to hash head inside object
+ * @params:     hash table parameters
+ *
+ * Will take a per bucket spinlock to protect against mutual mutations
+ * on the same bucket. Multiple insertions may occur in parallel unless
+ * they map to the same bucket lock.
+ *
+ * It is safe to call this function from atomic context.
+ *
+ * Will trigger an automatic deferred table resizing if the size grows
+ * beyond the watermark indicated by grow_decision() which can be passed
+ * to rhashtable_init().
+ */
+static inline int rhashtable_insert_fast(
+        struct rhashtable *ht, struct rhash_head *obj,
+        const struct rhashtable_params params)
+{
+        return __rhashtable_insert_fast(ht, NULL, obj, params);
+}
+
+/**
+ * rhashtable_lookup_insert_fast - lookup and insert object into hash table
+ * @ht:         hash table
+ * @obj:        pointer to hash head inside object
+ * @params:     hash table parameters
+ *
+ * Locks down the bucket chain in both the old and new table if a resize
+ * is in progress to ensure that writers can't remove from the old table
+ * and can't insert to the new table during the atomic operation of search
+ * and insertion. Searches for duplicates in both the old and new table if
+ * a resize is in progress.
+ *
+ * This lookup function may only be used for fixed key hash table (key_len
+ * parameter set). It will BUG() if used inappropriately.
+ *
+ * It is safe to call this function from atomic context.
+ *
+ * Will trigger an automatic deferred table resizing if the size grows
+ * beyond the watermark indicated by grow_decision() which can be passed
+ * to rhashtable_init().
+ */
+static inline int rhashtable_lookup_insert_fast(
+        struct rhashtable *ht, struct rhash_head *obj,
+        const struct rhashtable_params params)
+{
+        const char *key = rht_obj(ht, obj);
+
+        BUG_ON(ht->p.obj_hashfn);
+
+        return __rhashtable_insert_fast(ht, key + ht->p.key_offset, obj,
+                                        params);
+}
+
+/**
+ * rhashtable_lookup_insert_key - search and insert object to hash table
+ *                                with explicit key
+ * @ht:         hash table
+ * @key:        key
+ * @obj:        pointer to hash head inside object
+ * @params:     hash table parameters
+ *
+ * Locks down the bucket chain in both the old and new table if a resize
+ * is in progress to ensure that writers can't remove from the old table
+ * and can't insert to the new table during the atomic operation of search
+ * and insertion. Searches for duplicates in both the old and new table if
+ * a resize is in progress.
+ *
+ * Lookups may occur in parallel with hashtable mutations and resizing.
+ *
+ * Will trigger an automatic deferred table resizing if the size grows
+ * beyond the watermark indicated by grow_decision() which can be passed
+ * to rhashtable_init().
+ *
+ * Returns zero on success.
+ */
+static inline int rhashtable_lookup_insert_key(
+        struct rhashtable *ht, const void *key, struct rhash_head *obj,
+        const struct rhashtable_params params)
+{
+        BUG_ON(!ht->p.obj_hashfn || !key);
+
+        return __rhashtable_insert_fast(ht, key, obj, params);
+}
+
+/* Internal function, please use rhashtable_remove_fast() instead */
+static inline int __rhashtable_remove_fast(
+        struct rhashtable *ht, struct bucket_table *tbl,
+        struct rhash_head *obj, const struct rhashtable_params params)
+{
+        struct rhash_head __rcu **pprev;
+        struct rhash_head *he;
+        spinlock_t * lock;
+        unsigned int hash;
+        int err = -ENOENT;
+
+        hash = rht_head_hashfn(ht, tbl, obj, params);
+        lock = rht_bucket_lock(tbl, hash);
+
+        spin_lock_bh(lock);
+
+        pprev = &tbl->buckets[hash];
+        rht_for_each(he, tbl, hash) {
+                if (he != obj) {
+                        pprev = &he->next;
+                        continue;
+                }
+
+                rcu_assign_pointer(*pprev, obj->next);
+                err = 0;
+                break;
+        }
+
+        spin_unlock_bh(lock);
+
+        return err;
+}
+
+/**
+ * rhashtable_remove_fast - remove object from hash table
+ * @ht:         hash table
+ * @obj:        pointer to hash head inside object
+ * @params:     hash table parameters
+ *
+ * Since the hash chain is single linked, the removal operation needs to
+ * walk the bucket chain upon removal. The removal operation is thus
+ * considerable slow if the hash table is not correctly sized.
+ *
+ * Will automatically shrink the table via rhashtable_expand() if the
+ * shrink_decision function specified at rhashtable_init() returns true.
+ *
+ * Returns zero on success, -ENOENT if the entry could not be found.
+ */
+static inline int rhashtable_remove_fast(
+        struct rhashtable *ht, struct rhash_head *obj,
+        const struct rhashtable_params params)
+{
+        struct bucket_table *tbl;
+        int err;
+
+        rcu_read_lock();
+
+        tbl = rht_dereference_rcu(ht->tbl, ht);
+
+        /* Because we have already taken (and released) the bucket
+         * lock in old_tbl, if we find that future_tbl is not yet
+         * visible then that guarantees the entry to still be in
+         * the old tbl if it exists.
+         */
+        while ((err = __rhashtable_remove_fast(ht, tbl, obj, params)) &&
+               (tbl = rht_dereference_rcu(tbl->future_tbl, ht)))
+                ;
+
+        if (err)
+                goto out;
+
+        atomic_dec(&ht->nelems);
+        if (unlikely(ht->p.automatic_shrinking &&
+                     rht_shrink_below_30(ht, tbl)))
+                schedule_work(&ht->run_work);
+
+out:
+        rcu_read_unlock();
+
+        return err;
+}
+
 #endif /* _LINUX_RHASHTABLE_H */
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index c4c559a45dc8..c89c53a113a8 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -105,14 +105,6 @@ static inline void put_anon_vma(struct anon_vma *anon_vma)
                 __put_anon_vma(anon_vma);
 }
 
-static inline struct anon_vma *page_anon_vma(struct page *page)
-{
-        if (((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) !=
-                                            PAGE_MAPPING_ANON)
-                return NULL;
-        return page_rmapping(page);
-}
-
 static inline void vma_lock_anon_vma(struct vm_area_struct *vma)
 {
         struct anon_vma *anon_vma = vma->anon_vma;
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index dcad7ee0d746..8dcf6825fa88 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -77,6 +77,7 @@ struct rtc_class_ops {
         int (*read_alarm)(struct device *, struct rtc_wkalrm *);
         int (*set_alarm)(struct device *, struct rtc_wkalrm *);
         int (*proc)(struct device *, struct seq_file *);
+        int (*set_mmss64)(struct device *, time64_t secs);
         int (*set_mmss)(struct device *, unsigned long secs);
         int (*read_callback)(struct device *, int data);
         int (*alarm_irq_enable)(struct device *, unsigned int enabled);
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 5db76a32fcab..2da5d1081ad9 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -77,7 +77,20 @@ static inline struct netdev_queue *dev_ingress_queue(struct net_device *dev)
         return rtnl_dereference(dev->ingress_queue);
 }
 
-extern struct netdev_queue *dev_ingress_queue_create(struct net_device *dev);
+struct netdev_queue *dev_ingress_queue_create(struct net_device *dev);
+
+#ifdef CONFIG_NET_CLS_ACT
+void net_inc_ingress_queue(void);
+void net_dec_ingress_queue(void);
+#else
+static inline void net_inc_ingress_queue(void)
+{
+}
+
+static inline void net_dec_ingress_queue(void)
+{
+}
+#endif
 
 extern void rtnetlink_init(void);
 extern void __rtnl_unlock(void);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 6d77432e14ff..8222ae40ecb0 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -125,7 +125,6 @@ struct sched_attr {
         u64 sched_period;
 };
 
-struct exec_domain;
 struct futex_pi_state;
 struct robust_list_head;
 struct bio_list;
@@ -176,6 +175,14 @@ extern void get_iowait_load(unsigned long *nr_waiters, unsigned long *load);
 extern void calc_global_load(unsigned long ticks);
 extern void update_cpu_load_nohz(void);
 
+/* Notifier for when a task gets migrated to a new CPU */
+struct task_migration_notifier {
+        struct task_struct *task;
+        int from_cpu;
+        int to_cpu;
+};
+extern void register_task_migration_notifier(struct notifier_block *n);
+
 extern unsigned long get_parent_ip(unsigned long addr);
 
 extern void dump_cpu_task(int cpu);
@@ -329,6 +336,8 @@ extern asmlinkage void schedule_tail(struct task_struct *prev);
 extern void init_idle(struct task_struct *idle, int cpu);
 extern void init_idle_bootup_task(struct task_struct *idle);
 
+extern cpumask_var_t cpu_isolated_map;
+
 extern int runqueue_is_locked(int cpu);
 
 #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
@@ -1115,15 +1124,28 @@ struct load_weight {
 };
 
 struct sched_avg {
+        u64 last_runnable_update;
+        s64 decay_count;
+        /*
+         * utilization_avg_contrib describes the amount of time that a
+         * sched_entity is running on a CPU. It is based on running_avg_sum
+         * and is scaled in the range [0..SCHED_LOAD_SCALE].
+         * load_avg_contrib described the amount of time that a sched_entity
+         * is runnable on a rq. It is based on both runnable_avg_sum and the
+         * weight of the task.
+         */
+        unsigned long load_avg_contrib, utilization_avg_contrib;
         /*
          * These sums represent an infinite geometric series and so are bound
          * above by 1024/(1-y).  Thus we only need a u32 to store them for all
          * choices of y < 1-2^(-32)*1024.
+         * running_avg_sum reflects the time that the sched_entity is
+         * effectively running on the CPU.
+         * runnable_avg_sum represents the amount of time a sched_entity is on
+         * a runqueue which includes the running time that is monitored by
+         * running_avg_sum.
          */
-        u32 runnable_avg_sum, runnable_avg_period;
-        u64 last_runnable_update;
-        s64 decay_count;
-        unsigned long load_avg_contrib;
+        u32 runnable_avg_sum, avg_period, running_avg_sum;
 };
 
 #ifdef CONFIG_SCHEDSTATS
@@ -1625,11 +1647,11 @@ struct task_struct {
 
         /*
          * numa_faults_locality tracks if faults recorded during the last
-         * scan window were remote/local. The task scan period is adapted
-         * based on the locality of the faults with different weights
-         * depending on whether they were shared or private faults
+         * scan window were remote/local or failed to migrate. The task scan
+         * period is adapted based on the locality of the faults with different
+         * weights depending on whether they were shared or private faults
          */
-        unsigned long numa_faults_locality[2];
+        unsigned long numa_faults_locality[3];
 
         unsigned long numa_pages_migrated;
 #endif /* CONFIG_NUMA_BALANCING */
@@ -1719,6 +1741,7 @@ struct task_struct {
 #define TNF_NO_GROUP    0x02
 #define TNF_SHARED      0x04
 #define TNF_FAULT_LOCAL 0x08
+#define TNF_MIGRATE_FAIL 0x10
 
 #ifdef CONFIG_NUMA_BALANCING
 extern void task_numa_fault(int last_node, int node, int pages, int flags);
@@ -2287,11 +2310,6 @@ extern void set_curr_task(int cpu, struct task_struct *p);
 
 void yield(void);
 
-/*
- * The default (Linux) execution domain.
- */
-extern struct exec_domain       default_exec_domain;
-
 union thread_union {
         struct thread_info thread_info;
         unsigned long stack[THREAD_SIZE/sizeof(long)];
diff --git a/include/linux/security.h b/include/linux/security.h
index a1b7dbd127ff..18264ea9e314 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1556,7 +1556,7 @@ struct security_operations {
         int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);
         int (*inode_permission) (struct inode *inode, int mask);
         int (*inode_setattr)    (struct dentry *dentry, struct iattr *attr);
-        int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);
+        int (*inode_getattr) (const struct path *path);
         int (*inode_setxattr) (struct dentry *dentry, const char *name,
                                const void *value, size_t size, int flags);
         void (*inode_post_setxattr) (struct dentry *dentry, const char *name,
@@ -1716,7 +1716,6 @@ struct security_operations {
         int (*tun_dev_attach_queue) (void *security);
         int (*tun_dev_attach) (struct sock *sk, void *security);
         int (*tun_dev_open) (void *security);
-        void (*skb_owned_by) (struct sk_buff *skb, struct sock *sk);
 #endif  /* CONFIG_SECURITY_NETWORK */
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
@@ -1843,7 +1842,7 @@ int security_inode_readlink(struct dentry *dentry);
 int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd);
 int security_inode_permission(struct inode *inode, int mask);
 int security_inode_setattr(struct dentry *dentry, struct iattr *attr);
-int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry);
+int security_inode_getattr(const struct path *path);
 int security_inode_setxattr(struct dentry *dentry, const char *name,
                             const void *value, size_t size, int flags);
 void security_inode_post_setxattr(struct dentry *dentry, const char *name,
@@ -2259,8 +2258,7 @@ static inline int security_inode_setattr(struct dentry *dentry,
         return 0;
 }
 
-static inline int security_inode_getattr(struct vfsmount *mnt,
-                                          struct dentry *dentry)
+static inline int security_inode_getattr(const struct path *path)
 {
         return 0;
 }
@@ -2735,8 +2733,6 @@ int security_tun_dev_attach_queue(void *security);
 int security_tun_dev_attach(struct sock *sk, void *security);
 int security_tun_dev_open(void *security);
 
-void security_skb_owned_by(struct sk_buff *skb, struct sock *sk);
-
 #else   /* CONFIG_SECURITY_NETWORK */
 static inline int security_unix_stream_connect(struct sock *sock,
                                                struct sock *other,
@@ -2928,11 +2924,6 @@ static inline int security_tun_dev_open(void *security)
 {
         return 0;
 }
-
-static inline void security_skb_owned_by(struct sk_buff *skb, struct sock *sk)
-{
-}
-
 #endif  /* CONFIG_SECURITY_NETWORK */
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index f5df8f687b4d..5f68d0a391ce 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -108,7 +108,7 @@ static inline unsigned __read_seqcount_begin(const seqcount_t *s)
         unsigned ret;
 
 repeat:
-        ret = ACCESS_ONCE(s->sequence);
+        ret = READ_ONCE(s->sequence);
         if (unlikely(ret & 1)) {
                 cpu_relax();
                 goto repeat;
@@ -127,7 +127,7 @@ repeat:
  */
 static inline unsigned raw_read_seqcount(const seqcount_t *s)
 {
-        unsigned ret = ACCESS_ONCE(s->sequence);
+        unsigned ret = READ_ONCE(s->sequence);
         smp_rmb();
         return ret;
 }
@@ -179,7 +179,7 @@ static inline unsigned read_seqcount_begin(const seqcount_t *s)
  */
 static inline unsigned raw_seqcount_begin(const seqcount_t *s)
 {
-        unsigned ret = ACCESS_ONCE(s->sequence);
+        unsigned ret = READ_ONCE(s->sequence);
         smp_rmb();
         return ret & ~1;
 }
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index a8efa235b7c1..78097e7a330a 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -60,6 +60,20 @@ enum {
 };
 
 struct uart_8250_dma;
+struct uart_8250_port;
+
+/**
+ * 8250 core driver operations
+ *
+ * @setup_irq()         Setup irq handling. The universal 8250 driver links this
+ *                      port to the irq chain. Other drivers may @request_irq().
+ * @release_irq()       Undo irq handling. The universal 8250 driver unlinks
+ *                      the port from the irq chain.
+ */
+struct uart_8250_ops {
+        int             (*setup_irq)(struct uart_8250_port *);
+        void            (*release_irq)(struct uart_8250_port *);
+};
 
 /*
  * This should be used by drivers which want to register
@@ -88,6 +102,8 @@ struct uart_8250_port {
         unsigned char           canary;         /* non-zero during system sleep
                                                  *   if no_console_suspend
                                                  */
+        unsigned char           probe;
+#define UART_PROBE_RSA  (1 << 0)
 
         /*
          * Some bits in registers are cleared on a read, so they must
@@ -100,6 +116,7 @@ struct uart_8250_port {
         unsigned char           msr_saved_flags;
 
         struct uart_8250_dma    *dma;
+        const struct uart_8250_ops *ops;
 
         /* 8250 specific callbacks */
         int                     (*dl_read)(struct uart_8250_port *);
@@ -118,11 +135,8 @@ void serial8250_resume_port(int line);
 
 extern int early_serial_setup(struct uart_port *port);
 
-extern int serial8250_find_port(struct uart_port *p);
-extern int serial8250_find_port_for_earlycon(void);
 extern unsigned int serial8250_early_in(struct uart_port *port, int offset);
 extern void serial8250_early_out(struct uart_port *port, int offset, int value);
-extern int setup_early_serial8250_console(char *cmdline);
 extern void serial8250_do_set_termios(struct uart_port *port,
                 struct ktermios *termios, struct ktermios *old);
 extern int serial8250_do_startup(struct uart_port *port);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index baf3e1d08416..025dad9dcde4 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -143,13 +143,13 @@ struct uart_port {
         unsigned char           iotype;                 /* io access style */
         unsigned char           unused1;
 
-#define UPIO_PORT               (0)                     /* 8b I/O port access */
-#define UPIO_HUB6               (1)                     /* Hub6 ISA card */
-#define UPIO_MEM                (2)                     /* 8b MMIO access */
-#define UPIO_MEM32              (3)                     /* 32b little endian */
-#define UPIO_MEM32BE            (4)                     /* 32b big endian */
-#define UPIO_AU                 (5)                     /* Au1x00 and RT288x type IO */
-#define UPIO_TSI                (6)                     /* Tsi108/109 type IO */
+#define UPIO_PORT               (SERIAL_IO_PORT)        /* 8b I/O port access */
+#define UPIO_HUB6               (SERIAL_IO_HUB6)        /* Hub6 ISA card */
+#define UPIO_MEM                (SERIAL_IO_MEM)         /* 8b MMIO access */
+#define UPIO_MEM32              (SERIAL_IO_MEM32)       /* 32b little endian */
+#define UPIO_AU                 (SERIAL_IO_AU)          /* Au1x00 and RT288x type IO */
+#define UPIO_TSI                (SERIAL_IO_TSI)         /* Tsi108/109 type IO */
+#define UPIO_MEM32BE            (SERIAL_IO_MEM32BE)     /* 32b big endian */
 
         unsigned int            read_status_mask;       /* driver specific */
         unsigned int            ignore_status_mask;     /* driver specific */
@@ -235,7 +235,9 @@ struct uart_port {
         const struct uart_ops   *ops;
         unsigned int            custom_divisor;
         unsigned int            line;                   /* port index */
+        unsigned int            minor;
         resource_size_t         mapbase;                /* for ioremap */
+        resource_size_t         mapsize;
         struct device           *dev;                   /* parent device */
         unsigned char           hub6;                   /* this should be in the 8250 driver */
         unsigned char           suspended;
@@ -336,24 +338,29 @@ struct earlycon_device {
         char options[16];               /* e.g., 115200n8 */
         unsigned int baud;
 };
-int setup_earlycon(char *buf, const char *match,
-                   int (*setup)(struct earlycon_device *, const char *));
 
+struct earlycon_id {
+        char    name[16];
+        int     (*setup)(struct earlycon_device *, const char *options);
+} __aligned(32);
+
+extern int setup_earlycon(char *buf);
 extern int of_setup_earlycon(unsigned long addr,
                              int (*setup)(struct earlycon_device *, const char *));
 
-#define EARLYCON_DECLARE(name, func) \
-static int __init name ## _setup_earlycon(char *buf) \
-{ \
-        return setup_earlycon(buf, __stringify(name), func); \
-} \
-early_param("earlycon", name ## _setup_earlycon);
+#define EARLYCON_DECLARE(_name, func)                                   \
+        static const struct earlycon_id __earlycon_##_name              \
+                __used __section(__earlycon_table)                      \
+                 = { .name  = __stringify(_name),                       \
+                     .setup = func  }
 
 #define OF_EARLYCON_DECLARE(name, compat, fn)                           \
         _OF_DECLARE(earlycon, name, compat, fn, void *)
 
 struct uart_port *uart_get_console(struct uart_port *ports, int nr,
                                    struct console *c);
+int uart_parse_earlycon(char *p, unsigned char *iotype, unsigned long *addr,
+                        char **options);
 void uart_parse_options(char *options, int *baud, int *parity, int *bits,
                         int *flow);
 int uart_set_options(struct uart_port *port, struct console *co, int baud,
diff --git a/include/linux/serial_mfd.h b/include/linux/serial_mfd.h
deleted file mode 100644
index 2b071e0b034d..000000000000
--- a/include/linux/serial_mfd.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _SERIAL_MFD_H_
-#define _SERIAL_MFD_H_
-
-/* HW register offset definition */
-#define UART_FOR        0x08
-#define UART_PS         0x0C
-#define UART_MUL        0x0D
-#define UART_DIV        0x0E
-
-#define HSU_GBL_IEN     0x0
-#define HSU_GBL_IST     0x4
-
-#define HSU_GBL_INT_BIT_PORT0   0x0
-#define HSU_GBL_INT_BIT_PORT1   0x1
-#define HSU_GBL_INT_BIT_PORT2   0x2
-#define HSU_GBL_INT_BIT_IRI     0x3
-#define HSU_GBL_INT_BIT_HDLC    0x4
-#define HSU_GBL_INT_BIT_DMA     0x5
-
-#define HSU_GBL_ISR     0x8
-#define HSU_GBL_DMASR   0x400
-#define HSU_GBL_DMAISR  0x404
-
-#define HSU_PORT_REG_OFFSET     0x80
-#define HSU_PORT0_REG_OFFSET    0x80
-#define HSU_PORT1_REG_OFFSET    0x100
-#define HSU_PORT2_REG_OFFSET    0x180
-#define HSU_PORT_REG_LENGTH     0x80
-
-#define HSU_DMA_CHANS_REG_OFFSET        0x500
-#define HSU_DMA_CHANS_REG_LENGTH        0x40
-
-#define HSU_CH_SR               0x0     /* channel status reg */
-#define HSU_CH_CR               0x4     /* control reg */
-#define HSU_CH_DCR              0x8     /* descriptor control reg */
-#define HSU_CH_BSR              0x10    /* max fifo buffer size reg */
-#define HSU_CH_MOTSR            0x14    /* minimum ocp transfer size */
-#define HSU_CH_D0SAR            0x20    /* desc 0 start addr */
-#define HSU_CH_D0TSR            0x24    /* desc 0 transfer size */
-#define HSU_CH_D1SAR            0x28
-#define HSU_CH_D1TSR            0x2C
-#define HSU_CH_D2SAR            0x30
-#define HSU_CH_D2TSR            0x34
-#define HSU_CH_D3SAR            0x38
-#define HSU_CH_D3TSR            0x3C
-
-#endif
diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h
index abdf1f229dc3..dd0ba502ccb3 100644
--- a/include/linux/shdma-base.h
+++ b/include/linux/shdma-base.h
@@ -69,6 +69,7 @@ struct shdma_chan {
         int id;                         /* Raw id of this channel */
         int irq;                        /* Channel IRQ */
         int slave_id;                   /* Client ID for slave DMA */
+        int real_slave_id;              /* argument passed to filter function */
         int hw_req;                     /* DMA request line for slave DMA - same
                                          * as MID/RID, used with DT */
         enum shdma_pm_state pm_state;
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 30007afe70b3..06793b598f44 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -166,10 +166,16 @@ struct nf_conntrack {
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
 struct nf_bridge_info {
         atomic_t                use;
+        enum {
+                BRNF_PROTO_UNCHANGED,
+                BRNF_PROTO_8021Q,
+                BRNF_PROTO_PPPOE
+        } orig_proto;
+        bool                    pkt_otherhost;
         unsigned int            mask;
         struct net_device       *physindev;
         struct net_device       *physoutdev;
-        unsigned long           data[32 / sizeof(unsigned long)];
+        char                    neigh_header[8];
 };
 #endif
 
@@ -492,7 +498,6 @@ static inline u32 skb_mstamp_us_delta(const struct skb_mstamp *t1,
   *     @napi_id: id of the NAPI struct this skb came from
  *      @secmark: security marking
  *      @mark: Generic packet mark
- *      @dropcount: total number of sk_receive_queue overflows
  *      @vlan_proto: vlan encapsulation protocol
  *      @vlan_tci: vlan tag control information
  *      @inner_protocol: Protocol (encapsulation)
@@ -641,7 +646,6 @@ struct sk_buff {
 #endif
         union {
                 __u32           mark;
-                __u32           dropcount;
                 __u32           reserved_tailroom;
         };
 
@@ -870,8 +874,7 @@ unsigned int skb_seq_read(unsigned int consumed, const u8 **data,
 void skb_abort_seq_read(struct skb_seq_state *st);
 
 unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
-                           unsigned int to, struct ts_config *config,
-                           struct ts_state *state);
+                           unsigned int to, struct ts_config *config);
 
 /*
  * Packet hash types specify the type of hash in skb_set_hash.
@@ -948,6 +951,13 @@ static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from)
         to->l4_hash = from->l4_hash;
 };
 
+static inline void skb_sender_cpu_clear(struct sk_buff *skb)
+{
+#ifdef CONFIG_XPS
+        skb->sender_cpu = 0;
+#endif
+}
+
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
 static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 {
@@ -3006,6 +3016,18 @@ static inline bool __skb_checksum_validate_needed(struct sk_buff *skb,
  */
 #define CHECKSUM_BREAK 76
 
+/* Unset checksum-complete
+ *
+ * Unset checksum complete can be done when packet is being modified
+ * (uncompressed for instance) and checksum-complete value is
+ * invalidated.
+ */
+static inline void skb_checksum_complete_unset(struct sk_buff *skb)
+{
+        if (skb->ip_summed == CHECKSUM_COMPLETE)
+                skb->ip_summed = CHECKSUM_NONE;
+}
+
 /* Validate (init) checksum based on checksum complete.
  *
  * Return values:
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 76f1feeabd38..ffd24c830151 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -18,7 +18,7 @@
 
 /*
  * Flags to pass to kmem_cache_create().
- * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
+ * The ones marked DEBUG are only valid if CONFIG_DEBUG_SLAB is set.
  */
 #define SLAB_DEBUG_FREE         0x00000100UL    /* DEBUG: Perform (expensive) checks on free */
 #define SLAB_RED_ZONE           0x00000400UL    /* DEBUG: Red zone objs in a cache */
diff --git a/include/linux/smp.h b/include/linux/smp.h
index be91db2a7017..c4414074bd88 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -18,7 +18,7 @@ struct call_single_data {
         struct llist_node llist;
         smp_call_func_t func;
         void *info;
-        u16 flags;
+        unsigned int flags;
 };
 
 /* total number of cpus in this system (may exceed NR_CPUS) */
diff --git a/include/linux/smpboot.h b/include/linux/smpboot.h
index 13e929679550..d600afb21926 100644
--- a/include/linux/smpboot.h
+++ b/include/linux/smpboot.h
@@ -47,6 +47,5 @@ struct smp_hotplug_thread {
 
 int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread);
 void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread);
-int smpboot_thread_schedule(void);
 
 #endif
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index 46cca4c06848..083ac388098e 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -19,8 +19,8 @@ void sock_diag_unregister(const struct sock_diag_handler *h);
 void sock_diag_register_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh));
 void sock_diag_unregister_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh));
 
-int sock_diag_check_cookie(void *sk, __u32 *cookie);
-void sock_diag_save_cookie(void *sk, __u32 *cookie);
+int sock_diag_check_cookie(struct sock *sk, const __u32 *cookie);
+void sock_diag_save_cookie(struct sock *sk, __u32 *cookie);
 
 int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr);
 int sock_diag_put_filterinfo(bool may_report_filterinfo, struct sock *sk,
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 5c19cba34dce..5bf59c8493b7 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -51,6 +51,7 @@ struct msghdr {
         void            *msg_control;   /* ancillary data */
         __kernel_size_t msg_controllen; /* ancillary data buffer length */
         unsigned int    msg_flags;      /* flags on received message */
+        struct kiocb    *msg_iocb;      /* ptr to iocb for async requests */
 };
  
 struct user_msghdr {
@@ -138,6 +139,11 @@ static inline struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr
         return __cmsg_nxthdr(__msg->msg_control, __msg->msg_controllen, __cmsg);
 }
 
+static inline size_t msg_data_left(struct msghdr *msg)
+{
+        return iov_iter_count(&msg->msg_iter);
+}
+
 /* "Socket"-level control message types: */
 
 #define SCM_RIGHTS      0x01            /* rw: access rights (array of int) */
@@ -181,6 +187,7 @@ struct ucred {
 #define AF_WANPIPE      25      /* Wanpipe API Sockets */
 #define AF_LLC          26      /* Linux LLC                    */
 #define AF_IB           27      /* Native InfiniBand address    */
+#define AF_MPLS         28      /* MPLS */
 #define AF_CAN          29      /* Controller Area Network      */
 #define AF_TIPC         30      /* TIPC sockets                 */
 #define AF_BLUETOOTH    31      /* Bluetooth sockets            */
@@ -226,6 +233,7 @@ struct ucred {
 #define PF_WANPIPE      AF_WANPIPE
 #define PF_LLC          AF_LLC
 #define PF_IB           AF_IB
+#define PF_MPLS         AF_MPLS
 #define PF_CAN          AF_CAN
 #define PF_TIPC         AF_TIPC
 #define PF_BLUETOOTH    AF_BLUETOOTH
diff --git a/include/linux/spi/at86rf230.h b/include/linux/spi/at86rf230.h
index cd519a11c2c6..b63fe6f5fdc8 100644
--- a/include/linux/spi/at86rf230.h
+++ b/include/linux/spi/at86rf230.h
@@ -22,6 +22,7 @@ struct at86rf230_platform_data {
         int rstn;
         int slp_tr;
         int dig2;
+        u8 xtal_trim;
 };
 
 #endif
diff --git a/include/linux/spi/cc2520.h b/include/linux/spi/cc2520.h
index 85b8ee67e937..e741e8baad92 100644
--- a/include/linux/spi/cc2520.h
+++ b/include/linux/spi/cc2520.h
@@ -21,6 +21,7 @@ struct cc2520_platform_data {
         int sfd;
         int reset;
         int vreg;
+        bool amplified;
 };
 
 #endif
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index ed9489d893a4..d673072346f2 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -162,8 +162,6 @@ struct spi_transfer;
  * @remove: Unbinds this driver from the spi device
  * @shutdown: Standard shutdown callback used during system state
  *      transitions such as powerdown/halt and kexec
- * @suspend: Standard suspend callback used during system state transitions
- * @resume: Standard resume callback used during system state transitions
  * @driver: SPI device drivers should initialize the name and owner
  *      field of this structure.
  *
@@ -184,8 +182,6 @@ struct spi_driver {
         int                     (*probe)(struct spi_device *spi);
         int                     (*remove)(struct spi_device *spi);
         void                    (*shutdown)(struct spi_device *spi);
-        int                     (*suspend)(struct spi_device *spi, pm_message_t mesg);
-        int                     (*resume)(struct spi_device *spi);
         struct device_driver    driver;
 };
 
@@ -294,6 +290,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
  *                    transfer_one_message are mutually exclusive; when both
  *                    are set, the generic subsystem does not call your
  *                    transfer_one callback.
+ * @handle_err: the subsystem calls the driver to handle an error that occurs
+ *              in the generic implementation of transfer_one_message().
  * @unprepare_message: undo any work done by prepare_message().
  * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS
  *      number. Any individual value may be -ENOENT for CS lines that
@@ -448,6 +446,8 @@ struct spi_master {
         void (*set_cs)(struct spi_device *spi, bool enable);
         int (*transfer_one)(struct spi_master *master, struct spi_device *spi,
                             struct spi_transfer *transfer);
+        void (*handle_err)(struct spi_master *master,
+                           struct spi_message *message);
 
         /* gpio chip select */
         int                     *cs_gpios;
@@ -649,7 +649,7 @@ struct spi_transfer {
  * sequence completes.  On some systems, many such sequences can execute as
  * as single programmed DMA transfer.  On all systems, these messages are
  * queued, and might complete after transactions to other devices.  Messages
- * sent to a given spi_device are alway executed in FIFO order.
+ * sent to a given spi_device are always executed in FIFO order.
  *
  * The code that submits an spi_message (and its spi_transfers)
  * to the lower layers is responsible for managing its memory.
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index 9cfd9623fb03..bdeb4567b71e 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -182,7 +182,7 @@ static inline int srcu_read_lock_held(struct srcu_struct *sp)
  * lockdep_is_held() calls.
  */
 #define srcu_dereference_check(p, sp, c) \
-        __rcu_dereference_check((p), srcu_read_lock_held(sp) || (c), __rcu)
+        __rcu_dereference_check((p), (c) || srcu_read_lock_held(sp), __rcu)
 
 /**
  * srcu_dereference - fetch SRCU-protected pointer for later dereferencing
diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h
index 669045ab73f3..0a34489a46b6 100644
--- a/include/linux/stacktrace.h
+++ b/include/linux/stacktrace.h
@@ -7,8 +7,6 @@ struct task_struct;
 struct pt_regs;
 
 #ifdef CONFIG_STACKTRACE
-struct task_struct;
-
 struct stack_trace {
         unsigned int nr_entries, max_entries;
         unsigned long *entries;
diff --git a/include/linux/stddef.h b/include/linux/stddef.h
index f4aec0e75c3a..076af437284d 100644
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -19,3 +19,12 @@ enum {
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 #endif
+
+/**
+ * offsetofend(TYPE, MEMBER)
+ *
+ * @TYPE: The type of the structure
+ * @MEMBER: The member within the structure to get the end offset of
+ */
+#define offsetofend(TYPE, MEMBER) \
+        (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index cd63851b57f2..7f484a239f53 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -114,6 +114,8 @@ struct plat_stmmacenet_data {
         int maxmtu;
         int multicast_filter_bins;
         int unicast_filter_entries;
+        int tx_fifo_size;
+        int rx_fifo_size;
         void (*fix_mac_speed)(void *priv, unsigned int speed);
         void (*bus_setup)(void __iomem *ioaddr);
         void *(*setup)(struct platform_device *pdev);
diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index 657571817260..71f711db4500 100644
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -10,7 +10,7 @@ enum string_size_units {
         STRING_UNITS_2,         /* use binary powers of 2^10 */
 };
 
-void string_get_size(u64 size, enum string_size_units units,
+void string_get_size(u64 size, u64 blk_size, enum string_size_units units,
                      char *buf, int len);
 
 #define UNESCAPE_SPACE          0x01
@@ -47,22 +47,22 @@ static inline int string_unescape_any_inplace(char *buf)
 #define ESCAPE_ANY_NP           (ESCAPE_ANY | ESCAPE_NP)
 #define ESCAPE_HEX              0x20
 
-int string_escape_mem(const char *src, size_t isz, char **dst, size_t osz,
+int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,
                 unsigned int flags, const char *esc);
 
 static inline int string_escape_mem_any_np(const char *src, size_t isz,
-                char **dst, size_t osz, const char *esc)
+                char *dst, size_t osz, const char *esc)
 {
         return string_escape_mem(src, isz, dst, osz, ESCAPE_ANY_NP, esc);
 }
 
-static inline int string_escape_str(const char *src, char **dst, size_t sz,
+static inline int string_escape_str(const char *src, char *dst, size_t sz,
                 unsigned int flags, const char *esc)
 {
         return string_escape_mem(src, strlen(src), dst, sz, flags, esc);
 }
 
-static inline int string_escape_str_any_np(const char *src, char **dst,
+static inline int string_escape_str_any_np(const char *src, char *dst,
                 size_t sz, const char *esc)
 {
         return string_escape_str(src, dst, sz, ESCAPE_ANY_NP, esc);
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index c57d8ea0716c..59a7889e15db 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -60,17 +60,17 @@ struct rpc_xprt;
 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
 void            rpc_register_sysctl(void);
 void            rpc_unregister_sysctl(void);
-int             sunrpc_debugfs_init(void);
+void            sunrpc_debugfs_init(void);
 void            sunrpc_debugfs_exit(void);
-int             rpc_clnt_debugfs_register(struct rpc_clnt *);
+void            rpc_clnt_debugfs_register(struct rpc_clnt *);
 void            rpc_clnt_debugfs_unregister(struct rpc_clnt *);
-int             rpc_xprt_debugfs_register(struct rpc_xprt *);
+void            rpc_xprt_debugfs_register(struct rpc_xprt *);
 void            rpc_xprt_debugfs_unregister(struct rpc_xprt *);
 #else
-static inline int
+static inline void
 sunrpc_debugfs_init(void)
 {
-        return 0;
+        return;
 }
 
 static inline void
@@ -79,10 +79,10 @@ sunrpc_debugfs_exit(void)
         return;
 }
 
-static inline int
+static inline void
 rpc_clnt_debugfs_register(struct rpc_clnt *clnt)
 {
-        return 0;
+        return;
 }
 
 static inline void
@@ -91,10 +91,10 @@ rpc_clnt_debugfs_unregister(struct rpc_clnt *clnt)
         return;
 }
 
-static inline int
+static inline void
 rpc_xprt_debugfs_register(struct rpc_xprt *xprt)
 {
-        return 0;
+        return;
 }
 
 static inline void
diff --git a/include/linux/sunrpc/msg_prot.h b/include/linux/sunrpc/msg_prot.h
index aadc6a04e1ac..807371357160 100644
--- a/include/linux/sunrpc/msg_prot.h
+++ b/include/linux/sunrpc/msg_prot.h
@@ -142,12 +142,18 @@ typedef __be32	rpc_fraghdr;
         (RPC_REPHDRSIZE + (2 + RPC_MAX_AUTH_SIZE/4))
 
 /*
- * RFC1833/RFC3530 rpcbind (v3+) well-known netid's.
+ * Well-known netids. See:
+ *
+ *   http://www.iana.org/assignments/rpc-netids/rpc-netids.xhtml
  */
 #define RPCBIND_NETID_UDP       "udp"
 #define RPCBIND_NETID_TCP       "tcp"
+#define RPCBIND_NETID_RDMA      "rdma"
+#define RPCBIND_NETID_SCTP      "sctp"
 #define RPCBIND_NETID_UDP6      "udp6"
 #define RPCBIND_NETID_TCP6      "tcp6"
+#define RPCBIND_NETID_RDMA6     "rdma6"
+#define RPCBIND_NETID_SCTP6     "sctp6"
 #define RPCBIND_NETID_LOCAL     "local"
 
 /*
diff --git a/include/linux/sunrpc/xprtrdma.h b/include/linux/sunrpc/xprtrdma.h
index 64a0a0a97b23..c984c85981ea 100644
--- a/include/linux/sunrpc/xprtrdma.h
+++ b/include/linux/sunrpc/xprtrdma.h
@@ -41,11 +41,6 @@
 #define _LINUX_SUNRPC_XPRTRDMA_H
 
 /*
- * rpcbind (v3+) RDMA netid.
- */
-#define RPCBIND_NETID_RDMA      "rdma"
-
-/*
  * Constants. Max RPC/NFS header is big enough to account for
  * additional marshaling buffers passed down by Linux client.
  *
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 7067eca501e2..cee108cbe2d5 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -307,7 +307,7 @@ extern void lru_add_drain(void);
 extern void lru_add_drain_cpu(int cpu);
 extern void lru_add_drain_all(void);
 extern void rotate_reclaimable_page(struct page *page);
-extern void deactivate_page(struct page *page);
+extern void deactivate_file_page(struct page *page);
 extern void swap_setup(void);
 
 extern void add_page_to_unevictable_list(struct page *page);
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index b7361f831226..795d5fea5697 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -212,4 +212,7 @@ static inline void setup_sysctl_set(struct ctl_table_set *p,
 
 #endif /* CONFIG_SYSCTL */
 
+int sysctl_max_threads(struct ctl_table *table, int write,
+                       void __user *buffer, size_t *lenp, loff_t *ppos);
+
 #endif /* _LINUX_SYSCTL_H */
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index ddad16148bd6..99382c0df17e 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -57,6 +57,21 @@ do {							\
 #define sysfs_attr_init(attr) do {} while (0)
 #endif
 
+/**
+ * struct attribute_group - data structure used to declare an attribute group.
+ * @name:       Optional: Attribute group name
+ *              If specified, the attribute group will be created in
+ *              a new subdirectory with this name.
+ * @is_visible: Optional: Function to return permissions associated with an
+ *              attribute of the group. Will be called repeatedly for each
+ *              attribute in the group. Only read/write permissions as well as
+ *              SYSFS_PREALLOC are accepted. Must return 0 if an attribute is
+ *              not visible. The returned value will replace static permissions
+ *              defined in struct attribute or struct bin_attribute.
+ * @attrs:      Pointer to NULL terminated list of attributes.
+ * @bin_attrs:  Pointer to NULL terminated list of binary attributes.
+ *              Either attrs or bin_attrs or both must be provided.
+ */
 struct attribute_group {
         const char              *name;
         umode_t                 (*is_visible)(struct kobject *,
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 1a7adb411647..0caa3a2d4106 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -58,6 +58,7 @@ static inline unsigned int tcp_optlen(const struct sk_buff *skb)
 struct tcp_fastopen_cookie {
         s8      len;
         u8      val[TCP_FASTOPEN_COOKIE_MAX];
+        bool    exp;    /* In RFC6994 experimental option format */
 };
 
 /* This defines a selective acknowledgement block. */
@@ -111,7 +112,7 @@ struct tcp_request_sock_ops;
 struct tcp_request_sock {
         struct inet_request_sock        req;
         const struct tcp_request_sock_ops *af_specific;
-        struct sock                     *listener; /* needed for TFO */
+        bool                            tfo_listener;
         u32                             rcv_isn;
         u32                             snt_isn;
         u32                             snt_synack; /* synack sent time */
@@ -188,6 +189,7 @@ struct tcp_sock {
         u8      do_early_retrans:1,/* Enable RFC5827 early-retransmit  */
                 syn_data:1,     /* SYN includes data */
                 syn_fastopen:1, /* SYN includes Fast Open option */
+                syn_fastopen_exp:1,/* SYN includes Fast Open exp. option */
                 syn_data_acked:1,/* data in SYN is acked by SYN-ACK */
                 is_cwnd_limited:1;/* forward progress limited by snd_cwnd? */
         u32     tlp_high_seq;   /* snd_nxt at the time of TLP retransmit. */
@@ -236,7 +238,6 @@ struct tcp_sock {
         u32     lost_out;       /* Lost packets                 */
         u32     sacked_out;     /* SACK'd packets                       */
         u32     fackets_out;    /* FACK'd packets                       */
-        u32     tso_deferred;
 
         /* from STCP, retrans queue hinting */
         struct sk_buff* lost_skb_hint;
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index fc52e307efab..5eac316490ea 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -314,6 +314,8 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
 }
 
 #endif
+
+#if IS_ENABLED(CONFIG_THERMAL)
 struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
                 void *, struct thermal_zone_device_ops *,
                 const struct thermal_zone_params *, int, int);
@@ -340,8 +342,58 @@ struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
                 struct thermal_cooling_device *, int);
 void thermal_cdev_update(struct thermal_cooling_device *);
 void thermal_notify_framework(struct thermal_zone_device *, int);
-
-#ifdef CONFIG_NET
+#else
+static inline struct thermal_zone_device *thermal_zone_device_register(
+        const char *type, int trips, int mask, void *devdata,
+        struct thermal_zone_device_ops *ops,
+        const struct thermal_zone_params *tzp,
+        int passive_delay, int polling_delay)
+{ return ERR_PTR(-ENODEV); }
+static inline void thermal_zone_device_unregister(
+        struct thermal_zone_device *tz)
+{ }
+static inline int thermal_zone_bind_cooling_device(
+        struct thermal_zone_device *tz, int trip,
+        struct thermal_cooling_device *cdev,
+        unsigned long upper, unsigned long lower)
+{ return -ENODEV; }
+static inline int thermal_zone_unbind_cooling_device(
+        struct thermal_zone_device *tz, int trip,
+        struct thermal_cooling_device *cdev)
+{ return -ENODEV; }
+static inline void thermal_zone_device_update(struct thermal_zone_device *tz)
+{ }
+static inline struct thermal_cooling_device *
+thermal_cooling_device_register(char *type, void *devdata,
+        const struct thermal_cooling_device_ops *ops)
+{ return ERR_PTR(-ENODEV); }
+static inline struct thermal_cooling_device *
+thermal_of_cooling_device_register(struct device_node *np,
+        char *type, void *devdata, const struct thermal_cooling_device_ops *ops)
+{ return ERR_PTR(-ENODEV); }
+static inline void thermal_cooling_device_unregister(
+        struct thermal_cooling_device *cdev)
+{ }
+static inline struct thermal_zone_device *thermal_zone_get_zone_by_name(
+                const char *name)
+{ return ERR_PTR(-ENODEV); }
+static inline int thermal_zone_get_temp(
+                struct thermal_zone_device *tz, unsigned long *temp)
+{ return -ENODEV; }
+static inline int get_tz_trend(struct thermal_zone_device *tz, int trip)
+{ return -ENODEV; }
+static inline struct thermal_instance *
+get_thermal_instance(struct thermal_zone_device *tz,
+        struct thermal_cooling_device *cdev, int trip)
+{ return ERR_PTR(-ENODEV); }
+static inline void thermal_cdev_update(struct thermal_cooling_device *cdev)
+{ }
+static inline void thermal_notify_framework(struct thermal_zone_device *tz,
+        int trip)
+{ }
+#endif /* CONFIG_THERMAL */
+
+#if defined(CONFIG_NET) && IS_ENABLED(CONFIG_THERMAL)
 extern int thermal_generate_netlink_event(struct thermal_zone_device *tz,
                                                 enum events event);
 #else
diff --git a/include/linux/tick.h b/include/linux/tick.h
index 9c085dc12ae9..f8492da57ad3 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -1,7 +1,5 @@
-/*  linux/include/linux/tick.h
- *
- *  This file contains the structure definitions for tick related functions
- *
+/*
+ * Tick related global functions
  */
 #ifndef _LINUX_TICK_H
 #define _LINUX_TICK_H
@@ -9,149 +7,99 @@
 #include <linux/clockchips.h>
 #include <linux/irqflags.h>
 #include <linux/percpu.h>
-#include <linux/hrtimer.h>
 #include <linux/context_tracking_state.h>
 #include <linux/cpumask.h>
 #include <linux/sched.h>
 
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
-
-enum tick_device_mode {
-        TICKDEV_MODE_PERIODIC,
-        TICKDEV_MODE_ONESHOT,
-};
-
-struct tick_device {
-        struct clock_event_device *evtdev;
-        enum tick_device_mode mode;
-};
-
-enum tick_nohz_mode {
-        NOHZ_MODE_INACTIVE,
-        NOHZ_MODE_LOWRES,
-        NOHZ_MODE_HIGHRES,
-};
-
-/**
- * struct tick_sched - sched tick emulation and no idle tick control/stats
- * @sched_timer:        hrtimer to schedule the periodic tick in high
- *                      resolution mode
- * @last_tick:          Store the last tick expiry time when the tick
- *                      timer is modified for nohz sleeps. This is necessary
- *                      to resume the tick timer operation in the timeline
- *                      when the CPU returns from nohz sleep.
- * @tick_stopped:       Indicator that the idle tick has been stopped
- * @idle_jiffies:       jiffies at the entry to idle for idle time accounting
- * @idle_calls:         Total number of idle calls
- * @idle_sleeps:        Number of idle calls, where the sched tick was stopped
- * @idle_entrytime:     Time when the idle call was entered
- * @idle_waketime:      Time when the idle was interrupted
- * @idle_exittime:      Time when the idle state was left
- * @idle_sleeptime:     Sum of the time slept in idle with sched tick stopped
- * @iowait_sleeptime:   Sum of the time slept in idle with sched tick stopped, with IO outstanding
- * @sleep_length:       Duration of the current idle sleep
- * @do_timer_lst:       CPU was the last one doing do_timer before going idle
- */
-struct tick_sched {
-        struct hrtimer                  sched_timer;
-        unsigned long                   check_clocks;
-        enum tick_nohz_mode             nohz_mode;
-        ktime_t                         last_tick;
-        int                             inidle;
-        int                             tick_stopped;
-        unsigned long                   idle_jiffies;
-        unsigned long                   idle_calls;
-        unsigned long                   idle_sleeps;
-        int                             idle_active;
-        ktime_t                         idle_entrytime;
-        ktime_t                         idle_waketime;
-        ktime_t                         idle_exittime;
-        ktime_t                         idle_sleeptime;
-        ktime_t                         iowait_sleeptime;
-        ktime_t                         sleep_length;
-        unsigned long                   last_jiffies;
-        unsigned long                   next_jiffies;
-        ktime_t                         idle_expires;
-        int                             do_timer_last;
-};
-
 extern void __init tick_init(void);
-extern int tick_is_oneshot_available(void);
-extern struct tick_device *tick_get_device(int cpu);
-
 extern void tick_freeze(void);
 extern void tick_unfreeze(void);
+/* Should be core only, but ARM BL switcher requires it */
+extern void tick_suspend_local(void);
+/* Should be core only, but XEN resume magic and ARM BL switcher require it */
+extern void tick_resume_local(void);
+extern void tick_handover_do_timer(void);
+extern void tick_cleanup_dead_cpu(int cpu);
+#else /* CONFIG_GENERIC_CLOCKEVENTS */
+static inline void tick_init(void) { }
+static inline void tick_freeze(void) { }
+static inline void tick_unfreeze(void) { }
+static inline void tick_suspend_local(void) { }
+static inline void tick_resume_local(void) { }
+static inline void tick_handover_do_timer(void) { }
+static inline void tick_cleanup_dead_cpu(int cpu) { }
+#endif /* !CONFIG_GENERIC_CLOCKEVENTS */
 
-# ifdef CONFIG_HIGH_RES_TIMERS
-extern int tick_init_highres(void);
-extern int tick_program_event(ktime_t expires, int force);
-extern void tick_setup_sched_timer(void);
-# endif
-
-# if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS
-extern void tick_cancel_sched_timer(int cpu);
-# else
-static inline void tick_cancel_sched_timer(int cpu) { }
-# endif
-
-# ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
-extern struct tick_device *tick_get_broadcast_device(void);
-extern struct cpumask *tick_get_broadcast_mask(void);
-
-#  ifdef CONFIG_TICK_ONESHOT
-extern struct cpumask *tick_get_broadcast_oneshot_mask(void);
-#  endif
-
-# endif /* BROADCAST */
-
-# ifdef CONFIG_TICK_ONESHOT
-extern void tick_clock_notify(void);
-extern int tick_check_oneshot_change(int allow_nohz);
-extern struct tick_sched *tick_get_tick_sched(int cpu);
+#ifdef CONFIG_TICK_ONESHOT
 extern void tick_irq_enter(void);
-extern int tick_oneshot_mode_active(void);
 #  ifndef arch_needs_cpu
 #   define arch_needs_cpu() (0)
 #  endif
 # else
-static inline void tick_clock_notify(void) { }
-static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }
 static inline void tick_irq_enter(void) { }
-static inline int tick_oneshot_mode_active(void) { return 0; }
-# endif
+#endif
 
-#else /* CONFIG_GENERIC_CLOCKEVENTS */
-static inline void tick_init(void) { }
-static inline void tick_freeze(void) { }
-static inline void tick_unfreeze(void) { }
-static inline void tick_cancel_sched_timer(int cpu) { }
-static inline void tick_clock_notify(void) { }
-static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }
-static inline void tick_irq_enter(void) { }
-static inline int tick_oneshot_mode_active(void) { return 0; }
-#endif /* !CONFIG_GENERIC_CLOCKEVENTS */
+#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)
+extern void hotplug_cpu__broadcast_tick_pull(int dead_cpu);
+#else
+static inline void hotplug_cpu__broadcast_tick_pull(int dead_cpu) { }
+#endif
 
-# ifdef CONFIG_NO_HZ_COMMON
-DECLARE_PER_CPU(struct tick_sched, tick_cpu_sched);
+enum tick_broadcast_mode {
+        TICK_BROADCAST_OFF,
+        TICK_BROADCAST_ON,
+        TICK_BROADCAST_FORCE,
+};
+
+enum tick_broadcast_state {
+        TICK_BROADCAST_EXIT,
+        TICK_BROADCAST_ENTER,
+};
+
+#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
+extern void tick_broadcast_control(enum tick_broadcast_mode mode);
+#else
+static inline void tick_broadcast_control(enum tick_broadcast_mode mode) { }
+#endif /* BROADCAST */
+
+#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)
+extern int tick_broadcast_oneshot_control(enum tick_broadcast_state state);
+#else
+static inline int tick_broadcast_oneshot_control(enum tick_broadcast_state state) { return 0; }
+#endif
 
-static inline int tick_nohz_tick_stopped(void)
+static inline void tick_broadcast_enable(void)
+{
+        tick_broadcast_control(TICK_BROADCAST_ON);
+}
+static inline void tick_broadcast_disable(void)
+{
+        tick_broadcast_control(TICK_BROADCAST_OFF);
+}
+static inline void tick_broadcast_force(void)
+{
+        tick_broadcast_control(TICK_BROADCAST_FORCE);
+}
+static inline int tick_broadcast_enter(void)
 {
-        return __this_cpu_read(tick_cpu_sched.tick_stopped);
+        return tick_broadcast_oneshot_control(TICK_BROADCAST_ENTER);
+}
+static inline void tick_broadcast_exit(void)
+{
+        tick_broadcast_oneshot_control(TICK_BROADCAST_EXIT);
 }
 
+#ifdef CONFIG_NO_HZ_COMMON
+extern int tick_nohz_tick_stopped(void);
 extern void tick_nohz_idle_enter(void);
 extern void tick_nohz_idle_exit(void);
 extern void tick_nohz_irq_exit(void);
 extern ktime_t tick_nohz_get_sleep_length(void);
 extern u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time);
 extern u64 get_cpu_iowait_time_us(int cpu, u64 *last_update_time);
-
-# else /* !CONFIG_NO_HZ_COMMON */
-static inline int tick_nohz_tick_stopped(void)
-{
-        return 0;
-}
-
+#else /* !CONFIG_NO_HZ_COMMON */
+static inline int tick_nohz_tick_stopped(void) { return 0; }
 static inline void tick_nohz_idle_enter(void) { }
 static inline void tick_nohz_idle_exit(void) { }
 
@@ -163,7 +111,7 @@ static inline ktime_t tick_nohz_get_sleep_length(void)
 }
 static inline u64 get_cpu_idle_time_us(int cpu, u64 *unused) { return -1; }
 static inline u64 get_cpu_iowait_time_us(int cpu, u64 *unused) { return -1; }
-# endif /* !CONFIG_NO_HZ_COMMON */
+#endif /* !CONFIG_NO_HZ_COMMON */
 
 #ifdef CONFIG_NO_HZ_FULL
 extern bool tick_nohz_full_running;
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index 05af9a334893..fb86963859c7 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -16,16 +16,16 @@
  * @read:       Read function of @clock
  * @mask:       Bitmask for two's complement subtraction of non 64bit clocks
  * @cycle_last: @clock cycle value at last update
- * @mult:       NTP adjusted multiplier for scaled math conversion
+ * @mult:       (NTP adjusted) multiplier for scaled math conversion
  * @shift:      Shift value for scaled math conversion
  * @xtime_nsec: Shifted (fractional) nano seconds offset for readout
- * @base_mono:  ktime_t (nanoseconds) base time for readout
+ * @base:       ktime_t (nanoseconds) base time for readout
  *
  * This struct has size 56 byte on 64 bit. Together with a seqcount it
  * occupies a single 64byte cache line.
  *
  * The struct is separate from struct timekeeper as it is also used
- * for a fast NMI safe accessor to clock monotonic.
+ * for a fast NMI safe accessors.
  */
 struct tk_read_base {
         struct clocksource      *clock;
@@ -35,12 +35,13 @@ struct tk_read_base {
         u32                     mult;
         u32                     shift;
         u64                     xtime_nsec;
-        ktime_t                 base_mono;
+        ktime_t                 base;
 };
 
 /**
  * struct timekeeper - Structure holding internal timekeeping values.
- * @tkr:                The readout base structure
+ * @tkr_mono:           The readout base structure for CLOCK_MONOTONIC
+ * @tkr_raw:            The readout base structure for CLOCK_MONOTONIC_RAW
  * @xtime_sec:          Current CLOCK_REALTIME time in seconds
  * @ktime_sec:          Current CLOCK_MONOTONIC time in seconds
  * @wall_to_monotonic:  CLOCK_REALTIME to CLOCK_MONOTONIC offset
@@ -48,7 +49,6 @@ struct tk_read_base {
  * @offs_boot:          Offset clock monotonic -> clock boottime
  * @offs_tai:           Offset clock monotonic -> clock tai
  * @tai_offset:         The current UTC to TAI offset in seconds
- * @base_raw:           Monotonic raw base time in ktime_t format
  * @raw_time:           Monotonic raw base time in timespec64 format
  * @cycle_interval:     Number of clock cycles in one NTP interval
  * @xtime_interval:     Number of clock shifted nano seconds in one NTP
@@ -76,7 +76,8 @@ struct tk_read_base {
  * used instead.
  */
 struct timekeeper {
-        struct tk_read_base     tkr;
+        struct tk_read_base     tkr_mono;
+        struct tk_read_base     tkr_raw;
         u64                     xtime_sec;
         unsigned long           ktime_sec;
         struct timespec64       wall_to_monotonic;
@@ -84,7 +85,6 @@ struct timekeeper {
         ktime_t                 offs_boot;
         ktime_t                 offs_tai;
         s32                     tai_offset;
-        ktime_t                 base_raw;
         struct timespec64       raw_time;
 
         /* The following members are for timekeeping internal use */
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 3eaae4754275..99176af216af 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -214,12 +214,18 @@ static inline u64 ktime_get_boot_ns(void)
         return ktime_to_ns(ktime_get_boottime());
 }
 
+static inline u64 ktime_get_tai_ns(void)
+{
+        return ktime_to_ns(ktime_get_clocktai());
+}
+
 static inline u64 ktime_get_raw_ns(void)
 {
         return ktime_to_ns(ktime_get_raw());
 }
 
 extern u64 ktime_get_mono_fast_ns(void);
+extern u64 ktime_get_raw_fast_ns(void);
 
 /*
  * Timespec interfaces utilizing the ktime based ones
@@ -242,6 +248,9 @@ static inline void timekeeping_clocktai(struct timespec *ts)
 /*
  * RTC specific
  */
+extern bool timekeeping_rtc_skipsuspend(void);
+extern bool timekeeping_rtc_skipresume(void);
+
 extern void timekeeping_inject_sleeptime64(struct timespec64 *delta);
 
 /*
@@ -253,17 +262,14 @@ extern void getnstime_raw_and_real(struct timespec *ts_raw,
 /*
  * Persistent clock related interfaces
  */
-extern bool persistent_clock_exist;
 extern int persistent_clock_is_local;
 
-static inline bool has_persistent_clock(void)
-{
-        return persistent_clock_exist;
-}
-
 extern void read_persistent_clock(struct timespec *ts);
+extern void read_persistent_clock64(struct timespec64 *ts);
 extern void read_boot_clock(struct timespec *ts);
+extern void read_boot_clock64(struct timespec64 *ts);
 extern int update_persistent_clock(struct timespec now);
+extern int update_persistent_clock64(struct timespec64 now);
 
 
 #endif
diff --git a/include/linux/tracefs.h b/include/linux/tracefs.h
new file mode 100644
index 000000000000..5b727a17beee
--- /dev/null
+++ b/include/linux/tracefs.h
@@ -0,0 +1,45 @@
+/*
+ *  tracefs.h - a pseudo file system for activating tracing
+ *
+ * Based on debugfs by: 2004 Greg Kroah-Hartman <greg@kroah.com>
+ *
+ *  Copyright (C) 2014 Red Hat Inc, author: Steven Rostedt <srostedt@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.
+ *
+ * tracefs is the file system that is used by the tracing infrastructure.
+ *
+ */
+
+#ifndef _TRACEFS_H_
+#define _TRACEFS_H_
+
+#include <linux/fs.h>
+#include <linux/seq_file.h>
+
+#include <linux/types.h>
+
+struct file_operations;
+
+#ifdef CONFIG_TRACING
+
+struct dentry *tracefs_create_file(const char *name, umode_t mode,
+                                   struct dentry *parent, void *data,
+                                   const struct file_operations *fops);
+
+struct dentry *tracefs_create_dir(const char *name, struct dentry *parent);
+
+void tracefs_remove(struct dentry *dentry);
+void tracefs_remove_recursive(struct dentry *dentry);
+
+struct dentry *tracefs_create_instance_dir(const char *name, struct dentry *parent,
+                                           int (*mkdir)(const char *name),
+                                           int (*rmdir)(const char *name));
+
+bool tracefs_initialized(void);
+
+#endif /* CONFIG_TRACING */
+
+#endif
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index c72851328ca9..a5f7f3ecafa3 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -36,6 +36,12 @@ struct tracepoint {
         struct tracepoint_func __rcu *funcs;
 };
 
+struct trace_enum_map {
+        const char              *system;
+        const char              *enum_string;
+        unsigned long           enum_value;
+};
+
 extern int
 tracepoint_probe_register(struct tracepoint *tp, void *probe, void *data);
 extern int
@@ -87,6 +93,8 @@ extern void syscall_unregfunc(void);
 
 #define PARAMS(args...) args
 
+#define TRACE_DEFINE_ENUM(x)
+
 #endif /* _LINUX_TRACEPOINT_H */
 
 /*
diff --git a/include/linux/types.h b/include/linux/types.h
index 6747247e3f9f..59698be03490 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -146,12 +146,6 @@ typedef u64 dma_addr_t;
 typedef u32 dma_addr_t;
 #endif /* dma_addr_t */
 
-#ifdef __CHECKER__
-#else
-#endif
-#ifdef __CHECK_ENDIAN__
-#else
-#endif
 typedef unsigned __bitwise__ gfp_t;
 typedef unsigned __bitwise__ fmode_t;
 typedef unsigned __bitwise__ oom_flags_t;
diff --git a/include/linux/udp.h b/include/linux/udp.h
index 247cfdcc4b08..87c094961bd5 100644
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -34,7 +34,7 @@ static inline struct udphdr *inner_udp_hdr(const struct sk_buff *skb)
 
 #define UDP_HTABLE_SIZE_MIN             (CONFIG_BASE_SMALL ? 128 : 256)
 
-static inline int udp_hashfn(struct net *net, unsigned num, unsigned mask)
+static inline u32 udp_hashfn(const struct net *net, u32 num, u32 mask)
 {
         return (num + net_hash_mix(net)) & mask;
 }
diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
index 2d1f9b627f91..0ee05da38899 100644
--- a/include/linux/uidgid.h
+++ b/include/linux/uidgid.h
@@ -29,6 +29,7 @@ typedef struct {
 #define KUIDT_INIT(value) (kuid_t){ value }
 #define KGIDT_INIT(value) (kgid_t){ value }
 
+#ifdef CONFIG_MULTIUSER
 static inline uid_t __kuid_val(kuid_t uid)
 {
         return uid.val;
@@ -38,6 +39,17 @@ static inline gid_t __kgid_val(kgid_t gid)
 {
         return gid.val;
 }
+#else
+static inline uid_t __kuid_val(kuid_t uid)
+{
+        return 0;
+}
+
+static inline gid_t __kgid_val(kgid_t gid)
+{
+        return 0;
+}
+#endif
 
 #define GLOBAL_ROOT_UID KUIDT_INIT(0)
 #define GLOBAL_ROOT_GID KGIDT_INIT(0)
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 07a022641996..8b01e1c3c614 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -76,6 +76,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
                 struct iov_iter *i, unsigned long offset, size_t bytes);
 void iov_iter_advance(struct iov_iter *i, size_t bytes);
 int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes);
+int iov_iter_fault_in_multipages_readable(struct iov_iter *i, size_t bytes);
 size_t iov_iter_single_seg_count(const struct iov_iter *i);
 size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,
                          struct iov_iter *i);
@@ -98,6 +99,8 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages,
                         size_t maxsize, size_t *start);
 int iov_iter_npages(const struct iov_iter *i, int maxpages);
 
+const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags);
+
 static inline size_t iov_iter_count(struct iov_iter *i)
 {
         return i->count;
@@ -109,6 +112,14 @@ static inline bool iter_is_iovec(struct iov_iter *i)
 }
 
 /*
+ * Get one of READ or WRITE out of iter->type without any other flags OR'd in
+ * with it.
+ *
+ * The ?: is just for type safety.
+ */
+#define iov_iter_rw(i) ((0 ? (struct iov_iter *)0 : (i))->type & RW_MASK)
+
+/*
  * Cap the iov_iter by given limit; note that the second argument is
  * *not* the new size - it's upper limit for such.  Passing it a value
  * greater than the amount of data in iov_iter is fine - it'll just do
@@ -137,4 +148,18 @@ static inline void iov_iter_reexpand(struct iov_iter *i, size_t count)
 size_t csum_and_copy_to_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i);
 size_t csum_and_copy_from_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i);
 
+int import_iovec(int type, const struct iovec __user * uvector,
+                 unsigned nr_segs, unsigned fast_segs,
+                 struct iovec **iov, struct iov_iter *i);
+
+#ifdef CONFIG_COMPAT
+struct compat_iovec;
+int compat_import_iovec(int type, const struct compat_iovec __user * uvector,
+                 unsigned nr_segs, unsigned fast_segs,
+                 struct iovec **iov, struct iov_iter *i);
+#endif
+
+int import_single_range(int type, void __user *buf, size_t len,
+                 struct iovec *iov, struct iov_iter *i);
+
 #endif
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 7ee1b5c3b4cb..447fe29b55b4 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -205,6 +205,32 @@ void usb_put_intf(struct usb_interface *intf);
 #define USB_MAXINTERFACES       32
 #define USB_MAXIADS             (USB_MAXINTERFACES/2)
 
+/*
+ * USB Resume Timer: Every Host controller driver should drive the resume
+ * signalling on the bus for the amount of time defined by this macro.
+ *
+ * That way we will have a 'stable' behavior among all HCDs supported by Linux.
+ *
+ * Note that the USB Specification states we should drive resume for *at least*
+ * 20 ms, but it doesn't give an upper bound. This creates two possible
+ * situations which we want to avoid:
+ *
+ * (a) sometimes an msleep(20) might expire slightly before 20 ms, which causes
+ * us to fail USB Electrical Tests, thus failing Certification
+ *
+ * (b) Some (many) devices actually need more than 20 ms of resume signalling,
+ * and while we can argue that's against the USB Specification, we don't have
+ * control over which devices a certification laboratory will be using for
+ * certification. If CertLab uses a device which was tested against Windows and
+ * that happens to have relaxed resume signalling rules, we might fall into
+ * situations where we fail interoperability and electrical tests.
+ *
+ * In order to avoid both conditions, we're using a 40 ms resume timeout, which
+ * should cope with both LPJ calibration errors and devices not following every
+ * detail of the USB Specification.
+ */
+#define USB_RESUME_TIMEOUT      40 /* ms */
+
 /**
  * struct usb_interface_cache - long-term representation of a device interface
  * @num_altsetting: number of altsettings defined.
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 535997a6681b..ab94f78c4dd1 100644
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -19,6 +19,7 @@ struct ci_hdrc_platform_data {
         enum usb_phy_interface phy_mode;
         unsigned long    flags;
 #define CI_HDRC_REGS_SHARED             BIT(0)
+#define CI_HDRC_SUPPORTS_RUNTIME_PM     BIT(2)
 #define CI_HDRC_DISABLE_STREAMING       BIT(3)
         /*
          * Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1,
@@ -27,6 +28,7 @@ struct ci_hdrc_platform_data {
 #define CI_HDRC_DUAL_ROLE_NOT_OTG       BIT(4)
 #define CI_HDRC_IMX28_WRITE_FIX         BIT(5)
 #define CI_HDRC_FORCE_FULLSPEED         BIT(6)
+#define CI_HDRC_TURN_VBUS_EARLY_ON      BIT(7)
         enum usb_dr_mode        dr_mode;
 #define CI_HDRC_CONTROLLER_RESET_EVENT          0
 #define CI_HDRC_CONTROLLER_STOPPED_EVENT        1
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 3d87defcc527..2511469a9904 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -148,6 +148,7 @@ struct usb_os_desc_table {
  * @disable: (REQUIRED) Indicates the function should be disabled.  Reasons
  *      include host resetting or reconfiguring the gadget, and disconnection.
  * @setup: Used for interface-specific control requests.
+ * @req_match: Tests if a given class request can be handled by this function.
  * @suspend: Notifies functions when the host stops sending USB traffic.
  * @resume: Notifies functions when the host restarts USB traffic.
  * @get_status: Returns function status as a reply to
@@ -213,6 +214,8 @@ struct usb_function {
         void                    (*disable)(struct usb_function *);
         int                     (*setup)(struct usb_function *,
                                         const struct usb_ctrlrequest *);
+        bool                    (*req_match)(struct usb_function *,
+                                        const struct usb_ctrlrequest *);
         void                    (*suspend)(struct usb_function *);
         void                    (*resume)(struct usb_function *);
 
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index e2f00fd8cd47..4f3dfb7d0654 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -190,7 +190,7 @@ struct usb_ep {
  * @ep:the endpoint being configured
  * @maxpacket_limit:value of maximum packet size limit
  *
- * This function shoud be used only in UDC drivers to initialize endpoint
+ * This function should be used only in UDC drivers to initialize endpoint
  * (usually in probe function).
  */
 static inline void usb_ep_set_maxpacket_limit(struct usb_ep *ep,
@@ -474,6 +474,7 @@ struct usb_dcd_config_params {
 
 struct usb_gadget;
 struct usb_gadget_driver;
+struct usb_udc;
 
 /* the rest of the api to the controller hardware: device operations,
  * which don't involve endpoints (or i/o).
@@ -496,6 +497,7 @@ struct usb_gadget_ops {
 /**
  * struct usb_gadget - represents a usb slave device
  * @work: (internal use) Workqueue to be used for sysfs_notify()
+ * @udc: struct usb_udc pointer for this gadget
  * @ops: Function pointers used to access hardware-specific operations.
  * @ep0: Endpoint zero, used when reading or writing responses to
  *      driver setup() requests
@@ -545,6 +547,7 @@ struct usb_gadget_ops {
  */
 struct usb_gadget {
         struct work_struct              work;
+        struct usb_udc                  *udc;
         /* readonly to gadget driver */
         const struct usb_gadget_ops     *ops;
         struct usb_ep                   *ep0;
@@ -1029,6 +1032,10 @@ extern void usb_gadget_udc_reset(struct usb_gadget *gadget,
 extern void usb_gadget_giveback_request(struct usb_ep *ep,
                 struct usb_request *req);
 
+/*-------------------------------------------------------------------------*/
+
+/* utility to update vbus status for udc core, it may be scheduled */
+extern void usb_udc_vbus_handler(struct usb_gadget *gadget, bool status);
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
index b0a39243295a..7dbecf9a4656 100644
--- a/include/linux/usb/msm_hsusb.h
+++ b/include/linux/usb/msm_hsusb.h
@@ -117,8 +117,6 @@ struct msm_otg_platform_data {
         enum otg_control_type otg_control;
         enum msm_usb_phy_type phy_type;
         void (*setup_gpio)(enum usb_otg_state state);
-        int (*link_clk_reset)(struct clk *link_clk, bool assert);
-        int (*phy_clk_reset)(struct clk *phy_clk);
 };
 
 /**
@@ -128,7 +126,6 @@ struct msm_otg_platform_data {
  * @irq: IRQ number assigned for HSUSB controller.
  * @clk: clock struct of usb_hs_clk.
  * @pclk: clock struct of usb_hs_pclk.
- * @phy_reset_clk: clock struct of usb_phy_clk.
  * @core_clk: clock struct of usb_hs_core_clk.
  * @regs: ioremapped register base address.
  * @inputs: OTG state machine inputs(Id, SessValid etc).
@@ -148,7 +145,6 @@ struct msm_otg {
         int irq;
         struct clk *clk;
         struct clk *pclk;
-        struct clk *phy_reset_clk;
         struct clk *core_clk;
         void __iomem *regs;
 #define ID              0
diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h
index b6ba1bfb86f2..f728f1854829 100644
--- a/include/linux/usb/otg-fsm.h
+++ b/include/linux/usb/otg-fsm.h
@@ -53,6 +53,8 @@ enum otg_fsm_timer {
         B_SE0_SRP,
         B_SRP_FAIL,
         A_WAIT_ENUM,
+        B_DATA_PLS,
+        B_SSEND_SRP,
 
         NUM_OTG_FSM_TIMERS,
 };
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index 9fd9e481ea98..f06529c14141 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -165,6 +165,8 @@ struct renesas_usbhs_driver_param {
          */
         u32 has_otg:1; /* for controlling PWEN/EXTLP */
         u32 has_sudmac:1; /* for SUDMAC */
+        u32 has_usb_dmac:1; /* for USB-DMAC */
+#define USBHS_USB_DMAC_XFER_SIZE        32      /* hardcode the xfer size */
 };
 
 #define USBHS_TYPE_R8A7790 1
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 9bb547c7bce7..704a1ab8240c 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -190,8 +190,7 @@ static inline void usb_set_serial_data(struct usb_serial *serial, void *data)
  * @num_ports: the number of different ports this device will have.
  * @bulk_in_size: minimum number of bytes to allocate for bulk-in buffer
  *      (0 = end-point size)
- * @bulk_out_size: minimum number of bytes to allocate for bulk-out buffer
- *      (0 = end-point size)
+ * @bulk_out_size: bytes to allocate for bulk-out buffer (0 = end-point size)
  * @calc_num_ports: pointer to a function to determine how many ports this
  *      device has dynamically.  It will be called after the probe()
  *      callback is called, but before attach()
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index d9a4905e01d0..6e0ce8c7b8cb 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -227,9 +227,23 @@ struct skb_data {	/* skb->cb is one of these */
         struct urb              *urb;
         struct usbnet           *dev;
         enum skb_state          state;
-        size_t                  length;
+        long                    length;
+        unsigned long           packets;
 };
 
+/* Drivers that set FLAG_MULTI_PACKET must call this in their
+ * tx_fixup method before returning an skb.
+ */
+static inline void
+usbnet_set_skb_tx_stats(struct sk_buff *skb,
+                        unsigned long packets, long bytes_delta)
+{
+        struct skb_data *entry = (struct skb_data *) skb->cb;
+
+        entry->packets = packets;
+        entry->length = bytes_delta;
+}
+
 extern int usbnet_open(struct net_device *net);
 extern int usbnet_stop(struct net_device *net);
 extern netdev_tx_t usbnet_start_xmit(struct sk_buff *skb,
diff --git a/include/linux/util_macros.h b/include/linux/util_macros.h
new file mode 100644
index 000000000000..d5f4fb69dba3
--- /dev/null
+++ b/include/linux/util_macros.h
@@ -0,0 +1,40 @@
+#ifndef _LINUX_HELPER_MACROS_H_
+#define _LINUX_HELPER_MACROS_H_
+
+#define __find_closest(x, a, as, op)                                    \
+({                                                                      \
+        typeof(as) __fc_i, __fc_as = (as) - 1;                          \
+        typeof(x) __fc_x = (x);                                         \
+        typeof(*a) *__fc_a = (a);                                       \
+        for (__fc_i = 0; __fc_i < __fc_as; __fc_i++) {                  \
+                if (__fc_x op DIV_ROUND_CLOSEST(__fc_a[__fc_i] +        \
+                                                __fc_a[__fc_i + 1], 2)) \
+                        break;                                          \
+        }                                                               \
+        (__fc_i);                                                       \
+})
+
+/**
+ * find_closest - locate the closest element in a sorted array
+ * @x: The reference value.
+ * @a: The array in which to look for the closest element. Must be sorted
+ *  in ascending order.
+ * @as: Size of 'a'.
+ *
+ * Returns the index of the element closest to 'x'.
+ */
+#define find_closest(x, a, as) __find_closest(x, a, as, <=)
+
+/**
+ * find_closest_descending - locate the closest element in a sorted array
+ * @x: The reference value.
+ * @a: The array in which to look for the closest element. Must be sorted
+ *  in descending order.
+ * @as: Size of 'a'.
+ *
+ * Similar to find_closest() but 'a' is expected to be sorted in descending
+ * order.
+ */
+#define find_closest_descending(x, a, as) __find_closest(x, a, as, >=)
+
+#endif
diff --git a/include/linux/uwb/umc.h b/include/linux/uwb/umc.h
index ba82f03d8287..02112299a1d3 100644
--- a/include/linux/uwb/umc.h
+++ b/include/linux/uwb/umc.h
@@ -87,8 +87,6 @@ struct umc_driver {
 
         int  (*probe)(struct umc_dev *);
         void (*remove)(struct umc_dev *);
-        int  (*suspend)(struct umc_dev *, pm_message_t state);
-        int  (*resume)(struct umc_dev *);
         int  (*pre_reset)(struct umc_dev *);
         int  (*post_reset)(struct umc_dev *);
 
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index 2d67b8998fd8..ddb440975382 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -14,6 +14,8 @@
 
 #include <linux/iommu.h>
 #include <linux/mm.h>
+#include <linux/workqueue.h>
+#include <linux/poll.h>
 #include <uapi/linux/vfio.h>
 
 /**
@@ -78,19 +80,6 @@ extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);
 extern void vfio_unregister_iommu_driver(
                                 const struct vfio_iommu_driver_ops *ops);
 
-/**
- * offsetofend(TYPE, MEMBER)
- *
- * @TYPE: The type of the structure
- * @MEMBER: The member within the structure to get the end offset of
- *
- * Simple helper macro for dealing with variable sized structures passed
- * from user space.  This allows us to easily determine if the provided
- * structure is sized to include various fields.
- */
-#define offsetofend(TYPE, MEMBER) \
-        (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))
-
 /*
  * External user API
  */
@@ -123,4 +112,27 @@ static inline long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group,
         return -ENOTTY;
 }
 #endif /* CONFIG_EEH */
+
+/*
+ * IRQfd - generic
+ */
+struct virqfd {
+        void                    *opaque;
+        struct eventfd_ctx      *eventfd;
+        int                     (*handler)(void *, void *);
+        void                    (*thread)(void *, void *);
+        void                    *data;
+        struct work_struct      inject;
+        wait_queue_t            wait;
+        poll_table              pt;
+        struct work_struct      shutdown;
+        struct virqfd           **pvirqfd;
+};
+
+extern int vfio_virqfd_enable(void *opaque,
+                              int (*handler)(void *, void *),
+                              void (*thread)(void *, void *),
+                              void *data, struct virqfd **pvirqfd, int fd);
+extern void vfio_virqfd_disable(struct virqfd **pvirqfd);
+
 #endif /* VFIO_H */
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index c37bd4d06739..8c3b412d84df 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -65,8 +65,13 @@ struct pci_dev;
  *     out of the arbitration process (and can be safe to take
  *     interrupts at any time.
  */
+#if defined(CONFIG_VGA_ARB)
 extern void vga_set_legacy_decoding(struct pci_dev *pdev,
                                     unsigned int decodes);
+#else
+static inline void vga_set_legacy_decoding(struct pci_dev *pdev,
+                                           unsigned int decodes) { };
+#endif
 
 /**
  *     vga_get         - acquire & locks VGA resources
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 28f0e65b9a11..8f4d4bfa6d46 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -108,8 +108,6 @@ struct virtio_device {
         void *priv;
 };
 
-bool virtio_device_is_legacy_only(struct virtio_device_id id);
-
 static inline struct virtio_device *dev_to_virtio(struct device *_dev)
 {
         return container_of(_dev, struct virtio_device, dev);
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index ca3ed78e5ec7..1e306f727edc 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -298,13 +298,6 @@ static inline __virtio64 cpu_to_virtio64(struct virtio_device *vdev, u64 val)
                 }                                                       \
         } while(0)
 
-static inline u8 virtio_cread8(struct virtio_device *vdev, unsigned int offset)
-{
-        u8 ret;
-        vdev->config->get(vdev, offset, &ret, sizeof(ret));
-        return ret;
-}
-
 /* Read @count fields, @bytes each. */
 static inline void __virtio_cread_many(struct virtio_device *vdev,
                                        unsigned int offset,
@@ -326,7 +319,6 @@ static inline void __virtio_cread_many(struct virtio_device *vdev,
         } while (gen != old);
 }
 
-
 static inline void virtio_cread_bytes(struct virtio_device *vdev,
                                       unsigned int offset,
                                       void *buf, size_t len)
@@ -334,6 +326,13 @@ static inline void virtio_cread_bytes(struct virtio_device *vdev,
         __virtio_cread_many(vdev, offset, buf, len, 1);
 }
 
+static inline u8 virtio_cread8(struct virtio_device *vdev, unsigned int offset)
+{
+        u8 ret;
+        vdev->config->get(vdev, offset, &ret, sizeof(ret));
+        return ret;
+}
+
 static inline void virtio_cwrite8(struct virtio_device *vdev,
                                   unsigned int offset, u8 val)
 {
@@ -374,7 +373,6 @@ static inline u64 virtio_cread64(struct virtio_device *vdev,
                                  unsigned int offset)
 {
         u64 ret;
-        vdev->config->get(vdev, offset, &ret, sizeof(ret));
         __virtio_cread_many(vdev, offset, &ret, 1, sizeof(ret));
         return virtio64_to_cpu(vdev, (__force __virtio64)ret);
 }
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index 67e06fe18c03..8e50888a6d59 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -21,19 +21,20 @@
  * actually quite cheap.
  */
 
-#ifdef CONFIG_SMP
 static inline void virtio_mb(bool weak_barriers)
 {
+#ifdef CONFIG_SMP
         if (weak_barriers)
                 smp_mb();
         else
+#endif
                 mb();
 }
 
 static inline void virtio_rmb(bool weak_barriers)
 {
         if (weak_barriers)
-                smp_rmb();
+                dma_rmb();
         else
                 rmb();
 }
@@ -41,26 +42,10 @@ static inline void virtio_rmb(bool weak_barriers)
 static inline void virtio_wmb(bool weak_barriers)
 {
         if (weak_barriers)
-                smp_wmb();
+                dma_wmb();
         else
                 wmb();
 }
-#else
-static inline void virtio_mb(bool weak_barriers)
-{
-        mb();
-}
-
-static inline void virtio_rmb(bool weak_barriers)
-{
-        rmb();
-}
-
-static inline void virtio_wmb(bool weak_barriers)
-{
-        wmb();
-}
-#endif
 
 struct virtio_device;
 struct virtqueue;
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 7d7acb35603d..0ec598381f97 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -17,6 +17,7 @@ struct vm_area_struct;		/* vma defining user mapping in mm_types.h */
 #define VM_VPAGES               0x00000010      /* buffer for pages was vmalloc'ed */
 #define VM_UNINITIALIZED        0x00000020      /* vm_struct is not fully initialized */
 #define VM_NO_GUARD             0x00000040      /* don't add guard page */
+#define VM_KASAN                0x00000080      /* has allocated kasan shadow memory */
 /* bits [20..32] reserved for arch specific ioremap internals */
 
 /*
diff --git a/include/linux/vme.h b/include/linux/vme.h
index 8cd6f19ca518..79242e9c06b8 100644
--- a/include/linux/vme.h
+++ b/include/linux/vme.h
@@ -137,6 +137,7 @@ ssize_t vme_master_read(struct vme_resource *, void *, size_t, loff_t);
 ssize_t vme_master_write(struct vme_resource *, void *, size_t, loff_t);
 unsigned int vme_master_rmw(struct vme_resource *, unsigned int, unsigned int,
         unsigned int, loff_t);
+int vme_master_mmap(struct vme_resource *resource, struct vm_area_struct *vma);
 void vme_master_free(struct vme_resource *);
 
 struct vme_resource *vme_dma_request(struct vme_dev *, u32);
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index 395b70e0eccf..a746bf5216f8 100644
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -137,4 +137,12 @@ extern int watchdog_init_timeout(struct watchdog_device *wdd,
 extern int watchdog_register_device(struct watchdog_device *);
 extern void watchdog_unregister_device(struct watchdog_device *);
 
+#ifdef CONFIG_HARDLOCKUP_DETECTOR
+void watchdog_nmi_disable_all(void);
+void watchdog_nmi_enable_all(void);
+#else
+static inline void watchdog_nmi_disable_all(void) {}
+static inline void watchdog_nmi_enable_all(void) {}
+#endif
+
 #endif  /* ifndef _LINUX_WATCHDOG_H */
diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
index a9c723be1acf..95704cd4cfab 100644
--- a/include/linux/wl12xx.h
+++ b/include/linux/wl12xx.h
@@ -26,28 +26,6 @@
 
 #include <linux/err.h>
 
-/* Reference clock values */
-enum {
-        WL12XX_REFCLOCK_19      = 0, /* 19.2 MHz */
-        WL12XX_REFCLOCK_26      = 1, /* 26 MHz */
-        WL12XX_REFCLOCK_38      = 2, /* 38.4 MHz */
-        WL12XX_REFCLOCK_52      = 3, /* 52 MHz */
-        WL12XX_REFCLOCK_38_XTAL = 4, /* 38.4 MHz, XTAL */
-        WL12XX_REFCLOCK_26_XTAL = 5, /* 26 MHz, XTAL */
-};
-
-/* TCXO clock values */
-enum {
-        WL12XX_TCXOCLOCK_19_2   = 0, /* 19.2MHz */
-        WL12XX_TCXOCLOCK_26     = 1, /* 26 MHz */
-        WL12XX_TCXOCLOCK_38_4   = 2, /* 38.4MHz */
-        WL12XX_TCXOCLOCK_52     = 3, /* 52 MHz */
-        WL12XX_TCXOCLOCK_16_368 = 4, /* 16.368 MHz */
-        WL12XX_TCXOCLOCK_32_736 = 5, /* 32.736 MHz */
-        WL12XX_TCXOCLOCK_16_8   = 6, /* 16.8 MHz */
-        WL12XX_TCXOCLOCK_33_6   = 7, /* 33.6 MHz */
-};
-
 struct wl1251_platform_data {
         int power_gpio;
         /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
@@ -55,23 +33,8 @@ struct wl1251_platform_data {
         bool use_eeprom;
 };
 
-struct wl12xx_platform_data {
-        int irq;
-        int board_ref_clock;
-        int board_tcxo_clock;
-        unsigned long platform_quirks;
-        bool pwr_in_suspend;
-};
-
-/* Platform does not support level trigger interrupts */
-#define WL12XX_PLATFORM_QUIRK_EDGE_IRQ  BIT(0)
-
 #ifdef CONFIG_WILINK_PLATFORM_DATA
 
-int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
-
-struct wl12xx_platform_data *wl12xx_get_platform_data(void);
-
 int wl1251_set_platform_data(const struct wl1251_platform_data *data);
 
 struct wl1251_platform_data *wl1251_get_platform_data(void);
@@ -79,18 +42,6 @@ struct wl1251_platform_data *wl1251_get_platform_data(void);
 #else
 
 static inline
-int wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
-{
-        return -ENOSYS;
-}
-
-static inline
-struct wl12xx_platform_data *wl12xx_get_platform_data(void)
-{
-        return ERR_PTR(-ENODATA);
-}
-
-static inline
 int wl1251_set_platform_data(const struct wl1251_platform_data *data)
 {
         return -ENOSYS;
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 74db135f9957..deee212af8e0 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -70,7 +70,8 @@ enum {
         /* data contains off-queue information when !WORK_STRUCT_PWQ */
         WORK_OFFQ_FLAG_BASE     = WORK_STRUCT_COLOR_SHIFT,
 
-        WORK_OFFQ_CANCELING     = (1 << WORK_OFFQ_FLAG_BASE),
+        __WORK_OFFQ_CANCELING   = WORK_OFFQ_FLAG_BASE,
+        WORK_OFFQ_CANCELING     = (1 << __WORK_OFFQ_CANCELING),
 
         /*
          * When a work item is off queue, its high bits point to the last
@@ -453,6 +454,7 @@ extern bool workqueue_congested(int cpu, struct workqueue_struct *wq);
 extern unsigned int work_busy(struct work_struct *work);
 extern __printf(1, 2) void set_worker_desc(const char *fmt, ...);
 extern void print_worker_info(const char *log_lvl, struct task_struct *task);
+extern void show_workqueue_state(void);
 
 /**
  * queue_work - queue work on a workqueue
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 00048339c23e..b2dd371ec0ca 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -130,6 +130,7 @@ extern int vm_dirty_ratio;
 extern unsigned long vm_dirty_bytes;
 extern unsigned int dirty_writeback_interval;
 extern unsigned int dirty_expire_interval;
+extern unsigned int dirtytime_expire_interval;
 extern int vm_highmem_is_dirtyable;
 extern int block_dump;
 extern int laptop_mode;
@@ -146,6 +147,8 @@ extern int dirty_ratio_handler(struct ctl_table *table, int write,
 extern int dirty_bytes_handler(struct ctl_table *table, int write,
                 void __user *buffer, size_t *lenp,
                 loff_t *ppos);
+int dirtytime_interval_handler(struct ctl_table *table, int write,
+                               void __user *buffer, size_t *lenp, loff_t *ppos);
 
 struct ctl_table;
 int dirty_writeback_centisecs_handler(struct ctl_table *, int,
diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h
index 3283c6a55425..1338190b5478 100644
--- a/include/linux/zsmalloc.h
+++ b/include/linux/zsmalloc.h
@@ -47,5 +47,6 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
 void zs_unmap_object(struct zs_pool *pool, unsigned long handle);
 
 unsigned long zs_get_total_pages(struct zs_pool *pool);
+unsigned long zs_compact(struct zs_pool *pool);
 
 #endif
diff --git a/include/media/adv7604.h b/include/media/adv7604.h
index aa1c4477722d..9ecf353160c1 100644
--- a/include/media/adv7604.h
+++ b/include/media/adv7604.h
@@ -47,16 +47,16 @@ enum adv7604_bus_order {
 };
 
 /* Input Color Space (IO register 0x02, [7:4]) */
-enum adv7604_inp_color_space {
-        ADV7604_INP_COLOR_SPACE_LIM_RGB = 0,
-        ADV7604_INP_COLOR_SPACE_FULL_RGB = 1,
-        ADV7604_INP_COLOR_SPACE_LIM_YCbCr_601 = 2,
-        ADV7604_INP_COLOR_SPACE_LIM_YCbCr_709 = 3,
-        ADV7604_INP_COLOR_SPACE_XVYCC_601 = 4,
-        ADV7604_INP_COLOR_SPACE_XVYCC_709 = 5,
-        ADV7604_INP_COLOR_SPACE_FULL_YCbCr_601 = 6,
-        ADV7604_INP_COLOR_SPACE_FULL_YCbCr_709 = 7,
-        ADV7604_INP_COLOR_SPACE_AUTO = 0xf,
+enum adv76xx_inp_color_space {
+        ADV76XX_INP_COLOR_SPACE_LIM_RGB = 0,
+        ADV76XX_INP_COLOR_SPACE_FULL_RGB = 1,
+        ADV76XX_INP_COLOR_SPACE_LIM_YCbCr_601 = 2,
+        ADV76XX_INP_COLOR_SPACE_LIM_YCbCr_709 = 3,
+        ADV76XX_INP_COLOR_SPACE_XVYCC_601 = 4,
+        ADV76XX_INP_COLOR_SPACE_XVYCC_709 = 5,
+        ADV76XX_INP_COLOR_SPACE_FULL_YCbCr_601 = 6,
+        ADV76XX_INP_COLOR_SPACE_FULL_YCbCr_709 = 7,
+        ADV76XX_INP_COLOR_SPACE_AUTO = 0xf,
 };
 
 /* Select output format (IO register 0x03, [4:2]) */
@@ -66,38 +66,39 @@ enum adv7604_op_format_mode_sel {
         ADV7604_OP_FORMAT_MODE2 = 0x08,
 };
 
-enum adv7604_drive_strength {
-        ADV7604_DR_STR_MEDIUM_LOW = 1,
-        ADV7604_DR_STR_MEDIUM_HIGH = 2,
-        ADV7604_DR_STR_HIGH = 3,
+enum adv76xx_drive_strength {
+        ADV76XX_DR_STR_MEDIUM_LOW = 1,
+        ADV76XX_DR_STR_MEDIUM_HIGH = 2,
+        ADV76XX_DR_STR_HIGH = 3,
 };
 
-enum adv7604_int1_config {
-        ADV7604_INT1_CONFIG_OPEN_DRAIN,
-        ADV7604_INT1_CONFIG_ACTIVE_LOW,
-        ADV7604_INT1_CONFIG_ACTIVE_HIGH,
-        ADV7604_INT1_CONFIG_DISABLED,
+/* INT1 Configuration (IO register 0x40, [1:0]) */
+enum adv76xx_int1_config {
+        ADV76XX_INT1_CONFIG_OPEN_DRAIN,
+        ADV76XX_INT1_CONFIG_ACTIVE_LOW,
+        ADV76XX_INT1_CONFIG_ACTIVE_HIGH,
+        ADV76XX_INT1_CONFIG_DISABLED,
 };
 
-enum adv7604_page {
-        ADV7604_PAGE_IO,
+enum adv76xx_page {
+        ADV76XX_PAGE_IO,
         ADV7604_PAGE_AVLINK,
-        ADV7604_PAGE_CEC,
-        ADV7604_PAGE_INFOFRAME,
+        ADV76XX_PAGE_CEC,
+        ADV76XX_PAGE_INFOFRAME,
         ADV7604_PAGE_ESDP,
         ADV7604_PAGE_DPP,
-        ADV7604_PAGE_AFE,
-        ADV7604_PAGE_REP,
-        ADV7604_PAGE_EDID,
-        ADV7604_PAGE_HDMI,
-        ADV7604_PAGE_TEST,
-        ADV7604_PAGE_CP,
+        ADV76XX_PAGE_AFE,
+        ADV76XX_PAGE_REP,
+        ADV76XX_PAGE_EDID,
+        ADV76XX_PAGE_HDMI,
+        ADV76XX_PAGE_TEST,
+        ADV76XX_PAGE_CP,
         ADV7604_PAGE_VDP,
-        ADV7604_PAGE_MAX,
+        ADV76XX_PAGE_MAX,
 };
 
 /* Platform dependent definition */
-struct adv7604_platform_data {
+struct adv76xx_platform_data {
         /* DIS_PWRDNB: 1 if the PWRDNB pin is unused and unconnected */
         unsigned disable_pwrdnb:1;
 
@@ -116,7 +117,7 @@ struct adv7604_platform_data {
         enum adv7604_op_format_mode_sel op_format_mode_sel;
 
         /* Configuration of the INT1 pin */
-        enum adv7604_int1_config int1_config;
+        enum adv76xx_int1_config int1_config;
 
         /* IO register 0x02 */
         unsigned alt_gamma:1;
@@ -134,9 +135,9 @@ struct adv7604_platform_data {
         unsigned inv_llc_pol:1;
 
         /* IO register 0x14 */
-        enum adv7604_drive_strength dr_str_data;
-        enum adv7604_drive_strength dr_str_clk;
-        enum adv7604_drive_strength dr_str_sync;
+        enum adv76xx_drive_strength dr_str_data;
+        enum adv76xx_drive_strength dr_str_clk;
+        enum adv76xx_drive_strength dr_str_sync;
 
         /* IO register 0x30 */
         unsigned output_bus_lsb_to_msb:1;
@@ -145,11 +146,11 @@ struct adv7604_platform_data {
         unsigned hdmi_free_run_mode;
 
         /* i2c addresses: 0 == use default */
-        u8 i2c_addresses[ADV7604_PAGE_MAX];
+        u8 i2c_addresses[ADV76XX_PAGE_MAX];
 };
 
-enum adv7604_pad {
-        ADV7604_PAD_HDMI_PORT_A = 0,
+enum adv76xx_pad {
+        ADV76XX_PAD_HDMI_PORT_A = 0,
         ADV7604_PAD_HDMI_PORT_B = 1,
         ADV7604_PAD_HDMI_PORT_C = 2,
         ADV7604_PAD_HDMI_PORT_D = 3,
@@ -158,7 +159,7 @@ enum adv7604_pad {
         /* The source pad is either 1 (ADV7611) or 6 (ADV7604) */
         ADV7604_PAD_SOURCE = 6,
         ADV7611_PAD_SOURCE = 1,
-        ADV7604_PAD_MAX = 7,
+        ADV76XX_PAD_MAX = 7,
 };
 
 #define V4L2_CID_ADV_RX_ANALOG_SAMPLING_PHASE   (V4L2_CID_DV_CLASS_BASE + 0x1000)
@@ -166,7 +167,7 @@ enum adv7604_pad {
 #define V4L2_CID_ADV_RX_FREE_RUN_COLOR          (V4L2_CID_DV_CLASS_BASE + 0x1002)
 
 /* notify events */
-#define ADV7604_HOTPLUG         1
-#define ADV7604_FMT_CHANGE      2
+#define ADV76XX_HOTPLUG         1
+#define ADV76XX_FMT_CHANGE      2
 
 #endif
diff --git a/include/media/atmel-isi.h b/include/media/atmel-isi.h
index c2e570336269..6008b0985b7b 100644
--- a/include/media/atmel-isi.h
+++ b/include/media/atmel-isi.h
@@ -59,6 +59,10 @@
 #define         ISI_CFG1_FRATE_DIV_MASK         (7 << 8)
 #define ISI_CFG1_DISCR                          (1 << 11)
 #define ISI_CFG1_FULL_MODE                      (1 << 12)
+/* Definition for THMASK(ISI_V2) */
+#define         ISI_CFG1_THMASK_BEATS_4         (0 << 13)
+#define         ISI_CFG1_THMASK_BEATS_8         (1 << 13)
+#define         ISI_CFG1_THMASK_BEATS_16        (2 << 13)
 
 /* Bitfields in CFG2 */
 #define ISI_CFG2_GRAYSCALE                      (1 << 13)
diff --git a/include/media/davinci/vpfe_capture.h b/include/media/davinci/vpfe_capture.h
index 288772e6900a..28bcd71cdd26 100644
--- a/include/media/davinci/vpfe_capture.h
+++ b/include/media/davinci/vpfe_capture.h
@@ -102,7 +102,7 @@ struct vpfe_config {
 struct vpfe_device {
         /* V4l2 specific parameters */
         /* Identifies video device for this channel */
-        struct video_device *video_dev;
+        struct video_device video_dev;
         /* sub devices */
         struct v4l2_subdev **sd;
         /* vpfe cfg */
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index e00459185d20..0c003d817493 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -44,6 +44,15 @@ struct media_pad {
         unsigned long flags;            /* Pad flags (MEDIA_PAD_FL_*) */
 };
 
+/**
+ * struct media_entity_operations - Media entity operations
+ * @link_setup:         Notify the entity of link changes. The operation can
+ *                      return an error, in which case link setup will be
+ *                      cancelled. Optional.
+ * @link_validate:      Return whether a link is valid from the entity point of
+ *                      view. The media_entity_pipeline_start() function
+ *                      validates all links by calling this operation. Optional.
+ */
 struct media_entity_operations {
         int (*link_setup)(struct media_entity *entity,
                           const struct media_pad *local,
@@ -87,17 +96,7 @@ struct media_entity {
                 struct {
                         u32 major;
                         u32 minor;
-                } v4l;
-                struct {
-                        u32 major;
-                        u32 minor;
-                } fb;
-                struct {
-                        u32 card;
-                        u32 device;
-                        u32 subdevice;
-                } alsa;
-                int dvb;
+                } dev;
 
                 /* Sub-device specifications */
                 /* Nothing needed yet */
diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h
index b1e63f2b72bd..1ba361205af1 100644
--- a/include/media/mt9p031.h
+++ b/include/media/mt9p031.h
@@ -5,12 +5,10 @@ struct v4l2_subdev;
 
 /*
  * struct mt9p031_platform_data - MT9P031 platform data
- * @reset: Chip reset GPIO (set to -1 if not used)
  * @ext_freq: Input clock frequency
  * @target_freq: Pixel clock frequency
  */
 struct mt9p031_platform_data {
-        int reset;
         int ext_freq;
         int target_freq;
 };
diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h
index 398279dd1922..048f8f9117ef 100644
--- a/include/media/omap3isp.h
+++ b/include/media/omap3isp.h
@@ -45,7 +45,7 @@ enum {
 };
 
 /**
- * struct isp_parallel_platform_data - Parallel interface platform data
+ * struct isp_parallel_cfg - Parallel interface configuration
  * @data_lane_shift: Data lane shifter
  *              ISP_LANE_SHIFT_0 - CAMEXT[13:0] -> CAM[13:0]
  *              ISP_LANE_SHIFT_2 - CAMEXT[13:2] -> CAM[11:0]
@@ -62,7 +62,7 @@ enum {
  * @data_pol: Data polarity
  *              0 - Normal, 1 - One's complement
  */
-struct isp_parallel_platform_data {
+struct isp_parallel_cfg {
         unsigned int data_lane_shift:2;
         unsigned int clk_pol:1;
         unsigned int hs_pol:1;
@@ -105,7 +105,7 @@ struct isp_csiphy_lanes_cfg {
 };
 
 /**
- * struct isp_ccp2_platform_data - CCP2 interface platform data
+ * struct isp_ccp2_cfg - CCP2 interface configuration
  * @strobe_clk_pol: Strobe/clock polarity
  *              0 - Non Inverted, 1 - Inverted
  * @crc: Enable the cyclic redundancy check
@@ -117,7 +117,7 @@ struct isp_csiphy_lanes_cfg {
  *              ISP_CCP2_PHY_DATA_STROBE - Data/strobe physical layer
  * @vpclk_div: Video port output clock control
  */
-struct isp_ccp2_platform_data {
+struct isp_ccp2_cfg {
         unsigned int strobe_clk_pol:1;
         unsigned int crc:1;
         unsigned int ccp2_mode:1;
@@ -127,39 +127,31 @@ struct isp_ccp2_platform_data {
 };
 
 /**
- * struct isp_csi2_platform_data - CSI2 interface platform data
+ * struct isp_csi2_cfg - CSI2 interface configuration
  * @crc: Enable the cyclic redundancy check
- * @vpclk_div: Video port output clock control
  */
-struct isp_csi2_platform_data {
+struct isp_csi2_cfg {
         unsigned crc:1;
-        unsigned vpclk_div:2;
         struct isp_csiphy_lanes_cfg lanecfg;
 };
 
-struct isp_subdev_i2c_board_info {
-        struct i2c_board_info *board_info;
-        int i2c_adapter_id;
-};
-
-struct isp_v4l2_subdevs_group {
-        struct isp_subdev_i2c_board_info *subdevs;
+struct isp_bus_cfg {
         enum isp_interface_type interface;
         union {
-                struct isp_parallel_platform_data parallel;
-                struct isp_ccp2_platform_data ccp2;
-                struct isp_csi2_platform_data csi2;
+                struct isp_parallel_cfg parallel;
+                struct isp_ccp2_cfg ccp2;
+                struct isp_csi2_cfg csi2;
         } bus; /* gcc < 4.6.0 chokes on anonymous union initializers */
 };
 
-struct isp_platform_xclk {
-        const char *dev_id;
-        const char *con_id;
+struct isp_platform_subdev {
+        struct i2c_board_info *board_info;
+        int i2c_adapter_id;
+        struct isp_bus_cfg *bus;
 };
 
 struct isp_platform_data {
-        struct isp_platform_xclk xclks[2];
-        struct isp_v4l2_subdevs_group *subdevs;
+        struct isp_platform_subdev *subdevs;
         void (*set_constraints)(struct isp_device *isp, bool enable);
 };
 
diff --git a/include/media/ov2659.h b/include/media/ov2659.h
new file mode 100644
index 000000000000..4216adc1ede2
--- /dev/null
+++ b/include/media/ov2659.h
@@ -0,0 +1,34 @@
+/*
+ * Omnivision OV2659 CMOS Image Sensor driver
+ *
+ * Copyright (C) 2015 Texas Instruments, Inc.
+ *
+ * Benoit Parrot <bparrot@ti.com>
+ * Lad, Prabhakar <prabhakar.csengg@gmail.com>
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef OV2659_H
+#define OV2659_H
+
+/**
+ * struct ov2659_platform_data - ov2659 driver platform data
+ * @link_frequency: target pixel clock frequency
+ */
+struct ov2659_platform_data {
+        s64 link_frequency;
+};
+
+#endif /* OV2659_H */
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index 944ecdf3530f..92766f77a5de 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -178,8 +178,8 @@ struct saa7146_use_ops  {
 };
 
 /* from saa7146_fops.c */
-int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, char *name, int type);
-int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev);
+int saa7146_register_device(struct video_device *vid, struct saa7146_dev *dev, char *name, int type);
+int saa7146_unregister_device(struct video_device *vid, struct saa7146_dev *dev);
 void saa7146_buffer_finish(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, int state);
 void saa7146_buffer_next(struct saa7146_dev *dev, struct saa7146_dmaqueue *q,int vbi);
 int saa7146_buffer_queue(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, struct saa7146_buf *buf);
diff --git a/include/media/v4l2-clk.h b/include/media/v4l2-clk.h
index 0b36cc138304..3ef6e3d5ed6c 100644
--- a/include/media/v4l2-clk.h
+++ b/include/media/v4l2-clk.h
@@ -22,14 +22,15 @@
 struct module;
 struct device;
 
+struct clk;
 struct v4l2_clk {
         struct list_head list;
         const struct v4l2_clk_ops *ops;
         const char *dev_id;
-        const char *id;
         int enable;
         struct mutex lock; /* Protect the enable count */
         atomic_t use_count;
+        struct clk *clk;
         void *priv;
 };
 
@@ -43,7 +44,7 @@ struct v4l2_clk_ops {
 
 struct v4l2_clk *v4l2_clk_register(const struct v4l2_clk_ops *ops,
                                    const char *dev_name,
-                                   const char *name, void *priv);
+                                   void *priv);
 void v4l2_clk_unregister(struct v4l2_clk *clk);
 struct v4l2_clk *v4l2_clk_get(struct device *dev, const char *id);
 void v4l2_clk_put(struct v4l2_clk *clk);
@@ -55,14 +56,13 @@ int v4l2_clk_set_rate(struct v4l2_clk *clk, unsigned long rate);
 struct module;
 
 struct v4l2_clk *__v4l2_clk_register_fixed(const char *dev_id,
-                const char *id, unsigned long rate, struct module *owner);
+                        unsigned long rate, struct module *owner);
 void v4l2_clk_unregister_fixed(struct v4l2_clk *clk);
 
 static inline struct v4l2_clk *v4l2_clk_register_fixed(const char *dev_id,
-                                                        const char *id,
                                                         unsigned long rate)
 {
-        return __v4l2_clk_register_fixed(dev_id, id, rate, THIS_MODULE);
+        return __v4l2_clk_register_fixed(dev_id, rate, THIS_MODULE);
 }
 
 #define v4l2_clk_name_i2c(name, size, adap, client) snprintf(name, size, \
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 3e4fddfc840c..acbcd2f5fe7f 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -65,7 +65,6 @@ struct v4l2_file_operations {
         ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
         ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
         unsigned int (*poll) (struct file *, struct poll_table_struct *);
-        long (*ioctl) (struct file *, unsigned int, unsigned long);
         long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
 #ifdef CONFIG_COMPAT
         long (*compat_ioctl32) (struct file *, unsigned int, unsigned long);
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
index ffb69da3ce9e..9c581578783f 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -58,8 +58,6 @@ struct v4l2_device {
         struct v4l2_ctrl_handler *ctrl_handler;
         /* Device's priority state */
         struct v4l2_prio_state prio;
-        /* BKL replacement mutex. Temporary solution only. */
-        struct mutex ioctl_lock;
         /* Keep track of the references to this struct. */
         struct kref ref;
         /* Release function that is called when the ref count goes to 0. */
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 8537983b9b22..8fbbd76d78e8 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -23,12 +23,6 @@ struct v4l2_ioctl_ops {
         /* VIDIOC_QUERYCAP handler */
         int (*vidioc_querycap)(struct file *file, void *fh, struct v4l2_capability *cap);
 
-        /* Priority handling */
-        int (*vidioc_g_priority)   (struct file *file, void *fh,
-                                    enum v4l2_priority *p);
-        int (*vidioc_s_priority)   (struct file *file, void *fh,
-                                    enum v4l2_priority p);
-
         /* VIDIOC_ENUM_FMT handlers */
         int (*vidioc_enum_fmt_vid_cap)     (struct file *file, void *fh,
                                             struct v4l2_fmtdesc *f);
diff --git a/include/media/v4l2-of.h b/include/media/v4l2-of.h
index 70fa7b7b0487..f831c9c225b6 100644
--- a/include/media/v4l2-of.h
+++ b/include/media/v4l2-of.h
@@ -29,12 +29,15 @@ struct device_node;
  * @data_lanes: an array of physical data lane indexes
  * @clock_lane: physical lane index of the clock lane
  * @num_data_lanes: number of data lanes
+ * @lane_polarities: polarity of the lanes. The order is the same of
+ *                 the physical lanes.
  */
 struct v4l2_of_bus_mipi_csi2 {
         unsigned int flags;
         unsigned char data_lanes[4];
         unsigned char clock_lane;
         unsigned short num_data_lanes;
+        bool lane_polarities[5];
 };
 
 /**
@@ -66,9 +69,26 @@ struct v4l2_of_endpoint {
         struct list_head head;
 };
 
+/**
+ * struct v4l2_of_link - a link between two endpoints
+ * @local_node: pointer to device_node of this endpoint
+ * @local_port: identifier of the port this endpoint belongs to
+ * @remote_node: pointer to device_node of the remote endpoint
+ * @remote_port: identifier of the port the remote endpoint belongs to
+ */
+struct v4l2_of_link {
+        struct device_node *local_node;
+        unsigned int local_port;
+        struct device_node *remote_node;
+        unsigned int remote_port;
+};
+
 #ifdef CONFIG_OF
 int v4l2_of_parse_endpoint(const struct device_node *node,
                            struct v4l2_of_endpoint *endpoint);
+int v4l2_of_parse_link(const struct device_node *node,
+                       struct v4l2_of_link *link);
+void v4l2_of_put_link(struct v4l2_of_link *link);
 #else /* CONFIG_OF */
 
 static inline int v4l2_of_parse_endpoint(const struct device_node *node,
@@ -77,6 +97,16 @@ static inline int v4l2_of_parse_endpoint(const struct device_node *node,
         return -ENOSYS;
 }
 
+static inline int v4l2_of_parse_link(const struct device_node *node,
+                                     struct v4l2_of_link *link)
+{
+        return -ENOSYS;
+}
+
+static inline void v4l2_of_put_link(struct v4l2_of_link *link)
+{
+}
+
 #endif /* CONFIG_OF */
 
 #endif /* _V4L2_OF_H */
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 5beeb8744fd1..2f0a345a7fed 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -332,8 +332,6 @@ struct v4l2_subdev_video_ops {
                                 struct v4l2_subdev_frame_interval *interval);
         int (*s_frame_interval)(struct v4l2_subdev *sd,
                                 struct v4l2_subdev_frame_interval *interval);
-        int (*enum_framesizes)(struct v4l2_subdev *sd, struct v4l2_frmsizeenum *fsize);
-        int (*enum_frameintervals)(struct v4l2_subdev *sd, struct v4l2_frmivalenum *fival);
         int (*s_dv_timings)(struct v4l2_subdev *sd,
                         struct v4l2_dv_timings *timings);
         int (*g_dv_timings)(struct v4l2_subdev *sd,
@@ -482,6 +480,18 @@ struct v4l2_subdev_ir_ops {
                                 struct v4l2_subdev_ir_parameters *params);
 };
 
+/*
+ * Used for storing subdev pad information. This structure only needs
+ * to be passed to the pad op if the 'which' field of the main argument
+ * is set to V4L2_SUBDEV_FORMAT_TRY. For V4L2_SUBDEV_FORMAT_ACTIVE it is
+ * safe to pass NULL.
+ */
+struct v4l2_subdev_pad_config {
+        struct v4l2_mbus_framefmt try_fmt;
+        struct v4l2_rect try_crop;
+        struct v4l2_rect try_compose;
+};
+
 /**
  * struct v4l2_subdev_pad_ops - v4l2-subdev pad level operations
  * @get_frame_desc: get the current low level media bus frame parameters.
@@ -489,21 +499,26 @@ struct v4l2_subdev_ir_ops {
  *                  may be adjusted by the subdev driver to device capabilities.
  */
 struct v4l2_subdev_pad_ops {
-        int (*enum_mbus_code)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+        int (*enum_mbus_code)(struct v4l2_subdev *sd,
+                              struct v4l2_subdev_pad_config *cfg,
                               struct v4l2_subdev_mbus_code_enum *code);
         int (*enum_frame_size)(struct v4l2_subdev *sd,
-                               struct v4l2_subdev_fh *fh,
+                               struct v4l2_subdev_pad_config *cfg,
                                struct v4l2_subdev_frame_size_enum *fse);
         int (*enum_frame_interval)(struct v4l2_subdev *sd,
-                                   struct v4l2_subdev_fh *fh,
+                                   struct v4l2_subdev_pad_config *cfg,
                                    struct v4l2_subdev_frame_interval_enum *fie);
-        int (*get_fmt)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+        int (*get_fmt)(struct v4l2_subdev *sd,
+                       struct v4l2_subdev_pad_config *cfg,
                        struct v4l2_subdev_format *format);
-        int (*set_fmt)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+        int (*set_fmt)(struct v4l2_subdev *sd,
+                       struct v4l2_subdev_pad_config *cfg,
                        struct v4l2_subdev_format *format);
-        int (*get_selection)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+        int (*get_selection)(struct v4l2_subdev *sd,
+                             struct v4l2_subdev_pad_config *cfg,
                              struct v4l2_subdev_selection *sel);
-        int (*set_selection)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+        int (*set_selection)(struct v4l2_subdev *sd,
+                             struct v4l2_subdev_pad_config *cfg,
                              struct v4l2_subdev_selection *sel);
         int (*get_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid);
         int (*set_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid);
@@ -625,11 +640,7 @@ struct v4l2_subdev {
 struct v4l2_subdev_fh {
         struct v4l2_fh vfh;
 #if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
-        struct {
-                struct v4l2_mbus_framefmt try_fmt;
-                struct v4l2_rect try_crop;
-                struct v4l2_rect try_compose;
-        } *pad;
+        struct v4l2_subdev_pad_config *pad;
 #endif
 };
 
@@ -639,17 +650,17 @@ struct v4l2_subdev_fh {
 #if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
 #define __V4L2_SUBDEV_MK_GET_TRY(rtype, fun_name, field_name)           \
         static inline struct rtype *                                    \
-        v4l2_subdev_get_try_##fun_name(struct v4l2_subdev_fh *fh,       \
-                                       unsigned int pad)                \
+        fun_name(struct v4l2_subdev *sd,                                \
+                 struct v4l2_subdev_pad_config *cfg,                    \
+                 unsigned int pad)                                      \
         {                                                               \
-                BUG_ON(pad >= vdev_to_v4l2_subdev(                      \
-                                        fh->vfh.vdev)->entity.num_pads); \
-                return &fh->pad[pad].field_name;                        \
+                BUG_ON(pad >= sd->entity.num_pads);                     \
+                return &cfg[pad].field_name;                            \
         }
 
-__V4L2_SUBDEV_MK_GET_TRY(v4l2_mbus_framefmt, format, try_fmt)
-__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, crop, try_crop)
-__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, compose, try_compose)
+__V4L2_SUBDEV_MK_GET_TRY(v4l2_mbus_framefmt, v4l2_subdev_get_try_format, try_fmt)
+__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, v4l2_subdev_get_try_crop, try_crop)
+__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, v4l2_subdev_get_try_compose, try_compose)
 #endif
 
 extern const struct v4l2_file_operations v4l2_subdev_fops;
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index bd2cec2d6c3d..a5790fd5d125 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -134,17 +134,6 @@ enum vb2_io_modes {
 };
 
 /**
- * enum vb2_fileio_flags - flags for selecting a mode of the file io emulator,
- * by default the 'streaming' style is used by the file io emulator
- * @VB2_FILEIO_READ_ONCE:       report EOF after reading the first buffer
- * @VB2_FILEIO_WRITE_IMMEDIATELY:       queue buffer after each write() call
- */
-enum vb2_fileio_flags {
-        VB2_FILEIO_READ_ONCE            = (1 << 0),
-        VB2_FILEIO_WRITE_IMMEDIATELY    = (1 << 1),
-};
-
-/**
  * enum vb2_buffer_state - current video buffer state
  * @VB2_BUF_STATE_DEQUEUED:     buffer under userspace control
  * @VB2_BUF_STATE_PREPARING:    buffer is being prepared in videobuf
@@ -346,7 +335,9 @@ struct v4l2_fh;
  *
  * @type:       queue type (see V4L2_BUF_TYPE_* in linux/videodev2.h
  * @io_modes:   supported io methods (see vb2_io_modes enum)
- * @io_flags:   additional io flags (see vb2_fileio_flags enum)
+ * @fileio_read_once:           report EOF after reading the first buffer
+ * @fileio_write_immediately:   queue buffer after each write() call
+ * @allow_zero_bytesused:       allow bytesused == 0 to be passed to the driver
  * @lock:       pointer to a mutex that protects the vb2_queue struct. The
  *              driver can set this to a mutex to let the v4l2 core serialize
  *              the queuing ioctls. If the driver wants to handle locking
@@ -396,7 +387,10 @@ struct v4l2_fh;
 struct vb2_queue {
         enum v4l2_buf_type              type;
         unsigned int                    io_modes;
-        unsigned int                    io_flags;
+        unsigned                        fileio_read_once:1;
+        unsigned                        fileio_write_immediately:1;
+        unsigned                        allow_zero_bytesused:1;
+
         struct mutex                    *lock;
         struct v4l2_fh                  *owner;
 
diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index 6fab66c5c5af..c6b97e58cf84 100644
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -211,6 +211,8 @@ struct p9_dirent {
         char d_name[256];
 };
 
+struct iov_iter;
+
 int p9_client_statfs(struct p9_fid *fid, struct p9_rstatfs *sb);
 int p9_client_rename(struct p9_fid *fid, struct p9_fid *newdirfid,
                      const char *name);
@@ -236,10 +238,8 @@ int p9_client_clunk(struct p9_fid *fid);
 int p9_client_fsync(struct p9_fid *fid, int datasync);
 int p9_client_remove(struct p9_fid *fid);
 int p9_client_unlinkat(struct p9_fid *dfid, const char *name, int flags);
-int p9_client_read(struct p9_fid *fid, char *data, char __user *udata,
-                                                        u64 offset, u32 count);
-int p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
-                                                        u64 offset, u32 count);
+int p9_client_read(struct p9_fid *fid, u64 offset, struct iov_iter *to, int *err);
+int p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err);
 int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset);
 int p9dirent_read(struct p9_client *clnt, char *buf, int len,
                   struct p9_dirent *dirent);
diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
index 2a25dec30211..5122b5e40f78 100644
--- a/include/net/9p/transport.h
+++ b/include/net/9p/transport.h
@@ -61,7 +61,7 @@ struct p9_trans_module {
         int (*cancel) (struct p9_client *, struct p9_req_t *req);
         int (*cancelled)(struct p9_client *, struct p9_req_t *req);
         int (*zc_request)(struct p9_client *, struct p9_req_t *,
-                          char *, char *, int , int, int, int);
+                          struct iov_iter *, struct iov_iter *, int , int, int);
 };
 
 void v9fs_register_trans(struct p9_trans_module *m);
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
index 0d87674fb775..172632dd9930 100644
--- a/include/net/af_vsock.h
+++ b/include/net/af_vsock.h
@@ -100,8 +100,8 @@ struct vsock_transport {
 
         /* DGRAM. */
         int (*dgram_bind)(struct vsock_sock *, struct sockaddr_vm *);
-        int (*dgram_dequeue)(struct kiocb *kiocb, struct vsock_sock *vsk,
-                             struct msghdr *msg, size_t len, int flags);
+        int (*dgram_dequeue)(struct vsock_sock *vsk, struct msghdr *msg,
+                             size_t len, int flags);
         int (*dgram_enqueue)(struct vsock_sock *, struct sockaddr_vm *,
                              struct msghdr *, size_t len);
         bool (*dgram_allow)(u32 cid, u32 port);
diff --git a/include/net/arp.h b/include/net/arp.h
index 73c49864076b..5e0f891d476c 100644
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -9,28 +9,17 @@
 
 extern struct neigh_table arp_tbl;
 
-static inline u32 arp_hashfn(u32 key, const struct net_device *dev, u32 hash_rnd)
+static inline u32 arp_hashfn(const void *pkey, const struct net_device *dev, u32 *hash_rnd)
 {
+        u32 key = *(const u32 *)pkey;
         u32 val = key ^ hash32_ptr(dev);
 
-        return val * hash_rnd;
+        return val * hash_rnd[0];
 }
 
 static inline struct neighbour *__ipv4_neigh_lookup_noref(struct net_device *dev, u32 key)
 {
-        struct neigh_hash_table *nht = rcu_dereference_bh(arp_tbl.nht);
-        struct neighbour *n;
-        u32 hash_val;
-
-        hash_val = arp_hashfn(key, dev, nht->hash_rnd[0]) >> (32 - nht->hash_shift);
-        for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
-             n != NULL;
-             n = rcu_dereference_bh(n->next)) {
-                if (n->dev == dev && *(u32 *)n->primary_key == key)
-                        return n;
-        }
-
-        return NULL;
+        return ___neigh_lookup_noref(&arp_tbl, neigh_key_eq32, arp_hashfn, &key, dev);
 }
 
 static inline struct neighbour *__ipv4_neigh_lookup(struct net_device *dev, u32 key)
@@ -47,7 +36,6 @@ static inline struct neighbour *__ipv4_neigh_lookup(struct net_device *dev, u32
 }
 
 void arp_init(void);
-int arp_find(unsigned char *haddr, struct sk_buff *skb);
 int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg);
 void arp_send(int type, int ptype, __be32 dest_ip,
               struct net_device *dev, __be32 src_ip,
diff --git a/include/net/ax25.h b/include/net/ax25.h
index bf0396e9a5d3..16a923a3a43a 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -12,6 +12,7 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/atomic.h>
+#include <net/neighbour.h>
 
 #define AX25_T1CLAMPLO                  1
 #define AX25_T1CLAMPHI                  (30 * HZ)
@@ -366,9 +367,7 @@ int ax25_kiss_rcv(struct sk_buff *, struct net_device *, struct packet_type *,
                   struct net_device *);
 
 /* ax25_ip.c */
-int ax25_hard_header(struct sk_buff *, struct net_device *, unsigned short,
-                     const void *, const void *, unsigned int);
-int ax25_rebuild_header(struct sk_buff *);
+netdev_tx_t ax25_ip_xmit(struct sk_buff *skb);
 extern const struct header_ops ax25_header_ops;
 
 /* ax25_out.c */
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index e00455aab18c..7dba80546f16 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -245,10 +245,10 @@ int  bt_sock_register(int proto, const struct net_proto_family *ops);
 void bt_sock_unregister(int proto);
 void bt_sock_link(struct bt_sock_list *l, struct sock *s);
 void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);
-int  bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-                                struct msghdr *msg, size_t len, int flags);
-int  bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
-                        struct msghdr *msg, size_t len, int flags);
+int  bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+                     int flags);
+int  bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg,
+                            size_t len, int flags);
 uint bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);
 int  bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int  bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);
@@ -269,29 +269,34 @@ struct l2cap_ctrl {
         __u16   reqseq;
         __u16   txseq;
         __u8    retries;
+        __le16  psm;
+        bdaddr_t bdaddr;
+        struct l2cap_chan *chan;
 };
 
 struct hci_dev;
 
 typedef void (*hci_req_complete_t)(struct hci_dev *hdev, u8 status, u16 opcode);
-
-struct hci_req_ctrl {
-        bool                    start;
-        u8                      event;
-        hci_req_complete_t      complete;
+typedef void (*hci_req_complete_skb_t)(struct hci_dev *hdev, u8 status,
+                                       u16 opcode, struct sk_buff *skb);
+
+struct req_ctrl {
+        bool start;
+        u8 event;
+        hci_req_complete_t complete;
+        hci_req_complete_skb_t complete_skb;
 };
 
 struct bt_skb_cb {
         __u8 pkt_type;
-        __u8 incoming;
+        __u8 force_active;
         __u16 opcode;
         __u16 expect;
-        __u8 force_active;
-        struct l2cap_chan *chan;
-        struct l2cap_ctrl control;
-        struct hci_req_ctrl req;
-        bdaddr_t bdaddr;
-        __le16 psm;
+        __u8 incoming:1;
+        union {
+                struct l2cap_ctrl l2cap;
+                struct req_ctrl req;
+        };
 };
 #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))
 
@@ -339,6 +344,11 @@ out:
 
 int bt_to_errno(__u16 code);
 
+void hci_sock_set_flag(struct sock *sk, int nr);
+void hci_sock_clear_flag(struct sock *sk, int nr);
+int hci_sock_test_flag(struct sock *sk, int nr);
+unsigned short hci_sock_get_channel(struct sock *sk);
+
 int hci_sock_init(void);
 void hci_sock_cleanup(void);
 
@@ -358,6 +368,9 @@ void l2cap_exit(void);
 int sco_init(void);
 void sco_exit(void);
 
+int mgmt_init(void);
+void mgmt_exit(void);
+
 void bt_sock_reclassify_lock(struct sock *sk, int proto);
 
 #endif /* __BLUETOOTH_H */
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 8e54f825153c..d95da83cb1b0 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -160,6 +160,14 @@ enum {
          * during the hdev->setup vendor callback.
          */
         HCI_QUIRK_STRICT_DUPLICATE_FILTER,
+
+        /* When this quirk is set, LE scan and BR/EDR inquiry is done
+         * simultaneously, otherwise it's interleaved.
+         *
+         * This quirk can be set before hci_register_dev is called or
+         * during the hdev->setup vendor callback.
+         */
+        HCI_QUIRK_SIMULTANEOUS_DISCOVERY,
 };
 
 /* HCI device flags */
@@ -179,13 +187,14 @@ enum {
         HCI_RESET,
 };
 
-/* BR/EDR and/or LE controller flags: the flags defined here should represent
- * states configured via debugfs for debugging and testing purposes only.
- */
+/* HCI socket flags */
 enum {
-        HCI_DUT_MODE,
-        HCI_FORCE_BREDR_SMP,
-        HCI_FORCE_STATIC_ADDR,
+        HCI_SOCK_TRUSTED,
+        HCI_MGMT_INDEX_EVENTS,
+        HCI_MGMT_UNCONF_INDEX_EVENTS,
+        HCI_MGMT_EXT_INDEX_EVENTS,
+        HCI_MGMT_GENERIC_EVENTS,
+        HCI_MGMT_OOB_DATA_EVENTS,
 };
 
 /*
@@ -217,6 +226,8 @@ enum {
         HCI_HS_ENABLED,
         HCI_LE_ENABLED,
         HCI_ADVERTISING,
+        HCI_ADVERTISING_CONNECTABLE,
+        HCI_ADVERTISING_INSTANCE,
         HCI_CONNECTABLE,
         HCI_DISCOVERABLE,
         HCI_LIMITED_DISCOVERABLE,
@@ -225,13 +236,13 @@ enum {
         HCI_FAST_CONNECTABLE,
         HCI_BREDR_ENABLED,
         HCI_LE_SCAN_INTERRUPTED,
-};
 
-/* A mask for the flags that are supposed to remain when a reset happens
- * or the HCI device is closed.
- */
-#define HCI_PERSISTENT_MASK (BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ) | \
-                              BIT(HCI_FAST_CONNECTABLE) | BIT(HCI_LE_ADV))
+        HCI_DUT_MODE,
+        HCI_FORCE_BREDR_SMP,
+        HCI_FORCE_STATIC_ADDR,
+
+        __HCI_NUM_FLAGS,
+};
 
 /* HCI timeouts */
 #define HCI_DISCONN_TIMEOUT     msecs_to_jiffies(2000)  /* 2 seconds */
@@ -363,6 +374,7 @@ enum {
 /* LE features */
 #define HCI_LE_ENCRYPTION               0x01
 #define HCI_LE_CONN_PARAM_REQ_PROC      0x02
+#define HCI_LE_SLAVE_FEATURES           0x08
 #define HCI_LE_PING                     0x10
 #define HCI_LE_DATA_LEN_EXT             0x20
 #define HCI_LE_EXT_SCAN_POLICY          0x80
@@ -452,9 +464,16 @@ enum {
 #define EIR_NAME_COMPLETE       0x09 /* complete local name */
 #define EIR_TX_POWER            0x0A /* transmit power level */
 #define EIR_CLASS_OF_DEV        0x0D /* Class of Device */
-#define EIR_SSP_HASH_C          0x0E /* Simple Pairing Hash C */
-#define EIR_SSP_RAND_R          0x0F /* Simple Pairing Randomizer R */
+#define EIR_SSP_HASH_C192       0x0E /* Simple Pairing Hash C-192 */
+#define EIR_SSP_RAND_R192       0x0F /* Simple Pairing Randomizer R-192 */
 #define EIR_DEVICE_ID           0x10 /* device ID */
+#define EIR_APPEARANCE          0x19 /* Device appearance */
+#define EIR_LE_BDADDR           0x1B /* LE Bluetooth device address */
+#define EIR_LE_ROLE             0x1C /* LE role */
+#define EIR_SSP_HASH_C256       0x1D /* Simple Pairing Hash C-256 */
+#define EIR_SSP_RAND_R256       0x1E /* Simple Pairing Rand R-256 */
+#define EIR_LE_SC_CONFIRM       0x22 /* LE SC Confirmation Value */
+#define EIR_LE_SC_RANDOM        0x23 /* LE SC Random Value */
 
 /* Low Energy Advertising Flags */
 #define LE_AD_LIMITED           0x01 /* Limited Discoverable */
@@ -1358,6 +1377,11 @@ struct hci_cp_le_conn_update {
         __le16   max_ce_len;
 } __packed;
 
+#define HCI_OP_LE_READ_REMOTE_FEATURES  0x2016
+struct hci_cp_le_read_remote_features {
+        __le16   handle;
+} __packed;
+
 #define HCI_OP_LE_START_ENC             0x2019
 struct hci_cp_le_start_enc {
         __le16  handle;
@@ -1850,6 +1874,13 @@ struct hci_ev_le_conn_update_complete {
         __le16   supervision_timeout;
 } __packed;
 
+#define HCI_EV_LE_REMOTE_FEAT_COMPLETE  0x04
+struct hci_ev_le_remote_feat_complete {
+        __u8     status;
+        __le16   handle;
+        __u8     features[8];
+} __packed;
+
 #define HCI_EV_LE_LTK_REQ               0x05
 struct hci_ev_le_ltk_req {
         __le16  handle;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 52863c3e0b13..a056c2bfeb81 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -76,6 +76,7 @@ struct discovery_state {
         u8                      last_adv_data[HCI_MAX_AD_LENGTH];
         u8                      last_adv_data_len;
         bool                    report_invalid_rssi;
+        bool                    result_filtering;
         s8                      rssi;
         u16                     uuid_count;
         u8                      (*uuids)[16];
@@ -108,7 +109,7 @@ struct bt_uuid {
 struct smp_csrk {
         bdaddr_t bdaddr;
         u8 bdaddr_type;
-        u8 master;
+        u8 type;
         u8 val[16];
 };
 
@@ -154,6 +155,17 @@ struct oob_data {
         u8 rand256[16];
 };
 
+struct adv_info {
+        struct delayed_work timeout_exp;
+        __u8    instance;
+        __u32   flags;
+        __u16   timeout;
+        __u16   adv_data_len;
+        __u8    adv_data[HCI_MAX_AD_LENGTH];
+        __u16   scan_rsp_len;
+        __u8    scan_rsp_data[HCI_MAX_AD_LENGTH];
+};
+
 #define HCI_MAX_SHORT_NAME_LENGTH       10
 
 /* Default LE RPA expiry time, 15 minutes */
@@ -173,7 +185,6 @@ struct amp_assoc {
 
 #define HCI_MAX_PAGES   3
 
-#define NUM_REASSEMBLY 4
 struct hci_dev {
         struct list_head list;
         struct mutex    lock;
@@ -314,14 +325,13 @@ struct hci_dev {
         struct sk_buff_head     raw_q;
         struct sk_buff_head     cmd_q;
 
-        struct sk_buff          *recv_evt;
         struct sk_buff          *sent_cmd;
-        struct sk_buff          *reassembly[NUM_REASSEMBLY];
 
         struct mutex            req_lock;
         wait_queue_head_t       req_wait_q;
         __u32                   req_status;
         __u32                   req_result;
+        struct sk_buff          *req_skb;
 
         void                    *smp_data;
         void                    *smp_bredr_data;
@@ -352,8 +362,7 @@ struct hci_dev {
 
         struct rfkill           *rfkill;
 
-        unsigned long           dbg_flags;
-        unsigned long           dev_flags;
+        DECLARE_BITMAP(dev_flags, __HCI_NUM_FLAGS);
 
         struct delayed_work     le_scan_disable;
         struct delayed_work     le_scan_restart;
@@ -364,6 +373,8 @@ struct hci_dev {
         __u8                    scan_rsp_data[HCI_MAX_AD_LENGTH];
         __u8                    scan_rsp_data_len;
 
+        struct adv_info         adv_instance;
+
         __u8                    irk[16];
         __u32                   rpa_timeout;
         struct delayed_work     rpa_expired;
@@ -373,6 +384,7 @@ struct hci_dev {
         int (*close)(struct hci_dev *hdev);
         int (*flush)(struct hci_dev *hdev);
         int (*setup)(struct hci_dev *hdev);
+        int (*shutdown)(struct hci_dev *hdev);
         int (*send)(struct hci_dev *hdev, struct sk_buff *skb);
         void (*notify)(struct hci_dev *hdev, unsigned int evt);
         void (*hw_error)(struct hci_dev *hdev, u8 code);
@@ -498,19 +510,29 @@ struct hci_conn_params {
 extern struct list_head hci_dev_list;
 extern struct list_head hci_cb_list;
 extern rwlock_t hci_dev_list_lock;
-extern rwlock_t hci_cb_list_lock;
+extern struct mutex hci_cb_list_lock;
+
+#define hci_dev_set_flag(hdev, nr)             set_bit((nr), (hdev)->dev_flags)
+#define hci_dev_clear_flag(hdev, nr)           clear_bit((nr), (hdev)->dev_flags)
+#define hci_dev_change_flag(hdev, nr)          change_bit((nr), (hdev)->dev_flags)
+#define hci_dev_test_flag(hdev, nr)            test_bit((nr), (hdev)->dev_flags)
+#define hci_dev_test_and_set_flag(hdev, nr)    test_and_set_bit((nr), (hdev)->dev_flags)
+#define hci_dev_test_and_clear_flag(hdev, nr)  test_and_clear_bit((nr), (hdev)->dev_flags)
+#define hci_dev_test_and_change_flag(hdev, nr) test_and_change_bit((nr), (hdev)->dev_flags)
+
+#define hci_dev_clear_volatile_flags(hdev)                      \
+        do {                                                    \
+                hci_dev_clear_flag(hdev, HCI_LE_SCAN);          \
+                hci_dev_clear_flag(hdev, HCI_LE_ADV);           \
+                hci_dev_clear_flag(hdev, HCI_PERIODIC_INQ);     \
+        } while (0)
 
 /* ----- HCI interface to upper protocols ----- */
 int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);
-void l2cap_connect_cfm(struct hci_conn *hcon, u8 status);
 int l2cap_disconn_ind(struct hci_conn *hcon);
-void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason);
-int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt);
 int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags);
 
 int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags);
-void sco_connect_cfm(struct hci_conn *hcon, __u8 status);
-void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason);
 int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);
 
 /* ----- Inquiry cache ----- */
@@ -529,6 +551,7 @@ static inline void discovery_init(struct hci_dev *hdev)
 
 static inline void hci_discovery_filter_clear(struct hci_dev *hdev)
 {
+        hdev->discovery.result_filtering = false;
         hdev->discovery.report_invalid_rssi = true;
         hdev->discovery.rssi = HCI_RSSI_INVALID;
         hdev->discovery.uuid_count = 0;
@@ -538,6 +561,11 @@ static inline void hci_discovery_filter_clear(struct hci_dev *hdev)
         hdev->discovery.scan_duration = 0;
 }
 
+static inline void adv_info_init(struct hci_dev *hdev)
+{
+        memset(&hdev->adv_instance, 0, sizeof(struct adv_info));
+}
+
 bool hci_discovery_active(struct hci_dev *hdev);
 
 void hci_discovery_set_state(struct hci_dev *hdev, int state);
@@ -584,7 +612,6 @@ enum {
         HCI_CONN_SC_ENABLED,
         HCI_CONN_AES_CCM,
         HCI_CONN_POWER_SAVE,
-        HCI_CONN_REMOTE_OOB,
         HCI_CONN_FLUSH_KEY,
         HCI_CONN_ENCRYPT,
         HCI_CONN_AUTH,
@@ -600,14 +627,14 @@ enum {
 static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
 {
         struct hci_dev *hdev = conn->hdev;
-        return test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
+        return hci_dev_test_flag(hdev, HCI_SSP_ENABLED) &&
                test_bit(HCI_CONN_SSP_ENABLED, &conn->flags);
 }
 
 static inline bool hci_conn_sc_enabled(struct hci_conn *conn)
 {
         struct hci_dev *hdev = conn->hdev;
-        return test_bit(HCI_SC_ENABLED, &hdev->dev_flags) &&
+        return hci_dev_test_flag(hdev, HCI_SC_ENABLED) &&
                test_bit(HCI_CONN_SC_ENABLED, &conn->flags);
 }
 
@@ -969,6 +996,8 @@ struct smp_irk *hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr,
 void hci_remove_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type);
 void hci_smp_irks_clear(struct hci_dev *hdev);
 
+bool hci_bdaddr_is_paired(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
+
 void hci_remote_oob_data_clear(struct hci_dev *hdev);
 struct oob_data *hci_find_remote_oob_data(struct hci_dev *hdev,
                                           bdaddr_t *bdaddr, u8 bdaddr_type);
@@ -981,7 +1010,6 @@ int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
 void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
 
 int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb);
-int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count);
 
 void hci_init_sysfs(struct hci_dev *hdev);
 void hci_conn_init_sysfs(struct hci_conn *conn);
@@ -1025,10 +1053,10 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
 #define lmp_host_le_capable(dev)   (!!((dev)->features[1][0] & LMP_HOST_LE))
 #define lmp_host_le_br_capable(dev) (!!((dev)->features[1][0] & LMP_HOST_LE_BREDR))
 
-#define hdev_is_powered(hdev) (test_bit(HCI_UP, &hdev->flags) && \
-                                !test_bit(HCI_AUTO_OFF, &hdev->dev_flags))
-#define bredr_sc_enabled(dev) (lmp_sc_capable(dev) && \
-                               test_bit(HCI_SC_ENABLED, &(dev)->dev_flags))
+#define hdev_is_powered(dev)   (test_bit(HCI_UP, &(dev)->flags) && \
+                                !hci_dev_test_flag(dev, HCI_AUTO_OFF))
+#define bredr_sc_enabled(dev)  (lmp_sc_capable(dev) && \
+                                hci_dev_test_flag(dev, HCI_SC_ENABLED))
 
 /* ----- HCI protocols ----- */
 #define HCI_PROTO_DEFER             0x01
@@ -1050,28 +1078,6 @@ static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr,
         }
 }
 
-static inline void hci_proto_connect_cfm(struct hci_conn *conn, __u8 status)
-{
-        switch (conn->type) {
-        case ACL_LINK:
-        case LE_LINK:
-                l2cap_connect_cfm(conn, status);
-                break;
-
-        case SCO_LINK:
-        case ESCO_LINK:
-                sco_connect_cfm(conn, status);
-                break;
-
-        default:
-                BT_ERR("unknown link type %d", conn->type);
-                break;
-        }
-
-        if (conn->connect_cfm_cb)
-                conn->connect_cfm_cb(conn, status);
-}
-
 static inline int hci_proto_disconn_ind(struct hci_conn *conn)
 {
         if (conn->type != ACL_LINK && conn->type != LE_LINK)
@@ -1080,91 +1086,69 @@ static inline int hci_proto_disconn_ind(struct hci_conn *conn)
         return l2cap_disconn_ind(conn);
 }
 
-static inline void hci_proto_disconn_cfm(struct hci_conn *conn, __u8 reason)
-{
-        switch (conn->type) {
-        case ACL_LINK:
-        case LE_LINK:
-                l2cap_disconn_cfm(conn, reason);
-                break;
-
-        case SCO_LINK:
-        case ESCO_LINK:
-                sco_disconn_cfm(conn, reason);
-                break;
-
-        /* L2CAP would be handled for BREDR chan */
-        case AMP_LINK:
-                break;
+/* ----- HCI callbacks ----- */
+struct hci_cb {
+        struct list_head list;
 
-        default:
-                BT_ERR("unknown link type %d", conn->type);
-                break;
-        }
+        char *name;
 
-        if (conn->disconn_cfm_cb)
-                conn->disconn_cfm_cb(conn, reason);
-}
+        void (*connect_cfm)     (struct hci_conn *conn, __u8 status);
+        void (*disconn_cfm)     (struct hci_conn *conn, __u8 status);
+        void (*security_cfm)    (struct hci_conn *conn, __u8 status,
+                                                                __u8 encrypt);
+        void (*key_change_cfm)  (struct hci_conn *conn, __u8 status);
+        void (*role_switch_cfm) (struct hci_conn *conn, __u8 status, __u8 role);
+};
 
-static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
+static inline void hci_connect_cfm(struct hci_conn *conn, __u8 status)
 {
-        __u8 encrypt;
-
-        if (conn->type != ACL_LINK && conn->type != LE_LINK)
-                return;
-
-        if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags))
-                return;
+        struct hci_cb *cb;
 
-        encrypt = test_bit(HCI_CONN_ENCRYPT, &conn->flags) ? 0x01 : 0x00;
-        l2cap_security_cfm(conn, status, encrypt);
+        mutex_lock(&hci_cb_list_lock);
+        list_for_each_entry(cb, &hci_cb_list, list) {
+                if (cb->connect_cfm)
+                        cb->connect_cfm(conn, status);
+        }
+        mutex_unlock(&hci_cb_list_lock);
 
-        if (conn->security_cfm_cb)
-                conn->security_cfm_cb(conn, status);
+        if (conn->connect_cfm_cb)
+                conn->connect_cfm_cb(conn, status);
 }
 
-static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status,
-                                                                __u8 encrypt)
+static inline void hci_disconn_cfm(struct hci_conn *conn, __u8 reason)
 {
-        if (conn->type != ACL_LINK && conn->type != LE_LINK)
-                return;
+        struct hci_cb *cb;
 
-        l2cap_security_cfm(conn, status, encrypt);
+        mutex_lock(&hci_cb_list_lock);
+        list_for_each_entry(cb, &hci_cb_list, list) {
+                if (cb->disconn_cfm)
+                        cb->disconn_cfm(conn, reason);
+        }
+        mutex_unlock(&hci_cb_list_lock);
 
-        if (conn->security_cfm_cb)
-                conn->security_cfm_cb(conn, status);
+        if (conn->disconn_cfm_cb)
+                conn->disconn_cfm_cb(conn, reason);
 }
 
-/* ----- HCI callbacks ----- */
-struct hci_cb {
-        struct list_head list;
-
-        char *name;
-
-        void (*security_cfm)    (struct hci_conn *conn, __u8 status,
-                                                                __u8 encrypt);
-        void (*key_change_cfm)  (struct hci_conn *conn, __u8 status);
-        void (*role_switch_cfm) (struct hci_conn *conn, __u8 status, __u8 role);
-};
-
 static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status)
 {
         struct hci_cb *cb;
         __u8 encrypt;
 
-        hci_proto_auth_cfm(conn, status);
-
         if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags))
                 return;
 
         encrypt = test_bit(HCI_CONN_ENCRYPT, &conn->flags) ? 0x01 : 0x00;
 
-        read_lock(&hci_cb_list_lock);
+        mutex_lock(&hci_cb_list_lock);
         list_for_each_entry(cb, &hci_cb_list, list) {
                 if (cb->security_cfm)
                         cb->security_cfm(conn, status, encrypt);
         }
-        read_unlock(&hci_cb_list_lock);
+        mutex_unlock(&hci_cb_list_lock);
+
+        if (conn->security_cfm_cb)
+                conn->security_cfm_cb(conn, status);
 }
 
 static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
@@ -1178,26 +1162,27 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
         if (conn->pending_sec_level > conn->sec_level)
                 conn->sec_level = conn->pending_sec_level;
 
-        hci_proto_encrypt_cfm(conn, status, encrypt);
-
-        read_lock(&hci_cb_list_lock);
+        mutex_lock(&hci_cb_list_lock);
         list_for_each_entry(cb, &hci_cb_list, list) {
                 if (cb->security_cfm)
                         cb->security_cfm(conn, status, encrypt);
         }
-        read_unlock(&hci_cb_list_lock);
+        mutex_unlock(&hci_cb_list_lock);
+
+        if (conn->security_cfm_cb)
+                conn->security_cfm_cb(conn, status);
 }
 
 static inline void hci_key_change_cfm(struct hci_conn *conn, __u8 status)
 {
         struct hci_cb *cb;
 
-        read_lock(&hci_cb_list_lock);
+        mutex_lock(&hci_cb_list_lock);
         list_for_each_entry(cb, &hci_cb_list, list) {
                 if (cb->key_change_cfm)
                         cb->key_change_cfm(conn, status);
         }
-        read_unlock(&hci_cb_list_lock);
+        mutex_unlock(&hci_cb_list_lock);
 }
 
 static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status,
@@ -1205,12 +1190,12 @@ static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status,
 {
         struct hci_cb *cb;
 
-        read_lock(&hci_cb_list_lock);
+        mutex_lock(&hci_cb_list_lock);
         list_for_each_entry(cb, &hci_cb_list, list) {
                 if (cb->role_switch_cfm)
                         cb->role_switch_cfm(conn, status, role);
         }
-        read_unlock(&hci_cb_list_lock);
+        mutex_unlock(&hci_cb_list_lock);
 }
 
 static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type)
@@ -1296,8 +1281,6 @@ static inline int hci_check_conn_params(u16 min, u16 max, u16 latency,
 int hci_register_cb(struct hci_cb *hcb);
 int hci_unregister_cb(struct hci_cb *hcb);
 
-bool hci_req_pending(struct hci_dev *hdev);
-
 struct sk_buff *__hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,
                                const void *param, u32 timeout);
 struct sk_buff *__hci_cmd_sync_ev(struct hci_dev *hdev, u16 opcode, u32 plen,
@@ -1312,11 +1295,35 @@ void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode);
 
 /* ----- HCI Sockets ----- */
 void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb);
-void hci_send_to_control(struct sk_buff *skb, struct sock *skip_sk);
+void hci_send_to_channel(unsigned short channel, struct sk_buff *skb,
+                         int flag, struct sock *skip_sk);
 void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb);
 
 void hci_sock_dev_event(struct hci_dev *hdev, int event);
 
+#define HCI_MGMT_VAR_LEN        BIT(0)
+#define HCI_MGMT_NO_HDEV        BIT(1)
+#define HCI_MGMT_UNTRUSTED      BIT(2)
+#define HCI_MGMT_UNCONFIGURED   BIT(3)
+
+struct hci_mgmt_handler {
+        int (*func) (struct sock *sk, struct hci_dev *hdev, void *data,
+                     u16 data_len);
+        size_t data_len;
+        unsigned long flags;
+};
+
+struct hci_mgmt_chan {
+        struct list_head list;
+        unsigned short channel;
+        size_t handler_count;
+        const struct hci_mgmt_handler *handlers;
+        void (*hdev_init) (struct sock *sk, struct hci_dev *hdev);
+};
+
+int hci_mgmt_chan_register(struct hci_mgmt_chan *c);
+void hci_mgmt_chan_unregister(struct hci_mgmt_chan *c);
+
 /* Management interface */
 #define DISCOV_TYPE_BREDR               (BIT(BDADDR_BREDR))
 #define DISCOV_TYPE_LE                  (BIT(BDADDR_LE_PUBLIC) | \
@@ -1336,7 +1343,6 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event);
 #define DISCOV_BREDR_INQUIRY_LEN        0x08
 #define DISCOV_LE_RESTART_DELAY         msecs_to_jiffies(200)   /* msec */
 
-int mgmt_control(struct sock *sk, struct msghdr *msg, size_t len);
 int mgmt_new_settings(struct hci_dev *hdev);
 void mgmt_index_added(struct hci_dev *hdev);
 void mgmt_index_removed(struct hci_dev *hdev);
@@ -1382,9 +1388,6 @@ void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status);
 void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,
                                     u8 status);
 void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);
-void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192,
-                                       u8 *rand192, u8 *hash256, u8 *rand256,
-                                       u8 status);
 void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
                        u8 addr_type, u8 *dev_class, s8 rssi, u32 flags,
                        u8 *eir, u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len);
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index e218a30f2061..b831242d48a4 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -43,6 +43,8 @@
 #define MGMT_STATUS_CANCELLED           0x10
 #define MGMT_STATUS_INVALID_INDEX       0x11
 #define MGMT_STATUS_RFKILLED            0x12
+#define MGMT_STATUS_ALREADY_PAIRED      0x13
+#define MGMT_STATUS_PERMISSION_DENIED   0x14
 
 struct mgmt_hdr {
         __le16  opcode;
@@ -98,6 +100,7 @@ struct mgmt_rp_read_index_list {
 #define MGMT_SETTING_DEBUG_KEYS         0x00001000
 #define MGMT_SETTING_PRIVACY            0x00002000
 #define MGMT_SETTING_CONFIGURATION      0x00004000
+#define MGMT_SETTING_STATIC_ADDRESS     0x00008000
 
 #define MGMT_OP_READ_INFO               0x0004
 #define MGMT_READ_INFO_SIZE             0
@@ -503,6 +506,71 @@ struct mgmt_cp_start_service_discovery {
 } __packed;
 #define MGMT_START_SERVICE_DISCOVERY_SIZE 4
 
+#define MGMT_OP_READ_LOCAL_OOB_EXT_DATA 0x003B
+struct mgmt_cp_read_local_oob_ext_data {
+        __u8 type;
+} __packed;
+#define MGMT_READ_LOCAL_OOB_EXT_DATA_SIZE 1
+struct mgmt_rp_read_local_oob_ext_data {
+        __u8    type;
+        __le16  eir_len;
+        __u8    eir[0];
+} __packed;
+
+#define MGMT_OP_READ_EXT_INDEX_LIST     0x003C
+#define MGMT_READ_EXT_INDEX_LIST_SIZE   0
+struct mgmt_rp_read_ext_index_list {
+        __le16  num_controllers;
+        struct {
+                __le16 index;
+                __u8   type;
+                __u8   bus;
+        } entry[0];
+} __packed;
+
+#define MGMT_OP_READ_ADV_FEATURES       0x0003D
+#define MGMT_READ_ADV_FEATURES_SIZE     0
+struct mgmt_rp_read_adv_features {
+        __le32 supported_flags;
+        __u8   max_adv_data_len;
+        __u8   max_scan_rsp_len;
+        __u8   max_instances;
+        __u8   num_instances;
+        __u8   instance[0];
+} __packed;
+
+#define MGMT_OP_ADD_ADVERTISING         0x003E
+struct mgmt_cp_add_advertising {
+        __u8    instance;
+        __le32  flags;
+        __le16  duration;
+        __le16  timeout;
+        __u8    adv_data_len;
+        __u8    scan_rsp_len;
+        __u8    data[0];
+} __packed;
+#define MGMT_ADD_ADVERTISING_SIZE       11
+struct mgmt_rp_add_advertising {
+        __u8    instance;
+} __packed;
+
+#define MGMT_ADV_FLAG_CONNECTABLE       BIT(0)
+#define MGMT_ADV_FLAG_DISCOV            BIT(1)
+#define MGMT_ADV_FLAG_LIMITED_DISCOV    BIT(2)
+#define MGMT_ADV_FLAG_MANAGED_FLAGS     BIT(3)
+#define MGMT_ADV_FLAG_TX_POWER          BIT(4)
+#define MGMT_ADV_FLAG_APPEARANCE        BIT(5)
+#define MGMT_ADV_FLAG_LOCAL_NAME        BIT(6)
+
+#define MGMT_OP_REMOVE_ADVERTISING      0x003F
+struct mgmt_cp_remove_advertising {
+        __u8    instance;
+} __packed;
+#define MGMT_REMOVE_ADVERTISING_SIZE    1
+struct mgmt_rp_remove_advertising {
+        __u8    instance;
+} __packed;
+
 #define MGMT_EV_CMD_COMPLETE            0x0001
 struct mgmt_ev_cmd_complete {
         __le16  opcode;
@@ -647,9 +715,14 @@ struct mgmt_ev_new_irk {
         struct mgmt_irk_info irk;
 } __packed;
 
+#define MGMT_CSRK_LOCAL_UNAUTHENTICATED         0x00
+#define MGMT_CSRK_REMOTE_UNAUTHENTICATED        0x01
+#define MGMT_CSRK_LOCAL_AUTHENTICATED           0x02
+#define MGMT_CSRK_REMOTE_AUTHENTICATED          0x03
+
 struct mgmt_csrk_info {
         struct mgmt_addr_info addr;
-        __u8 master;
+        __u8 type;
         __u8 val[16];
 } __packed;
 
@@ -685,3 +758,29 @@ struct mgmt_ev_new_conn_param {
 #define MGMT_EV_UNCONF_INDEX_REMOVED    0x001e
 
 #define MGMT_EV_NEW_CONFIG_OPTIONS      0x001f
+
+struct mgmt_ev_ext_index {
+        __u8 type;
+        __u8 bus;
+} __packed;
+
+#define MGMT_EV_EXT_INDEX_ADDED         0x0020
+
+#define MGMT_EV_EXT_INDEX_REMOVED       0x0021
+
+#define MGMT_EV_LOCAL_OOB_DATA_UPDATED  0x0022
+struct mgmt_ev_local_oob_data_updated {
+        __u8    type;
+        __le16  eir_len;
+        __u8    eir[0];
+} __packed;
+
+#define MGMT_EV_ADVERTISING_ADDED       0x0023
+struct mgmt_ev_advertising_added {
+        __u8    instance;
+} __packed;
+
+#define MGMT_EV_ADVERTISING_REMOVED     0x0024
+struct mgmt_ev_advertising_removed {
+        __u8    instance;
+} __packed;
diff --git a/include/net/bond_3ad.h b/include/net/bond_3ad.h
index f04cdbb7848e..c2a40a172fcd 100644
--- a/include/net/bond_3ad.h
+++ b/include/net/bond_3ad.h
@@ -82,6 +82,13 @@ typedef enum {
         AD_TRANSMIT             /* tx Machine */
 } tx_states_t;
 
+/* churn machine states(43.4.17 in the 802.3ad standard) */
+typedef enum {
+         AD_CHURN_MONITOR, /* monitoring for churn */
+         AD_CHURN,         /* churn detected (error) */
+         AD_NO_CHURN       /* no churn (no error) */
+} churn_state_t;
+
 /* rx indication types */
 typedef enum {
         AD_TYPE_LACPDU = 1,     /* type lacpdu */
@@ -229,6 +236,12 @@ typedef struct port {
         u16 sm_mux_timer_counter;       /* state machine mux timer counter */
         tx_states_t sm_tx_state;        /* state machine tx state */
         u16 sm_tx_timer_counter;        /* state machine tx timer counter(allways on - enter to transmit state 3 time per second) */
+        u16 sm_churn_actor_timer_counter;
+        u16 sm_churn_partner_timer_counter;
+        u32 churn_actor_count;
+        u32 churn_partner_count;
+        churn_state_t sm_churn_actor_state;
+        churn_state_t sm_churn_partner_state;
         struct slave *slave;            /* pointer to the bond slave that this port belongs to */
         struct aggregator *aggregator;  /* pointer to an aggregator that this port related to */
         struct port *next_port_in_aggregator;   /* Next port on the linked list of the parent aggregator */
@@ -262,6 +275,22 @@ struct ad_slave_info {
         u16 id;
 };
 
+static inline const char *bond_3ad_churn_desc(churn_state_t state)
+{
+        static const char *const churn_description[] = {
+                "monitoring",
+                "churned",
+                "none",
+                "unknown"
+        };
+        int max_size = sizeof(churn_description) / sizeof(churn_description[0]);
+
+        if (state >= max_size)
+                state = max_size - 1;
+
+        return churn_description[state];
+}
+
 /* ========== AD Exported functions to the main bonding code ========== */
 void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution);
 void bond_3ad_bind_slave(struct slave *slave);
diff --git a/include/net/caif/cfpkt.h b/include/net/caif/cfpkt.h
index 1c1ad46250d5..fe328c52c46b 100644
--- a/include/net/caif/cfpkt.h
+++ b/include/net/caif/cfpkt.h
@@ -171,7 +171,7 @@ struct cfpkt *cfpkt_split(struct cfpkt *pkt, u16 pos);
  * @return    Checksum of buffer.
  */
 
-u16 cfpkt_iterate(struct cfpkt *pkt,
+int cfpkt_iterate(struct cfpkt *pkt,
                 u16 (*iter_func)(u16 chks, void *buf, u16 len),
                 u16 data);
 
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 64e09e1e8099..f8d6813cd5b2 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -215,6 +215,39 @@ enum ieee80211_rate_flags {
 };
 
 /**
+ * enum ieee80211_bss_type - BSS type filter
+ *
+ * @IEEE80211_BSS_TYPE_ESS: Infrastructure BSS
+ * @IEEE80211_BSS_TYPE_PBSS: Personal BSS
+ * @IEEE80211_BSS_TYPE_IBSS: Independent BSS
+ * @IEEE80211_BSS_TYPE_MBSS: Mesh BSS
+ * @IEEE80211_BSS_TYPE_ANY: Wildcard value for matching any BSS type
+ */
+enum ieee80211_bss_type {
+        IEEE80211_BSS_TYPE_ESS,
+        IEEE80211_BSS_TYPE_PBSS,
+        IEEE80211_BSS_TYPE_IBSS,
+        IEEE80211_BSS_TYPE_MBSS,
+        IEEE80211_BSS_TYPE_ANY
+};
+
+/**
+ * enum ieee80211_privacy - BSS privacy filter
+ *
+ * @IEEE80211_PRIVACY_ON: privacy bit set
+ * @IEEE80211_PRIVACY_OFF: privacy bit clear
+ * @IEEE80211_PRIVACY_ANY: Wildcard value for matching any privacy setting
+ */
+enum ieee80211_privacy {
+        IEEE80211_PRIVACY_ON,
+        IEEE80211_PRIVACY_OFF,
+        IEEE80211_PRIVACY_ANY
+};
+
+#define IEEE80211_PRIVACY(x)    \
+        ((x) ? IEEE80211_PRIVACY_ON : IEEE80211_PRIVACY_OFF)
+
+/**
  * struct ieee80211_rate - bitrate definition
  *
  * This structure describes a bitrate that an 802.11 PHY can
@@ -2423,6 +2456,7 @@ struct cfg80211_ops {
 
         struct wireless_dev * (*add_virtual_intf)(struct wiphy *wiphy,
                                                   const char *name,
+                                                  unsigned char name_assign_type,
                                                   enum nl80211_iftype type,
                                                   u32 *flags,
                                                   struct vif_params *params);
@@ -3183,10 +3217,8 @@ struct wiphy {
         const struct ieee80211_ht_cap *ht_capa_mod_mask;
         const struct ieee80211_vht_cap *vht_capa_mod_mask;
 
-#ifdef CONFIG_NET_NS
         /* the network namespace this phy lives in currently */
-        struct net *_net;
-#endif
+        possible_net_t _net;
 
 #ifdef CONFIG_CFG80211_WEXT
         const struct iw_handler_def *wext;
@@ -4012,14 +4044,16 @@ struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy,
                                       struct ieee80211_channel *channel,
                                       const u8 *bssid,
                                       const u8 *ssid, size_t ssid_len,
-                                      u16 capa_mask, u16 capa_val);
+                                      enum ieee80211_bss_type bss_type,
+                                      enum ieee80211_privacy);
 static inline struct cfg80211_bss *
 cfg80211_get_ibss(struct wiphy *wiphy,
                   struct ieee80211_channel *channel,
                   const u8 *ssid, size_t ssid_len)
 {
         return cfg80211_get_bss(wiphy, channel, NULL, ssid, ssid_len,
-                                WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
+                                IEEE80211_BSS_TYPE_IBSS,
+                                IEEE80211_PRIVACY_ANY);
 }
 
 /**
@@ -4260,6 +4294,7 @@ struct sk_buff *__cfg80211_alloc_reply_skb(struct wiphy *wiphy,
                                            int approxlen);
 
 struct sk_buff *__cfg80211_alloc_event_skb(struct wiphy *wiphy,
+                                           struct wireless_dev *wdev,
                                            enum nl80211_commands cmd,
                                            enum nl80211_attrs attr,
                                            int vendor_event_idx,
@@ -4314,6 +4349,7 @@ int cfg80211_vendor_cmd_reply(struct sk_buff *skb);
 /**
  * cfg80211_vendor_event_alloc - allocate vendor-specific event skb
  * @wiphy: the wiphy
+ * @wdev: the wireless device
  * @event_idx: index of the vendor event in the wiphy's vendor_events
  * @approxlen: an upper bound of the length of the data that will
  *      be put into the skb
@@ -4322,16 +4358,20 @@ int cfg80211_vendor_cmd_reply(struct sk_buff *skb);
  * This function allocates and pre-fills an skb for an event on the
  * vendor-specific multicast group.
  *
+ * If wdev != NULL, both the ifindex and identifier of the specified
+ * wireless device are added to the event message before the vendor data
+ * attribute.
+ *
  * When done filling the skb, call cfg80211_vendor_event() with the
  * skb to send the event.
  *
  * Return: An allocated and pre-filled skb. %NULL if any errors happen.
  */
 static inline struct sk_buff *
-cfg80211_vendor_event_alloc(struct wiphy *wiphy, int approxlen,
-                            int event_idx, gfp_t gfp)
+cfg80211_vendor_event_alloc(struct wiphy *wiphy, struct wireless_dev *wdev,
+                             int approxlen, int event_idx, gfp_t gfp)
 {
-        return __cfg80211_alloc_event_skb(wiphy, NL80211_CMD_VENDOR,
+        return __cfg80211_alloc_event_skb(wiphy, wdev, NL80211_CMD_VENDOR,
                                           NL80211_ATTR_VENDOR_DATA,
                                           event_idx, approxlen, gfp);
 }
@@ -4432,7 +4472,7 @@ static inline int cfg80211_testmode_reply(struct sk_buff *skb)
 static inline struct sk_buff *
 cfg80211_testmode_alloc_event_skb(struct wiphy *wiphy, int approxlen, gfp_t gfp)
 {
-        return __cfg80211_alloc_event_skb(wiphy, NL80211_CMD_TESTMODE,
+        return __cfg80211_alloc_event_skb(wiphy, NULL, NL80211_CMD_TESTMODE,
                                           NL80211_ATTR_TESTDATA, -1,
                                           approxlen, gfp);
 }
@@ -4862,6 +4902,17 @@ void cfg80211_ch_switch_started_notify(struct net_device *dev,
 bool ieee80211_operating_class_to_band(u8 operating_class,
                                        enum ieee80211_band *band);
 
+/**
+ * ieee80211_chandef_to_operating_class - convert chandef to operation class
+ *
+ * @chandef: the chandef to convert
+ * @op_class: a pointer to the resulting operating class
+ *
+ * Returns %true if the conversion was successful, %false otherwise.
+ */
+bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef,
+                                          u8 *op_class);
+
 /*
  * cfg80211_tdls_oper_request - request userspace to perform TDLS operation
  * @dev: the device on which the operation is requested
@@ -4950,6 +5001,64 @@ int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
                           u8 *buf, unsigned int bufsize);
 
 /**
+ * ieee80211_ie_split_ric - split an IE buffer according to ordering (with RIC)
+ * @ies: the IE buffer
+ * @ielen: the length of the IE buffer
+ * @ids: an array with element IDs that are allowed before
+ *      the split
+ * @n_ids: the size of the element ID array
+ * @after_ric: array IE types that come after the RIC element
+ * @n_after_ric: size of the @after_ric array
+ * @offset: offset where to start splitting in the buffer
+ *
+ * This function splits an IE buffer by updating the @offset
+ * variable to point to the location where the buffer should be
+ * split.
+ *
+ * It assumes that the given IE buffer is well-formed, this
+ * has to be guaranteed by the caller!
+ *
+ * It also assumes that the IEs in the buffer are ordered
+ * correctly, if not the result of using this function will not
+ * be ordered correctly either, i.e. it does no reordering.
+ *
+ * The function returns the offset where the next part of the
+ * buffer starts, which may be @ielen if the entire (remainder)
+ * of the buffer should be used.
+ */
+size_t ieee80211_ie_split_ric(const u8 *ies, size_t ielen,
+                              const u8 *ids, int n_ids,
+                              const u8 *after_ric, int n_after_ric,
+                              size_t offset);
+
+/**
+ * ieee80211_ie_split - split an IE buffer according to ordering
+ * @ies: the IE buffer
+ * @ielen: the length of the IE buffer
+ * @ids: an array with element IDs that are allowed before
+ *      the split
+ * @n_ids: the size of the element ID array
+ * @offset: offset where to start splitting in the buffer
+ *
+ * This function splits an IE buffer by updating the @offset
+ * variable to point to the location where the buffer should be
+ * split.
+ *
+ * It assumes that the given IE buffer is well-formed, this
+ * has to be guaranteed by the caller!
+ *
+ * It also assumes that the IEs in the buffer are ordered
+ * correctly, if not the result of using this function will not
+ * be ordered correctly either, i.e. it does no reordering.
+ *
+ * The function returns the offset where the next part of the
+ * buffer starts, which may be @ielen if the entire (remainder)
+ * of the buffer should be used.
+ */
+size_t ieee80211_ie_split(const u8 *ies, size_t ielen,
+                          const u8 *ids, int n_ids, size_t offset);
+
+/**
  * cfg80211_report_wowlan_wakeup - report wakeup from WoWLAN
  * @wdev: the wireless device reporting the wakeup
  * @wakeup: the wakeup report
diff --git a/include/net/compat.h b/include/net/compat.h
index 42a9c8431177..48103cf94e97 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -40,7 +40,7 @@ int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
 #define compat_mmsghdr  mmsghdr
 #endif /* defined(CONFIG_COMPAT) */
 
-ssize_t get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *,
+int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *,
                       struct sockaddr __user **, struct iovec **);
 asmlinkage long compat_sys_sendmsg(int, struct compat_msghdr __user *,
                                    unsigned int);
diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h
index 597b88a94332..207d9ba1f92c 100644
--- a/include/net/dcbnl.h
+++ b/include/net/dcbnl.h
@@ -49,6 +49,9 @@ struct dcbnl_rtnl_ops {
         int (*ieee_setets) (struct net_device *, struct ieee_ets *);
         int (*ieee_getmaxrate) (struct net_device *, struct ieee_maxrate *);
         int (*ieee_setmaxrate) (struct net_device *, struct ieee_maxrate *);
+        int (*ieee_getqcn) (struct net_device *, struct ieee_qcn *);
+        int (*ieee_setqcn) (struct net_device *, struct ieee_qcn *);
+        int (*ieee_getqcnstats) (struct net_device *, struct ieee_qcn_stats *);
         int (*ieee_getpfc) (struct net_device *, struct ieee_pfc *);
         int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *);
         int (*ieee_getapp) (struct net_device *, struct dcb_app *);
diff --git a/include/net/dn_neigh.h b/include/net/dn_neigh.h
index fac4e3f4a6d3..d0424269313f 100644
--- a/include/net/dn_neigh.h
+++ b/include/net/dn_neigh.h
@@ -18,10 +18,11 @@ struct dn_neigh {
 
 void dn_neigh_init(void);
 void dn_neigh_cleanup(void);
-int dn_neigh_router_hello(struct sk_buff *skb);
-int dn_neigh_endnode_hello(struct sk_buff *skb);
+int dn_neigh_router_hello(struct sock *sk, struct sk_buff *skb);
+int dn_neigh_endnode_hello(struct sock *sk, struct sk_buff *skb);
 void dn_neigh_pointopoint_hello(struct sk_buff *skb);
 int dn_neigh_elist(struct net_device *dev, unsigned char *ptr, int n);
+int dn_to_neigh_output(struct sock *sk, struct sk_buff *skb);
 
 extern struct neigh_table dn_neigh_table;
 
diff --git a/include/net/dsa.h b/include/net/dsa.h
index ed3c34bbb67a..fbca63ba8f73 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -72,6 +72,7 @@ struct dsa_platform_data {
          * to the root switch chip of the tree.
          */
         struct device   *netdev;
+        struct net_device *of_netdev;
 
         /*
          * Info structs describing each of the switch chips
@@ -128,6 +129,11 @@ struct dsa_switch {
         int                     index;
 
         /*
+         * Tagging protocol understood by this switch
+         */
+        enum dsa_tag_protocol   tag_protocol;
+
+        /*
          * Configuration data for this switch.
          */
         struct dsa_chip_data    *pd;
@@ -165,6 +171,11 @@ static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
         return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port);
 }
 
+static inline bool dsa_is_port_initialized(struct dsa_switch *ds, int p)
+{
+        return ds->phys_port_mask & (1 << p) && ds->ports[p];
+}
+
 static inline u8 dsa_upstream_port(struct dsa_switch *ds)
 {
         struct dsa_switch_tree *dst = ds->dst;
@@ -275,6 +286,22 @@ struct dsa_switch_driver {
         int     (*get_regs_len)(struct dsa_switch *ds, int port);
         void    (*get_regs)(struct dsa_switch *ds, int port,
                             struct ethtool_regs *regs, void *p);
+
+        /*
+         * Bridge integration
+         */
+        int     (*port_join_bridge)(struct dsa_switch *ds, int port,
+                                    u32 br_port_mask);
+        int     (*port_leave_bridge)(struct dsa_switch *ds, int port,
+                                     u32 br_port_mask);
+        int     (*port_stp_update)(struct dsa_switch *ds, int port,
+                                   u8 state);
+        int     (*fdb_add)(struct dsa_switch *ds, int port,
+                           const unsigned char *addr, u16 vid);
+        int     (*fdb_del)(struct dsa_switch *ds, int port,
+                           const unsigned char *addr, u16 vid);
+        int     (*fdb_getnext)(struct dsa_switch *ds, int port,
+                               unsigned char *addr, bool *is_static);
 };
 
 void register_switch_driver(struct dsa_switch_driver *type);
diff --git a/include/net/dst.h b/include/net/dst.h
index a8ae4e760778..0fb99a26e973 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -481,6 +481,7 @@ void dst_init(void);
 enum {
         XFRM_LOOKUP_ICMP = 1 << 0,
         XFRM_LOOKUP_QUEUE = 1 << 1,
+        XFRM_LOOKUP_KEEP_DST_REF = 1 << 2,
 };
 
 struct flowi;
diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
index 1f99a1de0e4f..d64253914a6a 100644
--- a/include/net/dst_ops.h
+++ b/include/net/dst_ops.h
@@ -12,7 +12,6 @@ struct sock;
 
 struct dst_ops {
         unsigned short          family;
-        __be16                  protocol;
         unsigned int            gc_thresh;
 
         int                     (*gc)(struct dst_ops *ops);
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index e584de16e4c3..6d67383a5114 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -58,7 +58,7 @@ struct fib_rules_ops {
                                              struct sk_buff *,
                                              struct fib_rule_hdr *,
                                              struct nlattr **);
-        void                    (*delete)(struct fib_rule *);
+        int                     (*delete)(struct fib_rule *);
         int                     (*compare)(struct fib_rule *,
                                            struct fib_rule_hdr *,
                                            struct nlattr **);
@@ -95,17 +95,10 @@ static inline void fib_rule_get(struct fib_rule *rule)
         atomic_inc(&rule->refcnt);
 }
 
-static inline void fib_rule_put_rcu(struct rcu_head *head)
-{
-        struct fib_rule *rule = container_of(head, struct fib_rule, rcu);
-        release_net(rule->fr_net);
-        kfree(rule);
-}
-
 static inline void fib_rule_put(struct fib_rule *rule)
 {
         if (atomic_dec_and_test(&rule->refcnt))
-                call_rcu(&rule->rcu, fib_rule_put_rcu);
+                kfree_rcu(rule, rcu);
 }
 
 static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 0574abd3db86..a9af1cc8c1bc 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -92,9 +92,7 @@ struct genl_info {
         struct genlmsghdr *     genlhdr;
         void *                  userhdr;
         struct nlattr **        attrs;
-#ifdef CONFIG_NET_NS
-        struct net *            _net;
-#endif
+        possible_net_t          _net;
         void *                  user_ptr[2];
         struct sock *           dst_sk;
 };
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 98e5f9578f86..1c8b6820b694 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -41,18 +41,18 @@ enum {
 struct inet6_ifaddr {
         struct in6_addr         addr;
         __u32                   prefix_len;
-        
+
         /* In seconds, relative to tstamp. Expiry is at tstamp + HZ * lft. */
         __u32                   valid_lft;
         __u32                   prefered_lft;
         atomic_t                refcnt;
         spinlock_t              lock;
-        spinlock_t              state_lock;
 
         int                     state;
 
         __u32                   flags;
         __u8                    dad_probes;
+        __u8                    stable_privacy_retry;
 
         __u16                   scope;
 
diff --git a/include/net/inet6_connection_sock.h b/include/net/inet6_connection_sock.h
index 74af137304be..6d539e4e5ba7 100644
--- a/include/net/inet6_connection_sock.h
+++ b/include/net/inet6_connection_sock.h
@@ -28,8 +28,7 @@ int inet6_csk_bind_conflict(const struct sock *sk,
 struct dst_entry *inet6_csk_route_req(struct sock *sk, struct flowi6 *fl6,
                                       const struct request_sock *req);
 
-struct request_sock *inet6_csk_search_req(const struct sock *sk,
-                                          struct request_sock ***prevp,
+struct request_sock *inet6_csk_search_req(struct sock *sk,
                                           const __be16 rport,
                                           const struct in6_addr *raddr,
                                           const struct in6_addr *laddr,
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 9201afe083fa..7ff588ca6817 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -38,8 +38,6 @@ static inline unsigned int __inet6_ehashfn(const u32 lhash,
         return jhash_3words(lhash, fhash, ports, initval);
 }
 
-int __inet6_hash(struct sock *sk, struct inet_timewait_sock *twp);
-
 /*
  * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so
  * we need not check it for TCP lookups anymore, thanks Alexey. -DaveM
diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index b2828a06a5a6..4a92423eefa5 100644
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
@@ -21,12 +21,11 @@ int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
 int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr,
                        int addr_len, int flags);
 int inet_accept(struct socket *sock, struct socket *newsock, int flags);
-int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
-                 size_t size);
+int inet_sendmsg(struct socket *sock, struct msghdr *msg, size_t size);
 ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,
                       size_t size, int flags);
-int inet_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
-                 size_t size, int flags);
+int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
+                 int flags);
 int inet_shutdown(struct socket *sock, int how);
 int inet_listen(struct socket *sock, int backlog);
 void inet_sock_destruct(struct sock *sk);
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 5976bdecf58b..7b5887cd1172 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -126,6 +126,8 @@ struct inet_connection_sock {
 
                 /* Information on the current probe. */
                 int               probe_size;
+
+                u32               probe_timestamp;
         } icsk_mtup;
         u32                       icsk_ca_priv[16];
         u32                       icsk_user_timeout;
@@ -254,8 +256,7 @@ inet_csk_rto_backoff(const struct inet_connection_sock *icsk,
 
 struct sock *inet_csk_accept(struct sock *sk, int flags, int *err);
 
-struct request_sock *inet_csk_search_req(const struct sock *sk,
-                                         struct request_sock ***prevp,
+struct request_sock *inet_csk_search_req(struct sock *sk,
                                          const __be16 rport,
                                          const __be32 raddr,
                                          const __be32 laddr);
@@ -281,15 +282,13 @@ void inet_csk_reqsk_queue_hash_add(struct sock *sk, struct request_sock *req,
 static inline void inet_csk_reqsk_queue_removed(struct sock *sk,
                                                 struct request_sock *req)
 {
-        if (reqsk_queue_removed(&inet_csk(sk)->icsk_accept_queue, req) == 0)
-                inet_csk_delete_keepalive_timer(sk);
+        reqsk_queue_removed(&inet_csk(sk)->icsk_accept_queue, req);
 }
 
 static inline void inet_csk_reqsk_queue_added(struct sock *sk,
                                               const unsigned long timeout)
 {
-        if (reqsk_queue_added(&inet_csk(sk)->icsk_accept_queue) == 0)
-                inet_csk_reset_keepalive_timer(sk, timeout);
+        reqsk_queue_added(&inet_csk(sk)->icsk_accept_queue);
 }
 
 static inline int inet_csk_reqsk_queue_len(const struct sock *sk)
@@ -308,26 +307,19 @@ static inline int inet_csk_reqsk_queue_is_full(const struct sock *sk)
 }
 
 static inline void inet_csk_reqsk_queue_unlink(struct sock *sk,
-                                               struct request_sock *req,
-                                               struct request_sock **prev)
+                                               struct request_sock *req)
 {
-        reqsk_queue_unlink(&inet_csk(sk)->icsk_accept_queue, req, prev);
+        reqsk_queue_unlink(&inet_csk(sk)->icsk_accept_queue, req);
 }
 
 static inline void inet_csk_reqsk_queue_drop(struct sock *sk,
-                                             struct request_sock *req,
-                                             struct request_sock **prev)
+                                             struct request_sock *req)
 {
-        inet_csk_reqsk_queue_unlink(sk, req, prev);
+        inet_csk_reqsk_queue_unlink(sk, req);
         inet_csk_reqsk_queue_removed(sk, req);
-        reqsk_free(req);
+        reqsk_put(req);
 }
 
-void inet_csk_reqsk_queue_prune(struct sock *parent,
-                                const unsigned long interval,
-                                const unsigned long timeout,
-                                const unsigned long max_rto);
-
 void inet_csk_destroy_sock(struct sock *sk);
 void inet_csk_prepare_forced_close(struct sock *sk);
 
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index dd1950a7e273..73fe0f9525d9 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -76,9 +76,7 @@ struct inet_ehash_bucket {
  * ports are created in O(1) time?  I thought so. ;-)   -DaveM
  */
 struct inet_bind_bucket {
-#ifdef CONFIG_NET_NS
-        struct net              *ib_net;
-#endif
+        possible_net_t          ib_net;
         unsigned short          port;
         signed char             fastreuse;
         signed char             fastreuseport;
@@ -223,8 +221,8 @@ inet_bind_bucket_create(struct kmem_cache *cachep, struct net *net,
 void inet_bind_bucket_destroy(struct kmem_cache *cachep,
                               struct inet_bind_bucket *tb);
 
-static inline int inet_bhashfn(struct net *net, const __u16 lport,
-                               const int bhash_size)
+static inline u32 inet_bhashfn(const struct net *net, const __u16 lport,
+                               const u32 bhash_size)
 {
         return (lport + net_hash_mix(net)) & (bhash_size - 1);
 }
@@ -233,7 +231,7 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
                     const unsigned short snum);
 
 /* These can have wildcards, don't try too hard. */
-static inline int inet_lhashfn(struct net *net, const unsigned short num)
+static inline u32 inet_lhashfn(const struct net *net, const unsigned short num)
 {
         return (num + net_hash_mix(net)) & (INET_LHTABLE_SIZE - 1);
 }
@@ -251,6 +249,7 @@ void inet_put_port(struct sock *sk);
 void inet_hashinfo_init(struct inet_hashinfo *h);
 
 int __inet_hash_nolisten(struct sock *sk, struct inet_timewait_sock *tw);
+int __inet_hash(struct sock *sk, struct inet_timewait_sock *tw);
 void inet_hash(struct sock *sk);
 void inet_unhash(struct sock *sk);
 
@@ -385,13 +384,32 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,
                                      iph->daddr, dport, inet_iif(skb));
 }
 
+u32 sk_ehashfn(const struct sock *sk);
+u32 inet6_ehashfn(const struct net *net,
+                  const struct in6_addr *laddr, const u16 lport,
+                  const struct in6_addr *faddr, const __be16 fport);
+
+static inline void sk_daddr_set(struct sock *sk, __be32 addr)
+{
+        sk->sk_daddr = addr; /* alias of inet_daddr */
+#if IS_ENABLED(CONFIG_IPV6)
+        ipv6_addr_set_v4mapped(addr, &sk->sk_v6_daddr);
+#endif
+}
+
+static inline void sk_rcv_saddr_set(struct sock *sk, __be32 addr)
+{
+        sk->sk_rcv_saddr = addr; /* alias of inet_rcv_saddr */
+#if IS_ENABLED(CONFIG_IPV6)
+        ipv6_addr_set_v4mapped(addr, &sk->sk_v6_rcv_saddr);
+#endif
+}
+
 int __inet_hash_connect(struct inet_timewait_death_row *death_row,
                         struct sock *sk, u32 port_offset,
                         int (*check_established)(struct inet_timewait_death_row *,
                                                  struct sock *, __u16,
-                                                 struct inet_timewait_sock **),
-                        int (*hash)(struct sock *sk,
-                                    struct inet_timewait_sock *twp));
+                                                 struct inet_timewait_sock **));
 
 int inet_hash_connect(struct inet_timewait_death_row *death_row,
                       struct sock *sk);
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index eb16c7beed1e..b6c3737da4e9 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -27,6 +27,7 @@
 #include <net/sock.h>
 #include <net/request_sock.h>
 #include <net/netns/hash.h>
+#include <net/tcp_states.h>
 
 /** struct ip_options - IP Options
  *
@@ -77,6 +78,10 @@ struct inet_request_sock {
 #define ir_v6_rmt_addr          req.__req_common.skc_v6_daddr
 #define ir_v6_loc_addr          req.__req_common.skc_v6_rcv_saddr
 #define ir_iif                  req.__req_common.skc_bound_dev_if
+#define ir_cookie               req.__req_common.skc_cookie
+#define ireq_net                req.__req_common.skc_net
+#define ireq_state              req.__req_common.skc_state
+#define ireq_family             req.__req_common.skc_family
 
         kmemcheck_bitfield_begin(flags);
         u16                     snd_wscale : 4,
@@ -88,11 +93,11 @@ struct inet_request_sock {
                                 acked      : 1,
                                 no_srccheck: 1;
         kmemcheck_bitfield_end(flags);
+        u32                     ir_mark;
         union {
                 struct ip_options_rcu   *opt;
                 struct sk_buff          *pktopts;
         };
-        u32                     ir_mark;
 };
 
 static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)
@@ -100,13 +105,12 @@ static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)
         return (struct inet_request_sock *)sk;
 }
 
-static inline u32 inet_request_mark(struct sock *sk, struct sk_buff *skb)
+static inline u32 inet_request_mark(const struct sock *sk, struct sk_buff *skb)
 {
-        if (!sk->sk_mark && sock_net(sk)->ipv4.sysctl_tcp_fwmark_accept) {
+        if (!sk->sk_mark && sock_net(sk)->ipv4.sysctl_tcp_fwmark_accept)
                 return skb->mark;
-        } else {
-                return sk->sk_mark;
-        }
+
+        return sk->sk_mark;
 }
 
 struct inet_cork {
@@ -239,18 +243,8 @@ static inline unsigned int __inet_ehashfn(const __be32 laddr,
                             initval);
 }
 
-static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops)
-{
-        struct request_sock *req = reqsk_alloc(ops);
-        struct inet_request_sock *ireq = inet_rsk(req);
-
-        if (req != NULL) {
-                kmemcheck_annotate_bitfield(ireq, flags);
-                ireq->opt = NULL;
-        }
-
-        return req;
-}
+struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
+                                      struct sock *sk_listener);
 
 static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
 {
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 6c566034e26d..360c4802288d 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -31,67 +31,14 @@
 
 struct inet_hashinfo;
 
-#define INET_TWDR_RECYCLE_SLOTS_LOG     5
-#define INET_TWDR_RECYCLE_SLOTS         (1 << INET_TWDR_RECYCLE_SLOTS_LOG)
-
-/*
- * If time > 4sec, it is "slow" path, no recycling is required,
- * so that we select tick to get range about 4 seconds.
- */
-#if HZ <= 16 || HZ > 4096
-# error Unsupported: HZ <= 16 or HZ > 4096
-#elif HZ <= 32
-# define INET_TWDR_RECYCLE_TICK (5 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-#elif HZ <= 64
-# define INET_TWDR_RECYCLE_TICK (6 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-#elif HZ <= 128
-# define INET_TWDR_RECYCLE_TICK (7 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-#elif HZ <= 256
-# define INET_TWDR_RECYCLE_TICK (8 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-#elif HZ <= 512
-# define INET_TWDR_RECYCLE_TICK (9 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-#elif HZ <= 1024
-# define INET_TWDR_RECYCLE_TICK (10 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-#elif HZ <= 2048
-# define INET_TWDR_RECYCLE_TICK (11 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-#else
-# define INET_TWDR_RECYCLE_TICK (12 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-#endif
-
-static inline u32 inet_tw_time_stamp(void)
-{
-        return jiffies;
-}
-
-/* TIME_WAIT reaping mechanism. */
-#define INET_TWDR_TWKILL_SLOTS  8 /* Please keep this a power of 2. */
-
-#define INET_TWDR_TWKILL_QUOTA 100
-
 struct inet_timewait_death_row {
-        /* Short-time timewait calendar */
-        int                     twcal_hand;
-        unsigned long           twcal_jiffie;
-        struct timer_list       twcal_timer;
-        struct hlist_head       twcal_row[INET_TWDR_RECYCLE_SLOTS];
-
-        spinlock_t              death_lock;
-        int                     tw_count;
-        int                     period;
-        u32                     thread_slots;
-        struct work_struct      twkill_work;
-        struct timer_list       tw_timer;
-        int                     slot;
-        struct hlist_head       cells[INET_TWDR_TWKILL_SLOTS];
-        struct inet_hashinfo    *hashinfo;
+        atomic_t                tw_count;
+
+        struct inet_hashinfo    *hashinfo ____cacheline_aligned_in_smp;
         int                     sysctl_tw_recycle;
         int                     sysctl_max_tw_buckets;
 };
 
-void inet_twdr_hangman(unsigned long data);
-void inet_twdr_twkill_work(struct work_struct *work);
-void inet_twdr_twcal_tick(unsigned long data);
-
 struct inet_bind_bucket;
 
 /*
@@ -122,6 +69,7 @@ struct inet_timewait_sock {
 #define tw_v6_rcv_saddr         __tw_common.skc_v6_rcv_saddr
 #define tw_dport                __tw_common.skc_dport
 #define tw_num                  __tw_common.skc_num
+#define tw_cookie               __tw_common.skc_cookie
 
         int                     tw_timeout;
         volatile unsigned char  tw_substate;
@@ -132,52 +80,18 @@ struct inet_timewait_sock {
         __be16                  tw_sport;
         kmemcheck_bitfield_begin(flags);
         /* And these are ours. */
-        unsigned int            tw_pad0         : 1,    /* 1 bit hole */
+        unsigned int            tw_kill         : 1,
                                 tw_transparent  : 1,
                                 tw_flowlabel    : 20,
                                 tw_pad          : 2,    /* 2 bits hole */
                                 tw_tos          : 8;
         kmemcheck_bitfield_end(flags);
-        u32                     tw_ttd;
+        struct timer_list       tw_timer;
         struct inet_bind_bucket *tw_tb;
-        struct hlist_node       tw_death_node;
+        struct inet_timewait_death_row *tw_dr;
 };
 #define tw_tclass tw_tos
 
-static inline int inet_twsk_dead_hashed(const struct inet_timewait_sock *tw)
-{
-        return !hlist_unhashed(&tw->tw_death_node);
-}
-
-static inline void inet_twsk_dead_node_init(struct inet_timewait_sock *tw)
-{
-        tw->tw_death_node.pprev = NULL;
-}
-
-static inline void __inet_twsk_del_dead_node(struct inet_timewait_sock *tw)
-{
-        __hlist_del(&tw->tw_death_node);
-        inet_twsk_dead_node_init(tw);
-}
-
-static inline int inet_twsk_del_dead_node(struct inet_timewait_sock *tw)
-{
-        if (inet_twsk_dead_hashed(tw)) {
-                __inet_twsk_del_dead_node(tw);
-                return 1;
-        }
-        return 0;
-}
-
-#define inet_twsk_for_each(tw, node, head) \
-        hlist_nulls_for_each_entry(tw, node, head, tw_node)
-
-#define inet_twsk_for_each_inmate(tw, jail) \
-        hlist_for_each_entry(tw, jail, tw_death_node)
-
-#define inet_twsk_for_each_inmate_safe(tw, safe, jail) \
-        hlist_for_each_entry_safe(tw, safe, jail, tw_death_node)
-
 static inline struct inet_timewait_sock *inet_twsk(const struct sock *sk)
 {
         return (struct inet_timewait_sock *)sk;
@@ -192,16 +106,14 @@ int inet_twsk_bind_unhash(struct inet_timewait_sock *tw,
                           struct inet_hashinfo *hashinfo);
 
 struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,
+                                           struct inet_timewait_death_row *dr,
                                            const int state);
 
 void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
                            struct inet_hashinfo *hashinfo);
 
-void inet_twsk_schedule(struct inet_timewait_sock *tw,
-                        struct inet_timewait_death_row *twdr,
-                        const int timeo, const int timewait_len);
-void inet_twsk_deschedule(struct inet_timewait_sock *tw,
-                          struct inet_timewait_death_row *twdr);
+void inet_twsk_schedule(struct inet_timewait_sock *tw, const int timeo);
+void inet_twsk_deschedule(struct inet_timewait_sock *tw);
 
 void inet_twsk_purge(struct inet_hashinfo *hashinfo,
                      struct inet_timewait_death_row *twdr, int family);
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 80479abddf73..d5332ddcea3f 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -19,6 +19,7 @@ struct inetpeer_addr_base {
         union {
                 __be32                  a4;
                 __be32                  a6[4];
+                struct in6_addr         in6;
         };
 };
 
@@ -151,7 +152,7 @@ static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base,
 {
         struct inetpeer_addr daddr;
 
-        *(struct in6_addr *)daddr.addr.a6 = *v6daddr;
+        daddr.addr.in6 = *v6daddr;
         daddr.family = AF_INET6;
         return inet_getpeer(base, &daddr, create);
 }
diff --git a/include/net/ip.h b/include/net/ip.h
index 025c61c0dffb..d14af7edd197 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -108,7 +108,8 @@ int ip_local_deliver(struct sk_buff *skb);
 int ip_mr_input(struct sk_buff *skb);
 int ip_output(struct sock *sk, struct sk_buff *skb);
 int ip_mc_output(struct sock *sk, struct sk_buff *skb);
-int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
+int ip_fragment(struct sock *sk, struct sk_buff *skb,
+                int (*output)(struct sock *, struct sk_buff *));
 int ip_do_nat(struct sk_buff *skb);
 void ip_send_check(struct iphdr *ip);
 int __ip_local_out(struct sk_buff *skb);
@@ -318,9 +319,10 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
 }
 
 u32 ip_idents_reserve(u32 hash, int segs);
-void __ip_select_ident(struct iphdr *iph, int segs);
+void __ip_select_ident(struct net *net, struct iphdr *iph, int segs);
 
-static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
+static inline void ip_select_ident_segs(struct net *net, struct sk_buff *skb,
+                                        struct sock *sk, int segs)
 {
         struct iphdr *iph = ip_hdr(skb);
 
@@ -337,13 +339,14 @@ static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, in
                         iph->id = 0;
                 }
         } else {
-                __ip_select_ident(iph, segs);
+                __ip_select_ident(net, iph, segs);
         }
 }
 
-static inline void ip_select_ident(struct sk_buff *skb, struct sock *sk)
+static inline void ip_select_ident(struct net *net, struct sk_buff *skb,
+                                   struct sock *sk)
 {
-        ip_select_ident_segs(skb, sk, 1);
+        ip_select_ident_segs(net, skb, sk, 1);
 }
 
 static inline __wsum inet_compute_pseudo(struct sk_buff *skb, int proto)
@@ -453,22 +456,6 @@ static __inline__ void inet_reset_saddr(struct sock *sk)
 
 #endif
 
-static inline int sk_mc_loop(struct sock *sk)
-{
-        if (!sk)
-                return 1;
-        switch (sk->sk_family) {
-        case AF_INET:
-                return inet_sk(sk)->mc_loop;
-#if IS_ENABLED(CONFIG_IPV6)
-        case AF_INET6:
-                return inet6_sk(sk)->mc_loop;
-#endif
-        }
-        WARN_ON(1);
-        return 1;
-}
-
 bool ip_call_ra_chain(struct sk_buff *skb);
 
 /*
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 1d09b46c1e48..5e192068e6cb 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -170,11 +170,13 @@ static inline bool ipv6_anycast_destination(const struct sk_buff *skb)
         return rt->rt6i_flags & RTF_ANYCAST;
 }
 
-int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
+int ip6_fragment(struct sock *sk, struct sk_buff *skb,
+                 int (*output)(struct sock *, struct sk_buff *));
 
 static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
 {
-        struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL;
+        struct ipv6_pinfo *np = skb->sk && !dev_recursion_level() ?
+                                inet6_sk(skb->sk) : NULL;
 
         return (np && np->pmtudisc >= IPV6_PMTUDISC_PROBE) ?
                skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb));
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index 76c091b53dae..b8529aa1dae7 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -71,14 +71,16 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw);
 __u32 ip6_tnl_get_cap(struct ip6_tnl *t, const struct in6_addr *laddr,
                              const struct in6_addr *raddr);
 struct net *ip6_tnl_get_link_net(const struct net_device *dev);
+int ip6_tnl_get_iflink(const struct net_device *dev);
 
-static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
+static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,
+                                  struct net_device *dev)
 {
         struct net_device_stats *stats = &dev->stats;
         int pkt_len, err;
 
         pkt_len = skb->len;
-        err = ip6_local_out(skb);
+        err = ip6_local_out_sk(sk, skb);
 
         if (net_xmit_eval(err) == 0) {
                 struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats);
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 5bd120e4bc0a..54271ed0ed45 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -136,7 +136,7 @@ struct fib_result {
         u32             tclassid;
         struct fib_info *fi;
         struct fib_table *table;
-        struct list_head *fa_head;
+        struct hlist_head *fa_head;
 };
 
 struct fib_result_nl {
@@ -185,7 +185,9 @@ struct fib_table {
         u32                     tb_id;
         int                     tb_default;
         int                     tb_num_default;
-        unsigned long           tb_data[0];
+        struct rcu_head         rcu;
+        unsigned long           *tb_data;
+        unsigned long           __data[0];
 };
 
 int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
@@ -195,10 +197,10 @@ int fib_table_delete(struct fib_table *, struct fib_config *);
 int fib_table_dump(struct fib_table *table, struct sk_buff *skb,
                    struct netlink_callback *cb);
 int fib_table_flush(struct fib_table *table);
+struct fib_table *fib_trie_unmerge(struct fib_table *main_tb);
+void fib_table_flush_external(struct fib_table *table);
 void fib_free_table(struct fib_table *tb);
 
-
-
 #ifndef CONFIG_IP_MULTIPLE_TABLES
 
 #define TABLE_LOCAL_INDEX       (RT_TABLE_LOCAL & (FIB_TABLE_HASHSZ - 1))
@@ -206,12 +208,16 @@ void fib_free_table(struct fib_table *tb);
 
 static inline struct fib_table *fib_get_table(struct net *net, u32 id)
 {
+        struct hlist_node *tb_hlist;
         struct hlist_head *ptr;
 
         ptr = id == RT_TABLE_LOCAL ?
                 &net->ipv4.fib_table_hash[TABLE_LOCAL_INDEX] :
                 &net->ipv4.fib_table_hash[TABLE_MAIN_INDEX];
-        return hlist_entry(ptr->first, struct fib_table, tb_hlist);
+
+        tb_hlist = rcu_dereference_rtnl(hlist_first_rcu(ptr));
+
+        return hlist_entry(tb_hlist, struct fib_table, tb_hlist);
 }
 
 static inline struct fib_table *fib_new_table(struct net *net, u32 id)
@@ -222,14 +228,13 @@ static inline struct fib_table *fib_new_table(struct net *net, u32 id)
 static inline int fib_lookup(struct net *net, const struct flowi4 *flp,
                              struct fib_result *res)
 {
+        struct fib_table *tb;
         int err = -ENETUNREACH;
 
         rcu_read_lock();
 
-        if (!fib_table_lookup(fib_get_table(net, RT_TABLE_LOCAL), flp, res,
-                              FIB_LOOKUP_NOREF) ||
-            !fib_table_lookup(fib_get_table(net, RT_TABLE_MAIN), flp, res,
-                              FIB_LOOKUP_NOREF))
+        tb = fib_get_table(net, RT_TABLE_MAIN);
+        if (tb && !fib_table_lookup(tb, flp, res, FIB_LOOKUP_NOREF))
                 err = 0;
 
         rcu_read_unlock();
@@ -249,28 +254,29 @@ int __fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res);
 static inline int fib_lookup(struct net *net, struct flowi4 *flp,
                              struct fib_result *res)
 {
-        if (!net->ipv4.fib_has_custom_rules) {
-                int err = -ENETUNREACH;
-
-                rcu_read_lock();
-
-                res->tclassid = 0;
-                if ((net->ipv4.fib_local &&
-                     !fib_table_lookup(net->ipv4.fib_local, flp, res,
-                                       FIB_LOOKUP_NOREF)) ||
-                    (net->ipv4.fib_main &&
-                     !fib_table_lookup(net->ipv4.fib_main, flp, res,
-                                       FIB_LOOKUP_NOREF)) ||
-                    (net->ipv4.fib_default &&
-                     !fib_table_lookup(net->ipv4.fib_default, flp, res,
-                                       FIB_LOOKUP_NOREF)))
-                        err = 0;
-
-                rcu_read_unlock();
-
-                return err;
+        struct fib_table *tb;
+        int err;
+
+        if (net->ipv4.fib_has_custom_rules)
+                return __fib_lookup(net, flp, res);
+
+        rcu_read_lock();
+
+        res->tclassid = 0;
+
+        for (err = 0; !err; err = -ENETUNREACH) {
+                tb = rcu_dereference_rtnl(net->ipv4.fib_main);
+                if (tb && !fib_table_lookup(tb, flp, res, FIB_LOOKUP_NOREF))
+                        break;
+
+                tb = rcu_dereference_rtnl(net->ipv4.fib_default);
+                if (tb && !fib_table_lookup(tb, flp, res, FIB_LOOKUP_NOREF))
+                        break;
         }
-        return __fib_lookup(net, flp, res);
+
+        rcu_read_unlock();
+
+        return err;
 }
 
 #endif /* CONFIG_IP_MULTIPLE_TABLES */
@@ -294,6 +300,8 @@ static inline int fib_num_tclassid_users(struct net *net)
         return 0;
 }
 #endif
+int fib_unmerge(struct net *net);
+void fib_flush_external(struct net *net);
 
 /* Exported by fib_semantics.c */
 int ip_fib_check_default(__be32 gw, struct net_device *dev);
@@ -304,7 +312,7 @@ void fib_select_multipath(struct fib_result *res);
 
 /* Exported by fib_trie.c */
 void fib_trie_init(void);
-struct fib_table *fib_trie_table(u32 id);
+struct fib_table *fib_trie_table(u32 id, struct fib_table *alias);
 
 static inline void fib_combine_itag(u32 *itag, const struct fib_result *res)
 {
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 2c47061a6954..d8214cb88bbc 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -142,6 +142,7 @@ int ip_tunnel_init(struct net_device *dev);
 void ip_tunnel_uninit(struct net_device *dev);
 void  ip_tunnel_dellink(struct net_device *dev, struct list_head *head);
 struct net *ip_tunnel_get_link_net(const struct net_device *dev);
+int ip_tunnel_get_iflink(const struct net_device *dev);
 int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id,
                        struct rtnl_link_ops *ops, char *devname);
 
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 615b20b58545..4e3731ee4eac 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -47,13 +47,13 @@ static inline struct net *skb_net(const struct sk_buff *skb)
          * Start with the most likely hit
          * End with BUG
          */
-        if (likely(skb->dev && skb->dev->nd_net))
+        if (likely(skb->dev && dev_net(skb->dev)))
                 return dev_net(skb->dev);
         if (skb_dst(skb) && skb_dst(skb)->dev)
                 return dev_net(skb_dst(skb)->dev);
         WARN(skb->sk, "Maybe skb_sknet should be used in %s() at line:%d\n",
                       __func__, __LINE__);
-        if (likely(skb->sk && skb->sk->sk_net))
+        if (likely(skb->sk && sock_net(skb->sk)))
                 return sock_net(skb->sk);
         pr_err("There is no net ptr to find in the skb in %s() line:%d\n",
                 __func__, __LINE__);
@@ -71,11 +71,11 @@ static inline struct net *skb_sknet(const struct sk_buff *skb)
 #ifdef CONFIG_NET_NS
 #ifdef CONFIG_IP_VS_DEBUG
         /* Start with the most likely hit */
-        if (likely(skb->sk && skb->sk->sk_net))
+        if (likely(skb->sk && sock_net(skb->sk)))
                 return sock_net(skb->sk);
         WARN(skb->dev, "Maybe skb_net should be used instead in %s() line:%d\n",
                        __func__, __LINE__);
-        if (likely(skb->dev && skb->dev->nd_net))
+        if (likely(skb->dev && dev_net(skb->dev)))
                 return dev_net(skb->dev);
         pr_err("There is no net ptr to find in the skb in %s() line:%d\n",
                 __func__, __LINE__);
@@ -365,15 +365,15 @@ struct ip_vs_seq {
 
 /* counters per cpu */
 struct ip_vs_counters {
-        __u32           conns;          /* connections scheduled */
-        __u32           inpkts;         /* incoming packets */
-        __u32           outpkts;        /* outgoing packets */
+        __u64           conns;          /* connections scheduled */
+        __u64           inpkts;         /* incoming packets */
+        __u64           outpkts;        /* outgoing packets */
         __u64           inbytes;        /* incoming bytes */
         __u64           outbytes;       /* outgoing bytes */
 };
 /* Stats per cpu */
 struct ip_vs_cpu_stats {
-        struct ip_vs_counters   ustats;
+        struct ip_vs_counters   cnt;
         struct u64_stats_sync   syncp;
 };
 
@@ -383,23 +383,40 @@ struct ip_vs_estimator {
 
         u64                     last_inbytes;
         u64                     last_outbytes;
-        u32                     last_conns;
-        u32                     last_inpkts;
-        u32                     last_outpkts;
-
-        u32                     cps;
-        u32                     inpps;
-        u32                     outpps;
-        u32                     inbps;
-        u32                     outbps;
+        u64                     last_conns;
+        u64                     last_inpkts;
+        u64                     last_outpkts;
+
+        u64                     cps;
+        u64                     inpps;
+        u64                     outpps;
+        u64                     inbps;
+        u64                     outbps;
+};
+
+/*
+ * IPVS statistics object, 64-bit kernel version of struct ip_vs_stats_user
+ */
+struct ip_vs_kstats {
+        u64                     conns;          /* connections scheduled */
+        u64                     inpkts;         /* incoming packets */
+        u64                     outpkts;        /* outgoing packets */
+        u64                     inbytes;        /* incoming bytes */
+        u64                     outbytes;       /* outgoing bytes */
+
+        u64                     cps;            /* current connection rate */
+        u64                     inpps;          /* current in packet rate */
+        u64                     outpps;         /* current out packet rate */
+        u64                     inbps;          /* current in byte rate */
+        u64                     outbps;         /* current out byte rate */
 };
 
 struct ip_vs_stats {
-        struct ip_vs_stats_user ustats;         /* statistics */
+        struct ip_vs_kstats     kstats;         /* kernel statistics */
         struct ip_vs_estimator  est;            /* estimator */
         struct ip_vs_cpu_stats __percpu *cpustats;      /* per cpu counters */
         spinlock_t              lock;           /* spin lock */
-        struct ip_vs_stats_user ustats0;        /* reset values */
+        struct ip_vs_kstats     kstats0;        /* reset values */
 };
 
 struct dst_entry;
@@ -924,6 +941,7 @@ struct netns_ipvs {
         int                     sysctl_nat_icmp_send;
         int                     sysctl_pmtu_disc;
         int                     sysctl_backup_only;
+        int                     sysctl_conn_reuse_mode;
 
         /* ip_vs_lblc */
         int                     sysctl_lblc_expiration;
@@ -1042,6 +1060,11 @@ static inline int sysctl_backup_only(struct netns_ipvs *ipvs)
                ipvs->sysctl_backup_only;
 }
 
+static inline int sysctl_conn_reuse_mode(struct netns_ipvs *ipvs)
+{
+        return ipvs->sysctl_conn_reuse_mode;
+}
+
 #else
 
 static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
@@ -1109,6 +1132,11 @@ static inline int sysctl_backup_only(struct netns_ipvs *ipvs)
         return 0;
 }
 
+static inline int sysctl_conn_reuse_mode(struct netns_ipvs *ipvs)
+{
+        return 1;
+}
+
 #endif
 
 /* IPVS core functions
@@ -1388,8 +1416,7 @@ void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp, int pkts);
 void ip_vs_start_estimator(struct net *net, struct ip_vs_stats *stats);
 void ip_vs_stop_estimator(struct net *net, struct ip_vs_stats *stats);
 void ip_vs_zero_estimator(struct ip_vs_stats *stats);
-void ip_vs_read_estimator(struct ip_vs_stats_user *dst,
-                          struct ip_vs_stats *stats);
+void ip_vs_read_estimator(struct ip_vs_kstats *dst, struct ip_vs_stats *stats);
 
 /* Various IPVS packet transmitters (from ip_vs_xmit.c) */
 int ip_vs_null_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 4c9fe224d73b..eec8ad3c9843 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -47,8 +47,6 @@
 
 #define NEXTHDR_MAX             255
 
-
-
 #define IPV6_DEFAULT_HOPLIMIT   64
 #define IPV6_DEFAULT_MCASTHOPS  1
 
@@ -671,8 +669,9 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_add
         return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr));
 }
 
-void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt);
-void ipv6_proxy_select_ident(struct sk_buff *skb);
+void ipv6_select_ident(struct net *net, struct frag_hdr *fhdr,
+                       struct rt6_info *rt);
+void ipv6_proxy_select_ident(struct net *net, struct sk_buff *skb);
 
 int ip6_dst_hoplimit(struct dst_entry *dst);
 
@@ -768,7 +767,7 @@ static inline u8 ip6_tclass(__be32 flowinfo)
 int ipv6_rcv(struct sk_buff *skb, struct net_device *dev,
              struct packet_type *pt, struct net_device *orig_dev);
 
-int ip6_rcv_finish(struct sk_buff *skb);
+int ip6_rcv_finish(struct sock *sk, struct sk_buff *skb);
 
 /*
  *      upper-layer output functions
@@ -826,6 +825,7 @@ int ip6_input(struct sk_buff *skb);
 int ip6_mc_input(struct sk_buff *skb);
 
 int __ip6_local_out(struct sk_buff *skb);
+int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb);
 int ip6_local_out(struct sk_buff *skb);
 
 /*
@@ -940,4 +940,8 @@ int ipv6_sysctl_register(void);
 void ipv6_sysctl_unregister(void);
 #endif
 
+int ipv6_sock_mc_join(struct sock *sk, int ifindex,
+                      const struct in6_addr *addr);
+int ipv6_sock_mc_drop(struct sock *sk, int ifindex,
+                      const struct in6_addr *addr);
 #endif /* _NET_IPV6_H */
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
index a830b01baba4..8f81bbbc38fc 100644
--- a/include/net/iw_handler.h
+++ b/include/net/iw_handler.h
@@ -519,6 +519,17 @@ iwe_stream_add_event(struct iw_request_info *info, char *stream, char *ends,
         return stream;
 }
 
+static inline char *
+iwe_stream_add_event_check(struct iw_request_info *info, char *stream,
+                           char *ends, struct iw_event *iwe, int event_len)
+{
+        char *res = iwe_stream_add_event(info, stream, ends, iwe, event_len);
+
+        if (res == stream)
+                return ERR_PTR(-E2BIG);
+        return res;
+}
+
 /*------------------------------------------------------------------*/
 /*
  * Wrapper to add an short Wireless Event containing a pointer to a
@@ -545,6 +556,17 @@ iwe_stream_add_point(struct iw_request_info *info, char *stream, char *ends,
         return stream;
 }
 
+static inline char *
+iwe_stream_add_point_check(struct iw_request_info *info, char *stream,
+                           char *ends, struct iw_event *iwe, char *extra)
+{
+        char *res = iwe_stream_add_point(info, stream, ends, iwe, extra);
+
+        if (res == stream)
+                return ERR_PTR(-E2BIG);
+        return res;
+}
+
 /*------------------------------------------------------------------*/
 /*
  * Wrapper to add a value to a Wireless Event in a stream of events.
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index d52914b75331..b4bef1152c05 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -84,6 +84,39 @@
  *
  */
 
+/**
+ * DOC: mac80211 software tx queueing
+ *
+ * mac80211 provides an optional intermediate queueing implementation designed
+ * to allow the driver to keep hardware queues short and provide some fairness
+ * between different stations/interfaces.
+ * In this model, the driver pulls data frames from the mac80211 queue instead
+ * of letting mac80211 push them via drv_tx().
+ * Other frames (e.g. control or management) are still pushed using drv_tx().
+ *
+ * Drivers indicate that they use this model by implementing the .wake_tx_queue
+ * driver operation.
+ *
+ * Intermediate queues (struct ieee80211_txq) are kept per-sta per-tid, with a
+ * single per-vif queue for multicast data frames.
+ *
+ * The driver is expected to initialize its private per-queue data for stations
+ * and interfaces in the .add_interface and .sta_add ops.
+ *
+ * The driver can't access the queue directly. To dequeue a frame, it calls
+ * ieee80211_tx_dequeue(). Whenever mac80211 adds a new frame to a queue, it
+ * calls the .wake_tx_queue driver op.
+ *
+ * For AP powersave TIM handling, the driver only needs to indicate if it has
+ * buffered packets in the driver specific data structures by calling
+ * ieee80211_sta_set_buffered(). For frames buffered in the ieee80211_txq
+ * struct, mac80211 sets the appropriate TIM PVB bits and calls
+ * .release_buffered_frames().
+ * In that callback the driver is therefore expected to release its own
+ * buffered frames and afterwards also frames from the ieee80211_txq (obtained
+ * via the usual ieee80211_tx_dequeue).
+ */
+
 struct device;
 
 /**
@@ -301,17 +334,86 @@ enum ieee80211_bss_change {
 #define IEEE80211_BSS_ARP_ADDR_LIST_LEN 4
 
 /**
- * enum ieee80211_rssi_event - RSSI threshold event
- * An indicator for when RSSI goes below/above a certain threshold.
- * @RSSI_EVENT_HIGH: AP's rssi crossed the high threshold set by the driver.
- * @RSSI_EVENT_LOW: AP's rssi crossed the low threshold set by the driver.
+ * enum ieee80211_event_type - event to be notified to the low level driver
+ * @RSSI_EVENT: AP's rssi crossed the a threshold set by the driver.
+ * @MLME_EVENT: event related to MLME
  */
-enum ieee80211_rssi_event {
+enum ieee80211_event_type {
+        RSSI_EVENT,
+        MLME_EVENT,
+};
+
+/**
+ * enum ieee80211_rssi_event_data - relevant when event type is %RSSI_EVENT
+ * @RSSI_EVENT_HIGH: AP's rssi went below the threshold set by the driver.
+ * @RSSI_EVENT_LOW: AP's rssi went above the threshold set by the driver.
+ */
+enum ieee80211_rssi_event_data {
         RSSI_EVENT_HIGH,
         RSSI_EVENT_LOW,
 };
 
 /**
+ * enum ieee80211_rssi_event - data attached to an %RSSI_EVENT
+ * @data: See &enum ieee80211_rssi_event_data
+ */
+struct ieee80211_rssi_event {
+        enum ieee80211_rssi_event_data data;
+};
+
+/**
+ * enum ieee80211_mlme_event_data - relevant when event type is %MLME_EVENT
+ * @AUTH_EVENT: the MLME operation is authentication
+ * @ASSOC_EVENT: the MLME operation is association
+ * @DEAUTH_RX_EVENT: deauth received..
+ * @DEAUTH_TX_EVENT: deauth sent.
+ */
+enum ieee80211_mlme_event_data {
+        AUTH_EVENT,
+        ASSOC_EVENT,
+        DEAUTH_RX_EVENT,
+        DEAUTH_TX_EVENT,
+};
+
+/**
+ * enum ieee80211_mlme_event_status - relevant when event type is %MLME_EVENT
+ * @MLME_SUCCESS: the MLME operation completed successfully.
+ * @MLME_DENIED: the MLME operation was denied by the peer.
+ * @MLME_TIMEOUT: the MLME operation timed out.
+ */
+enum ieee80211_mlme_event_status {
+        MLME_SUCCESS,
+        MLME_DENIED,
+        MLME_TIMEOUT,
+};
+
+/**
+ * enum ieee80211_mlme_event - data attached to an %MLME_EVENT
+ * @data: See &enum ieee80211_mlme_event_data
+ * @status: See &enum ieee80211_mlme_event_status
+ * @reason: the reason code if applicable
+ */
+struct ieee80211_mlme_event {
+        enum ieee80211_mlme_event_data data;
+        enum ieee80211_mlme_event_status status;
+        u16 reason;
+};
+
+/**
+ * struct ieee80211_event - event to be sent to the driver
+ * @type The event itself. See &enum ieee80211_event_type.
+ * @rssi: relevant if &type is %RSSI_EVENT
+ * @mlme: relevant if &type is %AUTH_EVENT
+ */
+struct ieee80211_event {
+        enum ieee80211_event_type type;
+        union {
+                struct ieee80211_rssi_event rssi;
+                struct ieee80211_mlme_event mlme;
+        } u;
+};
+
+/**
  * struct ieee80211_bss_conf - holds the BSS's changing parameters
  *
  * This structure keeps information about a BSS (and an association
@@ -337,12 +439,15 @@ enum ieee80211_rssi_event {
  *      HW flag %IEEE80211_HW_TIMING_BEACON_ONLY is set, then this can
  *      only come from a beacon, but might not become valid until after
  *      association when a beacon is received (which is notified with the
- *      %BSS_CHANGED_DTIM flag.)
+ *      %BSS_CHANGED_DTIM flag.). See also sync_dtim_count important notice.
  * @sync_device_ts: the device timestamp corresponding to the sync_tsf,
  *      the driver/device can use this to calculate synchronisation
- *      (see @sync_tsf)
+ *      (see @sync_tsf). See also sync_dtim_count important notice.
  * @sync_dtim_count: Only valid when %IEEE80211_HW_TIMING_BEACON_ONLY
  *      is requested, see @sync_tsf/@sync_device_ts.
+ *      IMPORTANT: These three sync_* parameters would possibly be out of sync
+ *      by the time the driver will use them. The synchronized view is currently
+ *      guaranteed only in certain callbacks.
  * @beacon_int: beacon interval
  * @assoc_capability: capabilities taken from assoc resp
  * @basic_rates: bitmap of basic rates, each bit stands for an
@@ -1234,6 +1339,7 @@ enum ieee80211_vif_flags {
  *      monitor interface (if that is requested.)
  * @drv_priv: data area for driver use, will always be aligned to
  *      sizeof(void *).
+ * @txq: the multicast data TX queue (if driver uses the TXQ abstraction)
  */
 struct ieee80211_vif {
         enum nl80211_iftype type;
@@ -1245,6 +1351,8 @@ struct ieee80211_vif {
         u8 cab_queue;
         u8 hw_queue[IEEE80211_NUM_ACS];
 
+        struct ieee80211_txq *txq;
+
         struct ieee80211_chanctx_conf __rcu *chanctx_conf;
 
         u32 driver_flags;
@@ -1279,6 +1387,19 @@ static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
 struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev);
 
 /**
+ * ieee80211_vif_to_wdev - return a wdev struct from a vif
+ * @vif: the vif to get the wdev for
+ *
+ * This can be used by mac80211 drivers with direct cfg80211 APIs
+ * (like the vendor commands) that needs to get the wdev for a vif.
+ *
+ * Note that this function may return %NULL if the given wdev isn't
+ * associated with a vif that the driver knows about (e.g. monitor
+ * or AP_VLAN interfaces.)
+ */
+struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif);
+
+/**
  * enum ieee80211_key_flags - key flags
  *
  * These flags are used for communication about keys between the driver
@@ -1472,7 +1593,8 @@ struct ieee80211_sta_rates {
  * @supp_rates: Bitmap of supported rates (per band)
  * @ht_cap: HT capabilities of this STA; restricted to our own capabilities
  * @vht_cap: VHT capabilities of this STA; restricted to our own capabilities
- * @wme: indicates whether the STA supports QoS/WME.
+ * @wme: indicates whether the STA supports QoS/WME (if local devices does,
+ *      otherwise always false)
  * @drv_priv: data area for driver use, will always be aligned to
  *      sizeof(void *), size is determined in hw information.
  * @uapsd_queues: bitmap of queues configured for uapsd. Only valid
@@ -1488,6 +1610,8 @@ struct ieee80211_sta_rates {
  * @tdls: indicates whether the STA is a TDLS peer
  * @tdls_initiator: indicates the STA is an initiator of the TDLS link. Only
  *      valid if the STA is a TDLS peer in the first place.
+ * @mfp: indicates whether the STA uses management frame protection or not.
+ * @txq: per-TID data TX queues (if driver uses the TXQ abstraction)
  */
 struct ieee80211_sta {
         u32 supp_rates[IEEE80211_NUM_BANDS];
@@ -1504,6 +1628,9 @@ struct ieee80211_sta {
         struct ieee80211_sta_rates __rcu *rates;
         bool tdls;
         bool tdls_initiator;
+        bool mfp;
+
+        struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];
 
         /* must be last */
         u8 drv_priv[0] __aligned(sizeof(void *));
@@ -1533,6 +1660,27 @@ struct ieee80211_tx_control {
 };
 
 /**
+ * struct ieee80211_txq - Software intermediate tx queue
+ *
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
+ * @sta: station table entry, %NULL for per-vif queue
+ * @tid: the TID for this queue (unused for per-vif queue)
+ * @ac: the AC for this queue
+ *
+ * The driver can obtain packets from this queue by calling
+ * ieee80211_tx_dequeue().
+ */
+struct ieee80211_txq {
+        struct ieee80211_vif *vif;
+        struct ieee80211_sta *sta;
+        u8 tid;
+        u8 ac;
+
+        /* must be last */
+        u8 drv_priv[0] __aligned(sizeof(void *));
+};
+
+/**
  * enum ieee80211_hw_flags - hardware flags
  *
  * These flags are used to indicate hardware capabilities to
@@ -1756,6 +1904,8 @@ enum ieee80211_hw_flags {
  *      within &struct ieee80211_sta.
  * @chanctx_data_size: size (in bytes) of the drv_priv data area
  *      within &struct ieee80211_chanctx_conf.
+ * @txq_data_size: size (in bytes) of the drv_priv data area
+ *      within @struct ieee80211_txq.
  *
  * @max_rates: maximum number of alternate rate retry stages the hw
  *      can handle.
@@ -1804,6 +1954,9 @@ enum ieee80211_hw_flags {
  * @n_cipher_schemes: a size of an array of cipher schemes definitions.
  * @cipher_schemes: a pointer to an array of cipher scheme definitions
  *      supported by HW.
+ *
+ * @txq_ac_max_pending: maximum number of frames per AC pending in all txq
+ *      entries for a vif.
  */
 struct ieee80211_hw {
         struct ieee80211_conf conf;
@@ -1816,6 +1969,7 @@ struct ieee80211_hw {
         int vif_data_size;
         int sta_data_size;
         int chanctx_data_size;
+        int txq_data_size;
         u16 queues;
         u16 max_listen_interval;
         s8 max_signal;
@@ -1832,6 +1986,7 @@ struct ieee80211_hw {
         u8 uapsd_max_sp_len;
         u8 n_cipher_schemes;
         const struct ieee80211_cipher_scheme *cipher_schemes;
+        int txq_ac_max_pending;
 };
 
 /**
@@ -2844,8 +2999,9 @@ enum ieee80211_reconfig_type {
  * @set_bitrate_mask: Set a mask of rates to be used for rate control selection
  *      when transmitting a frame. Currently only legacy rates are handled.
  *      The callback can sleep.
- * @rssi_callback: Notify driver when the average RSSI goes above/below
- *      thresholds that were registered previously. The callback can sleep.
+ * @event_callback: Notify driver about any event in mac80211. See
+ *      &enum ieee80211_event_type for the different types.
+ *      The callback can sleep.
  *
  * @release_buffered_frames: Release buffered frames according to the given
  *      parameters. In the case where the driver buffers some frames for
@@ -2993,6 +3149,8 @@ enum ieee80211_reconfig_type {
  *      response template is provided, together with the location of the
  *      switch-timing IE within the template. The skb can only be used within
  *      the function call.
+ *
+ * @wake_tx_queue: Called when new packets have been added to the queue.
  */
 struct ieee80211_ops {
         void (*tx)(struct ieee80211_hw *hw,
@@ -3141,9 +3299,9 @@ struct ieee80211_ops {
         bool (*tx_frames_pending)(struct ieee80211_hw *hw);
         int (*set_bitrate_mask)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                                 const struct cfg80211_bitrate_mask *mask);
-        void (*rssi_callback)(struct ieee80211_hw *hw,
-                              struct ieee80211_vif *vif,
-                              enum ieee80211_rssi_event rssi_event);
+        void (*event_callback)(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               const struct ieee80211_event *event);
 
         void (*allow_buffered_frames)(struct ieee80211_hw *hw,
                                       struct ieee80211_sta *sta,
@@ -3224,6 +3382,9 @@ struct ieee80211_ops {
         void (*tdls_recv_channel_switch)(struct ieee80211_hw *hw,
                                          struct ieee80211_vif *vif,
                                          struct ieee80211_tdls_ch_sw_params *params);
+
+        void (*wake_tx_queue)(struct ieee80211_hw *hw,
+                              struct ieee80211_txq *txq);
 };
 
 /**
@@ -4343,13 +4504,33 @@ void ieee80211_sched_scan_stopped(struct ieee80211_hw *hw);
  *      haven't been re-added to the driver yet.
  * @IEEE80211_IFACE_ITER_RESUME_ALL: During resume, iterate over all
  *      interfaces, even if they haven't been re-added to the driver yet.
+ * @IEEE80211_IFACE_ITER_ACTIVE: Iterate only active interfaces (netdev is up).
  */
 enum ieee80211_interface_iteration_flags {
         IEEE80211_IFACE_ITER_NORMAL     = 0,
         IEEE80211_IFACE_ITER_RESUME_ALL = BIT(0),
+        IEEE80211_IFACE_ITER_ACTIVE     = BIT(1),
 };
 
 /**
+ * ieee80211_iterate_interfaces - iterate interfaces
+ *
+ * This function iterates over the interfaces associated with a given
+ * hardware and calls the callback for them. This includes active as well as
+ * inactive interfaces. This function allows the iterator function to sleep.
+ * Will iterate over a new interface during add_interface().
+ *
+ * @hw: the hardware struct of which the interfaces should be iterated over
+ * @iter_flags: iteration flags, see &enum ieee80211_interface_iteration_flags
+ * @iterator: the iterator function to call
+ * @data: first argument of the iterator function
+ */
+void ieee80211_iterate_interfaces(struct ieee80211_hw *hw, u32 iter_flags,
+                                  void (*iterator)(void *data, u8 *mac,
+                                                   struct ieee80211_vif *vif),
+                                  void *data);
+
+/**
  * ieee80211_iterate_active_interfaces - iterate active interfaces
  *
  * This function iterates over the interfaces associated with a given
@@ -4364,11 +4545,16 @@ enum ieee80211_interface_iteration_flags {
  * @iterator: the iterator function to call
  * @data: first argument of the iterator function
  */
-void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
-                                         u32 iter_flags,
-                                         void (*iterator)(void *data, u8 *mac,
-                                                struct ieee80211_vif *vif),
-                                         void *data);
+static inline void
+ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, u32 iter_flags,
+                                    void (*iterator)(void *data, u8 *mac,
+                                                     struct ieee80211_vif *vif),
+                                    void *data)
+{
+        ieee80211_iterate_interfaces(hw,
+                                     iter_flags | IEEE80211_IFACE_ITER_ACTIVE,
+                                     iterator, data);
+}
 
 /**
  * ieee80211_iterate_active_interfaces_atomic - iterate active interfaces
@@ -5194,30 +5380,13 @@ int ieee80211_reserve_tid(struct ieee80211_sta *sta, u8 tid);
 void ieee80211_unreserve_tid(struct ieee80211_sta *sta, u8 tid);
 
 /**
- * ieee80211_ie_split - split an IE buffer according to ordering
- *
- * @ies: the IE buffer
- * @ielen: the length of the IE buffer
- * @ids: an array with element IDs that are allowed before
- *      the split
- * @n_ids: the size of the element ID array
- * @offset: offset where to start splitting in the buffer
- *
- * This function splits an IE buffer by updating the @offset
- * variable to point to the location where the buffer should be
- * split.
+ * ieee80211_tx_dequeue - dequeue a packet from a software tx queue
  *
- * It assumes that the given IE buffer is well-formed, this
- * has to be guaranteed by the caller!
- *
- * It also assumes that the IEs in the buffer are ordered
- * correctly, if not the result of using this function will not
- * be ordered correctly either, i.e. it does no reordering.
+ * @hw: pointer as obtained from ieee80211_alloc_hw()
+ * @txq: pointer obtained from station or virtual interface
  *
- * The function returns the offset where the next part of the
- * buffer starts, which may be @ielen if the entire (remainder)
- * of the buffer should be used.
+ * Returns the skb if successful, %NULL if no frame was available.
  */
-size_t ieee80211_ie_split(const u8 *ies, size_t ielen,
-                          const u8 *ids, int n_ids, size_t offset);
+struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
+                                     struct ieee80211_txq *txq);
 #endif /* MAC80211_H */
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index 850647811749..e18e7fd43f47 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -19,6 +19,7 @@
 #include <net/af_ieee802154.h>
 #include <linux/ieee802154.h>
 #include <linux/skbuff.h>
+#include <linux/unaligned/memmove.h>
 
 #include <net/cfg802154.h>
 
@@ -212,7 +213,7 @@ struct ieee802154_ops {
         int             (*set_hw_addr_filt)(struct ieee802154_hw *hw,
                                             struct ieee802154_hw_addr_filt *filt,
                                             unsigned long changed);
-        int             (*set_txpower)(struct ieee802154_hw *hw, int db);
+        int             (*set_txpower)(struct ieee802154_hw *hw, s8 dbm);
         int             (*set_lbt)(struct ieee802154_hw *hw, bool on);
         int             (*set_cca_mode)(struct ieee802154_hw *hw,
                                         const struct wpan_phy_cca *cca);
@@ -233,9 +234,7 @@ struct ieee802154_ops {
  */
 static inline void ieee802154_be64_to_le64(void *le64_dst, const void *be64_src)
 {
-        __le64 tmp = (__force __le64)swab64p(be64_src);
-
-        memcpy(le64_dst, &tmp, IEEE802154_EXTENDED_ADDR_LEN);
+        __put_unaligned_memmove64(swab64p(be64_src), le64_dst);
 }
 
 /**
@@ -245,12 +244,10 @@ static inline void ieee802154_be64_to_le64(void *le64_dst, const void *be64_src)
  */
 static inline void ieee802154_le64_to_be64(void *be64_dst, const void *le64_src)
 {
-        __be64 tmp = (__force __be64)swab64p(le64_src);
-
-        memcpy(be64_dst, &tmp, IEEE802154_EXTENDED_ADDR_LEN);
+        __put_unaligned_memmove64(swab64p(le64_src), be64_dst);
 }
 
-/* Basic interface to register ieee802154 hwice */
+/* Basic interface to register ieee802154 device */
 struct ieee802154_hw *
 ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops);
 void ieee802154_free_hw(struct ieee802154_hw *hw);
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 6bbda34d5e59..b3a7751251b4 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -156,24 +156,7 @@ static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, _
 
 static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey)
 {
-        struct neigh_hash_table *nht;
-        const u32 *p32 = pkey;
-        struct neighbour *n;
-        u32 hash_val;
-
-        nht = rcu_dereference_bh(nd_tbl.nht);
-        hash_val = ndisc_hashfn(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift);
-        for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
-             n != NULL;
-             n = rcu_dereference_bh(n->next)) {
-                u32 *n32 = (u32 *) n->primary_key;
-                if (n->dev == dev &&
-                    ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
-                     (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0)
-                        return n;
-        }
-
-        return NULL;
+        return ___neigh_lookup_noref(&nd_tbl, neigh_key_eq128, ndisc_hashfn, pkey, dev);
 }
 
 static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, const void *pkey)
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 76f708486aae..bd33e66f49aa 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -42,6 +42,7 @@ enum {
         NEIGH_VAR_MCAST_PROBES,
         NEIGH_VAR_UCAST_PROBES,
         NEIGH_VAR_APP_PROBES,
+        NEIGH_VAR_MCAST_REPROBES,
         NEIGH_VAR_RETRANS_TIME,
         NEIGH_VAR_BASE_REACHABLE_TIME,
         NEIGH_VAR_DELAY_PROBE_TIME,
@@ -65,9 +66,7 @@ enum {
 };
 
 struct neigh_parms {
-#ifdef CONFIG_NET_NS
-        struct net *net;
-#endif
+        possible_net_t net;
         struct net_device *dev;
         struct list_head list;
         int     (*neigh_setup)(struct neighbour *);
@@ -167,9 +166,7 @@ struct neigh_ops {
 
 struct pneigh_entry {
         struct pneigh_entry     *next;
-#ifdef CONFIG_NET_NS
-        struct net              *net;
-#endif
+        possible_net_t          net;
         struct net_device       *dev;
         u8                      flags;
         u8                      key[0];
@@ -193,9 +190,11 @@ struct neigh_table {
         int                     family;
         int                     entry_size;
         int                     key_len;
+        __be16                  protocol;
         __u32                   (*hash)(const void *pkey,
                                         const struct net_device *dev,
                                         __u32 *hash_rnd);
+        bool                    (*key_eq)(const struct neighbour *, const void *pkey);
         int                     (*constructor)(struct neighbour *);
         int                     (*pconstructor)(struct pneigh_entry *);
         void                    (*pdestructor)(struct pneigh_entry *);
@@ -224,6 +223,7 @@ enum {
         NEIGH_ND_TABLE = 1,
         NEIGH_DN_TABLE = 2,
         NEIGH_NR_TABLES,
+        NEIGH_LINK_TABLE = NEIGH_NR_TABLES /* Pseudo table for neigh_xmit */
 };
 
 static inline int neigh_parms_family(struct neigh_parms *p)
@@ -246,6 +246,57 @@ static inline void *neighbour_priv(const struct neighbour *n)
 #define NEIGH_UPDATE_F_ISROUTER                 0x40000000
 #define NEIGH_UPDATE_F_ADMIN                    0x80000000
 
+
+static inline bool neigh_key_eq16(const struct neighbour *n, const void *pkey)
+{
+        return *(const u16 *)n->primary_key == *(const u16 *)pkey;
+}
+
+static inline bool neigh_key_eq32(const struct neighbour *n, const void *pkey)
+{
+        return *(const u32 *)n->primary_key == *(const u32 *)pkey;
+}
+
+static inline bool neigh_key_eq128(const struct neighbour *n, const void *pkey)
+{
+        const u32 *n32 = (const u32 *)n->primary_key;
+        const u32 *p32 = pkey;
+
+        return ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
+                (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0;
+}
+
+static inline struct neighbour *___neigh_lookup_noref(
+        struct neigh_table *tbl,
+        bool (*key_eq)(const struct neighbour *n, const void *pkey),
+        __u32 (*hash)(const void *pkey,
+                      const struct net_device *dev,
+                      __u32 *hash_rnd),
+        const void *pkey,
+        struct net_device *dev)
+{
+        struct neigh_hash_table *nht = rcu_dereference_bh(tbl->nht);
+        struct neighbour *n;
+        u32 hash_val;
+
+        hash_val = hash(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift);
+        for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
+             n != NULL;
+             n = rcu_dereference_bh(n->next)) {
+                if (n->dev == dev && key_eq(n, pkey))
+                        return n;
+        }
+
+        return NULL;
+}
+
+static inline struct neighbour *__neigh_lookup_noref(struct neigh_table *tbl,
+                                                     const void *pkey,
+                                                     struct net_device *dev)
+{
+        return ___neigh_lookup_noref(tbl, tbl->key_eq, tbl->hash, pkey, dev);
+}
+
 void neigh_table_init(int index, struct neigh_table *tbl);
 int neigh_table_clear(int index, struct neigh_table *tbl);
 struct neighbour *neigh_lookup(struct neigh_table *tbl, const void *pkey,
@@ -268,7 +319,6 @@ void neigh_changeaddr(struct neigh_table *tbl, struct net_device *dev);
 int neigh_ifdown(struct neigh_table *tbl, struct net_device *dev);
 int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb);
 int neigh_connected_output(struct neighbour *neigh, struct sk_buff *skb);
-int neigh_compat_output(struct neighbour *neigh, struct sk_buff *skb);
 int neigh_direct_output(struct neighbour *neigh, struct sk_buff *skb);
 struct neighbour *neigh_event_ns(struct neigh_table *tbl,
                                                 u8 *lladdr, void *saddr,
@@ -306,6 +356,7 @@ void neigh_for_each(struct neigh_table *tbl,
                     void (*cb)(struct neighbour *, void *), void *cookie);
 void __neigh_for_each_release(struct neigh_table *tbl,
                               int (*cb)(struct neighbour *));
+int neigh_xmit(int fam, struct net_device *, const void *, struct sk_buff *);
 void pneigh_for_each(struct neigh_table *tbl,
                      void (*cb)(struct pneigh_entry *));
 
@@ -459,4 +510,6 @@ static inline void neigh_ha_snapshot(char *dst, const struct neighbour *n,
                 memcpy(dst, n->ha, dev->addr_len);
         } while (read_seqretry(&n->ha_lock, seq));
 }
+
+
 #endif
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 36faf4990c4b..f733656404de 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -26,6 +26,7 @@
 #endif
 #include <net/netns/nftables.h>
 #include <net/netns/xfrm.h>
+#include <net/netns/mpls.h>
 #include <linux/ns_common.h>
 
 struct user_namespace;
@@ -48,13 +49,10 @@ struct net {
         atomic_t                count;          /* To decided when the network
                                                  *  namespace should be shut down.
                                                  */
-#ifdef NETNS_REFCNT_DEBUG
-        atomic_t                use_count;      /* To track references we
-                                                 * destroy on demand
-                                                 */
-#endif
         spinlock_t              rules_mod_lock;
 
+        atomic64_t              cookie_gen;
+
         struct list_head        list;           /* list of network namespaces */
         struct list_head        cleanup_list;   /* namespaces on death row */
         struct list_head        exit_list;      /* Use only net_mutex */
@@ -130,6 +128,9 @@ struct net {
 #if IS_ENABLED(CONFIG_IP_VS)
         struct netns_ipvs       *ipvs;
 #endif
+#if IS_ENABLED(CONFIG_MPLS)
+        struct netns_mpls       mpls;
+#endif
         struct sock             *diag_nlsk;
         atomic_t                fnhe_genid;
 };
@@ -230,48 +231,27 @@ int net_eq(const struct net *net1, const struct net *net2)
 #endif
 
 
-#ifdef NETNS_REFCNT_DEBUG
-static inline struct net *hold_net(struct net *net)
-{
-        if (net)
-                atomic_inc(&net->use_count);
-        return net;
-}
-
-static inline void release_net(struct net *net)
-{
-        if (net)
-                atomic_dec(&net->use_count);
-}
-#else
-static inline struct net *hold_net(struct net *net)
-{
-        return net;
-}
-
-static inline void release_net(struct net *net)
-{
-}
-#endif
-
+typedef struct {
 #ifdef CONFIG_NET_NS
+        struct net *net;
+#endif
+} possible_net_t;
 
-static inline void write_pnet(struct net **pnet, struct net *net)
+static inline void write_pnet(possible_net_t *pnet, struct net *net)
 {
-        *pnet = net;
+#ifdef CONFIG_NET_NS
+        pnet->net = net;
+#endif
 }
 
-static inline struct net *read_pnet(struct net * const *pnet)
+static inline struct net *read_pnet(const possible_net_t *pnet)
 {
-        return *pnet;
-}
-
+#ifdef CONFIG_NET_NS
+        return pnet->net;
 #else
-
-#define write_pnet(pnet, net)   do { (void)(net);} while (0)
-#define read_pnet(pnet)         (&init_net)
-
+        return &init_net;
 #endif
+}
 
 #define for_each_net(VAR)                               \
         list_for_each_entry(VAR, &net_namespace_list, list)
diff --git a/include/net/netfilter/ipv4/nf_reject.h b/include/net/netfilter/ipv4/nf_reject.h
index 03e928a55229..77862c3645f0 100644
--- a/include/net/netfilter/ipv4/nf_reject.h
+++ b/include/net/netfilter/ipv4/nf_reject.h
@@ -5,18 +5,14 @@
 #include <net/ip.h>
 #include <net/icmp.h>
 
-static inline void nf_send_unreach(struct sk_buff *skb_in, int code)
-{
-        icmp_send(skb_in, ICMP_DEST_UNREACH, code, 0);
-}
-
+void nf_send_unreach(struct sk_buff *skb_in, int code, int hook);
 void nf_send_reset(struct sk_buff *oldskb, int hook);
 
 const struct tcphdr *nf_reject_ip_tcphdr_get(struct sk_buff *oldskb,
                                              struct tcphdr *_oth, int hook);
 struct iphdr *nf_reject_iphdr_put(struct sk_buff *nskb,
                                   const struct sk_buff *oldskb,
-                                  __be16 protocol, int ttl);
+                                  __u8 protocol, int ttl);
 void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb,
                              const struct tcphdr *oth);
 
diff --git a/include/net/netfilter/ipv6/nf_reject.h b/include/net/netfilter/ipv6/nf_reject.h
index 23216d48abf9..0ea4fa37db16 100644
--- a/include/net/netfilter/ipv6/nf_reject.h
+++ b/include/net/netfilter/ipv6/nf_reject.h
@@ -3,15 +3,8 @@
 
 #include <linux/icmpv6.h>
 
-static inline void
-nf_send_unreach6(struct net *net, struct sk_buff *skb_in, unsigned char code,
-             unsigned int hooknum)
-{
-        if (hooknum == NF_INET_LOCAL_OUT && skb_in->dev == NULL)
-                skb_in->dev = net->loopback_dev;
-
-        icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0);
-}
+void nf_send_unreach6(struct net *net, struct sk_buff *skb_in, unsigned char code,
+                      unsigned int hooknum);
 
 void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook);
 
@@ -20,7 +13,7 @@ const struct tcphdr *nf_reject_ip6_tcphdr_get(struct sk_buff *oldskb,
                                               unsigned int *otcplen, int hook);
 struct ipv6hdr *nf_reject_ip6hdr_put(struct sk_buff *nskb,
                                      const struct sk_buff *oldskb,
-                                     __be16 protocol, int hoplimit);
+                                     __u8 protocol, int hoplimit);
 void nf_reject_ip6_tcphdr_put(struct sk_buff *nskb,
                               const struct sk_buff *oldskb,
                               const struct tcphdr *oth, unsigned int otcplen);
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 74f271a172dd..095433b8a8b0 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -95,9 +95,8 @@ struct nf_conn {
         /* Timer function; drops refcnt when it goes off. */
         struct timer_list timeout;
 
-#ifdef CONFIG_NET_NS
-        struct net *ct_net;
-#endif
+        possible_net_t ct_net;
+
         /* all members below initialized via memset */
         u8 __nfct_init_offset[0];
 
diff --git a/include/net/netfilter/nf_log.h b/include/net/netfilter/nf_log.h
index 534e1f2ac4fc..57639fca223a 100644
--- a/include/net/netfilter/nf_log.h
+++ b/include/net/netfilter/nf_log.h
@@ -79,6 +79,16 @@ void nf_log_packet(struct net *net,
                    const struct nf_loginfo *li,
                    const char *fmt, ...);
 
+__printf(8, 9)
+void nf_log_trace(struct net *net,
+                  u_int8_t pf,
+                  unsigned int hooknum,
+                  const struct sk_buff *skb,
+                  const struct net_device *in,
+                  const struct net_device *out,
+                  const struct nf_loginfo *li,
+                  const char *fmt, ...);
+
 struct nf_log_buf;
 
 struct nf_log_buf *nf_log_buf_open(void);
diff --git a/include/net/netfilter/nf_nat_l3proto.h b/include/net/netfilter/nf_nat_l3proto.h
index 340c013795a4..a3127325f624 100644
--- a/include/net/netfilter/nf_nat_l3proto.h
+++ b/include/net/netfilter/nf_nat_l3proto.h
@@ -44,40 +44,32 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb, struct nf_conn *ct,
                                   unsigned int hooknum);
 
 unsigned int nf_nat_ipv4_in(const struct nf_hook_ops *ops, struct sk_buff *skb,
-                            const struct net_device *in,
-                            const struct net_device *out,
+                            const struct nf_hook_state *state,
                             unsigned int (*do_chain)(const struct nf_hook_ops *ops,
                                                      struct sk_buff *skb,
-                                                     const struct net_device *in,
-                                                     const struct net_device *out,
+                                                     const struct nf_hook_state *state,
                                                      struct nf_conn *ct));
 
 unsigned int nf_nat_ipv4_out(const struct nf_hook_ops *ops, struct sk_buff *skb,
-                             const struct net_device *in,
-                             const struct net_device *out,
+                             const struct nf_hook_state *state,
                              unsigned int (*do_chain)(const struct nf_hook_ops *ops,
                                                       struct sk_buff *skb,
-                                                      const struct net_device *in,
-                                                      const struct net_device *out,
+                                                      const struct nf_hook_state *state,
                                                       struct nf_conn *ct));
 
 unsigned int nf_nat_ipv4_local_fn(const struct nf_hook_ops *ops,
                                   struct sk_buff *skb,
-                                  const struct net_device *in,
-                                  const struct net_device *out,
+                                  const struct nf_hook_state *state,
                                   unsigned int (*do_chain)(const struct nf_hook_ops *ops,
                                                            struct sk_buff *skb,
-                                                           const struct net_device *in,
-                                                           const struct net_device *out,
+                                                           const struct nf_hook_state *state,
                                                            struct nf_conn *ct));
 
 unsigned int nf_nat_ipv4_fn(const struct nf_hook_ops *ops, struct sk_buff *skb,
-                            const struct net_device *in,
-                            const struct net_device *out,
+                            const struct nf_hook_state *state,
                             unsigned int (*do_chain)(const struct nf_hook_ops *ops,
                                                      struct sk_buff *skb,
-                                                     const struct net_device *in,
-                                                     const struct net_device *out,
+                                                     const struct nf_hook_state *state,
                                                      struct nf_conn *ct));
 
 int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, struct nf_conn *ct,
@@ -85,40 +77,32 @@ int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, struct nf_conn *ct,
                                     unsigned int hooknum, unsigned int hdrlen);
 
 unsigned int nf_nat_ipv6_in(const struct nf_hook_ops *ops, struct sk_buff *skb,
-                            const struct net_device *in,
-                            const struct net_device *out,
+                            const struct nf_hook_state *state,
                             unsigned int (*do_chain)(const struct nf_hook_ops *ops,
                                                      struct sk_buff *skb,
-                                                     const struct net_device *in,
-                                                     const struct net_device *out,
+                                                     const struct nf_hook_state *state,
                                                      struct nf_conn *ct));
 
 unsigned int nf_nat_ipv6_out(const struct nf_hook_ops *ops, struct sk_buff *skb,
-                             const struct net_device *in,
-                             const struct net_device *out,
+                             const struct nf_hook_state *state,
                              unsigned int (*do_chain)(const struct nf_hook_ops *ops,
                                                       struct sk_buff *skb,
-                                                      const struct net_device *in,
-                                                      const struct net_device *out,
+                                                      const struct nf_hook_state *state,
                                                       struct nf_conn *ct));
 
 unsigned int nf_nat_ipv6_local_fn(const struct nf_hook_ops *ops,
                                   struct sk_buff *skb,
-                                  const struct net_device *in,
-                                  const struct net_device *out,
+                                  const struct nf_hook_state *state,
                                   unsigned int (*do_chain)(const struct nf_hook_ops *ops,
                                                            struct sk_buff *skb,
-                                                           const struct net_device *in,
-                                                           const struct net_device *out,
+                                                           const struct nf_hook_state *state,
                                                            struct nf_conn *ct));
 
 unsigned int nf_nat_ipv6_fn(const struct nf_hook_ops *ops, struct sk_buff *skb,
-                            const struct net_device *in,
-                            const struct net_device *out,
+                            const struct nf_hook_state *state,
                             unsigned int (*do_chain)(const struct nf_hook_ops *ops,
                                                      struct sk_buff *skb,
-                                                     const struct net_device *in,
-                                                     const struct net_device *out,
+                                                     const struct nf_hook_state *state,
                                                      struct nf_conn *ct));
 
 #endif /* _NF_NAT_L3PROTO_H */
diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
index 84a53d780306..d81d584157e1 100644
--- a/include/net/netfilter/nf_queue.h
+++ b/include/net/netfilter/nf_queue.h
@@ -12,12 +12,8 @@ struct nf_queue_entry {
         unsigned int            id;
 
         struct nf_hook_ops      *elem;
-        u_int8_t                pf;
+        struct nf_hook_state    state;
         u16                     size; /* sizeof(entry) + saved route keys */
-        unsigned int            hook;
-        struct net_device       *indev;
-        struct net_device       *outdev;
-        int                     (*okfn)(struct sk_buff *);
 
         /* extra space to store route keys */
 };
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 9eaaa7884586..e6bcf55dcf20 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -1,6 +1,7 @@
 #ifndef _NET_NF_TABLES_H
 #define _NET_NF_TABLES_H
 
+#include <linux/module.h>
 #include <linux/list.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink.h>
@@ -26,40 +27,53 @@ struct nft_pktinfo {
 static inline void nft_set_pktinfo(struct nft_pktinfo *pkt,
                                    const struct nf_hook_ops *ops,
                                    struct sk_buff *skb,
-                                   const struct net_device *in,
-                                   const struct net_device *out)
+                                   const struct nf_hook_state *state)
 {
         pkt->skb = skb;
-        pkt->in = pkt->xt.in = in;
-        pkt->out = pkt->xt.out = out;
+        pkt->in = pkt->xt.in = state->in;
+        pkt->out = pkt->xt.out = state->out;
         pkt->ops = ops;
         pkt->xt.hooknum = ops->hooknum;
         pkt->xt.family = ops->pf;
 }
 
+/**
+ *      struct nft_verdict - nf_tables verdict
+ *
+ *      @code: nf_tables/netfilter verdict code
+ *      @chain: destination chain for NFT_JUMP/NFT_GOTO
+ */
+struct nft_verdict {
+        u32                             code;
+        struct nft_chain                *chain;
+};
+
 struct nft_data {
         union {
-                u32                             data[4];
-                struct {
-                        u32                     verdict;
-                        struct nft_chain        *chain;
-                };
+                u32                     data[4];
+                struct nft_verdict      verdict;
         };
 } __attribute__((aligned(__alignof__(u64))));
 
-static inline int nft_data_cmp(const struct nft_data *d1,
-                               const struct nft_data *d2,
-                               unsigned int len)
-{
-        return memcmp(d1->data, d2->data, len);
-}
+/**
+ *      struct nft_regs - nf_tables register set
+ *
+ *      @data: data registers
+ *      @verdict: verdict register
+ *
+ *      The first four data registers alias to the verdict register.
+ */
+struct nft_regs {
+        union {
+                u32                     data[20];
+                struct nft_verdict      verdict;
+        };
+};
 
-static inline void nft_data_copy(struct nft_data *dst,
-                                 const struct nft_data *src)
+static inline void nft_data_copy(u32 *dst, const struct nft_data *src,
+                                 unsigned int len)
 {
-        BUILD_BUG_ON(__alignof__(*dst) != __alignof__(u64));
-        *(u64 *)&dst->data[0] = *(u64 *)&src->data[0];
-        *(u64 *)&dst->data[2] = *(u64 *)&src->data[2];
+        memcpy(dst, src, len);
 }
 
 static inline void nft_data_debug(const struct nft_data *data)
@@ -97,7 +111,8 @@ struct nft_data_desc {
         unsigned int                    len;
 };
 
-int nft_data_init(const struct nft_ctx *ctx, struct nft_data *data,
+int nft_data_init(const struct nft_ctx *ctx,
+                  struct nft_data *data, unsigned int size,
                   struct nft_data_desc *desc, const struct nlattr *nla);
 void nft_data_uninit(const struct nft_data *data, enum nft_data_types type);
 int nft_data_dump(struct sk_buff *skb, int attr, const struct nft_data *data,
@@ -113,28 +128,42 @@ static inline enum nft_registers nft_type_to_reg(enum nft_data_types type)
         return type == NFT_DATA_VERDICT ? NFT_REG_VERDICT : NFT_REG_1;
 }
 
-int nft_validate_input_register(enum nft_registers reg);
-int nft_validate_output_register(enum nft_registers reg);
-int nft_validate_data_load(const struct nft_ctx *ctx, enum nft_registers reg,
-                           const struct nft_data *data,
-                           enum nft_data_types type);
+unsigned int nft_parse_register(const struct nlattr *attr);
+int nft_dump_register(struct sk_buff *skb, unsigned int attr, unsigned int reg);
+
+int nft_validate_register_load(enum nft_registers reg, unsigned int len);
+int nft_validate_register_store(const struct nft_ctx *ctx,
+                                enum nft_registers reg,
+                                const struct nft_data *data,
+                                enum nft_data_types type, unsigned int len);
+
+/**
+ *      struct nft_userdata - user defined data associated with an object
+ *
+ *      @len: length of the data
+ *      @data: content
+ *
+ *      The presence of user data is indicated in an object specific fashion,
+ *      so a length of zero can't occur and the value "len" indicates data
+ *      of length len + 1.
+ */
+struct nft_userdata {
+        u8                      len;
+        unsigned char           data[0];
+};
 
 /**
  *      struct nft_set_elem - generic representation of set elements
  *
- *      @cookie: implementation specific element cookie
  *      @key: element key
- *      @data: element data (maps only)
- *      @flags: element flags (end of interval)
- *
- *      The cookie can be used to store a handle to the element for subsequent
- *      removal.
+ *      @priv: element private data and extensions
  */
 struct nft_set_elem {
-        void                    *cookie;
-        struct nft_data         key;
-        struct nft_data         data;
-        u32                     flags;
+        union {
+                u32             buf[NFT_DATA_VALUE_MAXLEN / sizeof(u32)];
+                struct nft_data val;
+        } key;
+        void                    *priv;
 };
 
 struct nft_set;
@@ -186,11 +215,16 @@ struct nft_set_estimate {
         enum nft_set_class      class;
 };
 
+struct nft_set_ext;
+struct nft_expr;
+
 /**
  *      struct nft_set_ops - nf_tables set operations
  *
  *      @lookup: look up an element within the set
  *      @insert: insert new element into set
+ *      @activate: activate new element in the next generation
+ *      @deactivate: deactivate element in the next generation
  *      @remove: remove element from set
  *      @walk: iterate over all set elemeennts
  *      @privsize: function to return size of set private data
@@ -198,16 +232,28 @@ struct nft_set_estimate {
  *      @destroy: destroy private data of set instance
  *      @list: nf_tables_set_ops list node
  *      @owner: module reference
+ *      @elemsize: element private size
  *      @features: features supported by the implementation
  */
 struct nft_set_ops {
         bool                            (*lookup)(const struct nft_set *set,
-                                                  const struct nft_data *key,
-                                                  struct nft_data *data);
-        int                             (*get)(const struct nft_set *set,
-                                               struct nft_set_elem *elem);
+                                                  const u32 *key,
+                                                  const struct nft_set_ext **ext);
+        bool                            (*update)(struct nft_set *set,
+                                                  const u32 *key,
+                                                  void *(*new)(struct nft_set *,
+                                                               const struct nft_expr *,
+                                                               struct nft_regs *),
+                                                  const struct nft_expr *expr,
+                                                  struct nft_regs *regs,
+                                                  const struct nft_set_ext **ext);
+
         int                             (*insert)(const struct nft_set *set,
                                                   const struct nft_set_elem *elem);
+        void                            (*activate)(const struct nft_set *set,
+                                                    const struct nft_set_elem *elem);
+        void *                          (*deactivate)(const struct nft_set *set,
+                                                      const struct nft_set_elem *elem);
         void                            (*remove)(const struct nft_set *set,
                                                   const struct nft_set_elem *elem);
         void                            (*walk)(const struct nft_ctx *ctx,
@@ -225,6 +271,7 @@ struct nft_set_ops {
 
         struct list_head                list;
         struct module                   *owner;
+        unsigned int                    elemsize;
         u32                             features;
 };
 
@@ -241,8 +288,12 @@ void nft_unregister_set(struct nft_set_ops *ops);
  *      @dtype: data type (verdict or numeric type defined by userspace)
  *      @size: maximum set size
  *      @nelems: number of elements
+ *      @ndeact: number of deactivated elements queued for removal
+ *      @timeout: default timeout value in msecs
+ *      @gc_int: garbage collection interval in msecs
  *      @policy: set parameterization (see enum nft_set_policies)
  *      @ops: set ops
+ *      @pnet: network namespace
  *      @flags: set flags
  *      @klen: key length
  *      @dlen: data length
@@ -255,10 +306,14 @@ struct nft_set {
         u32                             ktype;
         u32                             dtype;
         u32                             size;
-        u32                             nelems;
+        atomic_t                        nelems;
+        u32                             ndeact;
+        u64                             timeout;
+        u32                             gc_int;
         u16                             policy;
         /* runtime data below here */
         const struct nft_set_ops        *ops ____cacheline_aligned;
+        possible_net_t                  pnet;
         u16                             flags;
         u8                              klen;
         u8                              dlen;
@@ -271,16 +326,27 @@ static inline void *nft_set_priv(const struct nft_set *set)
         return (void *)set->data;
 }
 
+static inline struct nft_set *nft_set_container_of(const void *priv)
+{
+        return (void *)priv - offsetof(struct nft_set, data);
+}
+
 struct nft_set *nf_tables_set_lookup(const struct nft_table *table,
                                      const struct nlattr *nla);
 struct nft_set *nf_tables_set_lookup_byid(const struct net *net,
                                           const struct nlattr *nla);
 
+static inline unsigned long nft_set_gc_interval(const struct nft_set *set)
+{
+        return set->gc_int ? msecs_to_jiffies(set->gc_int) : HZ;
+}
+
 /**
  *      struct nft_set_binding - nf_tables set binding
  *
  *      @list: set bindings list node
  *      @chain: chain containing the rule bound to the set
+ *      @flags: set action flags
  *
  *      A set binding contains all information necessary for validation
  *      of new elements added to a bound set.
@@ -288,6 +354,7 @@ struct nft_set *nf_tables_set_lookup_byid(const struct net *net,
 struct nft_set_binding {
         struct list_head                list;
         const struct nft_chain          *chain;
+        u32                             flags;
 };
 
 int nf_tables_bind_set(const struct nft_ctx *ctx, struct nft_set *set,
@@ -295,6 +362,215 @@ int nf_tables_bind_set(const struct nft_ctx *ctx, struct nft_set *set,
 void nf_tables_unbind_set(const struct nft_ctx *ctx, struct nft_set *set,
                           struct nft_set_binding *binding);
 
+/**
+ *      enum nft_set_extensions - set extension type IDs
+ *
+ *      @NFT_SET_EXT_KEY: element key
+ *      @NFT_SET_EXT_DATA: mapping data
+ *      @NFT_SET_EXT_FLAGS: element flags
+ *      @NFT_SET_EXT_TIMEOUT: element timeout
+ *      @NFT_SET_EXT_EXPIRATION: element expiration time
+ *      @NFT_SET_EXT_USERDATA: user data associated with the element
+ *      @NFT_SET_EXT_EXPR: expression assiociated with the element
+ *      @NFT_SET_EXT_NUM: number of extension types
+ */
+enum nft_set_extensions {
+        NFT_SET_EXT_KEY,
+        NFT_SET_EXT_DATA,
+        NFT_SET_EXT_FLAGS,
+        NFT_SET_EXT_TIMEOUT,
+        NFT_SET_EXT_EXPIRATION,
+        NFT_SET_EXT_USERDATA,
+        NFT_SET_EXT_EXPR,
+        NFT_SET_EXT_NUM
+};
+
+/**
+ *      struct nft_set_ext_type - set extension type
+ *
+ *      @len: fixed part length of the extension
+ *      @align: alignment requirements of the extension
+ */
+struct nft_set_ext_type {
+        u8      len;
+        u8      align;
+};
+
+extern const struct nft_set_ext_type nft_set_ext_types[];
+
+/**
+ *      struct nft_set_ext_tmpl - set extension template
+ *
+ *      @len: length of extension area
+ *      @offset: offsets of individual extension types
+ */
+struct nft_set_ext_tmpl {
+        u16     len;
+        u8      offset[NFT_SET_EXT_NUM];
+};
+
+/**
+ *      struct nft_set_ext - set extensions
+ *
+ *      @genmask: generation mask
+ *      @offset: offsets of individual extension types
+ *      @data: beginning of extension data
+ */
+struct nft_set_ext {
+        u8      genmask;
+        u8      offset[NFT_SET_EXT_NUM];
+        char    data[0];
+};
+
+static inline void nft_set_ext_prepare(struct nft_set_ext_tmpl *tmpl)
+{
+        memset(tmpl, 0, sizeof(*tmpl));
+        tmpl->len = sizeof(struct nft_set_ext);
+}
+
+static inline void nft_set_ext_add_length(struct nft_set_ext_tmpl *tmpl, u8 id,
+                                          unsigned int len)
+{
+        tmpl->len        = ALIGN(tmpl->len, nft_set_ext_types[id].align);
+        BUG_ON(tmpl->len > U8_MAX);
+        tmpl->offset[id] = tmpl->len;
+        tmpl->len       += nft_set_ext_types[id].len + len;
+}
+
+static inline void nft_set_ext_add(struct nft_set_ext_tmpl *tmpl, u8 id)
+{
+        nft_set_ext_add_length(tmpl, id, 0);
+}
+
+static inline void nft_set_ext_init(struct nft_set_ext *ext,
+                                    const struct nft_set_ext_tmpl *tmpl)
+{
+        memcpy(ext->offset, tmpl->offset, sizeof(ext->offset));
+}
+
+static inline bool __nft_set_ext_exists(const struct nft_set_ext *ext, u8 id)
+{
+        return !!ext->offset[id];
+}
+
+static inline bool nft_set_ext_exists(const struct nft_set_ext *ext, u8 id)
+{
+        return ext && __nft_set_ext_exists(ext, id);
+}
+
+static inline void *nft_set_ext(const struct nft_set_ext *ext, u8 id)
+{
+        return (void *)ext + ext->offset[id];
+}
+
+static inline struct nft_data *nft_set_ext_key(const struct nft_set_ext *ext)
+{
+        return nft_set_ext(ext, NFT_SET_EXT_KEY);
+}
+
+static inline struct nft_data *nft_set_ext_data(const struct nft_set_ext *ext)
+{
+        return nft_set_ext(ext, NFT_SET_EXT_DATA);
+}
+
+static inline u8 *nft_set_ext_flags(const struct nft_set_ext *ext)
+{
+        return nft_set_ext(ext, NFT_SET_EXT_FLAGS);
+}
+
+static inline u64 *nft_set_ext_timeout(const struct nft_set_ext *ext)
+{
+        return nft_set_ext(ext, NFT_SET_EXT_TIMEOUT);
+}
+
+static inline unsigned long *nft_set_ext_expiration(const struct nft_set_ext *ext)
+{
+        return nft_set_ext(ext, NFT_SET_EXT_EXPIRATION);
+}
+
+static inline struct nft_userdata *nft_set_ext_userdata(const struct nft_set_ext *ext)
+{
+        return nft_set_ext(ext, NFT_SET_EXT_USERDATA);
+}
+
+static inline struct nft_expr *nft_set_ext_expr(const struct nft_set_ext *ext)
+{
+        return nft_set_ext(ext, NFT_SET_EXT_EXPR);
+}
+
+static inline bool nft_set_elem_expired(const struct nft_set_ext *ext)
+{
+        return nft_set_ext_exists(ext, NFT_SET_EXT_EXPIRATION) &&
+               time_is_before_eq_jiffies(*nft_set_ext_expiration(ext));
+}
+
+static inline struct nft_set_ext *nft_set_elem_ext(const struct nft_set *set,
+                                                   void *elem)
+{
+        return elem + set->ops->elemsize;
+}
+
+void *nft_set_elem_init(const struct nft_set *set,
+                        const struct nft_set_ext_tmpl *tmpl,
+                        const u32 *key, const u32 *data,
+                        u64 timeout, gfp_t gfp);
+void nft_set_elem_destroy(const struct nft_set *set, void *elem);
+
+/**
+ *      struct nft_set_gc_batch_head - nf_tables set garbage collection batch
+ *
+ *      @rcu: rcu head
+ *      @set: set the elements belong to
+ *      @cnt: count of elements
+ */
+struct nft_set_gc_batch_head {
+        struct rcu_head                 rcu;
+        const struct nft_set            *set;
+        unsigned int                    cnt;
+};
+
+#define NFT_SET_GC_BATCH_SIZE   ((PAGE_SIZE -                             \
+                                  sizeof(struct nft_set_gc_batch_head)) / \
+                                 sizeof(void *))
+
+/**
+ *      struct nft_set_gc_batch - nf_tables set garbage collection batch
+ *
+ *      @head: GC batch head
+ *      @elems: garbage collection elements
+ */
+struct nft_set_gc_batch {
+        struct nft_set_gc_batch_head    head;
+        void                            *elems[NFT_SET_GC_BATCH_SIZE];
+};
+
+struct nft_set_gc_batch *nft_set_gc_batch_alloc(const struct nft_set *set,
+                                                gfp_t gfp);
+void nft_set_gc_batch_release(struct rcu_head *rcu);
+
+static inline void nft_set_gc_batch_complete(struct nft_set_gc_batch *gcb)
+{
+        if (gcb != NULL)
+                call_rcu(&gcb->head.rcu, nft_set_gc_batch_release);
+}
+
+static inline struct nft_set_gc_batch *
+nft_set_gc_batch_check(const struct nft_set *set, struct nft_set_gc_batch *gcb,
+                       gfp_t gfp)
+{
+        if (gcb != NULL) {
+                if (gcb->head.cnt + 1 < ARRAY_SIZE(gcb->elems))
+                        return gcb;
+                nft_set_gc_batch_complete(gcb);
+        }
+        return nft_set_gc_batch_alloc(set, gfp);
+}
+
+static inline void nft_set_gc_batch_add(struct nft_set_gc_batch *gcb,
+                                        void *elem)
+{
+        gcb->elems[gcb->head.cnt++] = elem;
+}
 
 /**
  *      struct nft_expr_type - nf_tables expression type
@@ -307,6 +583,7 @@ void nf_tables_unbind_set(const struct nft_ctx *ctx, struct nft_set *set,
  *      @policy: netlink attribute policy
  *      @maxattr: highest netlink attribute number
  *      @family: address family for AF-specific types
+ *      @flags: expression type flags
  */
 struct nft_expr_type {
         const struct nft_expr_ops       *(*select_ops)(const struct nft_ctx *,
@@ -318,8 +595,11 @@ struct nft_expr_type {
         const struct nla_policy         *policy;
         unsigned int                    maxattr;
         u8                              family;
+        u8                              flags;
 };
 
+#define NFT_EXPR_STATEFUL               0x1
+
 /**
  *      struct nft_expr_ops - nf_tables expression operations
  *
@@ -335,7 +615,7 @@ struct nft_expr_type {
 struct nft_expr;
 struct nft_expr_ops {
         void                            (*eval)(const struct nft_expr *expr,
-                                                struct nft_data data[NFT_REG_MAX + 1],
+                                                struct nft_regs *regs,
                                                 const struct nft_pktinfo *pkt);
         unsigned int                    size;
 
@@ -373,6 +653,18 @@ static inline void *nft_expr_priv(const struct nft_expr *expr)
         return (void *)expr->data;
 }
 
+struct nft_expr *nft_expr_init(const struct nft_ctx *ctx,
+                               const struct nlattr *nla);
+void nft_expr_destroy(const struct nft_ctx *ctx, struct nft_expr *expr);
+int nft_expr_dump(struct sk_buff *skb, unsigned int attr,
+                  const struct nft_expr *expr);
+
+static inline void nft_expr_clone(struct nft_expr *dst, struct nft_expr *src)
+{
+        __module_get(src->ops->type->owner);
+        memcpy(dst, src, src->ops->size);
+}
+
 /**
  *      struct nft_rule - nf_tables rule
  *
@@ -380,7 +672,7 @@ static inline void *nft_expr_priv(const struct nft_expr *expr)
  *      @handle: rule handle
  *      @genmask: generation mask
  *      @dlen: length of expression data
- *      @ulen: length of user data (used for comments)
+ *      @udata: user data is appended to the rule
  *      @data: expression data
  */
 struct nft_rule {
@@ -388,79 +680,11 @@ struct nft_rule {
         u64                             handle:42,
                                         genmask:2,
                                         dlen:12,
-                                        ulen:8;
+                                        udata:1;
         unsigned char                   data[]
                 __attribute__((aligned(__alignof__(struct nft_expr))));
 };
 
-/**
- *      struct nft_trans - nf_tables object update in transaction
- *
- *      @list: used internally
- *      @msg_type: message type
- *      @ctx: transaction context
- *      @data: internal information related to the transaction
- */
-struct nft_trans {
-        struct list_head                list;
-        int                             msg_type;
-        struct nft_ctx                  ctx;
-        char                            data[0];
-};
-
-struct nft_trans_rule {
-        struct nft_rule                 *rule;
-};
-
-#define nft_trans_rule(trans)   \
-        (((struct nft_trans_rule *)trans->data)->rule)
-
-struct nft_trans_set {
-        struct nft_set  *set;
-        u32             set_id;
-};
-
-#define nft_trans_set(trans)    \
-        (((struct nft_trans_set *)trans->data)->set)
-#define nft_trans_set_id(trans) \
-        (((struct nft_trans_set *)trans->data)->set_id)
-
-struct nft_trans_chain {
-        bool            update;
-        char            name[NFT_CHAIN_MAXNAMELEN];
-        struct nft_stats __percpu *stats;
-        u8              policy;
-};
-
-#define nft_trans_chain_update(trans)   \
-        (((struct nft_trans_chain *)trans->data)->update)
-#define nft_trans_chain_name(trans)     \
-        (((struct nft_trans_chain *)trans->data)->name)
-#define nft_trans_chain_stats(trans)    \
-        (((struct nft_trans_chain *)trans->data)->stats)
-#define nft_trans_chain_policy(trans)   \
-        (((struct nft_trans_chain *)trans->data)->policy)
-
-struct nft_trans_table {
-        bool            update;
-        bool            enable;
-};
-
-#define nft_trans_table_update(trans)   \
-        (((struct nft_trans_table *)trans->data)->update)
-#define nft_trans_table_enable(trans)   \
-        (((struct nft_trans_table *)trans->data)->enable)
-
-struct nft_trans_elem {
-        struct nft_set          *set;
-        struct nft_set_elem     elem;
-};
-
-#define nft_trans_elem_set(trans)       \
-        (((struct nft_trans_elem *)trans->data)->set)
-#define nft_trans_elem(trans)   \
-        (((struct nft_trans_elem *)trans->data)->elem)
-
 static inline struct nft_expr *nft_expr_first(const struct nft_rule *rule)
 {
         return (struct nft_expr *)&rule->data[0];
@@ -476,7 +700,7 @@ static inline struct nft_expr *nft_expr_last(const struct nft_rule *rule)
         return (struct nft_expr *)&rule->data[rule->dlen];
 }
 
-static inline void *nft_userdata(const struct nft_rule *rule)
+static inline struct nft_userdata *nft_userdata(const struct nft_rule *rule)
 {
         return (void *)&rule->data[rule->dlen];
 }
@@ -501,7 +725,6 @@ enum nft_chain_flags {
  *
  *      @rules: list of rules in the chain
  *      @list: used internally
- *      @net: net namespace that this chain belongs to
  *      @table: table that this chain belongs to
  *      @handle: chain handle
  *      @use: number of jump references to this chain
@@ -512,7 +735,6 @@ enum nft_chain_flags {
 struct nft_chain {
         struct list_head                rules;
         struct list_head                list;
-        struct net                      *net;
         struct nft_table                *table;
         u64                             handle;
         u32                             use;
@@ -528,6 +750,25 @@ enum nft_chain_type {
         NFT_CHAIN_T_MAX
 };
 
+/**
+ *      struct nf_chain_type - nf_tables chain type info
+ *
+ *      @name: name of the type
+ *      @type: numeric identifier
+ *      @family: address family
+ *      @owner: module owner
+ *      @hook_mask: mask of valid hooks
+ *      @hooks: hookfn overrides
+ */
+struct nf_chain_type {
+        const char                      *name;
+        enum nft_chain_type             type;
+        int                             family;
+        struct module                   *owner;
+        unsigned int                    hook_mask;
+        nf_hookfn                       *hooks[NF_MAX_HOOKS];
+};
+
 int nft_chain_validate_dependency(const struct nft_chain *chain,
                                   enum nft_chain_type type);
 int nft_chain_validate_hooks(const struct nft_chain *chain,
@@ -545,6 +786,7 @@ struct nft_stats {
  *      struct nft_base_chain - nf_tables base chain
  *
  *      @ops: netfilter hook ops
+ *      @pnet: net namespace that this chain belongs to
  *      @type: chain type
  *      @policy: default policy
  *      @stats: per-cpu chain stats
@@ -552,6 +794,7 @@ struct nft_stats {
  */
 struct nft_base_chain {
         struct nf_hook_ops              ops[NFT_HOOK_OPS_MAX];
+        possible_net_t                  pnet;
         const struct nf_chain_type      *type;
         u8                              policy;
         struct nft_stats __percpu       *stats;
@@ -584,7 +827,7 @@ struct nft_table {
         u64                             hgenerator;
         u32                             use;
         u16                             flags;
-        char                            name[];
+        char                            name[NFT_TABLE_MAXNAMELEN];
 };
 
 /**
@@ -614,25 +857,6 @@ struct nft_af_info {
 int nft_register_afinfo(struct net *, struct nft_af_info *);
 void nft_unregister_afinfo(struct nft_af_info *);
 
-/**
- *      struct nf_chain_type - nf_tables chain type info
- *
- *      @name: name of the type
- *      @type: numeric identifier
- *      @family: address family
- *      @owner: module owner
- *      @hook_mask: mask of valid hooks
- *      @hooks: hookfn overrides
- */
-struct nf_chain_type {
-        const char                      *name;
-        enum nft_chain_type             type;
-        int                             family;
-        struct module                   *owner;
-        unsigned int                    hook_mask;
-        nf_hookfn                       *hooks[NF_MAX_HOOKS];
-};
-
 int nft_register_chain_type(const struct nf_chain_type *);
 void nft_unregister_chain_type(const struct nf_chain_type *);
 
@@ -657,4 +881,153 @@ void nft_unregister_expr(struct nft_expr_type *);
 #define MODULE_ALIAS_NFT_SET() \
         MODULE_ALIAS("nft-set")
 
+/*
+ * The gencursor defines two generations, the currently active and the
+ * next one. Objects contain a bitmask of 2 bits specifying the generations
+ * they're active in. A set bit means they're inactive in the generation
+ * represented by that bit.
+ *
+ * New objects start out as inactive in the current and active in the
+ * next generation. When committing the ruleset the bitmask is cleared,
+ * meaning they're active in all generations. When removing an object,
+ * it is set inactive in the next generation. After committing the ruleset,
+ * the objects are removed.
+ */
+static inline unsigned int nft_gencursor_next(const struct net *net)
+{
+        return net->nft.gencursor + 1 == 1 ? 1 : 0;
+}
+
+static inline u8 nft_genmask_next(const struct net *net)
+{
+        return 1 << nft_gencursor_next(net);
+}
+
+static inline u8 nft_genmask_cur(const struct net *net)
+{
+        /* Use ACCESS_ONCE() to prevent refetching the value for atomicity */
+        return 1 << ACCESS_ONCE(net->nft.gencursor);
+}
+
+#define NFT_GENMASK_ANY         ((1 << 0) | (1 << 1))
+
+/*
+ * Set element transaction helpers
+ */
+
+static inline bool nft_set_elem_active(const struct nft_set_ext *ext,
+                                       u8 genmask)
+{
+        return !(ext->genmask & genmask);
+}
+
+static inline void nft_set_elem_change_active(const struct nft_set *set,
+                                              struct nft_set_ext *ext)
+{
+        ext->genmask ^= nft_genmask_next(read_pnet(&set->pnet));
+}
+
+/*
+ * We use a free bit in the genmask field to indicate the element
+ * is busy, meaning it is currently being processed either by
+ * the netlink API or GC.
+ *
+ * Even though the genmask is only a single byte wide, this works
+ * because the extension structure if fully constant once initialized,
+ * so there are no non-atomic write accesses unless it is already
+ * marked busy.
+ */
+#define NFT_SET_ELEM_BUSY_MASK  (1 << 2)
+
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+#define NFT_SET_ELEM_BUSY_BIT   2
+#elif defined(__BIG_ENDIAN_BITFIELD)
+#define NFT_SET_ELEM_BUSY_BIT   (BITS_PER_LONG - BITS_PER_BYTE + 2)
+#else
+#error
+#endif
+
+static inline int nft_set_elem_mark_busy(struct nft_set_ext *ext)
+{
+        unsigned long *word = (unsigned long *)ext;
+
+        BUILD_BUG_ON(offsetof(struct nft_set_ext, genmask) != 0);
+        return test_and_set_bit(NFT_SET_ELEM_BUSY_BIT, word);
+}
+
+static inline void nft_set_elem_clear_busy(struct nft_set_ext *ext)
+{
+        unsigned long *word = (unsigned long *)ext;
+
+        clear_bit(NFT_SET_ELEM_BUSY_BIT, word);
+}
+
+/**
+ *      struct nft_trans - nf_tables object update in transaction
+ *
+ *      @list: used internally
+ *      @msg_type: message type
+ *      @ctx: transaction context
+ *      @data: internal information related to the transaction
+ */
+struct nft_trans {
+        struct list_head                list;
+        int                             msg_type;
+        struct nft_ctx                  ctx;
+        char                            data[0];
+};
+
+struct nft_trans_rule {
+        struct nft_rule                 *rule;
+};
+
+#define nft_trans_rule(trans)   \
+        (((struct nft_trans_rule *)trans->data)->rule)
+
+struct nft_trans_set {
+        struct nft_set                  *set;
+        u32                             set_id;
+};
+
+#define nft_trans_set(trans)    \
+        (((struct nft_trans_set *)trans->data)->set)
+#define nft_trans_set_id(trans) \
+        (((struct nft_trans_set *)trans->data)->set_id)
+
+struct nft_trans_chain {
+        bool                            update;
+        char                            name[NFT_CHAIN_MAXNAMELEN];
+        struct nft_stats __percpu       *stats;
+        u8                              policy;
+};
+
+#define nft_trans_chain_update(trans)   \
+        (((struct nft_trans_chain *)trans->data)->update)
+#define nft_trans_chain_name(trans)     \
+        (((struct nft_trans_chain *)trans->data)->name)
+#define nft_trans_chain_stats(trans)    \
+        (((struct nft_trans_chain *)trans->data)->stats)
+#define nft_trans_chain_policy(trans)   \
+        (((struct nft_trans_chain *)trans->data)->policy)
+
+struct nft_trans_table {
+        bool                            update;
+        bool                            enable;
+};
+
+#define nft_trans_table_update(trans)   \
+        (((struct nft_trans_table *)trans->data)->update)
+#define nft_trans_table_enable(trans)   \
+        (((struct nft_trans_table *)trans->data)->enable)
+
+struct nft_trans_elem {
+        struct nft_set                  *set;
+        struct nft_set_elem             elem;
+};
+
+#define nft_trans_elem_set(trans)       \
+        (((struct nft_trans_elem *)trans->data)->set)
+#define nft_trans_elem(trans)   \
+        (((struct nft_trans_elem *)trans->data)->elem)
+
 #endif /* _NET_NF_TABLES_H */
diff --git a/include/net/netfilter/nf_tables_core.h b/include/net/netfilter/nf_tables_core.h
index a75fc8e27cd6..c6f400cfaac8 100644
--- a/include/net/netfilter/nf_tables_core.h
+++ b/include/net/netfilter/nf_tables_core.h
@@ -31,6 +31,9 @@ void nft_cmp_module_exit(void);
 int nft_lookup_module_init(void);
 void nft_lookup_module_exit(void);
 
+int nft_dynset_module_init(void);
+void nft_dynset_module_exit(void);
+
 int nft_bitwise_module_init(void);
 void nft_bitwise_module_exit(void);
 
diff --git a/include/net/netfilter/nf_tables_ipv4.h b/include/net/netfilter/nf_tables_ipv4.h
index cba143fbd2e4..2df7f96902ee 100644
--- a/include/net/netfilter/nf_tables_ipv4.h
+++ b/include/net/netfilter/nf_tables_ipv4.h
@@ -8,12 +8,11 @@ static inline void
 nft_set_pktinfo_ipv4(struct nft_pktinfo *pkt,
                      const struct nf_hook_ops *ops,
                      struct sk_buff *skb,
-                     const struct net_device *in,
-                     const struct net_device *out)
+                     const struct nf_hook_state *state)
 {
         struct iphdr *ip;
 
-        nft_set_pktinfo(pkt, ops, skb, in, out);
+        nft_set_pktinfo(pkt, ops, skb, state);
 
         ip = ip_hdr(pkt->skb);
         pkt->tprot = ip->protocol;
diff --git a/include/net/netfilter/nf_tables_ipv6.h b/include/net/netfilter/nf_tables_ipv6.h
index 74d976137658..97db2e3a5e65 100644
--- a/include/net/netfilter/nf_tables_ipv6.h
+++ b/include/net/netfilter/nf_tables_ipv6.h
@@ -8,13 +8,12 @@ static inline int
 nft_set_pktinfo_ipv6(struct nft_pktinfo *pkt,
                      const struct nf_hook_ops *ops,
                      struct sk_buff *skb,
-                     const struct net_device *in,
-                     const struct net_device *out)
+                     const struct nf_hook_state *state)
 {
         int protohdr, thoff = 0;
         unsigned short frag_off;
 
-        nft_set_pktinfo(pkt, ops, skb, in, out);
+        nft_set_pktinfo(pkt, ops, skb, state);
 
         protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, NULL);
         /* If malformed, drop it */
diff --git a/include/net/netfilter/nft_meta.h b/include/net/netfilter/nft_meta.h
index 0ee47c3e2e31..711887a09e91 100644
--- a/include/net/netfilter/nft_meta.h
+++ b/include/net/netfilter/nft_meta.h
@@ -26,11 +26,11 @@ int nft_meta_set_dump(struct sk_buff *skb,
                       const struct nft_expr *expr);
 
 void nft_meta_get_eval(const struct nft_expr *expr,
-                       struct nft_data data[NFT_REG_MAX + 1],
+                       struct nft_regs *regs,
                        const struct nft_pktinfo *pkt);
 
 void nft_meta_set_eval(const struct nft_expr *expr,
-                       struct nft_data data[NFT_REG_MAX + 1],
+                       struct nft_regs *regs,
                        const struct nft_pktinfo *pkt);
 
 #endif
diff --git a/include/net/netlink.h b/include/net/netlink.h
index e010ee8da41d..2a5dbcc90d1c 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -4,6 +4,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 #include <linux/jiffies.h>
+#include <linux/in6.h>
 
 /* ========================================================================
  *         Netlink Messages and Attributes Interface (As Seen On TV)
@@ -105,6 +106,8 @@
  *   nla_put_string(skb, type, str)     add string attribute to skb
  *   nla_put_flag(skb, type)            add flag attribute to skb
  *   nla_put_msecs(skb, type, jiffies)  add msecs attribute to skb
+ *   nla_put_in_addr(skb, type, addr)   add IPv4 address attribute to skb
+ *   nla_put_in6_addr(skb, type, addr)  add IPv6 address attribute to skb
  *
  * Nested Attributes Construction:
  *   nla_nest_start(skb, type)          start a nested attribute
@@ -957,6 +960,32 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
 }
 
 /**
+ * nla_put_in_addr - Add an IPv4 address netlink attribute to a socket
+ * buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @addr: IPv4 address
+ */
+static inline int nla_put_in_addr(struct sk_buff *skb, int attrtype,
+                                  __be32 addr)
+{
+        return nla_put_be32(skb, attrtype, addr);
+}
+
+/**
+ * nla_put_in6_addr - Add an IPv6 address netlink attribute to a socket
+ * buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @addr: IPv6 address
+ */
+static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype,
+                                   const struct in6_addr *addr)
+{
+        return nla_put(skb, attrtype, sizeof(*addr), addr);
+}
+
+/**
  * nla_get_u32 - return payload of u32 attribute
  * @nla: u32 netlink attribute
  */
@@ -1099,6 +1128,27 @@ static inline unsigned long nla_get_msecs(const struct nlattr *nla)
 }
 
 /**
+ * nla_get_in_addr - return payload of IPv4 address attribute
+ * @nla: IPv4 address netlink attribute
+ */
+static inline __be32 nla_get_in_addr(const struct nlattr *nla)
+{
+        return *(__be32 *) nla_data(nla);
+}
+
+/**
+ * nla_get_in6_addr - return payload of IPv6 address attribute
+ * @nla: IPv6 address netlink attribute
+ */
+static inline struct in6_addr nla_get_in6_addr(const struct nlattr *nla)
+{
+        struct in6_addr tmp;
+
+        nla_memcpy(&tmp, nla, sizeof(tmp));
+        return tmp;
+}
+
+/**
  * nla_nest_start - Start a new level of nested attributes
  * @skb: socket buffer to add attributes to
  * @attrtype: attribute type of container
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index 0931618c0f7f..70e158551704 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -38,11 +38,9 @@ static inline void *net_generic(const struct net *net, int id)
 
         rcu_read_lock();
         ng = rcu_dereference(net->gen);
-        BUG_ON(id == 0 || id > ng->len);
         ptr = ng->ptr[id - 1];
         rcu_read_unlock();
 
-        BUG_ON(!ptr);
         return ptr;
 }
 #endif
diff --git a/include/net/netns/hash.h b/include/net/netns/hash.h
index c06ac58ca107..69a6715d9f3f 100644
--- a/include/net/netns/hash.h
+++ b/include/net/netns/hash.h
@@ -5,7 +5,7 @@
 
 struct net;
 
-static inline unsigned int net_hash_mix(struct net *net)
+static inline u32 net_hash_mix(const struct net *net)
 {
 #ifdef CONFIG_NET_NS
         /*
@@ -13,7 +13,7 @@ static inline unsigned int net_hash_mix(struct net *net)
          * always zeroed
          */
 
-        return (unsigned)(((unsigned long)net) >> L1_CACHE_SHIFT);
+        return (u32)(((unsigned long)net) >> L1_CACHE_SHIFT);
 #else
         return 0;
 #endif
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index dbe225478adb..614a49be68a9 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -7,6 +7,7 @@
 
 #include <linux/uidgid.h>
 #include <net/inet_frag.h>
+#include <linux/rcupdate.h>
 
 struct tcpm_hash_bucket;
 struct ctl_table_header;
@@ -38,21 +39,21 @@ struct netns_ipv4 {
 #ifdef CONFIG_IP_MULTIPLE_TABLES
         struct fib_rules_ops    *rules_ops;
         bool                    fib_has_custom_rules;
-        struct fib_table        *fib_local;
-        struct fib_table        *fib_main;
-        struct fib_table        *fib_default;
+        struct fib_table __rcu  *fib_local;
+        struct fib_table __rcu  *fib_main;
+        struct fib_table __rcu  *fib_default;
 #endif
 #ifdef CONFIG_IP_ROUTE_CLASSID
         int                     fib_num_tclassid_users;
 #endif
         struct hlist_head       *fib_table_hash;
+        bool                    fib_offload_disabled;
         struct sock             *fibnl;
 
         struct sock  * __percpu *icmp_sk;
+        struct sock             *mc_autojoin_sk;
 
         struct inet_peer_base   *peers;
-        struct tcpm_hash_bucket *tcp_metrics_hash;
-        unsigned int            tcp_metrics_hash_log;
         struct sock  * __percpu *tcp_sk;
         struct netns_frags      frags;
 #ifdef CONFIG_NETFILTER
@@ -84,6 +85,8 @@ struct netns_ipv4 {
         int sysctl_tcp_fwmark_accept;
         int sysctl_tcp_mtu_probing;
         int sysctl_tcp_base_mss;
+        int sysctl_tcp_probe_threshold;
+        u32 sysctl_tcp_probe_interval;
 
         struct ping_group_range ping_group_range;
 
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 69ae41f2098c..d2527bf81142 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -32,6 +32,8 @@ struct netns_sysctl_ipv6 {
         int icmpv6_time;
         int anycast_src_echo_reply;
         int fwmark_reflect;
+        int idgen_retries;
+        int idgen_delay;
 };
 
 struct netns_ipv6 {
@@ -67,6 +69,7 @@ struct netns_ipv6 {
         struct sock             *ndisc_sk;
         struct sock             *tcp_sk;
         struct sock             *igmp_sk;
+        struct sock             *mc_autojoin_sk;
 #ifdef CONFIG_IPV6_MROUTE
 #ifndef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES
         struct mr6_table        *mrt6;
diff --git a/include/net/netns/mpls.h b/include/net/netns/mpls.h
new file mode 100644
index 000000000000..d29203651c01
--- /dev/null
+++ b/include/net/netns/mpls.h
@@ -0,0 +1,17 @@
+/*
+ * mpls in net namespaces
+ */
+
+#ifndef __NETNS_MPLS_H__
+#define __NETNS_MPLS_H__
+
+struct mpls_route;
+struct ctl_table_header;
+
+struct netns_mpls {
+        size_t platform_labels;
+        struct mpls_route __rcu * __rcu *platform_label;
+        struct ctl_table_header *ctl;
+};
+
+#endif /* __NETNS_MPLS_H__ */
diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h
index c24060ee411e..4d6597ad6067 100644
--- a/include/net/netns/x_tables.h
+++ b/include/net/netns/x_tables.h
@@ -9,6 +9,7 @@ struct ebt_table;
 struct netns_xt {
         struct list_head tables[NFPROTO_NUMPROTO];
         bool notrack_deprecated_warning;
+        bool clusterip_deprecated_warning;
 #if defined(CONFIG_BRIDGE_NF_EBTABLES) || \
     defined(CONFIG_BRIDGE_NF_EBTABLES_MODULE)
         struct ebt_table *broute_table;
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
index ab672b537dd4..020a814bc8ed 100644
--- a/include/net/nfc/hci.h
+++ b/include/net/nfc/hci.h
@@ -83,6 +83,10 @@ struct nfc_hci_pipe {
 };
 
 #define NFC_HCI_MAX_CUSTOM_GATES        50
+/*
+ * According to specification 102 622 chapter 4.4 Pipes,
+ * the pipe identifier is 7 bits long.
+ */
 #define NFC_HCI_MAX_PIPES               127
 struct nfc_hci_init_data {
         u8 gate_count;
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index ff87f8611fa3..d4dcc7199fd7 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -71,6 +71,7 @@ struct nci_ops {
         int   (*close)(struct nci_dev *ndev);
         int   (*send)(struct nci_dev *ndev, struct sk_buff *skb);
         int   (*setup)(struct nci_dev *ndev);
+        int   (*fw_download)(struct nci_dev *ndev, const char *firmware_name);
         __u32 (*get_rfprotocol)(struct nci_dev *ndev, __u8 rf_protocol);
         int   (*discover_se)(struct nci_dev *ndev);
         int   (*disable_se)(struct nci_dev *ndev, u32 se_idx);
@@ -137,6 +138,10 @@ struct nci_conn_info {
 #define NCI_HCI_INVALID_HOST               0x80
 
 #define NCI_HCI_MAX_CUSTOM_GATES   50
+/*
+ * According to specification 102 622 chapter 4.4 Pipes,
+ * the pipe identifier is 7 bits long.
+ */
 #define NCI_HCI_MAX_PIPES          127
 
 struct nci_hci_gate {
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index 73190e65d5c1..7ac029c07546 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -157,7 +157,7 @@ struct nfc_evt_transaction {
         u32 aid_len;
         u8 aid[NFC_MAX_AID_LENGTH];
         u8 params_len;
-        u8 params[NFC_MAX_PARAMS_LENGTH];
+        u8 params[0];
 } __packed;
 
 struct nfc_genl_data {
diff --git a/include/net/ping.h b/include/net/ping.h
index cc16d413f681..ac80cb45e630 100644
--- a/include/net/ping.h
+++ b/include/net/ping.h
@@ -75,12 +75,11 @@ void ping_err(struct sk_buff *skb, int offset, u32 info);
 int  ping_getfrag(void *from, char *to, int offset, int fraglen, int odd,
                   struct sk_buff *);
 
-int  ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                  size_t len, int noblock, int flags, int *addr_len);
+int  ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
+                  int flags, int *addr_len);
 int  ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
                          void *user_icmph, size_t icmph_len);
-int  ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                     size_t len);
+int  ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len);
 int  ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
 bool ping_rcv(struct sk_buff *skb);
 
diff --git a/include/net/request_sock.h b/include/net/request_sock.h
index 7f830ff67f08..fe41f3ceb008 100644
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -39,8 +39,7 @@ struct request_sock_ops {
         void            (*send_reset)(struct sock *sk,
                                       struct sk_buff *skb);
         void            (*destructor)(struct request_sock *req);
-        void            (*syn_ack_timeout)(struct sock *sk,
-                                           struct request_sock *req);
+        void            (*syn_ack_timeout)(const struct request_sock *req);
 };
 
 int inet_rtx_syn_ack(struct sock *parent, struct request_sock *req);
@@ -49,7 +48,11 @@ int inet_rtx_syn_ack(struct sock *parent, struct request_sock *req);
  */
 struct request_sock {
         struct sock_common              __req_common;
+#define rsk_refcnt                      __req_common.skc_refcnt
+#define rsk_hash                        __req_common.skc_hash
+
         struct request_sock             *dl_next;
+        struct sock                     *rsk_listener;
         u16                             mss;
         u8                              num_retrans; /* number of retransmits */
         u8                              cookie_ts:1; /* syncookie: encode tcpopts in timestamp */
@@ -58,32 +61,56 @@ struct request_sock {
         u32                             window_clamp; /* window clamp at creation time */
         u32                             rcv_wnd;          /* rcv_wnd offered first time */
         u32                             ts_recent;
-        unsigned long                   expires;
+        struct timer_list               rsk_timer;
         const struct request_sock_ops   *rsk_ops;
         struct sock                     *sk;
         u32                             secid;
         u32                             peer_secid;
 };
 
-static inline struct request_sock *reqsk_alloc(const struct request_sock_ops *ops)
+static inline struct request_sock *
+reqsk_alloc(const struct request_sock_ops *ops, struct sock *sk_listener)
 {
         struct request_sock *req = kmem_cache_alloc(ops->slab, GFP_ATOMIC);
 
-        if (req != NULL)
+        if (req) {
                 req->rsk_ops = ops;
-
+                sock_hold(sk_listener);
+                req->rsk_listener = sk_listener;
+
+                /* Following is temporary. It is coupled with debugging
+                 * helpers in reqsk_put() & reqsk_free()
+                 */
+                atomic_set(&req->rsk_refcnt, 0);
+        }
         return req;
 }
 
-static inline void __reqsk_free(struct request_sock *req)
+static inline struct request_sock *inet_reqsk(struct sock *sk)
 {
-        kmem_cache_free(req->rsk_ops->slab, req);
+        return (struct request_sock *)sk;
+}
+
+static inline struct sock *req_to_sk(struct request_sock *req)
+{
+        return (struct sock *)req;
 }
 
 static inline void reqsk_free(struct request_sock *req)
 {
+        /* temporary debugging */
+        WARN_ON_ONCE(atomic_read(&req->rsk_refcnt) != 0);
+
         req->rsk_ops->destructor(req);
-        __reqsk_free(req);
+        if (req->rsk_listener)
+                sock_put(req->rsk_listener);
+        kmem_cache_free(req->rsk_ops->slab, req);
+}
+
+static inline void reqsk_put(struct request_sock *req)
+{
+        if (atomic_dec_and_test(&req->rsk_refcnt))
+                reqsk_free(req);
 }
 
 extern int sysctl_max_syn_backlog;
@@ -93,12 +120,16 @@ extern int sysctl_max_syn_backlog;
  * @max_qlen_log - log_2 of maximal queued SYNs/REQUESTs
  */
 struct listen_sock {
-        u8                      max_qlen_log;
+        int                     qlen_inc; /* protected by listener lock */
+        int                     young_inc;/* protected by listener lock */
+
+        /* following fields can be updated by timer */
+        atomic_t                qlen_dec; /* qlen = qlen_inc - qlen_dec */
+        atomic_t                young_dec;
+
+        u8                      max_qlen_log ____cacheline_aligned_in_smp;
         u8                      synflood_warned;
         /* 2 bytes hole, try to use */
-        int                     qlen;
-        int                     qlen_young;
-        int                     clock_hand;
         u32                     hash_rnd;
         u32                     nr_table_entries;
         struct request_sock     *syn_table[0];
@@ -142,18 +173,11 @@ struct fastopen_queue {
  * %syn_wait_lock is necessary only to avoid proc interface having to grab the main
  * lock sock while browsing the listening hash (otherwise it's deadlock prone).
  *
- * This lock is acquired in read mode only from listening_get_next() seq_file
- * op and it's acquired in write mode _only_ from code that is actively
- * changing rskq_accept_head. All readers that are holding the master sock lock
- * don't need to grab this lock in read mode too as rskq_accept_head. writes
- * are always protected from the main sock lock.
  */
 struct request_sock_queue {
         struct request_sock     *rskq_accept_head;
         struct request_sock     *rskq_accept_tail;
-        rwlock_t                syn_wait_lock;
         u8                      rskq_defer_accept;
-        /* 3 bytes hole, try to pack */
         struct listen_sock      *listen_opt;
         struct fastopen_queue   *fastopenq; /* This is non-NULL iff TFO has been
                                              * enabled on this listener. Check
@@ -161,6 +185,9 @@ struct request_sock_queue {
                                              * to determine if TFO is enabled
                                              * right at this moment.
                                              */
+
+        /* temporary alignment, our goal is to get rid of this lock */
+        spinlock_t              syn_wait_lock ____cacheline_aligned_in_smp;
 };
 
 int reqsk_queue_alloc(struct request_sock_queue *queue,
@@ -186,12 +213,21 @@ static inline int reqsk_queue_empty(struct request_sock_queue *queue)
 }
 
 static inline void reqsk_queue_unlink(struct request_sock_queue *queue,
-                                      struct request_sock *req,
-                                      struct request_sock **prev_req)
+                                      struct request_sock *req)
 {
-        write_lock(&queue->syn_wait_lock);
-        *prev_req = req->dl_next;
-        write_unlock(&queue->syn_wait_lock);
+        struct listen_sock *lopt = queue->listen_opt;
+        struct request_sock **prev;
+
+        spin_lock(&queue->syn_wait_lock);
+
+        prev = &lopt->syn_table[req->rsk_hash];
+        while (*prev != req)
+                prev = &(*prev)->dl_next;
+        *prev = req->dl_next;
+
+        spin_unlock(&queue->syn_wait_lock);
+        if (del_timer(&req->rsk_timer))
+                reqsk_put(req);
 }
 
 static inline void reqsk_queue_add(struct request_sock_queue *queue,
@@ -224,57 +260,53 @@ static inline struct request_sock *reqsk_queue_remove(struct request_sock_queue
         return req;
 }
 
-static inline int reqsk_queue_removed(struct request_sock_queue *queue,
-                                      struct request_sock *req)
+static inline void reqsk_queue_removed(struct request_sock_queue *queue,
+                                       const struct request_sock *req)
 {
         struct listen_sock *lopt = queue->listen_opt;
 
         if (req->num_timeout == 0)
-                --lopt->qlen_young;
-
-        return --lopt->qlen;
+                atomic_inc(&lopt->young_dec);
+        atomic_inc(&lopt->qlen_dec);
 }
 
-static inline int reqsk_queue_added(struct request_sock_queue *queue)
+static inline void reqsk_queue_added(struct request_sock_queue *queue)
 {
         struct listen_sock *lopt = queue->listen_opt;
-        const int prev_qlen = lopt->qlen;
 
-        lopt->qlen_young++;
-        lopt->qlen++;
-        return prev_qlen;
+        lopt->young_inc++;
+        lopt->qlen_inc++;
 }
 
-static inline int reqsk_queue_len(const struct request_sock_queue *queue)
+static inline int listen_sock_qlen(const struct listen_sock *lopt)
 {
-        return queue->listen_opt != NULL ? queue->listen_opt->qlen : 0;
+        return lopt->qlen_inc - atomic_read(&lopt->qlen_dec);
 }
 
-static inline int reqsk_queue_len_young(const struct request_sock_queue *queue)
+static inline int listen_sock_young(const struct listen_sock *lopt)
 {
-        return queue->listen_opt->qlen_young;
+        return lopt->young_inc - atomic_read(&lopt->young_dec);
 }
 
-static inline int reqsk_queue_is_full(const struct request_sock_queue *queue)
+static inline int reqsk_queue_len(const struct request_sock_queue *queue)
 {
-        return queue->listen_opt->qlen >> queue->listen_opt->max_qlen_log;
+        const struct listen_sock *lopt = queue->listen_opt;
+
+        return lopt ? listen_sock_qlen(lopt) : 0;
 }
 
-static inline void reqsk_queue_hash_req(struct request_sock_queue *queue,
-                                        u32 hash, struct request_sock *req,
-                                        unsigned long timeout)
+static inline int reqsk_queue_len_young(const struct request_sock_queue *queue)
 {
-        struct listen_sock *lopt = queue->listen_opt;
-
-        req->expires = jiffies + timeout;
-        req->num_retrans = 0;
-        req->num_timeout = 0;
-        req->sk = NULL;
-        req->dl_next = lopt->syn_table[hash];
+        return listen_sock_young(queue->listen_opt);
+}
 
-        write_lock(&queue->syn_wait_lock);
-        lopt->syn_table[hash] = req;
-        write_unlock(&queue->syn_wait_lock);
+static inline int reqsk_queue_is_full(const struct request_sock_queue *queue)
+{
+        return reqsk_queue_len(queue) >> queue->listen_opt->max_qlen_log;
 }
 
+void reqsk_queue_hash_req(struct request_sock_queue *queue,
+                          u32 hash, struct request_sock *req,
+                          unsigned long timeout);
+
 #endif /* _REQUEST_SOCK_H */
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index 6c6d5393fc34..343d922d15c2 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -137,7 +137,7 @@ void rtnl_af_register(struct rtnl_af_ops *ops);
 void rtnl_af_unregister(struct rtnl_af_ops *ops);
 
 struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]);
-struct net_device *rtnl_create_link(struct net *net, char *ifname,
+struct net_device *rtnl_create_link(struct net *net, const char *ifname,
                                     unsigned char name_assign_type,
                                     const struct rtnl_link_ops *ops,
                                     struct nlattr *tb[]);
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index c605d305c577..6d778efcfdfd 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -213,7 +213,7 @@ struct tcf_proto_ops {
                                             const struct tcf_proto *,
                                             struct tcf_result *);
         int                     (*init)(struct tcf_proto*);
-        void                    (*destroy)(struct tcf_proto*);
+        bool                    (*destroy)(struct tcf_proto*, bool);
 
         unsigned long           (*get)(struct tcf_proto*, u32 handle);
         int                     (*change)(struct net *net, struct sk_buff *,
@@ -399,7 +399,7 @@ struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
                                 const struct Qdisc_ops *ops, u32 parentid);
 void __qdisc_calculate_pkt_len(struct sk_buff *skb,
                                const struct qdisc_size_table *stab);
-void tcf_destroy(struct tcf_proto *tp);
+bool tcf_destroy(struct tcf_proto *tp, bool force);
 void tcf_destroy_chain(struct tcf_proto __rcu **fl);
 
 /* Reset all TX qdiscs greater then index of a device.  */
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 856f01cb51dd..c56a438c3a1e 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -166,6 +166,9 @@ void sctp_remaddr_proc_exit(struct net *net);
   */
 extern struct kmem_cache *sctp_chunk_cachep __read_mostly;
 extern struct kmem_cache *sctp_bucket_cachep __read_mostly;
+extern long sysctl_sctp_mem[3];
+extern int sysctl_sctp_rmem[3];
+extern int sysctl_sctp_wmem[3];
 
 /*
  *  Section:  Macros, externs, and inlines
diff --git a/include/net/sock.h b/include/net/sock.h
index ab186b1d31ff..3a4898ec8c67 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -57,7 +57,6 @@
 #include <linux/page_counter.h>
 #include <linux/memcontrol.h>
 #include <linux/static_key.h>
-#include <linux/aio.h>
 #include <linux/sched.h>
 
 #include <linux/filter.h>
@@ -67,6 +66,7 @@
 #include <linux/atomic.h>
 #include <net/dst.h>
 #include <net/checksum.h>
+#include <net/tcp_states.h>
 #include <linux/net_tstamp.h>
 
 struct cgroup;
@@ -190,15 +190,15 @@ struct sock_common {
                 struct hlist_nulls_node skc_portaddr_node;
         };
         struct proto            *skc_prot;
-#ifdef CONFIG_NET_NS
-        struct net              *skc_net;
-#endif
+        possible_net_t          skc_net;
 
 #if IS_ENABLED(CONFIG_IPV6)
         struct in6_addr         skc_v6_daddr;
         struct in6_addr         skc_v6_rcv_saddr;
 #endif
 
+        atomic64_t              skc_cookie;
+
         /*
          * fields between dontcopy_begin/dontcopy_end
          * are not copied in sock_copy()
@@ -329,6 +329,7 @@ struct sock {
 #define sk_net                  __sk_common.skc_net
 #define sk_v6_daddr             __sk_common.skc_v6_daddr
 #define sk_v6_rcv_saddr __sk_common.skc_v6_rcv_saddr
+#define sk_cookie               __sk_common.skc_cookie
 
         socket_lock_t           sk_lock;
         struct sk_buff_head     sk_receive_queue;
@@ -403,8 +404,8 @@ struct sock {
         rwlock_t                sk_callback_lock;
         int                     sk_err,
                                 sk_err_soft;
-        unsigned short          sk_ack_backlog;
-        unsigned short          sk_max_ack_backlog;
+        u32                     sk_ack_backlog;
+        u32                     sk_max_ack_backlog;
         __u32                   sk_priority;
 #if IS_ENABLED(CONFIG_CGROUP_NET_PRIO)
         __u32                   sk_cgrp_prioidx;
@@ -958,10 +959,9 @@ struct proto {
         int                     (*compat_ioctl)(struct sock *sk,
                                         unsigned int cmd, unsigned long arg);
 #endif
-        int                     (*sendmsg)(struct kiocb *iocb, struct sock *sk,
-                                           struct msghdr *msg, size_t len);
-        int                     (*recvmsg)(struct kiocb *iocb, struct sock *sk,
-                                           struct msghdr *msg,
+        int                     (*sendmsg)(struct sock *sk, struct msghdr *msg,
+                                           size_t len);
+        int                     (*recvmsg)(struct sock *sk, struct msghdr *msg,
                                            size_t len, int noblock, int flags,
                                            int *addr_len);
         int                     (*sendpage)(struct sock *sk, struct page *page,
@@ -1562,9 +1562,8 @@ int sock_no_listen(struct socket *, int);
 int sock_no_shutdown(struct socket *, int);
 int sock_no_getsockopt(struct socket *, int , int, char __user *, int __user *);
 int sock_no_setsockopt(struct socket *, int, int, char __user *, unsigned int);
-int sock_no_sendmsg(struct kiocb *, struct socket *, struct msghdr *, size_t);
-int sock_no_recvmsg(struct kiocb *, struct socket *, struct msghdr *, size_t,
-                    int);
+int sock_no_sendmsg(struct socket *, struct msghdr *, size_t);
+int sock_no_recvmsg(struct socket *, struct msghdr *, size_t, int);
 int sock_no_mmap(struct file *file, struct socket *sock,
                  struct vm_area_struct *vma);
 ssize_t sock_no_sendpage(struct socket *sock, struct page *page, int offset,
@@ -1576,8 +1575,8 @@ ssize_t sock_no_sendpage(struct socket *sock, struct page *page, int offset,
  */
 int sock_common_getsockopt(struct socket *sock, int level, int optname,
                                   char __user *optval, int __user *optlen);
-int sock_common_recvmsg(struct kiocb *iocb, struct socket *sock,
-                               struct msghdr *msg, size_t size, int flags);
+int sock_common_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
+                        int flags);
 int sock_common_setsockopt(struct socket *sock, int level, int optname,
                                   char __user *optval, unsigned int optlen);
 int compat_sock_common_getsockopt(struct socket *sock, int level,
@@ -1626,7 +1625,7 @@ static inline void sock_put(struct sock *sk)
                 sk_free(sk);
 }
 /* Generic version of sock_put(), dealing with all sockets
- * (TCP_TIMEWAIT, ESTABLISHED...)
+ * (TCP_TIMEWAIT, TCP_NEW_SYN_RECV, ESTABLISHED...)
  */
 void sock_gen_put(struct sock *sk);
 
@@ -1762,6 +1761,8 @@ struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie);
 
 struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie);
 
+bool sk_mc_loop(struct sock *sk);
+
 static inline bool sk_can_gso(const struct sock *sk)
 {
         return net_gso_ok(sk->sk_route_caps, sk->sk_gso_type);
@@ -2078,6 +2079,29 @@ static inline int sock_intr_errno(long timeo)
         return timeo == MAX_SCHEDULE_TIMEOUT ? -ERESTARTSYS : -EINTR;
 }
 
+struct sock_skb_cb {
+        u32 dropcount;
+};
+
+/* Store sock_skb_cb at the end of skb->cb[] so protocol families
+ * using skb->cb[] would keep using it directly and utilize its
+ * alignement guarantee.
+ */
+#define SOCK_SKB_CB_OFFSET ((FIELD_SIZEOF(struct sk_buff, cb) - \
+                            sizeof(struct sock_skb_cb)))
+
+#define SOCK_SKB_CB(__skb) ((struct sock_skb_cb *)((__skb)->cb + \
+                            SOCK_SKB_CB_OFFSET))
+
+#define sock_skb_cb_check_size(size) \
+        BUILD_BUG_ON((size) > SOCK_SKB_CB_OFFSET)
+
+static inline void
+sock_skb_set_dropcount(const struct sock *sk, struct sk_buff *skb)
+{
+        SOCK_SKB_CB(skb)->dropcount = atomic_read(&sk->sk_drops);
+}
+
 void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
                            struct sk_buff *skb);
 void __sock_recv_wifi_status(struct msghdr *msg, struct sock *sk,
@@ -2180,7 +2204,7 @@ static inline void sk_change_net(struct sock *sk, struct net *net)
 
         if (!net_eq(current_net, net)) {
                 put_net(current_net);
-                sock_net_set(sk, hold_net(net));
+                sock_net_set(sk, net);
         }
 }
 
@@ -2196,6 +2220,14 @@ static inline struct sock *skb_steal_sock(struct sk_buff *skb)
         return NULL;
 }
 
+/* This helper checks if a socket is a full socket,
+ * ie _not_ a timewait or request socket.
+ */
+static inline bool sk_fullsock(const struct sock *sk)
+{
+        return (1 << sk->sk_state) & ~(TCPF_TIME_WAIT | TCPF_NEW_SYN_RECV);
+}
+
 void sock_enable_timestamp(struct sock *sk, int flag);
 int sock_get_timestamp(struct sock *, struct timeval __user *);
 int sock_get_timestampns(struct sock *, struct timespec __user *);
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index cfcdac2e5d25..d2e69ee3019a 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -1,6 +1,7 @@
 /*
  * include/net/switchdev.h - Switch device API
  * Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
+ * Copyright (c) 2014-2015 Scott Feldman <sfeldma@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,6 +14,35 @@
 #include <linux/netdevice.h>
 #include <linux/notifier.h>
 
+struct fib_info;
+
+/**
+ * struct switchdev_ops - switchdev operations
+ *
+ * @swdev_parent_id_get: Called to get an ID of the switch chip this port
+ *   is part of.  If driver implements this, it indicates that it
+ *   represents a port of a switch chip.
+ *
+ * @swdev_port_stp_update: Called to notify switch device port of bridge
+ *   port STP state change.
+ *
+ * @swdev_fib_ipv4_add: Called to add/modify IPv4 route to switch device.
+ *
+ * @swdev_fib_ipv4_del: Called to delete IPv4 route from switch device.
+ */
+struct swdev_ops {
+        int     (*swdev_parent_id_get)(struct net_device *dev,
+                                       struct netdev_phys_item_id *psid);
+        int     (*swdev_port_stp_update)(struct net_device *dev, u8 state);
+        int     (*swdev_fib_ipv4_add)(struct net_device *dev, __be32 dst,
+                                      int dst_len, struct fib_info *fi,
+                                      u8 tos, u8 type, u32 nlflags,
+                                      u32 tb_id);
+        int     (*swdev_fib_ipv4_del)(struct net_device *dev, __be32 dst,
+                                      int dst_len, struct fib_info *fi,
+                                      u8 tos, u8 type, u32 tb_id);
+};
+
 enum netdev_switch_notifier_type {
         NETDEV_SWITCH_FDB_ADD = 1,
         NETDEV_SWITCH_FDB_DEL,
@@ -51,6 +81,12 @@ int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
                                                struct nlmsghdr *nlh, u16 flags);
 int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev,
                                                struct nlmsghdr *nlh, u16 flags);
+int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
+                               u8 tos, u8 type, u32 nlflags, u32 tb_id);
+int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
+                               u8 tos, u8 type, u32 tb_id);
+void netdev_switch_fib_ipv4_abort(struct fib_info *fi);
+
 #else
 
 static inline int netdev_switch_parent_id_get(struct net_device *dev,
@@ -109,6 +145,25 @@ static inline int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *
         return 0;
 }
 
+static inline int netdev_switch_fib_ipv4_add(u32 dst, int dst_len,
+                                             struct fib_info *fi,
+                                             u8 tos, u8 type,
+                                             u32 nlflags, u32 tb_id)
+{
+        return 0;
+}
+
+static inline int netdev_switch_fib_ipv4_del(u32 dst, int dst_len,
+                                             struct fib_info *fi,
+                                             u8 tos, u8 type, u32 tb_id)
+{
+        return 0;
+}
+
+static inline void netdev_switch_fib_ipv4_abort(struct fib_info *fi)
+{
+}
+
 #endif
 
 #endif /* _LINUX_SWITCHDEV_H_ */
diff --git a/include/net/tc_act/tc_bpf.h b/include/net/tc_act/tc_bpf.h
index 86a070ffc930..a152e9858b2c 100644
--- a/include/net/tc_act/tc_bpf.h
+++ b/include/net/tc_act/tc_bpf.h
@@ -16,8 +16,12 @@
 struct tcf_bpf {
         struct tcf_common       common;
         struct bpf_prog         *filter;
+        union {
+                u32             bpf_fd;
+                u16             bpf_num_ops;
+        };
         struct sock_filter      *bpf_ops;
-        u16                     bpf_num_ops;
+        const char              *bpf_name;
 };
 #define to_bpf(a) \
         container_of(a->priv, struct tcf_bpf, common)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 8d6b983d5099..051dc5c2802d 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -65,7 +65,13 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCP_MIN_MSS             88U
 
 /* The least MTU to use for probing */
-#define TCP_BASE_MSS            512
+#define TCP_BASE_MSS            1024
+
+/* probing interval, default to 10 minutes as per RFC4821 */
+#define TCP_PROBE_INTERVAL      600
+
+/* Specify interval when tcp mtu probing will stop */
+#define TCP_PROBE_THRESHOLD     8
 
 /* After receiving this amount of duplicate ACKs fast retransmit starts. */
 #define TCP_FASTRETRANS_THRESH 3
@@ -173,6 +179,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCPOPT_SACK             5       /* SACK Block */
 #define TCPOPT_TIMESTAMP        8       /* Better RTT estimations/PAWS */
 #define TCPOPT_MD5SIG           19      /* MD5 Signature (RFC2385) */
+#define TCPOPT_FASTOPEN         34      /* Fast open (RFC7413) */
 #define TCPOPT_EXP              254     /* Experimental */
 /* Magic number to be after the option value for sharing TCP
  * experimental options. See draft-ietf-tcpm-experimental-options-00.txt
@@ -188,6 +195,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCPOLEN_SACK_PERM      2
 #define TCPOLEN_TIMESTAMP      10
 #define TCPOLEN_MD5SIG         18
+#define TCPOLEN_FASTOPEN_BASE  2
 #define TCPOLEN_EXP_FASTOPEN_BASE  4
 
 /* But this is what stacks really send out. */
@@ -349,8 +357,7 @@ void tcp_v4_early_demux(struct sk_buff *skb);
 int tcp_v4_rcv(struct sk_buff *skb);
 
 int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);
-int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                size_t size);
+int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);
 int tcp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,
                  int flags);
 void tcp_release_cb(struct sock *sk);
@@ -401,8 +408,7 @@ enum tcp_tw_status tcp_timewait_state_process(struct inet_timewait_sock *tw,
                                               struct sk_buff *skb,
                                               const struct tcphdr *th);
 struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
-                           struct request_sock *req, struct request_sock **prev,
-                           bool fastopen);
+                           struct request_sock *req, bool fastopen);
 int tcp_child_process(struct sock *parent, struct sock *child,
                       struct sk_buff *skb);
 void tcp_enter_loss(struct sock *sk);
@@ -429,9 +435,9 @@ int compat_tcp_getsockopt(struct sock *sk, int level, int optname,
 int compat_tcp_setsockopt(struct sock *sk, int level, int optname,
                           char __user *optval, unsigned int optlen);
 void tcp_set_keepalive(struct sock *sk, int val);
-void tcp_syn_ack_timeout(struct sock *sk, struct request_sock *req);
-int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                size_t len, int nonblock, int flags, int *addr_len);
+void tcp_syn_ack_timeout(const struct request_sock *req);
+int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
+                int flags, int *addr_len);
 void tcp_parse_options(const struct sk_buff *skb,
                        struct tcp_options_received *opt_rx,
                        int estab, struct tcp_fastopen_cookie *foc);
@@ -443,6 +449,7 @@ const u8 *tcp_parse_md5sig_option(const struct tcphdr *th);
 
 void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb);
 void tcp_v4_mtu_reduced(struct sock *sk);
+void tcp_req_err(struct sock *sk, u32 seq);
 int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb);
 struct sock *tcp_create_openreq_child(struct sock *sk,
                                       struct request_sock *req,
@@ -524,8 +531,6 @@ int tcp_write_wakeup(struct sock *);
 void tcp_send_fin(struct sock *sk);
 void tcp_send_active_reset(struct sock *sk, gfp_t priority);
 int tcp_send_synack(struct sock *);
-bool tcp_syn_flood_action(struct sock *sk, const struct sk_buff *skb,
-                          const char *proto);
 void tcp_push_one(struct sock *, unsigned int mss_now);
 void tcp_send_ack(struct sock *sk);
 void tcp_send_delayed_ack(struct sock *sk);
@@ -824,7 +829,7 @@ struct tcp_congestion_ops {
         /* hook for packet ack accounting (optional) */
         void (*pkts_acked)(struct sock *sk, u32 num_acked, s32 rtt_us);
         /* get info for inet_diag (optional) */
-        void (*get_info)(struct sock *sk, u32 ext, struct sk_buff *skb);
+        int (*get_info)(struct sock *sk, u32 ext, struct sk_buff *skb);
 
         char            name[TCP_CA_NAME_MAX];
         struct module   *owner;
@@ -1132,31 +1137,6 @@ static inline int tcp_full_space(const struct sock *sk)
         return tcp_win_from_space(sk->sk_rcvbuf);
 }
 
-static inline void tcp_openreq_init(struct request_sock *req,
-                                    struct tcp_options_received *rx_opt,
-                                    struct sk_buff *skb, struct sock *sk)
-{
-        struct inet_request_sock *ireq = inet_rsk(req);
-
-        req->rcv_wnd = 0;               /* So that tcp_send_synack() knows! */
-        req->cookie_ts = 0;
-        tcp_rsk(req)->rcv_isn = TCP_SKB_CB(skb)->seq;
-        tcp_rsk(req)->rcv_nxt = TCP_SKB_CB(skb)->seq + 1;
-        tcp_rsk(req)->snt_synack = tcp_time_stamp;
-        tcp_rsk(req)->last_oow_ack_time = 0;
-        req->mss = rx_opt->mss_clamp;
-        req->ts_recent = rx_opt->saw_tstamp ? rx_opt->rcv_tsval : 0;
-        ireq->tstamp_ok = rx_opt->tstamp_ok;
-        ireq->sack_ok = rx_opt->sack_ok;
-        ireq->snd_wscale = rx_opt->snd_wscale;
-        ireq->wscale_ok = rx_opt->wscale_ok;
-        ireq->acked = 0;
-        ireq->ecn_ok = 0;
-        ireq->ir_rmt_port = tcp_hdr(skb)->source;
-        ireq->ir_num = ntohs(tcp_hdr(skb)->dest);
-        ireq->ir_mark = inet_request_mark(sk, skb);
-}
-
 extern void tcp_openreq_init_rwin(struct request_sock *req,
                                   struct sock *sk, struct dst_entry *dst);
 
@@ -1236,36 +1216,8 @@ static inline bool tcp_paws_reject(const struct tcp_options_received *rx_opt,
         return true;
 }
 
-/* Return true if we're currently rate-limiting out-of-window ACKs and
- * thus shouldn't send a dupack right now. We rate-limit dupacks in
- * response to out-of-window SYNs or ACKs to mitigate ACK loops or DoS
- * attacks that send repeated SYNs or ACKs for the same connection. To
- * do this, we do not send a duplicate SYNACK or ACK if the remote
- * endpoint is sending out-of-window SYNs or pure ACKs at a high rate.
- */
-static inline bool tcp_oow_rate_limited(struct net *net,
-                                        const struct sk_buff *skb,
-                                        int mib_idx, u32 *last_oow_ack_time)
-{
-        /* Data packets without SYNs are not likely part of an ACK loop. */
-        if ((TCP_SKB_CB(skb)->seq != TCP_SKB_CB(skb)->end_seq) &&
-            !tcp_hdr(skb)->syn)
-                goto not_rate_limited;
-
-        if (*last_oow_ack_time) {
-                s32 elapsed = (s32)(tcp_time_stamp - *last_oow_ack_time);
-
-                if (0 <= elapsed && elapsed < sysctl_tcp_invalid_ratelimit) {
-                        NET_INC_STATS_BH(net, mib_idx);
-                        return true;    /* rate-limited: don't send yet! */
-                }
-        }
-
-        *last_oow_ack_time = tcp_time_stamp;
-
-not_rate_limited:
-        return false;   /* not rate-limited: go ahead, send dupack now! */
-}
+bool tcp_oow_rate_limited(struct net *net, const struct sk_buff *skb,
+                          int mib_idx, u32 *last_oow_ack_time);
 
 static inline void tcp_mib_init(struct net *net)
 {
@@ -1344,15 +1296,14 @@ struct tcp_md5sig_pool {
 };
 
 /* - functions */
-int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,
-                        const struct sock *sk, const struct request_sock *req,
-                        const struct sk_buff *skb);
+int tcp_v4_md5_hash_skb(char *md5_hash, const struct tcp_md5sig_key *key,
+                        const struct sock *sk, const struct sk_buff *skb);
 int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,
                    int family, const u8 *newkey, u8 newkeylen, gfp_t gfp);
 int tcp_md5_do_del(struct sock *sk, const union tcp_md5_addr *addr,
                    int family);
 struct tcp_md5sig_key *tcp_v4_md5_lookup(struct sock *sk,
-                                         struct sock *addr_sk);
+                                         const struct sock *addr_sk);
 
 #ifdef CONFIG_TCP_MD5SIG
 struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk,
@@ -1388,7 +1339,8 @@ void tcp_fastopen_cache_get(struct sock *sk, u16 *mss,
                             struct tcp_fastopen_cookie *cookie, int *syn_loss,
                             unsigned long *last_syn_loss);
 void tcp_fastopen_cache_set(struct sock *sk, u16 mss,
-                            struct tcp_fastopen_cookie *cookie, bool syn_lost);
+                            struct tcp_fastopen_cookie *cookie, bool syn_lost,
+                            u16 try_exp);
 struct tcp_fastopen_request {
         /* Fast Open cookie. Size 0 means a cookie request */
         struct tcp_fastopen_cookie      cookie;
@@ -1663,28 +1615,26 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,
 struct tcp_sock_af_ops {
 #ifdef CONFIG_TCP_MD5SIG
         struct tcp_md5sig_key   *(*md5_lookup) (struct sock *sk,
-                                                struct sock *addr_sk);
-        int                     (*calc_md5_hash) (char *location,
-                                                  struct tcp_md5sig_key *md5,
-                                                  const struct sock *sk,
-                                                  const struct request_sock *req,
-                                                  const struct sk_buff *skb);
-        int                     (*md5_parse) (struct sock *sk,
-                                              char __user *optval,
-                                              int optlen);
+                                                const struct sock *addr_sk);
+        int             (*calc_md5_hash)(char *location,
+                                         const struct tcp_md5sig_key *md5,
+                                         const struct sock *sk,
+                                         const struct sk_buff *skb);
+        int             (*md5_parse)(struct sock *sk,
+                                     char __user *optval,
+                                     int optlen);
 #endif
 };
 
 struct tcp_request_sock_ops {
         u16 mss_clamp;
 #ifdef CONFIG_TCP_MD5SIG
-        struct tcp_md5sig_key   *(*md5_lookup) (struct sock *sk,
-                                                struct request_sock *req);
-        int                     (*calc_md5_hash) (char *location,
-                                                  struct tcp_md5sig_key *md5,
-                                                  const struct sock *sk,
-                                                  const struct request_sock *req,
-                                                  const struct sk_buff *skb);
+        struct tcp_md5sig_key *(*req_md5_lookup)(struct sock *sk,
+                                                 const struct sock *addr_sk);
+        int             (*calc_md5_hash) (char *location,
+                                          const struct tcp_md5sig_key *md5,
+                                          const struct sock *sk,
+                                          const struct sk_buff *skb);
 #endif
         void (*init_req)(struct request_sock *req, struct sock *sk,
                          struct sk_buff *skb);
diff --git a/include/net/tcp_states.h b/include/net/tcp_states.h
index b0b645988bd8..50e78a74d0df 100644
--- a/include/net/tcp_states.h
+++ b/include/net/tcp_states.h
@@ -25,6 +25,7 @@ enum {
         TCP_LAST_ACK,
         TCP_LISTEN,
         TCP_CLOSING,    /* Now a valid state */
+        TCP_NEW_SYN_RECV,
 
         TCP_MAX_STATES  /* Leave at the end! */
 };
@@ -44,7 +45,8 @@ enum {
         TCPF_CLOSE_WAIT  = (1 << 8),
         TCPF_LAST_ACK    = (1 << 9),
         TCPF_LISTEN      = (1 << 10),
-        TCPF_CLOSING     = (1 << 11) 
+        TCPF_CLOSING     = (1 << 11),
+        TCPF_NEW_SYN_RECV = (1 << 12),
 };
 
 #endif  /* _LINUX_TCP_STATES_H */
diff --git a/include/net/udp.h b/include/net/udp.h
index 07f9b70962f6..6d4ed18e1427 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -194,6 +194,8 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,
                      int (*)(const struct sock *, const struct sock *),
                      unsigned int hash2_nulladdr);
 
+u32 udp_flow_hashrnd(void);
+
 static inline __be16 udp_flow_src_port(struct net *net, struct sk_buff *skb,
                                        int min, int max, bool use_eth)
 {
@@ -205,12 +207,19 @@ static inline __be16 udp_flow_src_port(struct net *net, struct sk_buff *skb,
         }
 
         hash = skb_get_hash(skb);
-        if (unlikely(!hash) && use_eth) {
-                /* Can't find a normal hash, caller has indicated an Ethernet
-                 * packet so use that to compute a hash.
-                 */
-                hash = jhash(skb->data, 2 * ETH_ALEN,
-                             (__force u32) skb->protocol);
+        if (unlikely(!hash)) {
+                if (use_eth) {
+                        /* Can't find a normal hash, caller has indicated an
+                         * Ethernet packet so use that to compute a hash.
+                         */
+                        hash = jhash(skb->data, 2 * ETH_ALEN,
+                                     (__force u32) skb->protocol);
+                } else {
+                        /* Can't derive any sort of hash for the packet, set
+                         * to some consistent random value.
+                         */
+                        hash = udp_flow_hashrnd();
+                }
         }
 
         /* Since this is being sent on the wire obfuscate hash a bit
@@ -229,8 +238,7 @@ int udp_get_port(struct sock *sk, unsigned short snum,
                  int (*saddr_cmp)(const struct sock *,
                                   const struct sock *));
 void udp_err(struct sk_buff *, u32);
-int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                size_t len);
+int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len);
 int udp_push_pending_frames(struct sock *sk);
 void udp_flush_pending_frames(struct sock *sk);
 void udp4_hwcsum(struct sk_buff *skb, __be32 src, __be32 dst);
diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h
index 1a20d33d56bc..c491c1221606 100644
--- a/include/net/udp_tunnel.h
+++ b/include/net/udp_tunnel.h
@@ -77,13 +77,14 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,
                            struct udp_tunnel_sock_cfg *sock_cfg);
 
 /* Transmit the skb using UDP encapsulation. */
-int udp_tunnel_xmit_skb(struct rtable *rt, struct sk_buff *skb,
+int udp_tunnel_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,
                         __be32 src, __be32 dst, __u8 tos, __u8 ttl,
                         __be16 df, __be16 src_port, __be16 dst_port,
                         bool xnet, bool nocheck);
 
 #if IS_ENABLED(CONFIG_IPV6)
-int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb,
+int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,
+                         struct sk_buff *skb,
                          struct net_device *dev, struct in6_addr *saddr,
                          struct in6_addr *daddr,
                          __u8 prio, __u8 ttl, __be16 src_port,
diff --git a/include/net/vxlan.h b/include/net/vxlan.h
index eabd3a038674..0082b5d33d7d 100644
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
@@ -91,6 +91,7 @@ struct vxlanhdr {
 
 #define VXLAN_N_VID     (1u << 24)
 #define VXLAN_VID_MASK  (VXLAN_N_VID - 1)
+#define VXLAN_VNI_MASK  (VXLAN_VID_MASK << 8)
 #define VXLAN_HLEN (sizeof(struct udphdr) + sizeof(struct vxlanhdr))
 
 struct vxlan_metadata {
@@ -130,7 +131,7 @@ struct vxlan_sock {
 #define VXLAN_F_GBP                     0x800
 #define VXLAN_F_REMCSUM_NOPARTIAL       0x1000
 
-/* Flags that are used in the receive patch. These flags must match in
+/* Flags that are used in the receive path. These flags must match in
  * order for a socket to be shareable
  */
 #define VXLAN_F_RCV_FLAGS               (VXLAN_F_GBP |                  \
@@ -144,7 +145,7 @@ struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port,
 
 void vxlan_sock_release(struct vxlan_sock *vs);
 
-int vxlan_xmit_skb(struct rtable *rt, struct sk_buff *skb,
+int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,
                    __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df,
                    __be16 src_port, __be16 dst_port, struct vxlan_metadata *md,
                    bool xnet, u32 vxflags);
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index dc4865e90fe4..36ac102c97c7 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -126,9 +126,7 @@ struct xfrm_state_walk {
 
 /* Full description of state of transformer. */
 struct xfrm_state {
-#ifdef CONFIG_NET_NS
-        struct net              *xs_net;
-#endif
+        possible_net_t          xs_net;
         union {
                 struct hlist_node       gclist;
                 struct hlist_node       bydst;
@@ -334,7 +332,7 @@ struct xfrm_state_afinfo {
         int                     (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);
         int                     (*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);
         int                     (*output)(struct sock *sk, struct sk_buff *skb);
-        int                     (*output_finish)(struct sk_buff *skb);
+        int                     (*output_finish)(struct sock *sk, struct sk_buff *skb);
         int                     (*extract_input)(struct xfrm_state *x,
                                                  struct sk_buff *skb);
         int                     (*extract_output)(struct xfrm_state *x,
@@ -522,9 +520,7 @@ struct xfrm_policy_queue {
 };
 
 struct xfrm_policy {
-#ifdef CONFIG_NET_NS
-        struct net              *xp_net;
-#endif
+        possible_net_t          xp_net;
         struct hlist_node       bydst;
         struct hlist_node       byidx;
 
@@ -1029,7 +1025,7 @@ xfrm_addr_any(const xfrm_address_t *addr, unsigned short family)
         case AF_INET:
                 return addr->a4 == 0;
         case AF_INET6:
-                return ipv6_addr_any((struct in6_addr *)&addr->a6);
+                return ipv6_addr_any(&addr->in6);
         }
         return 0;
 }
@@ -1242,8 +1238,8 @@ void xfrm_flowi_addr_get(const struct flowi *fl,
                 memcpy(&daddr->a4, &fl->u.ip4.daddr, sizeof(daddr->a4));
                 break;
         case AF_INET6:
-                *(struct in6_addr *)saddr->a6 = fl->u.ip6.saddr;
-                *(struct in6_addr *)daddr->a6 = fl->u.ip6.daddr;
+                saddr->in6 = fl->u.ip6.saddr;
+                daddr->in6 = fl->u.ip6.daddr;
                 break;
         }
 }
@@ -1507,7 +1503,7 @@ int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb);
 int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type);
 int xfrm_input_resume(struct sk_buff *skb, int nexthdr);
 int xfrm_output_resume(struct sk_buff *skb, int err);
-int xfrm_output(struct sk_buff *skb);
+int xfrm_output(struct sock *sk, struct sk_buff *skb);
 int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb);
 void xfrm_local_error(struct sk_buff *skb, int mtu);
 int xfrm4_extract_header(struct sk_buff *skb);
@@ -1528,7 +1524,7 @@ static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)
 int xfrm4_extract_output(struct xfrm_state *x, struct sk_buff *skb);
 int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb);
 int xfrm4_output(struct sock *sk, struct sk_buff *skb);
-int xfrm4_output_finish(struct sk_buff *skb);
+int xfrm4_output_finish(struct sock *sk, struct sk_buff *skb);
 int xfrm4_rcv_cb(struct sk_buff *skb, u8 protocol, int err);
 int xfrm4_protocol_register(struct xfrm4_protocol *handler, unsigned char protocol);
 int xfrm4_protocol_deregister(struct xfrm4_protocol *handler, unsigned char protocol);
@@ -1553,7 +1549,7 @@ __be32 xfrm6_tunnel_spi_lookup(struct net *net, const xfrm_address_t *saddr);
 int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb);
 int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb);
 int xfrm6_output(struct sock *sk, struct sk_buff *skb);
-int xfrm6_output_finish(struct sk_buff *skb);
+int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb);
 int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
                           u8 **prevhdr);
 
diff --git a/include/rxrpc/packet.h b/include/rxrpc/packet.h
index f2902ef7ab75..4dce116bfd80 100644
--- a/include/rxrpc/packet.h
+++ b/include/rxrpc/packet.h
@@ -47,7 +47,8 @@ struct rxrpc_header {
 #define RXRPC_PACKET_TYPE_CHALLENGE     6       /* connection security challenge (SRVR->CLNT) */
 #define RXRPC_PACKET_TYPE_RESPONSE      7       /* connection secutity response (CLNT->SRVR) */
 #define RXRPC_PACKET_TYPE_DEBUG         8       /* debug info request */
-#define RXRPC_N_PACKET_TYPES            9       /* number of packet types (incl type 0) */
+#define RXRPC_PACKET_TYPE_VERSION       13      /* version string request */
+#define RXRPC_N_PACKET_TYPES            14      /* number of packet types (incl type 0) */
 
         uint8_t         flags;          /* packet flags */
 #define RXRPC_CLIENT_INITIATED  0x01            /* signifies a packet generated by a client */
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index 1e1421b06565..5a4bb5bb66b3 100644
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -59,6 +59,7 @@ extern int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len,
                                    u64 * info_out);
 
 extern void scsi_build_sense_buffer(int desc, u8 *buf, u8 key, u8 asc, u8 ascq);
+extern void scsi_set_sense_information(u8 *buf, u64 info);
 
 extern int scsi_ioctl_reset(struct scsi_device *, int __user *);
 
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 007a0bc01b74..784bc2c0929f 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -135,6 +135,7 @@ enum fc_vport_state {
 #define FC_PORTSPEED_40GBIT             0x100
 #define FC_PORTSPEED_50GBIT             0x200
 #define FC_PORTSPEED_100GBIT            0x400
+#define FC_PORTSPEED_25GBIT             0x800
 #define FC_PORTSPEED_NOT_NEGOTIATED     (1 << 15) /* Speed not established */
 
 /*
diff --git a/include/soc/at91/at91sam9_ddrsdr.h b/include/soc/at91/at91sam9_ddrsdr.h
index 0210797abf2e..dc10c52e0e91 100644
--- a/include/soc/at91/at91sam9_ddrsdr.h
+++ b/include/soc/at91/at91sam9_ddrsdr.h
@@ -92,7 +92,7 @@
 #define         AT91_DDRSDRC_UPD_MR     (3 << 20)        /* Update load mode register and extended mode register */
 
 #define AT91_DDRSDRC_MDR        0x20    /* Memory Device Register */
-#define         AT91_DDRSDRC_MD         (3 << 0)                /* Memory Device Type */
+#define         AT91_DDRSDRC_MD         (7 << 0)        /* Memory Device Type */
 #define                 AT91_DDRSDRC_MD_SDR             0
 #define                 AT91_DDRSDRC_MD_LOW_POWER_SDR   1
 #define                 AT91_DDRSDRC_MD_LOW_POWER_DDR   3
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index d315a08d6c6d..0e9d75b49bed 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -608,7 +608,9 @@ struct ac97_quirk {
         int type;               /* quirk type above */
 };
 
-int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, const char *override);
+int snd_ac97_tune_hardware(struct snd_ac97 *ac97,
+                           const struct ac97_quirk *quirk,
+                           const char *override);
 int snd_ac97_set_rate(struct snd_ac97 *ac97, int reg, unsigned int rate);
 
 /*
diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
index f48089d364c5..fa1d05512c09 100644
--- a/include/sound/compress_driver.h
+++ b/include/sound/compress_driver.h
@@ -70,7 +70,7 @@ struct snd_compr_runtime {
  * @device: device pointer
  * @direction: stream direction, playback/recording
  * @metadata_set: metadata set flag, true when set
- * @next_track: has userspace signall next track transistion, true when set
+ * @next_track: has userspace signal next track transition, true when set
  * @private_data: pointer to DSP private data
  */
 struct snd_compr_stream {
@@ -95,7 +95,7 @@ struct snd_compr_stream {
  * and the stream properties
  * @get_params: retrieve the codec parameters, mandatory
  * @set_metadata: Set the metadata values for a stream
- * @get_metadata: retreives the requested metadata values from stream
+ * @get_metadata: retrieves the requested metadata values from stream
  * @trigger: Trigger operations like start, pause, resume, drain, stop.
  * This callback is mandatory
  * @pointer: Retrieve current h/w pointer information. Mandatory
diff --git a/include/sound/control.h b/include/sound/control.h
index 75f3054023f7..95aad6d3fd1a 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -227,7 +227,7 @@ snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave)
  * Add a virtual slave control to the given master.
  * Unlike snd_ctl_add_slave(), the element added via this function
  * is supposed to have volatile values, and get callback is called
- * at each time quried from the master.
+ * at each time queried from the master.
  *
  * When the control peeks the hardware values directly and the value
  * can be changed by other means than the put callback of the element,
diff --git a/include/sound/core.h b/include/sound/core.h
index da5748289968..b12931f513f4 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -278,7 +278,8 @@ int snd_device_new(struct snd_card *card, enum snd_device_type type,
                    void *device_data, struct snd_device_ops *ops);
 int snd_device_register(struct snd_card *card, void *device_data);
 int snd_device_register_all(struct snd_card *card);
-int snd_device_disconnect_all(struct snd_card *card);
+void snd_device_disconnect(struct snd_card *card, void *device_data);
+void snd_device_disconnect_all(struct snd_card *card);
 void snd_device_free(struct snd_card *card, void *device_data);
 void snd_device_free_all(struct snd_card *card);
 
diff --git a/include/sound/designware_i2s.h b/include/sound/designware_i2s.h
index 26f406e0f673..3a8fca9409a7 100644
--- a/include/sound/designware_i2s.h
+++ b/include/sound/designware_i2s.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)
+ * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/include/sound/hda_regmap.h b/include/sound/hda_regmap.h
new file mode 100644
index 000000000000..53a18b3635e2
--- /dev/null
+++ b/include/sound/hda_regmap.h
@@ -0,0 +1,217 @@
+/*
+ * HD-audio regmap helpers
+ */
+
+#ifndef __SOUND_HDA_REGMAP_H
+#define __SOUND_HDA_REGMAP_H
+
+#include <linux/regmap.h>
+#include <sound/core.h>
+#include <sound/hdaudio.h>
+
+int snd_hdac_regmap_init(struct hdac_device *codec);
+void snd_hdac_regmap_exit(struct hdac_device *codec);
+int snd_hdac_regmap_add_vendor_verb(struct hdac_device *codec,
+                                    unsigned int verb);
+int snd_hdac_regmap_read_raw(struct hdac_device *codec, unsigned int reg,
+                             unsigned int *val);
+int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg,
+                              unsigned int val);
+int snd_hdac_regmap_update_raw(struct hdac_device *codec, unsigned int reg,
+                               unsigned int mask, unsigned int val);
+
+/**
+ * snd_hdac_regmap_encode_verb - encode the verb to a pseudo register
+ * @nid: widget NID
+ * @verb: codec verb
+ *
+ * Returns an encoded pseudo register.
+ */
+#define snd_hdac_regmap_encode_verb(nid, verb)          \
+        (((verb) << 8) | 0x80000 | ((unsigned int)(nid) << 20))
+
+/**
+ * snd_hdac_regmap_encode_amp - encode the AMP verb to a pseudo register
+ * @nid: widget NID
+ * @ch: channel (left = 0, right = 1)
+ * @dir: direction (#HDA_INPUT, #HDA_OUTPUT)
+ * @idx: input index value
+ *
+ * Returns an encoded pseudo register.
+ */
+#define snd_hdac_regmap_encode_amp(nid, ch, dir, idx)                   \
+        (snd_hdac_regmap_encode_verb(nid, AC_VERB_GET_AMP_GAIN_MUTE) |  \
+         ((ch) ? AC_AMP_GET_RIGHT : AC_AMP_GET_LEFT) |                  \
+         ((dir) == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT) | \
+         (idx))
+
+/**
+ * snd_hdac_regmap_encode_amp_stereo - encode a pseudo register for stereo AMPs
+ * @nid: widget NID
+ * @dir: direction (#HDA_INPUT, #HDA_OUTPUT)
+ * @idx: input index value
+ *
+ * Returns an encoded pseudo register.
+ */
+#define snd_hdac_regmap_encode_amp_stereo(nid, dir, idx)                \
+        (snd_hdac_regmap_encode_verb(nid, AC_VERB_GET_AMP_GAIN_MUTE) |  \
+         AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT | /* both bits set! */      \
+         ((dir) == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT) | \
+         (idx))
+
+/**
+ * snd_hdac_regmap_write - Write a verb with caching
+ * @nid: codec NID
+ * @reg: verb to write
+ * @val: value to write
+ *
+ * For writing an amp value, use snd_hda_regmap_amp_update().
+ */
+static inline int
+snd_hdac_regmap_write(struct hdac_device *codec, hda_nid_t nid,
+                      unsigned int verb, unsigned int val)
+{
+        unsigned int cmd = snd_hdac_regmap_encode_verb(nid, verb);
+
+        return snd_hdac_regmap_write_raw(codec, cmd, val);
+}
+
+/**
+ * snd_hda_regmap_update - Update a verb value with caching
+ * @nid: codec NID
+ * @verb: verb to update
+ * @mask: bit mask to update
+ * @val: value to update
+ *
+ * For updating an amp value, use snd_hda_regmap_amp_update().
+ */
+static inline int
+snd_hdac_regmap_update(struct hdac_device *codec, hda_nid_t nid,
+                       unsigned int verb, unsigned int mask,
+                       unsigned int val)
+{
+        unsigned int cmd = snd_hdac_regmap_encode_verb(nid, verb);
+
+        return snd_hdac_regmap_update_raw(codec, cmd, mask, val);
+}
+
+/**
+ * snd_hda_regmap_read - Read a verb with caching
+ * @nid: codec NID
+ * @verb: verb to read
+ * @val: pointer to store the value
+ *
+ * For reading an amp value, use snd_hda_regmap_get_amp().
+ */
+static inline int
+snd_hdac_regmap_read(struct hdac_device *codec, hda_nid_t nid,
+                     unsigned int verb, unsigned int *val)
+{
+        unsigned int cmd = snd_hdac_regmap_encode_verb(nid, verb);
+
+        return snd_hdac_regmap_read_raw(codec, cmd, val);
+}
+
+/**
+ * snd_hdac_regmap_get_amp - Read AMP value
+ * @codec: HD-audio codec
+ * @nid: NID to read the AMP value
+ * @ch: channel (left=0 or right=1)
+ * @direction: #HDA_INPUT or #HDA_OUTPUT
+ * @index: the index value (only for input direction)
+ * @val: the pointer to store the value
+ *
+ * Read AMP value.  The volume is between 0 to 0x7f, 0x80 = mute bit.
+ * Returns the value or a negative error.
+ */
+static inline int
+snd_hdac_regmap_get_amp(struct hdac_device *codec, hda_nid_t nid,
+                        int ch, int dir, int idx)
+{
+        unsigned int cmd = snd_hdac_regmap_encode_amp(nid, ch, dir, idx);
+        int err, val;
+
+        err = snd_hdac_regmap_read_raw(codec, cmd, &val);
+        return err < 0 ? err : val;
+}
+
+/**
+ * snd_hdac_regmap_update_amp - update the AMP value
+ * @codec: HD-audio codec
+ * @nid: NID to read the AMP value
+ * @ch: channel (left=0 or right=1)
+ * @direction: #HDA_INPUT or #HDA_OUTPUT
+ * @idx: the index value (only for input direction)
+ * @mask: bit mask to set
+ * @val: the bits value to set
+ *
+ * Update the AMP value with a bit mask.
+ * Returns 0 if the value is unchanged, 1 if changed, or a negative error.
+ */
+static inline int
+snd_hdac_regmap_update_amp(struct hdac_device *codec, hda_nid_t nid,
+                           int ch, int dir, int idx, int mask, int val)
+{
+        unsigned int cmd = snd_hdac_regmap_encode_amp(nid, ch, dir, idx);
+
+        return snd_hdac_regmap_update_raw(codec, cmd, mask, val);
+}
+
+/**
+ * snd_hdac_regmap_get_amp_stereo - Read stereo AMP values
+ * @codec: HD-audio codec
+ * @nid: NID to read the AMP value
+ * @ch: channel (left=0 or right=1)
+ * @direction: #HDA_INPUT or #HDA_OUTPUT
+ * @index: the index value (only for input direction)
+ * @val: the pointer to store the value
+ *
+ * Read stereo AMP values.  The lower byte is left, the upper byte is right.
+ * Returns the value or a negative error.
+ */
+static inline int
+snd_hdac_regmap_get_amp_stereo(struct hdac_device *codec, hda_nid_t nid,
+                               int dir, int idx)
+{
+        unsigned int cmd = snd_hdac_regmap_encode_amp_stereo(nid, dir, idx);
+        int err, val;
+
+        err = snd_hdac_regmap_read_raw(codec, cmd, &val);
+        return err < 0 ? err : val;
+}
+
+/**
+ * snd_hdac_regmap_update_amp_stereo - update the stereo AMP value
+ * @codec: HD-audio codec
+ * @nid: NID to read the AMP value
+ * @direction: #HDA_INPUT or #HDA_OUTPUT
+ * @idx: the index value (only for input direction)
+ * @mask: bit mask to set
+ * @val: the bits value to set
+ *
+ * Update the stereo AMP value with a bit mask.
+ * The lower byte is left, the upper byte is right.
+ * Returns 0 if the value is unchanged, 1 if changed, or a negative error.
+ */
+static inline int
+snd_hdac_regmap_update_amp_stereo(struct hdac_device *codec, hda_nid_t nid,
+                                  int dir, int idx, int mask, int val)
+{
+        unsigned int cmd = snd_hdac_regmap_encode_amp_stereo(nid, dir, idx);
+
+        return snd_hdac_regmap_update_raw(codec, cmd, mask, val);
+}
+
+/**
+ * snd_hdac_regmap_sync_node - sync the widget node attributes
+ * @codec: HD-audio codec
+ * @nid: NID to sync
+ */
+static inline void
+snd_hdac_regmap_sync_node(struct hdac_device *codec, hda_nid_t nid)
+{
+        regcache_mark_dirty(codec->regmap);
+        regcache_sync_region(codec->regmap, nid << 20, ((nid + 1) << 20) - 1);
+}
+
+#endif /* __SOUND_HDA_REGMAP_H */
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
new file mode 100644
index 000000000000..2a8aa9dfb83d
--- /dev/null
+++ b/include/sound/hdaudio.h
@@ -0,0 +1,247 @@
+/*
+ * HD-audio core stuff
+ */
+
+#ifndef __SOUND_HDAUDIO_H
+#define __SOUND_HDAUDIO_H
+
+#include <linux/device.h>
+#include <sound/hda_verbs.h>
+
+/* codec node id */
+typedef u16 hda_nid_t;
+
+struct hdac_bus;
+struct hdac_device;
+struct hdac_driver;
+struct hdac_widget_tree;
+
+/*
+ * exported bus type
+ */
+extern struct bus_type snd_hda_bus_type;
+
+/*
+ * generic arrays
+ */
+struct snd_array {
+        unsigned int used;
+        unsigned int alloced;
+        unsigned int elem_size;
+        unsigned int alloc_align;
+        void *list;
+};
+
+/*
+ * HD-audio codec base device
+ */
+struct hdac_device {
+        struct device dev;
+        int type;
+        struct hdac_bus *bus;
+        unsigned int addr;              /* codec address */
+        struct list_head list;          /* list point for bus codec_list */
+
+        hda_nid_t afg;                  /* AFG node id */
+        hda_nid_t mfg;                  /* MFG node id */
+
+        /* ids */
+        unsigned int vendor_id;
+        unsigned int subsystem_id;
+        unsigned int revision_id;
+        unsigned int afg_function_id;
+        unsigned int mfg_function_id;
+        unsigned int afg_unsol:1;
+        unsigned int mfg_unsol:1;
+
+        unsigned int power_caps;        /* FG power caps */
+
+        const char *vendor_name;        /* codec vendor name */
+        const char *chip_name;          /* codec chip name */
+
+        /* verb exec op override */
+        int (*exec_verb)(struct hdac_device *dev, unsigned int cmd,
+                         unsigned int flags, unsigned int *res);
+
+        /* widgets */
+        unsigned int num_nodes;
+        hda_nid_t start_nid, end_nid;
+
+        /* misc flags */
+        atomic_t in_pm;         /* suspend/resume being performed */
+
+        /* sysfs */
+        struct hdac_widget_tree *widgets;
+
+        /* regmap */
+        struct regmap *regmap;
+        struct snd_array vendor_verbs;
+        bool lazy_cache:1;      /* don't wake up for writes */
+        bool caps_overwriting:1; /* caps overwrite being in process */
+        bool cache_coef:1;      /* cache COEF read/write too */
+};
+
+/* device/driver type used for matching */
+enum {
+        HDA_DEV_CORE,
+        HDA_DEV_LEGACY,
+};
+
+/* direction */
+enum {
+        HDA_INPUT, HDA_OUTPUT
+};
+
+#define dev_to_hdac_dev(_dev)   container_of(_dev, struct hdac_device, dev)
+
+int snd_hdac_device_init(struct hdac_device *dev, struct hdac_bus *bus,
+                         const char *name, unsigned int addr);
+void snd_hdac_device_exit(struct hdac_device *dev);
+int snd_hdac_device_register(struct hdac_device *codec);
+void snd_hdac_device_unregister(struct hdac_device *codec);
+
+int snd_hdac_refresh_widgets(struct hdac_device *codec);
+
+unsigned int snd_hdac_make_cmd(struct hdac_device *codec, hda_nid_t nid,
+                               unsigned int verb, unsigned int parm);
+int snd_hdac_exec_verb(struct hdac_device *codec, unsigned int cmd,
+                       unsigned int flags, unsigned int *res);
+int snd_hdac_read(struct hdac_device *codec, hda_nid_t nid,
+                  unsigned int verb, unsigned int parm, unsigned int *res);
+int _snd_hdac_read_parm(struct hdac_device *codec, hda_nid_t nid, int parm,
+                        unsigned int *res);
+int snd_hdac_read_parm_uncached(struct hdac_device *codec, hda_nid_t nid,
+                                int parm);
+int snd_hdac_override_parm(struct hdac_device *codec, hda_nid_t nid,
+                           unsigned int parm, unsigned int val);
+int snd_hdac_get_connections(struct hdac_device *codec, hda_nid_t nid,
+                             hda_nid_t *conn_list, int max_conns);
+int snd_hdac_get_sub_nodes(struct hdac_device *codec, hda_nid_t nid,
+                           hda_nid_t *start_id);
+
+/**
+ * snd_hdac_read_parm - read a codec parameter
+ * @codec: the codec object
+ * @nid: NID to read a parameter
+ * @parm: parameter to read
+ *
+ * Returns -1 for error.  If you need to distinguish the error more
+ * strictly, use _snd_hdac_read_parm() directly.
+ */
+static inline int snd_hdac_read_parm(struct hdac_device *codec, hda_nid_t nid,
+                                     int parm)
+{
+        unsigned int val;
+
+        return _snd_hdac_read_parm(codec, nid, parm, &val) < 0 ? -1 : val;
+}
+
+#ifdef CONFIG_PM
+void snd_hdac_power_up(struct hdac_device *codec);
+void snd_hdac_power_down(struct hdac_device *codec);
+void snd_hdac_power_up_pm(struct hdac_device *codec);
+void snd_hdac_power_down_pm(struct hdac_device *codec);
+#else
+static inline void snd_hdac_power_up(struct hdac_device *codec) {}
+static inline void snd_hdac_power_down(struct hdac_device *codec) {}
+static inline void snd_hdac_power_up_pm(struct hdac_device *codec) {}
+static inline void snd_hdac_power_down_pm(struct hdac_device *codec) {}
+#endif
+
+/*
+ * HD-audio codec base driver
+ */
+struct hdac_driver {
+        struct device_driver driver;
+        int type;
+        int (*match)(struct hdac_device *dev, struct hdac_driver *drv);
+        void (*unsol_event)(struct hdac_device *dev, unsigned int event);
+};
+
+#define drv_to_hdac_driver(_drv) container_of(_drv, struct hdac_driver, driver)
+
+/*
+ * HD-audio bus base driver
+ */
+struct hdac_bus_ops {
+        /* send a single command */
+        int (*command)(struct hdac_bus *bus, unsigned int cmd);
+        /* get a response from the last command */
+        int (*get_response)(struct hdac_bus *bus, unsigned int addr,
+                            unsigned int *res);
+};
+
+#define HDA_UNSOL_QUEUE_SIZE    64
+
+struct hdac_bus {
+        struct device *dev;
+        const struct hdac_bus_ops *ops;
+
+        /* codec linked list */
+        struct list_head codec_list;
+        unsigned int num_codecs;
+
+        /* link caddr -> codec */
+        struct hdac_device *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1];
+
+        /* unsolicited event queue */
+        u32 unsol_queue[HDA_UNSOL_QUEUE_SIZE * 2]; /* ring buffer */
+        unsigned int unsol_rp, unsol_wp;
+        struct work_struct unsol_work;
+
+        /* bit flags of powered codecs */
+        unsigned long codec_powered;
+
+        /* flags */
+        bool sync_write:1;              /* sync after verb write */
+
+        /* locks */
+        struct mutex cmd_mutex;
+};
+
+int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev,
+                      const struct hdac_bus_ops *ops);
+void snd_hdac_bus_exit(struct hdac_bus *bus);
+int snd_hdac_bus_exec_verb(struct hdac_bus *bus, unsigned int addr,
+                           unsigned int cmd, unsigned int *res);
+int snd_hdac_bus_exec_verb_unlocked(struct hdac_bus *bus, unsigned int addr,
+                                    unsigned int cmd, unsigned int *res);
+void snd_hdac_bus_queue_event(struct hdac_bus *bus, u32 res, u32 res_ex);
+
+int snd_hdac_bus_add_device(struct hdac_bus *bus, struct hdac_device *codec);
+void snd_hdac_bus_remove_device(struct hdac_bus *bus,
+                                struct hdac_device *codec);
+
+static inline void snd_hdac_codec_link_up(struct hdac_device *codec)
+{
+        set_bit(codec->addr, &codec->bus->codec_powered);
+}
+
+static inline void snd_hdac_codec_link_down(struct hdac_device *codec)
+{
+        clear_bit(codec->addr, &codec->bus->codec_powered);
+}
+
+/*
+ * generic array helpers
+ */
+void *snd_array_new(struct snd_array *array);
+void snd_array_free(struct snd_array *array);
+static inline void snd_array_init(struct snd_array *array, unsigned int size,
+                                  unsigned int align)
+{
+        array->elem_size = size;
+        array->alloc_align = align;
+}
+
+static inline void *snd_array_elem(struct snd_array *array, unsigned int idx)
+{
+        return array->list + idx * array->elem_size;
+}
+
+static inline unsigned int snd_array_index(struct snd_array *array, void *ptr)
+{
+        return (unsigned long)(ptr - array->list) / array->elem_size;
+}
+
+#endif /* __SOUND_HDAUDIO_H */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index c0ddb7e69c28..0cb7f3f5df7b 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -60,6 +60,9 @@ struct snd_pcm_hardware {
 
 struct snd_pcm_substream;
 
+struct snd_pcm_audio_tstamp_config; /* definitions further down */
+struct snd_pcm_audio_tstamp_report;
+
 struct snd_pcm_ops {
         int (*open)(struct snd_pcm_substream *substream);
         int (*close)(struct snd_pcm_substream *substream);
@@ -71,8 +74,10 @@ struct snd_pcm_ops {
         int (*prepare)(struct snd_pcm_substream *substream);
         int (*trigger)(struct snd_pcm_substream *substream, int cmd);
         snd_pcm_uframes_t (*pointer)(struct snd_pcm_substream *substream);
-        int (*wall_clock)(struct snd_pcm_substream *substream,
-                          struct timespec *audio_ts);
+        int (*get_time_info)(struct snd_pcm_substream *substream,
+                        struct timespec *system_ts, struct timespec *audio_ts,
+                        struct snd_pcm_audio_tstamp_config *audio_tstamp_config,
+                        struct snd_pcm_audio_tstamp_report *audio_tstamp_report);
         int (*copy)(struct snd_pcm_substream *substream, int channel,
                     snd_pcm_uframes_t pos,
                     void __user *buf, snd_pcm_uframes_t count);
@@ -281,6 +286,58 @@ struct snd_pcm_hw_constraint_ranges {
 
 struct snd_pcm_hwptr_log;
 
+/*
+ * userspace-provided audio timestamp config to kernel,
+ * structure is for internal use only and filled with dedicated unpack routine
+ */
+struct snd_pcm_audio_tstamp_config {
+        /* 5 of max 16 bits used */
+        u32 type_requested:4;
+        u32 report_delay:1; /* add total delay to A/D or D/A */
+};
+
+static inline void snd_pcm_unpack_audio_tstamp_config(__u32 data,
+                                                struct snd_pcm_audio_tstamp_config *config)
+{
+        config->type_requested = data & 0xF;
+        config->report_delay = (data >> 4) & 1;
+}
+
+/*
+ * kernel-provided audio timestamp report to user-space
+ * structure is for internal use only and read by dedicated pack routine
+ */
+struct snd_pcm_audio_tstamp_report {
+        /* 6 of max 16 bits used for bit-fields */
+
+        /* for backwards compatibility */
+        u32 valid:1;
+
+        /* actual type if hardware could not support requested timestamp */
+        u32 actual_type:4;
+
+        /* accuracy represented in ns units */
+        u32 accuracy_report:1; /* 0 if accuracy unknown, 1 if accuracy field is valid */
+        u32 accuracy; /* up to 4.29s, will be packed in separate field  */
+};
+
+static inline void snd_pcm_pack_audio_tstamp_report(__u32 *data, __u32 *accuracy,
+                                                const struct snd_pcm_audio_tstamp_report *report)
+{
+        u32 tmp;
+
+        tmp = report->accuracy_report;
+        tmp <<= 4;
+        tmp |= report->actual_type;
+        tmp <<= 1;
+        tmp |= report->valid;
+
+        *data &= 0xffff; /* zero-clear MSBs */
+        *data |= (tmp << 16);
+        *accuracy = report->accuracy;
+}
+
+
 struct snd_pcm_runtime {
         /* -- Status -- */
         struct snd_pcm_substream *trigger_master;
@@ -361,6 +418,11 @@ struct snd_pcm_runtime {
 
         struct snd_dma_buffer *dma_buffer_p;    /* allocated buffer */
 
+        /* -- audio timestamp config -- */
+        struct snd_pcm_audio_tstamp_config audio_tstamp_config;
+        struct snd_pcm_audio_tstamp_report audio_tstamp_report;
+        struct timespec driver_tstamp;
+
 #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
         /* -- OSS things -- */
         struct snd_pcm_oss_runtime oss;
diff --git a/include/sound/pcm_params.h b/include/sound/pcm_params.h
index 3c45f3924ba7..c704357775fc 100644
--- a/include/sound/pcm_params.h
+++ b/include/sound/pcm_params.h
@@ -366,4 +366,11 @@ static inline int params_physical_width(const struct snd_pcm_hw_params *p)
         return snd_pcm_format_physical_width(params_format(p));
 }
 
+static inline void
+params_set_format(struct snd_pcm_hw_params *p, snd_pcm_format_t fmt)
+{
+        snd_mask_set(hw_param_mask(p, SNDRV_PCM_HW_PARAM_FORMAT),
+                (__force int)fmt);
+}
+
 #endif /* __SOUND_PCM_PARAMS_H */
diff --git a/include/sound/rt5670.h b/include/sound/rt5670.h
index bd311197a3b5..b7d60510819b 100644
--- a/include/sound/rt5670.h
+++ b/include/sound/rt5670.h
@@ -14,6 +14,7 @@
 struct rt5670_platform_data {
         int jd_mode;
         bool in2_diff;
+        bool dev_gpio;
 
         bool dmic_en;
         unsigned int dmic1_data_pin;
diff --git a/include/sound/seq_device.h b/include/sound/seq_device.h
index 2b5f24cc7548..ddc0d504cf39 100644
--- a/include/sound/seq_device.h
+++ b/include/sound/seq_device.h
@@ -25,29 +25,26 @@
  * registered device information
  */
 
-#define ID_LEN  32
-
-/* status flag */
-#define SNDRV_SEQ_DEVICE_FREE           0
-#define SNDRV_SEQ_DEVICE_REGISTERED     1
-
 struct snd_seq_device {
         /* device info */
         struct snd_card *card;  /* sound card */
         int device;             /* device number */
-        char id[ID_LEN];        /* driver id */
+        const char *id;         /* driver id */
         char name[80];          /* device name */
         int argsize;            /* size of the argument */
         void *driver_data;      /* private data for driver */
-        int status;             /* flag - read only */
         void *private_data;     /* private data for the caller */
         void (*private_free)(struct snd_seq_device *device);
-        struct list_head list;  /* link to next device */
+        struct device dev;
 };
 
+#define to_seq_dev(_dev) \
+        container_of(_dev, struct snd_seq_device, dev)
+
+/* sequencer driver */
 
 /* driver operators
- * init_device:
+ * probe:
  *      Initialize the device with given parameters.
  *      Typically,
  *              1. call snd_hwdep_new
@@ -55,25 +52,40 @@ struct snd_seq_device {
  *              3. call snd_hwdep_register
  *              4. store the instance to dev->driver_data pointer.
  *              
- * free_device:
+ * remove:
  *      Release the private data.
  *      Typically, call snd_device_free(dev->card, dev->driver_data)
  */
-struct snd_seq_dev_ops {
-        int (*init_device)(struct snd_seq_device *dev);
-        int (*free_device)(struct snd_seq_device *dev);
+struct snd_seq_driver {
+        struct device_driver driver;
+        char *id;
+        int argsize;
 };
 
+#define to_seq_drv(_drv) \
+        container_of(_drv, struct snd_seq_driver, driver)
+
 /*
  * prototypes
  */
+#ifdef CONFIG_MODULES
 void snd_seq_device_load_drivers(void);
-int snd_seq_device_new(struct snd_card *card, int device, char *id, int argsize, struct snd_seq_device **result);
-int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry, int argsize);
-int snd_seq_device_unregister_driver(char *id);
+#else
+#define snd_seq_device_load_drivers()
+#endif
+int snd_seq_device_new(struct snd_card *card, int device, const char *id,
+                       int argsize, struct snd_seq_device **result);
 
 #define SNDRV_SEQ_DEVICE_ARGPTR(dev) (void *)((char *)(dev) + sizeof(struct snd_seq_device))
 
+int __must_check __snd_seq_driver_register(struct snd_seq_driver *drv,
+                                           struct module *mod);
+#define snd_seq_driver_register(drv) \
+        __snd_seq_driver_register(drv, THIS_MODULE)
+void snd_seq_driver_unregister(struct snd_seq_driver *drv);
+
+#define module_snd_seq_driver(drv) \
+        module_driver(drv, snd_seq_driver_register, snd_seq_driver_unregister)
 
 /*
  * id strings for generic devices
diff --git a/include/sound/seq_kernel.h b/include/sound/seq_kernel.h
index 18a2ac58b88f..feb58d455560 100644
--- a/include/sound/seq_kernel.h
+++ b/include/sound/seq_kernel.h
@@ -99,13 +99,9 @@ int snd_seq_event_port_attach(int client, struct snd_seq_port_callback *pcbp,
 int snd_seq_event_port_detach(int client, int port);
 
 #ifdef CONFIG_MODULES
-void snd_seq_autoload_lock(void);
-void snd_seq_autoload_unlock(void);
 void snd_seq_autoload_init(void);
-#define snd_seq_autoload_exit() snd_seq_autoload_lock()
+void snd_seq_autoload_exit(void);
 #else
-#define snd_seq_autoload_lock()
-#define snd_seq_autoload_unlock()
 #define snd_seq_autoload_init()
 #define snd_seq_autoload_exit()
 #endif
diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h
index 1255ddb1d3e2..b9b4f289fe6b 100644
--- a/include/sound/simple_card.h
+++ b/include/sound/simple_card.h
@@ -16,7 +16,6 @@
 
 struct asoc_simple_dai {
         const char *name;
-        unsigned int fmt;
         unsigned int sysclk;
         int slots;
         int slot_width;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8d7416e46861..1065095c6973 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -287,7 +287,7 @@ struct device;
         .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\
         .tlv.p = (tlv_array), \
         .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \
-        .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) }
+        .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }
 #define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \
         SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array)
 #define SOC_DAPM_ENUM(xname, xenum) \
@@ -378,6 +378,7 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
 void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);
 int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
                          const struct snd_soc_pcm_stream *params,
+                         unsigned int num_params,
                          struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink);
 
@@ -440,7 +441,6 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card);
 int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
         struct snd_soc_dapm_widget_list **list);
 
-struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol);
 struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(
         struct snd_kcontrol *kcontrol);
 
@@ -531,6 +531,8 @@ struct snd_soc_dapm_widget {
         void *priv;                             /* widget specific data */
         struct regulator *regulator;            /* attached regulator */
         const struct snd_soc_pcm_stream *params; /* params for dai links */
+        unsigned int num_params; /* number of params for dai links */
+        unsigned int params_select; /* currently selected param for dai link */
 
         /* dapm control */
         int reg;                                /* negative reg = no direct dapm */
@@ -586,8 +588,6 @@ struct snd_soc_dapm_update {
 /* DAPM context */
 struct snd_soc_dapm_context {
         enum snd_soc_bias_level bias_level;
-        enum snd_soc_bias_level suspend_bias_level;
-        struct delayed_work delayed_work;
         unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
         /* Go to BIAS_OFF in suspend if the DAPM context is idle */
         unsigned int suspend_bias_off:1;
diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h
index 98f2ade0266e..806059052bfc 100644
--- a/include/sound/soc-dpcm.h
+++ b/include/sound/soc-dpcm.h
@@ -135,7 +135,7 @@ void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream,
 
 /* internal use only */
 int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute);
-int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
+void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
 int soc_dpcm_runtime_update(struct snd_soc_card *);
 
 int dpcm_path_get(struct snd_soc_pcm_runtime *fe,
diff --git a/include/sound/soc.h b/include/sound/soc.h
index cd8a12508f16..f6226914acfe 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -462,8 +462,10 @@ int soc_dai_hw_params(struct snd_pcm_substream *substream,
                       struct snd_soc_dai *dai);
 
 /* Jack reporting */
-int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
-                     struct snd_soc_jack *jack);
+int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,
+        struct snd_soc_jack *jack, struct snd_soc_jack_pin *pins,
+        unsigned int num_pins);
+
 void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask);
 int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
                           struct snd_soc_jack_pin *pins);
@@ -671,7 +673,7 @@ struct snd_soc_jack_gpio {
 struct snd_soc_jack {
         struct mutex mutex;
         struct snd_jack *jack;
-        struct snd_soc_codec *codec;
+        struct snd_soc_card *card;
         struct list_head pins;
         int status;
         struct blocking_notifier_head notifier;
@@ -953,6 +955,7 @@ struct snd_soc_dai_link {
         int be_id;      /* optional ID for machine driver BE identification */
 
         const struct snd_soc_pcm_stream *params;
+        unsigned int num_params;
 
         unsigned int dai_fmt;           /* format to set on init */
 
@@ -966,6 +969,9 @@ struct snd_soc_dai_link {
         unsigned int symmetric_channels:1;
         unsigned int symmetric_samplebits:1;
 
+        /* Mark this pcm with non atomic ops */
+        bool nonatomic;
+
         /* Do not create a PCM for this DAI link (Backend link) */
         unsigned int no_pcm:1;
 
@@ -1083,11 +1089,16 @@ struct snd_soc_card {
 
         /*
          * Card-specific routes and widgets.
+         * Note: of_dapm_xxx for Device Tree; Otherwise for driver build-in.
          */
         const struct snd_soc_dapm_widget *dapm_widgets;
         int num_dapm_widgets;
         const struct snd_soc_dapm_route *dapm_routes;
         int num_dapm_routes;
+        const struct snd_soc_dapm_widget *of_dapm_widgets;
+        int num_of_dapm_widgets;
+        const struct snd_soc_dapm_route *of_dapm_routes;
+        int num_of_dapm_routes;
         bool fully_routed;
 
         struct work_struct deferred_resume_work;
@@ -1270,6 +1281,19 @@ static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(
         return component->dapm_ptr;
 }
 
+/**
+ * snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol
+ * @kcontrol: The kcontrol
+ *
+ * This function must only be used on DAPM contexts that are known to be part of
+ * a CODEC (e.g. in a CODEC driver). Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(
+        struct snd_kcontrol *kcontrol)
+{
+        return snd_soc_dapm_to_codec(snd_soc_dapm_kcontrol_dapm(kcontrol));
+}
+
 /* codec IO */
 unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
 int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
@@ -1481,7 +1505,7 @@ static inline struct snd_soc_codec *snd_soc_kcontrol_codec(
 }
 
 /**
- * snd_soc_kcontrol_platform() - Returns the platform that registerd the control
+ * snd_soc_kcontrol_platform() - Returns the platform that registered the control
  * @kcontrol: The control for which to get the platform
  *
  * Note: This function will only work correctly if the control has been
diff --git a/include/sound/spear_dma.h b/include/sound/spear_dma.h
index 65aca51fe255..e290de4e7e82 100644
--- a/include/sound/spear_dma.h
+++ b/include/sound/spear_dma.h
@@ -1,7 +1,7 @@
 /*
 * linux/spear_dma.h
 *
-* Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)
+* Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h
index d3583d3ee193..54e7af301888 100644
--- a/include/target/iscsi/iscsi_target_core.h
+++ b/include/target/iscsi/iscsi_target_core.h
@@ -20,6 +20,8 @@
 #define ISCSIT_MIN_TAGS                 16
 #define ISCSIT_EXTRA_TAGS               8
 #define ISCSIT_TCP_BACKLOG              256
+#define ISCSI_RX_THREAD_NAME            "iscsi_trx"
+#define ISCSI_TX_THREAD_NAME            "iscsi_ttx"
 
 /* struct iscsi_node_attrib sanity values */
 #define NA_DATAOUT_TIMEOUT              3
@@ -60,6 +62,7 @@
 #define TA_CACHE_CORE_NPS               0
 /* T10 protection information disabled by default */
 #define TA_DEFAULT_T10_PI               0
+#define TA_DEFAULT_FABRIC_PROT_TYPE     0
 
 #define ISCSI_IOV_DATA_BUFFER           5
 
@@ -600,8 +603,11 @@ struct iscsi_conn {
         struct iscsi_tpg_np     *tpg_np;
         /* Pointer to parent session */
         struct iscsi_session    *sess;
-        /* Pointer to thread_set in use for this conn's threads */
-        struct iscsi_thread_set *thread_set;
+        int                     bitmap_id;
+        int                     rx_thread_active;
+        struct task_struct      *rx_thread;
+        int                     tx_thread_active;
+        struct task_struct      *tx_thread;
         /* list_head for session connection list */
         struct list_head        conn_list;
 } ____cacheline_aligned;
@@ -767,6 +773,7 @@ struct iscsi_tpg_attrib {
         u32                     demo_mode_discovery;
         u32                     default_erl;
         u8                      t10_pi;
+        u32                     fabric_prot_type;
         struct iscsi_portal_group *tpg;
 };
 
@@ -871,10 +878,10 @@ struct iscsit_global {
         /* Unique identifier used for the authentication daemon */
         u32                     auth_id;
         u32                     inactive_ts;
-        /* Thread Set bitmap count */
-        int                     ts_bitmap_count;
+#define ISCSIT_BITMAP_BITS      262144
         /* Thread Set bitmap pointer */
         unsigned long           *ts_bitmap;
+        spinlock_t              ts_bitmap_lock;
         /* Used for iSCSI discovery session authentication */
         struct iscsi_node_acl   discovery_acl;
         struct iscsi_portal_group       *discovery_tpg;
diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index db81c65b8f48..d61be7297b2c 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -111,6 +111,7 @@ void	array_free(void *array, int n);
 void    target_core_setup_sub_cits(struct se_subsystem_api *);
 
 /* attribute helpers from target_core_device.c for backend drivers */
+bool    se_dev_check_wce(struct se_device *);
 int     se_dev_set_max_unmap_lba_count(struct se_device *, u32);
 int     se_dev_set_max_unmap_block_desc_count(struct se_device *, u32);
 int     se_dev_set_unmap_granularity(struct se_device *, u32);
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 672150b6aaf5..480e9f82dfea 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -165,10 +165,8 @@ enum se_cmd_flags_table {
         SCF_SEND_DELAYED_TAS            = 0x00004000,
         SCF_ALUA_NON_OPTIMIZED          = 0x00008000,
         SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC = 0x00020000,
-        SCF_ACK_KREF                    = 0x00040000,
         SCF_COMPARE_AND_WRITE           = 0x00080000,
         SCF_COMPARE_AND_WRITE_POST      = 0x00100000,
-        SCF_CMD_XCOPY_PASSTHROUGH       = 0x00200000,
 };
 
 /* struct se_dev_entry->lun_flags and struct se_lun->lun_access */
@@ -520,11 +518,11 @@ struct se_cmd {
         struct list_head        se_cmd_list;
         struct completion       cmd_wait_comp;
         struct kref             cmd_kref;
-        struct target_core_fabric_ops *se_tfo;
+        const struct target_core_fabric_ops *se_tfo;
         sense_reason_t          (*execute_cmd)(struct se_cmd *);
         sense_reason_t          (*execute_rw)(struct se_cmd *, struct scatterlist *,
                                               u32, enum dma_data_direction);
-        sense_reason_t (*transport_complete_callback)(struct se_cmd *);
+        sense_reason_t (*transport_complete_callback)(struct se_cmd *, bool);
 
         unsigned char           *t_task_cdb;
         unsigned char           __t_task_cdb[TCM_MAX_COMMAND_SIZE];
@@ -591,6 +589,7 @@ struct se_node_acl {
         bool                    acl_stop:1;
         u32                     queue_depth;
         u32                     acl_index;
+        enum target_prot_type   saved_prot_type;
 #define MAX_ACL_TAG_SIZE 64
         char                    acl_tag[MAX_ACL_TAG_SIZE];
         /* Used for PR SPEC_I_PT=1 and REGISTER_AND_MOVE */
@@ -616,6 +615,7 @@ struct se_session {
         unsigned                sess_tearing_down:1;
         u64                     sess_bin_isid;
         enum target_prot_op     sup_prot_ops;
+        enum target_prot_type   sess_prot_type;
         struct se_node_acl      *se_node_acl;
         struct se_portal_group *se_tpg;
         void                    *fabric_sess_ptr;
@@ -890,7 +890,7 @@ struct se_portal_group {
         /* List of TCM sessions associated wth this TPG */
         struct list_head        tpg_sess_list;
         /* Pointer to $FABRIC_MOD dependent code */
-        struct target_core_fabric_ops *se_tpg_tfo;
+        const struct target_core_fabric_ops *se_tpg_tfo;
         struct se_wwn           *se_tpg_wwn;
         struct config_group     tpg_group;
         struct config_group     *tpg_default_groups[7];
diff --git a/include/target/target_core_configfs.h b/include/target/target_core_configfs.h
index e0801386e4dc..25bb04c4209e 100644
--- a/include/target/target_core_configfs.h
+++ b/include/target/target_core_configfs.h
@@ -5,12 +5,6 @@
 #define TARGET_CORE_NAME_MAX_LEN        64
 #define TARGET_FABRIC_NAME_SIZE         32
 
-extern struct target_fabric_configfs *target_fabric_configfs_init(
-                                struct module *, const char *);
-extern void target_fabric_configfs_free(struct target_fabric_configfs *);
-extern int target_fabric_configfs_register(struct target_fabric_configfs *);
-extern void target_fabric_configfs_deregister(struct target_fabric_configfs *);
-
 struct target_fabric_configfs_template {
         struct config_item_type tfc_discovery_cit;
         struct config_item_type tfc_wwn_cit;
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 22a4e98eec80..17c7f5ac7ea0 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -2,6 +2,8 @@
 #define TARGET_CORE_FABRIC_H
 
 struct target_core_fabric_ops {
+        struct module *module;
+        const char *name;
         struct configfs_subsystem *tf_subsys;
         char *(*get_fabric_name)(void);
         u8 (*get_fabric_proto_ident)(struct se_portal_group *);
@@ -27,6 +29,14 @@ struct target_core_fabric_ops {
          * inquiry response
          */
         int (*tpg_check_demo_mode_login_only)(struct se_portal_group *);
+        /*
+         * Optionally used as a configfs tunable to determine when
+         * target-core should signal the PROTECT=1 feature bit for
+         * backends that don't support T10-PI, so that either fabric
+         * HW offload or target-core emulation performs the associated
+         * WRITE_STRIP and READ_INSERT operations.
+         */
+        int (*tpg_check_prot_fabric_only)(struct se_portal_group *);
         struct se_node_acl *(*tpg_alloc_fabric_acl)(
                                         struct se_portal_group *);
         void (*tpg_release_fabric_acl)(struct se_portal_group *,
@@ -82,8 +92,23 @@ struct target_core_fabric_ops {
         struct se_node_acl *(*fabric_make_nodeacl)(struct se_portal_group *,
                                 struct config_group *, const char *);
         void (*fabric_drop_nodeacl)(struct se_node_acl *);
+
+        struct configfs_attribute **tfc_discovery_attrs;
+        struct configfs_attribute **tfc_wwn_attrs;
+        struct configfs_attribute **tfc_tpg_base_attrs;
+        struct configfs_attribute **tfc_tpg_np_base_attrs;
+        struct configfs_attribute **tfc_tpg_attrib_attrs;
+        struct configfs_attribute **tfc_tpg_auth_attrs;
+        struct configfs_attribute **tfc_tpg_param_attrs;
+        struct configfs_attribute **tfc_tpg_nacl_base_attrs;
+        struct configfs_attribute **tfc_tpg_nacl_attrib_attrs;
+        struct configfs_attribute **tfc_tpg_nacl_auth_attrs;
+        struct configfs_attribute **tfc_tpg_nacl_param_attrs;
 };
 
+int target_register_template(const struct target_core_fabric_ops *fo);
+void target_unregister_template(const struct target_core_fabric_ops *fo);
+
 struct se_session *transport_init_session(enum target_prot_op);
 int transport_alloc_session_tags(struct se_session *, unsigned int,
                 unsigned int);
@@ -95,13 +120,15 @@ void	transport_register_session(struct se_portal_group *,
                 struct se_node_acl *, struct se_session *, void *);
 void    target_get_session(struct se_session *);
 void    target_put_session(struct se_session *);
+ssize_t target_show_dynamic_sessions(struct se_portal_group *, char *);
 void    transport_free_session(struct se_session *);
 void    target_put_nacl(struct se_node_acl *);
 void    transport_deregister_session_configfs(struct se_session *);
 void    transport_deregister_session(struct se_session *);
 
 
-void    transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *,
+void    transport_init_se_cmd(struct se_cmd *,
+                const struct target_core_fabric_ops *,
                 struct se_session *, u32, int, int, unsigned char *);
 sense_reason_t transport_lookup_cmd_lun(struct se_cmd *, u32);
 sense_reason_t target_setup_cmd_from_cdb(struct se_cmd *, unsigned char *);
@@ -153,8 +180,8 @@ int	core_tpg_set_initiator_node_queue_depth(struct se_portal_group *,
                 unsigned char *, u32, int);
 int     core_tpg_set_initiator_node_tag(struct se_portal_group *,
                 struct se_node_acl *, const char *);
-int     core_tpg_register(struct target_core_fabric_ops *, struct se_wwn *,
-                struct se_portal_group *, void *, int);
+int     core_tpg_register(const struct target_core_fabric_ops *,
+                struct se_wwn *, struct se_portal_group *, void *, int);
 int     core_tpg_deregister(struct se_portal_group *);
 
 /* SAS helpers */
diff --git a/include/target/target_core_fabric_configfs.h b/include/target/target_core_fabric_configfs.h
index b32a14905cfa..7a0649c09e79 100644
--- a/include/target/target_core_fabric_configfs.h
+++ b/include/target/target_core_fabric_configfs.h
@@ -90,6 +90,11 @@ static struct target_fabric_tpg_attribute _fabric##_tpg_##_name =	\
         _fabric##_tpg_store_##_name);
 
 
+#define TF_TPG_BASE_ATTR_RO(_fabric, _name)                             \
+static struct target_fabric_tpg_attribute _fabric##_tpg_##_name =       \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        _fabric##_tpg_show_##_name);
+
 CONFIGFS_EATTR_STRUCT(target_fabric_wwn, target_fabric_configfs);
 #define TF_WWN_ATTR(_fabric, _name, _mode)                              \
 static struct target_fabric_wwn_attribute _fabric##_wwn_##_name =       \
diff --git a/include/trace/events/9p.h b/include/trace/events/9p.h
index a0666362c111..633ee9ee9778 100644
--- a/include/trace/events/9p.h
+++ b/include/trace/events/9p.h
@@ -6,76 +6,95 @@
 
 #include <linux/tracepoint.h>
 
+#define P9_MSG_T                                                        \
+                EM( P9_TLERROR,         "P9_TLERROR" )                  \
+                EM( P9_RLERROR,         "P9_RLERROR" )                  \
+                EM( P9_TSTATFS,         "P9_TSTATFS" )                  \
+                EM( P9_RSTATFS,         "P9_RSTATFS" )                  \
+                EM( P9_TLOPEN,          "P9_TLOPEN" )                   \
+                EM( P9_RLOPEN,          "P9_RLOPEN" )                   \
+                EM( P9_TLCREATE,        "P9_TLCREATE" )                 \
+                EM( P9_RLCREATE,        "P9_RLCREATE" )                 \
+                EM( P9_TSYMLINK,        "P9_TSYMLINK" )                 \
+                EM( P9_RSYMLINK,        "P9_RSYMLINK" )                 \
+                EM( P9_TMKNOD,          "P9_TMKNOD" )                   \
+                EM( P9_RMKNOD,          "P9_RMKNOD" )                   \
+                EM( P9_TRENAME,         "P9_TRENAME" )                  \
+                EM( P9_RRENAME,         "P9_RRENAME" )                  \
+                EM( P9_TREADLINK,       "P9_TREADLINK" )                \
+                EM( P9_RREADLINK,       "P9_RREADLINK" )                \
+                EM( P9_TGETATTR,        "P9_TGETATTR" )                 \
+                EM( P9_RGETATTR,        "P9_RGETATTR" )                 \
+                EM( P9_TSETATTR,        "P9_TSETATTR" )                 \
+                EM( P9_RSETATTR,        "P9_RSETATTR" )                 \
+                EM( P9_TXATTRWALK,      "P9_TXATTRWALK" )               \
+                EM( P9_RXATTRWALK,      "P9_RXATTRWALK" )               \
+                EM( P9_TXATTRCREATE,    "P9_TXATTRCREATE" )             \
+                EM( P9_RXATTRCREATE,    "P9_RXATTRCREATE" )             \
+                EM( P9_TREADDIR,        "P9_TREADDIR" )                 \
+                EM( P9_RREADDIR,        "P9_RREADDIR" )                 \
+                EM( P9_TFSYNC,          "P9_TFSYNC" )                   \
+                EM( P9_RFSYNC,          "P9_RFSYNC" )                   \
+                EM( P9_TLOCK,           "P9_TLOCK" )                    \
+                EM( P9_RLOCK,           "P9_RLOCK" )                    \
+                EM( P9_TGETLOCK,        "P9_TGETLOCK" )                 \
+                EM( P9_RGETLOCK,        "P9_RGETLOCK" )                 \
+                EM( P9_TLINK,           "P9_TLINK" )                    \
+                EM( P9_RLINK,           "P9_RLINK" )                    \
+                EM( P9_TMKDIR,          "P9_TMKDIR" )                   \
+                EM( P9_RMKDIR,          "P9_RMKDIR" )                   \
+                EM( P9_TRENAMEAT,       "P9_TRENAMEAT" )                \
+                EM( P9_RRENAMEAT,       "P9_RRENAMEAT" )                \
+                EM( P9_TUNLINKAT,       "P9_TUNLINKAT" )                \
+                EM( P9_RUNLINKAT,       "P9_RUNLINKAT" )                \
+                EM( P9_TVERSION,        "P9_TVERSION" )                 \
+                EM( P9_RVERSION,        "P9_RVERSION" )                 \
+                EM( P9_TAUTH,           "P9_TAUTH" )                    \
+                EM( P9_RAUTH,           "P9_RAUTH" )                    \
+                EM( P9_TATTACH,         "P9_TATTACH" )                  \
+                EM( P9_RATTACH,         "P9_RATTACH" )                  \
+                EM( P9_TERROR,          "P9_TERROR" )                   \
+                EM( P9_RERROR,          "P9_RERROR" )                   \
+                EM( P9_TFLUSH,          "P9_TFLUSH" )                   \
+                EM( P9_RFLUSH,          "P9_RFLUSH" )                   \
+                EM( P9_TWALK,           "P9_TWALK" )                    \
+                EM( P9_RWALK,           "P9_RWALK" )                    \
+                EM( P9_TOPEN,           "P9_TOPEN" )                    \
+                EM( P9_ROPEN,           "P9_ROPEN" )                    \
+                EM( P9_TCREATE,         "P9_TCREATE" )                  \
+                EM( P9_RCREATE,         "P9_RCREATE" )                  \
+                EM( P9_TREAD,           "P9_TREAD" )                    \
+                EM( P9_RREAD,           "P9_RREAD" )                    \
+                EM( P9_TWRITE,          "P9_TWRITE" )                   \
+                EM( P9_RWRITE,          "P9_RWRITE" )                   \
+                EM( P9_TCLUNK,          "P9_TCLUNK" )                   \
+                EM( P9_RCLUNK,          "P9_RCLUNK" )                   \
+                EM( P9_TREMOVE,         "P9_TREMOVE" )                  \
+                EM( P9_RREMOVE,         "P9_RREMOVE" )                  \
+                EM( P9_TSTAT,           "P9_TSTAT" )                    \
+                EM( P9_RSTAT,           "P9_RSTAT" )                    \
+                EM( P9_TWSTAT,          "P9_TWSTAT" )                   \
+                EMe(P9_RWSTAT,          "P9_RWSTAT" )
+
+/* Define EM() to export the enums to userspace via TRACE_DEFINE_ENUM() */
+#undef EM
+#undef EMe
+#define EM(a, b)        TRACE_DEFINE_ENUM(a);
+#define EMe(a, b)       TRACE_DEFINE_ENUM(a);
+
+P9_MSG_T
+
+/*
+ * Now redefine the EM() and EMe() macros to map the enums to the strings
+ * that will be printed in the output.
+ */
+#undef EM
+#undef EMe
+#define EM(a, b)        { a, b },
+#define EMe(a, b)       { a, b }
+
 #define show_9p_op(type)                                                \
-        __print_symbolic(type,                                          \
-                         { P9_TLERROR,          "P9_TLERROR" },         \
-                         { P9_RLERROR,          "P9_RLERROR" },         \
-                         { P9_TSTATFS,          "P9_TSTATFS" },         \
-                         { P9_RSTATFS,          "P9_RSTATFS" },         \
-                         { P9_TLOPEN,           "P9_TLOPEN" },          \
-                         { P9_RLOPEN,           "P9_RLOPEN" },          \
-                         { P9_TLCREATE,         "P9_TLCREATE" },        \
-                         { P9_RLCREATE,         "P9_RLCREATE" },        \
-                         { P9_TSYMLINK,         "P9_TSYMLINK" },        \
-                         { P9_RSYMLINK,         "P9_RSYMLINK" },        \
-                         { P9_TMKNOD,           "P9_TMKNOD" },          \
-                         { P9_RMKNOD,           "P9_RMKNOD" },          \
-                         { P9_TRENAME,          "P9_TRENAME" },         \
-                         { P9_RRENAME,          "P9_RRENAME" },         \
-                         { P9_TREADLINK,        "P9_TREADLINK" },       \
-                         { P9_RREADLINK,        "P9_RREADLINK" },       \
-                         { P9_TGETATTR,         "P9_TGETATTR" },        \
-                         { P9_RGETATTR,         "P9_RGETATTR" },        \
-                         { P9_TSETATTR,         "P9_TSETATTR" },        \
-                         { P9_RSETATTR,         "P9_RSETATTR" },        \
-                         { P9_TXATTRWALK,       "P9_TXATTRWALK" },      \
-                         { P9_RXATTRWALK,       "P9_RXATTRWALK" },      \
-                         { P9_TXATTRCREATE,     "P9_TXATTRCREATE" },    \
-                         { P9_RXATTRCREATE,     "P9_RXATTRCREATE" },    \
-                         { P9_TREADDIR,         "P9_TREADDIR" },        \
-                         { P9_RREADDIR,         "P9_RREADDIR" },        \
-                         { P9_TFSYNC,           "P9_TFSYNC" },          \
-                         { P9_RFSYNC,           "P9_RFSYNC" },          \
-                         { P9_TLOCK,            "P9_TLOCK" },           \
-                         { P9_RLOCK,            "P9_RLOCK" },           \
-                         { P9_TGETLOCK,         "P9_TGETLOCK" },        \
-                         { P9_RGETLOCK,         "P9_RGETLOCK" },        \
-                         { P9_TLINK,            "P9_TLINK" },           \
-                         { P9_RLINK,            "P9_RLINK" },           \
-                         { P9_TMKDIR,           "P9_TMKDIR" },          \
-                         { P9_RMKDIR,           "P9_RMKDIR" },          \
-                         { P9_TRENAMEAT,        "P9_TRENAMEAT" },       \
-                         { P9_RRENAMEAT,        "P9_RRENAMEAT" },       \
-                         { P9_TUNLINKAT,        "P9_TUNLINKAT" },       \
-                         { P9_RUNLINKAT,        "P9_RUNLINKAT" },       \
-                         { P9_TVERSION,         "P9_TVERSION" },        \
-                         { P9_RVERSION,         "P9_RVERSION" },        \
-                         { P9_TAUTH,            "P9_TAUTH" },           \
-                         { P9_RAUTH,            "P9_RAUTH" },           \
-                         { P9_TATTACH,          "P9_TATTACH" },         \
-                         { P9_RATTACH,          "P9_RATTACH" },         \
-                         { P9_TERROR,           "P9_TERROR" },          \
-                         { P9_RERROR,           "P9_RERROR" },          \
-                         { P9_TFLUSH,           "P9_TFLUSH" },          \
-                         { P9_RFLUSH,           "P9_RFLUSH" },          \
-                         { P9_TWALK,            "P9_TWALK" },           \
-                         { P9_RWALK,            "P9_RWALK" },           \
-                         { P9_TOPEN,            "P9_TOPEN" },           \
-                         { P9_ROPEN,            "P9_ROPEN" },           \
-                         { P9_TCREATE,          "P9_TCREATE" },         \
-                         { P9_RCREATE,          "P9_RCREATE" },         \
-                         { P9_TREAD,            "P9_TREAD" },           \
-                         { P9_RREAD,            "P9_RREAD" },           \
-                         { P9_TWRITE,           "P9_TWRITE" },          \
-                         { P9_RWRITE,           "P9_RWRITE" },          \
-                         { P9_TCLUNK,           "P9_TCLUNK" },          \
-                         { P9_RCLUNK,           "P9_RCLUNK" },          \
-                         { P9_TREMOVE,          "P9_TREMOVE" },         \
-                         { P9_RREMOVE,          "P9_RREMOVE" },         \
-                         { P9_TSTAT,            "P9_TSTAT" },           \
-                         { P9_RSTAT,            "P9_RSTAT" },           \
-                         { P9_TWSTAT,           "P9_TWSTAT" },          \
-                         { P9_RWSTAT,           "P9_RWSTAT" })
+        __print_symbolic(type, P9_MSG_T)
 
 TRACE_EVENT(9p_client_req,
             TP_PROTO(struct p9_client *clnt, int8_t type, int tag),
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 1faecea101f3..7f79cf459591 100644
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -407,10 +407,10 @@ TRACE_EVENT(btrfs_sync_file,
 
         TP_fast_assign(
                 struct dentry *dentry = file->f_path.dentry;
-                struct inode *inode = dentry->d_inode;
+                struct inode *inode = d_inode(dentry);
 
                 __entry->ino            = inode->i_ino;
-                __entry->parent         = dentry->d_parent->d_inode->i_ino;
+                __entry->parent         = d_inode(dentry->d_parent)->i_ino;
                 __entry->datasync       = datasync;
                 __entry->root_objectid  =
                                  BTRFS_I(inode)->root->root_key.objectid;
@@ -962,7 +962,7 @@ TRACE_EVENT(alloc_extent_state,
                 __entry->ip     = IP
         ),
 
-        TP_printk("state=%p; mask = %s; caller = %pF", __entry->state,
+        TP_printk("state=%p; mask = %s; caller = %pS", __entry->state,
                   show_gfp_flags(__entry->mask), (void *)__entry->ip)
 );
 
@@ -982,7 +982,7 @@ TRACE_EVENT(free_extent_state,
                 __entry->ip = IP
         ),
 
-        TP_printk(" state=%p; caller = %pF", __entry->state,
+        TP_printk(" state=%p; caller = %pS", __entry->state,
                   (void *)__entry->ip)
 );
 
diff --git a/include/trace/events/clk.h b/include/trace/events/clk.h
new file mode 100644
index 000000000000..758607226bfd
--- /dev/null
+++ b/include/trace/events/clk.h
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM clk
+
+#if !defined(_TRACE_CLK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_CLK_H
+
+#include <linux/tracepoint.h>
+
+struct clk_core;
+
+DECLARE_EVENT_CLASS(clk,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core),
+
+        TP_STRUCT__entry(
+                __string(        name,           core->name       )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, core->name);
+        ),
+
+        TP_printk("%s", __get_str(name))
+);
+
+DEFINE_EVENT(clk, clk_enable,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_enable_complete,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_disable,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_disable_complete,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_prepare,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_prepare_complete,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_unprepare,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_unprepare_complete,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DECLARE_EVENT_CLASS(clk_rate,
+
+        TP_PROTO(struct clk_core *core, unsigned long rate),
+
+        TP_ARGS(core, rate),
+
+        TP_STRUCT__entry(
+                __string(        name,           core->name                )
+                __field(unsigned long,           rate                      )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, core->name);
+                __entry->rate = rate;
+        ),
+
+        TP_printk("%s %lu", __get_str(name), (unsigned long)__entry->rate)
+);
+
+DEFINE_EVENT(clk_rate, clk_set_rate,
+
+        TP_PROTO(struct clk_core *core, unsigned long rate),
+
+        TP_ARGS(core, rate)
+);
+
+DEFINE_EVENT(clk_rate, clk_set_rate_complete,
+
+        TP_PROTO(struct clk_core *core, unsigned long rate),
+
+        TP_ARGS(core, rate)
+);
+
+DECLARE_EVENT_CLASS(clk_parent,
+
+        TP_PROTO(struct clk_core *core, struct clk_core *parent),
+
+        TP_ARGS(core, parent),
+
+        TP_STRUCT__entry(
+                __string(        name,           core->name                )
+                __string(        pname,          parent->name              )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, core->name);
+                __assign_str(pname, parent->name);
+        ),
+
+        TP_printk("%s %s", __get_str(name), __get_str(pname))
+);
+
+DEFINE_EVENT(clk_parent, clk_set_parent,
+
+        TP_PROTO(struct clk_core *core, struct clk_core *parent),
+
+        TP_ARGS(core, parent)
+);
+
+DEFINE_EVENT(clk_parent, clk_set_parent_complete,
+
+        TP_PROTO(struct clk_core *core, struct clk_core *parent),
+
+        TP_ARGS(core, parent)
+);
+
+DECLARE_EVENT_CLASS(clk_phase,
+
+        TP_PROTO(struct clk_core *core, int phase),
+
+        TP_ARGS(core, phase),
+
+        TP_STRUCT__entry(
+                __string(        name,           core->name                )
+                __field(          int,           phase                     )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, core->name);
+                __entry->phase = phase;
+        ),
+
+        TP_printk("%s %d", __get_str(name), (int)__entry->phase)
+);
+
+DEFINE_EVENT(clk_phase, clk_set_phase,
+
+        TP_PROTO(struct clk_core *core, int phase),
+
+        TP_ARGS(core, phase)
+);
+
+DEFINE_EVENT(clk_phase, clk_set_phase_complete,
+
+        TP_PROTO(struct clk_core *core, int phase),
+
+        TP_ARGS(core, phase)
+);
+
+#endif /* _TRACE_CLK_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/cma.h b/include/trace/events/cma.h
new file mode 100644
index 000000000000..d7cd961720a7
--- /dev/null
+++ b/include/trace/events/cma.h
@@ -0,0 +1,66 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM cma
+
+#if !defined(_TRACE_CMA_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_CMA_H
+
+#include <linux/types.h>
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(cma_alloc,
+
+        TP_PROTO(unsigned long pfn, const struct page *page,
+                 unsigned int count, unsigned int align),
+
+        TP_ARGS(pfn, page, count, align),
+
+        TP_STRUCT__entry(
+                __field(unsigned long, pfn)
+                __field(const struct page *, page)
+                __field(unsigned int, count)
+                __field(unsigned int, align)
+        ),
+
+        TP_fast_assign(
+                __entry->pfn = pfn;
+                __entry->page = page;
+                __entry->count = count;
+                __entry->align = align;
+        ),
+
+        TP_printk("pfn=%lx page=%p count=%u align=%u",
+                  __entry->pfn,
+                  __entry->page,
+                  __entry->count,
+                  __entry->align)
+);
+
+TRACE_EVENT(cma_release,
+
+        TP_PROTO(unsigned long pfn, const struct page *page,
+                 unsigned int count),
+
+        TP_ARGS(pfn, page, count),
+
+        TP_STRUCT__entry(
+                __field(unsigned long, pfn)
+                __field(const struct page *, page)
+                __field(unsigned int, count)
+        ),
+
+        TP_fast_assign(
+                __entry->pfn = pfn;
+                __entry->page = page;
+                __entry->count = count;
+        ),
+
+        TP_printk("pfn=%lx page=%p count=%u",
+                  __entry->pfn,
+                  __entry->page,
+                  __entry->count)
+);
+
+#endif /* _TRACE_CMA_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/ext3.h b/include/trace/events/ext3.h
index 6797b9de90ed..fc733d28117a 100644
--- a/include/trace/events/ext3.h
+++ b/include/trace/events/ext3.h
@@ -144,7 +144,7 @@ TRACE_EVENT(ext3_mark_inode_dirty,
                 __entry->ip     = IP;
         ),
 
-        TP_printk("dev %d,%d ino %lu caller %pF",
+        TP_printk("dev %d,%d ino %lu caller %pS",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, (void *)__entry->ip)
 );
@@ -439,10 +439,10 @@ TRACE_EVENT(ext3_sync_file_enter,
         TP_fast_assign(
                 struct dentry *dentry = file->f_path.dentry;
 
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
-                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->dev            = d_inode(dentry)->i_sb->s_dev;
+                __entry->ino            = d_inode(dentry)->i_ino;
                 __entry->datasync       = datasync;
-                __entry->parent         = dentry->d_parent->d_inode->i_ino;
+                __entry->parent         = d_inode(dentry->d_parent)->i_ino;
         ),
 
         TP_printk("dev %d,%d ino %lu parent %ld datasync %d ",
@@ -710,9 +710,9 @@ TRACE_EVENT(ext3_unlink_enter,
 
         TP_fast_assign(
                 __entry->parent         = parent->i_ino;
-                __entry->ino            = dentry->d_inode->i_ino;
-                __entry->size           = dentry->d_inode->i_size;
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
+                __entry->ino            = d_inode(dentry)->i_ino;
+                __entry->size           = d_inode(dentry)->i_size;
+                __entry->dev            = d_inode(dentry)->i_sb->s_dev;
         ),
 
         TP_printk("dev %d,%d ino %lu size %lld parent %ld",
@@ -734,8 +734,8 @@ TRACE_EVENT(ext3_unlink_exit,
         ),
 
         TP_fast_assign(
-                __entry->ino            = dentry->d_inode->i_ino;
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
+                __entry->ino            = d_inode(dentry)->i_ino;
+                __entry->dev            = d_inode(dentry)->i_sb->s_dev;
                 __entry->ret            = ret;
         ),
 
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 6e5abd6d38a2..08ec3dd27630 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -240,7 +240,7 @@ TRACE_EVENT(ext4_mark_inode_dirty,
                 __entry->ip     = IP;
         ),
 
-        TP_printk("dev %d,%d ino %lu caller %pF",
+        TP_printk("dev %d,%d ino %lu caller %pS",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, (void *)__entry->ip)
 );
@@ -872,10 +872,10 @@ TRACE_EVENT(ext4_sync_file_enter,
         TP_fast_assign(
                 struct dentry *dentry = file->f_path.dentry;
 
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
-                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->dev            = d_inode(dentry)->i_sb->s_dev;
+                __entry->ino            = d_inode(dentry)->i_ino;
                 __entry->datasync       = datasync;
-                __entry->parent         = dentry->d_parent->d_inode->i_ino;
+                __entry->parent         = d_inode(dentry->d_parent)->i_ino;
         ),
 
         TP_printk("dev %d,%d ino %lu parent %lu datasync %d ",
@@ -1453,10 +1453,10 @@ TRACE_EVENT(ext4_unlink_enter,
         ),
 
         TP_fast_assign(
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
-                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->dev            = d_inode(dentry)->i_sb->s_dev;
+                __entry->ino            = d_inode(dentry)->i_ino;
                 __entry->parent         = parent->i_ino;
-                __entry->size           = dentry->d_inode->i_size;
+                __entry->size           = d_inode(dentry)->i_size;
         ),
 
         TP_printk("dev %d,%d ino %lu size %lld parent %lu",
@@ -1477,8 +1477,8 @@ TRACE_EVENT(ext4_unlink_exit,
         ),
 
         TP_fast_assign(
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
-                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->dev            = d_inode(dentry)->i_sb->s_dev;
+                __entry->ino            = d_inode(dentry)->i_ino;
                 __entry->ret            = ret;
         ),
 
@@ -1762,7 +1762,7 @@ TRACE_EVENT(ext4_journal_start,
                 __entry->rsv_blocks      = rsv_blocks;
         ),
 
-        TP_printk("dev %d,%d blocks, %d rsv_blocks, %d caller %pF",
+        TP_printk("dev %d,%d blocks, %d rsv_blocks, %d caller %pS",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   __entry->blocks, __entry->rsv_blocks, (void *)__entry->ip)
 );
@@ -1784,7 +1784,7 @@ TRACE_EVENT(ext4_journal_start_reserved,
                 __entry->blocks          = blocks;
         ),
 
-        TP_printk("dev %d,%d blocks, %d caller %pF",
+        TP_printk("dev %d,%d blocks, %d caller %pS",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   __entry->blocks, (void *)__entry->ip)
 );
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 5422dbfaf97d..e202dec22e1d 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -9,12 +9,46 @@
 #define show_dev(entry)         MAJOR(entry->dev), MINOR(entry->dev)
 #define show_dev_ino(entry)     show_dev(entry), (unsigned long)entry->ino
 
+TRACE_DEFINE_ENUM(NODE);
+TRACE_DEFINE_ENUM(DATA);
+TRACE_DEFINE_ENUM(META);
+TRACE_DEFINE_ENUM(META_FLUSH);
+TRACE_DEFINE_ENUM(CURSEG_HOT_DATA);
+TRACE_DEFINE_ENUM(CURSEG_WARM_DATA);
+TRACE_DEFINE_ENUM(CURSEG_COLD_DATA);
+TRACE_DEFINE_ENUM(CURSEG_HOT_NODE);
+TRACE_DEFINE_ENUM(CURSEG_WARM_NODE);
+TRACE_DEFINE_ENUM(CURSEG_COLD_NODE);
+TRACE_DEFINE_ENUM(NO_CHECK_TYPE);
+TRACE_DEFINE_ENUM(GC_GREEDY);
+TRACE_DEFINE_ENUM(GC_CB);
+TRACE_DEFINE_ENUM(FG_GC);
+TRACE_DEFINE_ENUM(BG_GC);
+TRACE_DEFINE_ENUM(LFS);
+TRACE_DEFINE_ENUM(SSR);
+TRACE_DEFINE_ENUM(__REQ_RAHEAD);
+TRACE_DEFINE_ENUM(__REQ_WRITE);
+TRACE_DEFINE_ENUM(__REQ_SYNC);
+TRACE_DEFINE_ENUM(__REQ_NOIDLE);
+TRACE_DEFINE_ENUM(__REQ_FLUSH);
+TRACE_DEFINE_ENUM(__REQ_FUA);
+TRACE_DEFINE_ENUM(__REQ_PRIO);
+TRACE_DEFINE_ENUM(__REQ_META);
+TRACE_DEFINE_ENUM(CP_UMOUNT);
+TRACE_DEFINE_ENUM(CP_FASTBOOT);
+TRACE_DEFINE_ENUM(CP_SYNC);
+TRACE_DEFINE_ENUM(CP_DISCARD);
+
 #define show_block_type(type)                                           \
         __print_symbolic(type,                                          \
                 { NODE,         "NODE" },                               \
                 { DATA,         "DATA" },                               \
                 { META,         "META" },                               \
-                { META_FLUSH,   "META_FLUSH" })
+                { META_FLUSH,   "META_FLUSH" },                         \
+                { INMEM,        "INMEM" },                              \
+                { INMEM_DROP,   "INMEM_DROP" },                         \
+                { IPU,          "IN-PLACE" },                           \
+                { OPU,          "OUT-OF-PLACE" })
 
 #define F2FS_BIO_MASK(t)        (t & (READA | WRITE_FLUSH_FUA))
 #define F2FS_BIO_EXTRA_MASK(t)  (t & (REQ_META | REQ_PRIO))
@@ -74,6 +108,7 @@
                 { CP_UMOUNT,    "Umount" },                             \
                 { CP_FASTBOOT,  "Fastboot" },                           \
                 { CP_SYNC,      "Sync" },                               \
+                { CP_RECOVERY,  "Recovery" },                           \
                 { CP_DISCARD,   "Discard" })
 
 struct victim_sel_policy;
@@ -854,6 +889,13 @@ DEFINE_EVENT(f2fs__page, f2fs_writepage,
         TP_ARGS(page, type)
 );
 
+DEFINE_EVENT(f2fs__page, f2fs_do_write_data_page,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
+);
+
 DEFINE_EVENT(f2fs__page, f2fs_readpage,
 
         TP_PROTO(struct page *page, int type),
@@ -875,6 +917,20 @@ DEFINE_EVENT(f2fs__page, f2fs_vm_page_mkwrite,
         TP_ARGS(page, type)
 );
 
+DEFINE_EVENT(f2fs__page, f2fs_register_inmem_page,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
+);
+
+DEFINE_EVENT(f2fs__page, f2fs_commit_inmem_page,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
+);
+
 TRACE_EVENT(f2fs_writepages,
 
         TP_PROTO(struct inode *inode, struct writeback_control *wbc, int type),
@@ -1011,6 +1067,140 @@ TRACE_EVENT(f2fs_issue_flush,
                 __entry->nobarrier ? "skip (nobarrier)" : "issue",
                 __entry->flush_merge ? " with flush_merge" : "")
 );
+
+TRACE_EVENT(f2fs_lookup_extent_tree_start,
+
+        TP_PROTO(struct inode *inode, unsigned int pgofs),
+
+        TP_ARGS(inode, pgofs),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(unsigned int, pgofs)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = inode->i_sb->s_dev;
+                __entry->ino = inode->i_ino;
+                __entry->pgofs = pgofs;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u",
+                show_dev_ino(__entry),
+                __entry->pgofs)
+);
+
+TRACE_EVENT_CONDITION(f2fs_lookup_extent_tree_end,
+
+        TP_PROTO(struct inode *inode, unsigned int pgofs,
+                                                struct extent_node *en),
+
+        TP_ARGS(inode, pgofs, en),
+
+        TP_CONDITION(en),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(unsigned int, pgofs)
+                __field(unsigned int, fofs)
+                __field(u32, blk)
+                __field(unsigned int, len)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = inode->i_sb->s_dev;
+                __entry->ino = inode->i_ino;
+                __entry->pgofs = pgofs;
+                __entry->fofs = en->ei.fofs;
+                __entry->blk = en->ei.blk;
+                __entry->len = en->ei.len;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, "
+                "ext_info(fofs: %u, blk: %u, len: %u)",
+                show_dev_ino(__entry),
+                __entry->pgofs,
+                __entry->fofs,
+                __entry->blk,
+                __entry->len)
+);
+
+TRACE_EVENT(f2fs_update_extent_tree,
+
+        TP_PROTO(struct inode *inode, unsigned int pgofs, block_t blkaddr),
+
+        TP_ARGS(inode, pgofs, blkaddr),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(unsigned int, pgofs)
+                __field(u32, blk)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = inode->i_sb->s_dev;
+                __entry->ino = inode->i_ino;
+                __entry->pgofs = pgofs;
+                __entry->blk = blkaddr;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, blkaddr = %u",
+                show_dev_ino(__entry),
+                __entry->pgofs,
+                __entry->blk)
+);
+
+TRACE_EVENT(f2fs_shrink_extent_tree,
+
+        TP_PROTO(struct f2fs_sb_info *sbi, unsigned int node_cnt,
+                                                unsigned int tree_cnt),
+
+        TP_ARGS(sbi, node_cnt, tree_cnt),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(unsigned int, node_cnt)
+                __field(unsigned int, tree_cnt)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = sbi->sb->s_dev;
+                __entry->node_cnt = node_cnt;
+                __entry->tree_cnt = tree_cnt;
+        ),
+
+        TP_printk("dev = (%d,%d), shrunk: node_cnt = %u, tree_cnt = %u",
+                show_dev(__entry),
+                __entry->node_cnt,
+                __entry->tree_cnt)
+);
+
+TRACE_EVENT(f2fs_destroy_extent_tree,
+
+        TP_PROTO(struct inode *inode, unsigned int node_cnt),
+
+        TP_ARGS(inode, node_cnt),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(unsigned int, node_cnt)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = inode->i_sb->s_dev;
+                __entry->ino = inode->i_ino;
+                __entry->node_cnt = node_cnt;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, destroyed: node_cnt = %u",
+                show_dev_ino(__entry),
+                __entry->node_cnt)
+);
+
 #endif /* _TRACE_F2FS_H */
 
  /* This part must be outside protection */
diff --git a/include/trace/events/filemap.h b/include/trace/events/filemap.h
index 0421f49a20f7..42febb6bc1d5 100644
--- a/include/trace/events/filemap.h
+++ b/include/trace/events/filemap.h
@@ -18,14 +18,14 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache,
         TP_ARGS(page),
 
         TP_STRUCT__entry(
-                __field(struct page *, page)
+                __field(unsigned long, pfn)
                 __field(unsigned long, i_ino)
                 __field(unsigned long, index)
                 __field(dev_t, s_dev)
         ),
 
         TP_fast_assign(
-                __entry->page = page;
+                __entry->pfn = page_to_pfn(page);
                 __entry->i_ino = page->mapping->host->i_ino;
                 __entry->index = page->index;
                 if (page->mapping->host->i_sb)
@@ -37,8 +37,8 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache,
         TP_printk("dev %d:%d ino %lx page=%p pfn=%lu ofs=%lu",
                 MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
                 __entry->i_ino,
-                __entry->page,
-                page_to_pfn(__entry->page),
+                pfn_to_page(__entry->pfn),
+                __entry->pfn,
                 __entry->index << PAGE_SHIFT)
 );
 
diff --git a/include/trace/events/intel-sst.h b/include/trace/events/intel-sst.h
index 76c72d3f1902..edc24e6dea1b 100644
--- a/include/trace/events/intel-sst.h
+++ b/include/trace/events/intel-sst.h
@@ -1,6 +1,13 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM intel-sst
 
+/*
+ * The TRACE_SYSTEM_VAR defaults to TRACE_SYSTEM, but must be a
+ * legitimate C variable. It is not exported to user space.
+ */
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR intel_sst
+
 #if !defined(_TRACE_INTEL_SST_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_INTEL_SST_H
 
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
index 3608bebd3d9c..ff8f6c091a15 100644
--- a/include/trace/events/irq.h
+++ b/include/trace/events/irq.h
@@ -9,19 +9,34 @@
 struct irqaction;
 struct softirq_action;
 
-#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq }
+#define SOFTIRQ_NAME_LIST                               \
+                         softirq_name(HI)               \
+                         softirq_name(TIMER)            \
+                         softirq_name(NET_TX)           \
+                         softirq_name(NET_RX)           \
+                         softirq_name(BLOCK)            \
+                         softirq_name(BLOCK_IOPOLL)     \
+                         softirq_name(TASKLET)          \
+                         softirq_name(SCHED)            \
+                         softirq_name(HRTIMER)          \
+                         softirq_name_end(RCU)
+
+#undef softirq_name
+#undef softirq_name_end
+
+#define softirq_name(sirq) TRACE_DEFINE_ENUM(sirq##_SOFTIRQ);
+#define softirq_name_end(sirq)  TRACE_DEFINE_ENUM(sirq##_SOFTIRQ);
+
+SOFTIRQ_NAME_LIST
+
+#undef softirq_name
+#undef softirq_name_end
+
+#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq },
+#define softirq_name_end(sirq) { sirq##_SOFTIRQ, #sirq }
+
 #define show_softirq_name(val)                          \
-        __print_symbolic(val,                           \
-                         softirq_name(HI),              \
-                         softirq_name(TIMER),           \
-                         softirq_name(NET_TX),          \
-                         softirq_name(NET_RX),          \
-                         softirq_name(BLOCK),           \
-                         softirq_name(BLOCK_IOPOLL),    \
-                         softirq_name(TASKLET),         \
-                         softirq_name(SCHED),           \
-                         softirq_name(HRTIMER),         \
-                         softirq_name(RCU))
+        __print_symbolic(val, SOFTIRQ_NAME_LIST)
 
 /**
  * irq_handler_entry - called immediately before the irq action handler
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index 4ad10baecd4d..81ea59812117 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -154,18 +154,18 @@ TRACE_EVENT(mm_page_free,
         TP_ARGS(page, order),
 
         TP_STRUCT__entry(
-                __field(        struct page *,  page            )
+                __field(        unsigned long,  pfn             )
                 __field(        unsigned int,   order           )
         ),
 
         TP_fast_assign(
-                __entry->page           = page;
+                __entry->pfn            = page_to_pfn(page);
                 __entry->order          = order;
         ),
 
         TP_printk("page=%p pfn=%lu order=%d",
-                        __entry->page,
-                        page_to_pfn(__entry->page),
+                        pfn_to_page(__entry->pfn),
+                        __entry->pfn,
                         __entry->order)
 );
 
@@ -176,18 +176,18 @@ TRACE_EVENT(mm_page_free_batched,
         TP_ARGS(page, cold),
 
         TP_STRUCT__entry(
-                __field(        struct page *,  page            )
+                __field(        unsigned long,  pfn             )
                 __field(        int,            cold            )
         ),
 
         TP_fast_assign(
-                __entry->page           = page;
+                __entry->pfn            = page_to_pfn(page);
                 __entry->cold           = cold;
         ),
 
         TP_printk("page=%p pfn=%lu order=0 cold=%d",
-                        __entry->page,
-                        page_to_pfn(__entry->page),
+                        pfn_to_page(__entry->pfn),
+                        __entry->pfn,
                         __entry->cold)
 );
 
@@ -199,22 +199,22 @@ TRACE_EVENT(mm_page_alloc,
         TP_ARGS(page, order, gfp_flags, migratetype),
 
         TP_STRUCT__entry(
-                __field(        struct page *,  page            )
+                __field(        unsigned long,  pfn             )
                 __field(        unsigned int,   order           )
                 __field(        gfp_t,          gfp_flags       )
                 __field(        int,            migratetype     )
         ),
 
         TP_fast_assign(
-                __entry->page           = page;
+                __entry->pfn            = page ? page_to_pfn(page) : -1UL;
                 __entry->order          = order;
                 __entry->gfp_flags      = gfp_flags;
                 __entry->migratetype    = migratetype;
         ),
 
         TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s",
-                __entry->page,
-                __entry->page ? page_to_pfn(__entry->page) : 0,
+                __entry->pfn != -1UL ? pfn_to_page(__entry->pfn) : NULL,
+                __entry->pfn != -1UL ? __entry->pfn : 0,
                 __entry->order,
                 __entry->migratetype,
                 show_gfp_flags(__entry->gfp_flags))
@@ -227,20 +227,20 @@ DECLARE_EVENT_CLASS(mm_page,
         TP_ARGS(page, order, migratetype),
 
         TP_STRUCT__entry(
-                __field(        struct page *,  page            )
+                __field(        unsigned long,  pfn             )
                 __field(        unsigned int,   order           )
                 __field(        int,            migratetype     )
         ),
 
         TP_fast_assign(
-                __entry->page           = page;
+                __entry->pfn            = page ? page_to_pfn(page) : -1UL;
                 __entry->order          = order;
                 __entry->migratetype    = migratetype;
         ),
 
         TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d",
-                __entry->page,
-                __entry->page ? page_to_pfn(__entry->page) : 0,
+                __entry->pfn != -1UL ? pfn_to_page(__entry->pfn) : NULL,
+                __entry->pfn != -1UL ? __entry->pfn : 0,
                 __entry->order,
                 __entry->migratetype,
                 __entry->order == 0)
@@ -260,7 +260,7 @@ DEFINE_EVENT_PRINT(mm_page, mm_page_pcpu_drain,
         TP_ARGS(page, order, migratetype),
 
         TP_printk("page=%p pfn=%lu order=%d migratetype=%d",
-                __entry->page, page_to_pfn(__entry->page),
+                pfn_to_page(__entry->pfn), __entry->pfn,
                 __entry->order, __entry->migratetype)
 );
 
@@ -275,7 +275,7 @@ TRACE_EVENT(mm_page_alloc_extfrag,
                 alloc_migratetype, fallback_migratetype),
 
         TP_STRUCT__entry(
-                __field(        struct page *,  page                    )
+                __field(        unsigned long,  pfn                     )
                 __field(        int,            alloc_order             )
                 __field(        int,            fallback_order          )
                 __field(        int,            alloc_migratetype       )
@@ -284,7 +284,7 @@ TRACE_EVENT(mm_page_alloc_extfrag,
         ),
 
         TP_fast_assign(
-                __entry->page                   = page;
+                __entry->pfn                    = page_to_pfn(page);
                 __entry->alloc_order            = alloc_order;
                 __entry->fallback_order         = fallback_order;
                 __entry->alloc_migratetype      = alloc_migratetype;
@@ -294,8 +294,8 @@ TRACE_EVENT(mm_page_alloc_extfrag,
         ),
 
         TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
-                __entry->page,
-                page_to_pfn(__entry->page),
+                pfn_to_page(__entry->pfn),
+                __entry->pfn,
                 __entry->alloc_order,
                 __entry->fallback_order,
                 pageblock_order,
diff --git a/include/trace/events/libata.h b/include/trace/events/libata.h
new file mode 100644
index 000000000000..8b0fbd93082c
--- /dev/null
+++ b/include/trace/events/libata.h
@@ -0,0 +1,325 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM libata
+
+#if !defined(_TRACE_LIBATA_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_LIBATA_H
+
+#include <linux/ata.h>
+#include <linux/libata.h>
+#include <linux/tracepoint.h>
+#include <linux/trace_seq.h>
+
+#define ata_opcode_name(opcode) { opcode, #opcode }
+#define show_opcode_name(val)                                   \
+        __print_symbolic(val,                                   \
+                 ata_opcode_name(ATA_CMD_DEV_RESET),            \
+                 ata_opcode_name(ATA_CMD_CHK_POWER),            \
+                 ata_opcode_name(ATA_CMD_STANDBY),              \
+                 ata_opcode_name(ATA_CMD_IDLE),                 \
+                 ata_opcode_name(ATA_CMD_EDD),                  \
+                 ata_opcode_name(ATA_CMD_DOWNLOAD_MICRO),       \
+                 ata_opcode_name(ATA_CMD_DOWNLOAD_MICRO_DMA),   \
+                 ata_opcode_name(ATA_CMD_NOP),                  \
+                 ata_opcode_name(ATA_CMD_FLUSH),                \
+                 ata_opcode_name(ATA_CMD_FLUSH_EXT),            \
+                 ata_opcode_name(ATA_CMD_ID_ATA),               \
+                 ata_opcode_name(ATA_CMD_ID_ATAPI),             \
+                 ata_opcode_name(ATA_CMD_SERVICE),              \
+                 ata_opcode_name(ATA_CMD_READ),                 \
+                 ata_opcode_name(ATA_CMD_READ_EXT),             \
+                 ata_opcode_name(ATA_CMD_READ_QUEUED),          \
+                 ata_opcode_name(ATA_CMD_READ_STREAM_EXT),      \
+                 ata_opcode_name(ATA_CMD_READ_STREAM_DMA_EXT),  \
+                 ata_opcode_name(ATA_CMD_WRITE),                \
+                 ata_opcode_name(ATA_CMD_WRITE_EXT),            \
+                 ata_opcode_name(ATA_CMD_WRITE_QUEUED),         \
+                 ata_opcode_name(ATA_CMD_WRITE_STREAM_EXT),     \
+                 ata_opcode_name(ATA_CMD_WRITE_STREAM_DMA_EXT), \
+                 ata_opcode_name(ATA_CMD_WRITE_FUA_EXT),        \
+                 ata_opcode_name(ATA_CMD_WRITE_QUEUED_FUA_EXT), \
+                 ata_opcode_name(ATA_CMD_FPDMA_READ),           \
+                 ata_opcode_name(ATA_CMD_FPDMA_WRITE),          \
+                 ata_opcode_name(ATA_CMD_FPDMA_SEND),           \
+                 ata_opcode_name(ATA_CMD_FPDMA_RECV),           \
+                 ata_opcode_name(ATA_CMD_PIO_READ),             \
+                 ata_opcode_name(ATA_CMD_PIO_READ_EXT),         \
+                 ata_opcode_name(ATA_CMD_PIO_WRITE),            \
+                 ata_opcode_name(ATA_CMD_PIO_WRITE_EXT),        \
+                 ata_opcode_name(ATA_CMD_READ_MULTI),           \
+                 ata_opcode_name(ATA_CMD_READ_MULTI_EXT),       \
+                 ata_opcode_name(ATA_CMD_WRITE_MULTI),          \
+                 ata_opcode_name(ATA_CMD_WRITE_MULTI_EXT),      \
+                 ata_opcode_name(ATA_CMD_WRITE_MULTI_FUA_EXT),  \
+                 ata_opcode_name(ATA_CMD_SET_FEATURES),         \
+                 ata_opcode_name(ATA_CMD_SET_MULTI),            \
+                 ata_opcode_name(ATA_CMD_PACKET),               \
+                 ata_opcode_name(ATA_CMD_VERIFY),               \
+                 ata_opcode_name(ATA_CMD_VERIFY_EXT),           \
+                 ata_opcode_name(ATA_CMD_WRITE_UNCORR_EXT),     \
+                 ata_opcode_name(ATA_CMD_STANDBYNOW1),          \
+                 ata_opcode_name(ATA_CMD_IDLEIMMEDIATE),        \
+                 ata_opcode_name(ATA_CMD_SLEEP),                \
+                 ata_opcode_name(ATA_CMD_INIT_DEV_PARAMS),      \
+                 ata_opcode_name(ATA_CMD_READ_NATIVE_MAX),      \
+                 ata_opcode_name(ATA_CMD_READ_NATIVE_MAX_EXT),  \
+                 ata_opcode_name(ATA_CMD_SET_MAX),              \
+                 ata_opcode_name(ATA_CMD_SET_MAX_EXT),          \
+                 ata_opcode_name(ATA_CMD_READ_LOG_EXT),         \
+                 ata_opcode_name(ATA_CMD_WRITE_LOG_EXT),        \
+                 ata_opcode_name(ATA_CMD_READ_LOG_DMA_EXT),     \
+                 ata_opcode_name(ATA_CMD_WRITE_LOG_DMA_EXT),    \
+                 ata_opcode_name(ATA_CMD_TRUSTED_NONDATA),      \
+                 ata_opcode_name(ATA_CMD_TRUSTED_RCV),          \
+                 ata_opcode_name(ATA_CMD_TRUSTED_RCV_DMA),      \
+                 ata_opcode_name(ATA_CMD_TRUSTED_SND),          \
+                 ata_opcode_name(ATA_CMD_TRUSTED_SND_DMA),      \
+                 ata_opcode_name(ATA_CMD_PMP_READ),             \
+                 ata_opcode_name(ATA_CMD_PMP_READ_DMA),         \
+                 ata_opcode_name(ATA_CMD_PMP_WRITE),            \
+                 ata_opcode_name(ATA_CMD_PMP_WRITE_DMA),        \
+                 ata_opcode_name(ATA_CMD_CONF_OVERLAY),         \
+                 ata_opcode_name(ATA_CMD_SEC_SET_PASS),         \
+                 ata_opcode_name(ATA_CMD_SEC_UNLOCK),           \
+                 ata_opcode_name(ATA_CMD_SEC_ERASE_PREP),       \
+                 ata_opcode_name(ATA_CMD_SEC_ERASE_UNIT),       \
+                 ata_opcode_name(ATA_CMD_SEC_FREEZE_LOCK),      \
+                 ata_opcode_name(ATA_CMD_SEC_DISABLE_PASS),     \
+                 ata_opcode_name(ATA_CMD_CONFIG_STREAM),        \
+                 ata_opcode_name(ATA_CMD_SMART),                \
+                 ata_opcode_name(ATA_CMD_MEDIA_LOCK),           \
+                 ata_opcode_name(ATA_CMD_MEDIA_UNLOCK),         \
+                 ata_opcode_name(ATA_CMD_DSM),                  \
+                 ata_opcode_name(ATA_CMD_CHK_MED_CRD_TYP),      \
+                 ata_opcode_name(ATA_CMD_CFA_REQ_EXT_ERR),      \
+                 ata_opcode_name(ATA_CMD_CFA_WRITE_NE),         \
+                 ata_opcode_name(ATA_CMD_CFA_TRANS_SECT),       \
+                 ata_opcode_name(ATA_CMD_CFA_ERASE),            \
+                 ata_opcode_name(ATA_CMD_CFA_WRITE_MULT_NE),    \
+                 ata_opcode_name(ATA_CMD_REQ_SENSE_DATA),       \
+                 ata_opcode_name(ATA_CMD_SANITIZE_DEVICE),      \
+                 ata_opcode_name(ATA_CMD_RESTORE),              \
+                 ata_opcode_name(ATA_CMD_READ_LONG),            \
+                 ata_opcode_name(ATA_CMD_READ_LONG_ONCE),       \
+                 ata_opcode_name(ATA_CMD_WRITE_LONG),           \
+                 ata_opcode_name(ATA_CMD_WRITE_LONG_ONCE))
+
+#define ata_error_name(result)  { result, #result }
+#define show_error_name(val)                            \
+        __print_symbolic(val,                           \
+                ata_error_name(ATA_ICRC),               \
+                ata_error_name(ATA_UNC),                \
+                ata_error_name(ATA_MC),                 \
+                ata_error_name(ATA_IDNF),               \
+                ata_error_name(ATA_MCR),                \
+                ata_error_name(ATA_ABORTED),            \
+                ata_error_name(ATA_TRK0NF),             \
+                ata_error_name(ATA_AMNF))
+
+#define ata_protocol_name(proto)        { proto, #proto }
+#define show_protocol_name(val)                         \
+        __print_symbolic(val,                           \
+                ata_protocol_name(ATA_PROT_UNKNOWN),    \
+                ata_protocol_name(ATA_PROT_NODATA),     \
+                ata_protocol_name(ATA_PROT_PIO),        \
+                ata_protocol_name(ATA_PROT_DMA),        \
+                ata_protocol_name(ATA_PROT_NCQ),        \
+                ata_protocol_name(ATAPI_PROT_NODATA),   \
+                ata_protocol_name(ATAPI_PROT_PIO),      \
+                ata_protocol_name(ATAPI_PROT_DMA))
+
+const char *libata_trace_parse_status(struct trace_seq*, unsigned char);
+#define __parse_status(s) libata_trace_parse_status(p, s)
+
+const char *libata_trace_parse_eh_action(struct trace_seq *, unsigned int);
+#define __parse_eh_action(a) libata_trace_parse_eh_action(p, a)
+
+const char *libata_trace_parse_eh_err_mask(struct trace_seq *, unsigned int);
+#define __parse_eh_err_mask(m) libata_trace_parse_eh_err_mask(p, m)
+
+const char *libata_trace_parse_qc_flags(struct trace_seq *, unsigned int);
+#define __parse_qc_flags(f) libata_trace_parse_qc_flags(p, f)
+
+TRACE_EVENT(ata_qc_issue,
+
+        TP_PROTO(struct ata_queued_cmd *qc),
+
+        TP_ARGS(qc),
+
+        TP_STRUCT__entry(
+                __field( unsigned int,  ata_port )
+                __field( unsigned int,  ata_dev )
+                __field( unsigned int,  tag     )
+                __field( unsigned char, cmd     )
+                __field( unsigned char, dev     )
+                __field( unsigned char, lbal    )
+                __field( unsigned char, lbam    )
+                __field( unsigned char, lbah    )
+                __field( unsigned char, nsect   )
+                __field( unsigned char, feature )
+                __field( unsigned char, hob_lbal )
+                __field( unsigned char, hob_lbam )
+                __field( unsigned char, hob_lbah )
+                __field( unsigned char, hob_nsect )
+                __field( unsigned char, hob_feature )
+                __field( unsigned char, ctl )
+                __field( unsigned char, proto )
+                __field( unsigned long, flags )
+        ),
+
+        TP_fast_assign(
+                __entry->ata_port       = qc->ap->print_id;
+                __entry->ata_dev        = qc->dev->link->pmp + qc->dev->devno;
+                __entry->tag            = qc->tag;
+                __entry->proto          = qc->tf.protocol;
+                __entry->cmd            = qc->tf.command;
+                __entry->dev            = qc->tf.device;
+                __entry->lbal           = qc->tf.lbal;
+                __entry->lbam           = qc->tf.lbam;
+                __entry->lbah           = qc->tf.lbah;
+                __entry->hob_lbal       = qc->tf.hob_lbal;
+                __entry->hob_lbam       = qc->tf.hob_lbam;
+                __entry->hob_lbah       = qc->tf.hob_lbah;
+                __entry->feature        = qc->tf.feature;
+                __entry->hob_feature    = qc->tf.hob_feature;
+                __entry->nsect          = qc->tf.nsect;
+                __entry->hob_nsect      = qc->tf.hob_nsect;
+        ),
+
+        TP_printk("ata_port=%u ata_dev=%u tag=%d proto=%s cmd=%s " \
+                  " tf=(%02x/%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x/%02x)",
+                  __entry->ata_port, __entry->ata_dev, __entry->tag,
+                  show_protocol_name(__entry->proto),
+                  show_opcode_name(__entry->cmd),
+                  __entry->cmd, __entry->feature, __entry->nsect,
+                  __entry->lbal, __entry->lbam, __entry->lbah,
+                  __entry->hob_feature, __entry->hob_nsect,
+                  __entry->hob_lbal, __entry->hob_lbam, __entry->hob_lbah,
+                  __entry->dev)
+);
+
+DECLARE_EVENT_CLASS(ata_qc_complete_template,
+
+        TP_PROTO(struct ata_queued_cmd *qc),
+
+        TP_ARGS(qc),
+
+        TP_STRUCT__entry(
+                __field( unsigned int,  ata_port )
+                __field( unsigned int,  ata_dev )
+                __field( unsigned int,  tag     )
+                __field( unsigned char, status  )
+                __field( unsigned char, dev     )
+                __field( unsigned char, lbal    )
+                __field( unsigned char, lbam    )
+                __field( unsigned char, lbah    )
+                __field( unsigned char, nsect   )
+                __field( unsigned char, error   )
+                __field( unsigned char, hob_lbal )
+                __field( unsigned char, hob_lbam )
+                __field( unsigned char, hob_lbah )
+                __field( unsigned char, hob_nsect )
+                __field( unsigned char, hob_feature )
+                __field( unsigned char, ctl )
+                __field( unsigned long, flags )
+        ),
+
+        TP_fast_assign(
+                __entry->ata_port       = qc->ap->print_id;
+                __entry->ata_dev        = qc->dev->link->pmp + qc->dev->devno;
+                __entry->tag            = qc->tag;
+                __entry->status         = qc->result_tf.command;
+                __entry->dev            = qc->result_tf.device;
+                __entry->lbal           = qc->result_tf.lbal;
+                __entry->lbam           = qc->result_tf.lbam;
+                __entry->lbah           = qc->result_tf.lbah;
+                __entry->hob_lbal       = qc->result_tf.hob_lbal;
+                __entry->hob_lbam       = qc->result_tf.hob_lbam;
+                __entry->hob_lbah       = qc->result_tf.hob_lbah;
+                __entry->error          = qc->result_tf.feature;
+                __entry->hob_feature    = qc->result_tf.hob_feature;
+                __entry->nsect          = qc->result_tf.nsect;
+                __entry->hob_nsect      = qc->result_tf.hob_nsect;
+        ),
+
+        TP_printk("ata_port=%u ata_dev=%u tag=%d flags=%s status=%s " \
+                  " res=(%02x/%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x/%02x)",
+                  __entry->ata_port, __entry->ata_dev, __entry->tag,
+                  __parse_qc_flags(__entry->flags),
+                  __parse_status(__entry->status),
+                  __entry->status, __entry->error, __entry->nsect,
+                  __entry->lbal, __entry->lbam, __entry->lbah,
+                  __entry->hob_feature, __entry->hob_nsect,
+                  __entry->hob_lbal, __entry->hob_lbam, __entry->hob_lbah,
+                  __entry->dev)
+);
+
+DEFINE_EVENT(ata_qc_complete_template, ata_qc_complete_internal,
+             TP_PROTO(struct ata_queued_cmd *qc),
+             TP_ARGS(qc));
+
+DEFINE_EVENT(ata_qc_complete_template, ata_qc_complete_failed,
+             TP_PROTO(struct ata_queued_cmd *qc),
+             TP_ARGS(qc));
+
+DEFINE_EVENT(ata_qc_complete_template, ata_qc_complete_done,
+             TP_PROTO(struct ata_queued_cmd *qc),
+             TP_ARGS(qc));
+
+TRACE_EVENT(ata_eh_link_autopsy,
+
+        TP_PROTO(struct ata_device *dev, unsigned int eh_action, unsigned int eh_err_mask),
+
+        TP_ARGS(dev, eh_action, eh_err_mask),
+
+        TP_STRUCT__entry(
+                __field( unsigned int,  ata_port )
+                __field( unsigned int,  ata_dev )
+                __field( unsigned int,  eh_action )
+                __field( unsigned int,  eh_err_mask)
+        ),
+
+        TP_fast_assign(
+                __entry->ata_port       = dev->link->ap->print_id;
+                __entry->ata_dev        = dev->link->pmp + dev->devno;
+                __entry->eh_action      = eh_action;
+                __entry->eh_err_mask    = eh_err_mask;
+        ),
+
+        TP_printk("ata_port=%u ata_dev=%u eh_action=%s err_mask=%s",
+                  __entry->ata_port, __entry->ata_dev,
+                  __parse_eh_action(__entry->eh_action),
+                  __parse_eh_err_mask(__entry->eh_err_mask))
+);
+
+TRACE_EVENT(ata_eh_link_autopsy_qc,
+
+        TP_PROTO(struct ata_queued_cmd *qc),
+
+        TP_ARGS(qc),
+
+        TP_STRUCT__entry(
+                __field( unsigned int,  ata_port )
+                __field( unsigned int,  ata_dev )
+                __field( unsigned int,  tag     )
+                __field( unsigned int,  qc_flags )
+                __field( unsigned int,  eh_err_mask)
+        ),
+
+        TP_fast_assign(
+                __entry->ata_port       = qc->ap->print_id;
+                __entry->ata_dev        = qc->dev->link->pmp + qc->dev->devno;
+                __entry->tag            = qc->tag;
+                __entry->qc_flags       = qc->flags;
+                __entry->eh_err_mask    = qc->err_mask;
+        ),
+
+        TP_printk("ata_port=%u ata_dev=%u tag=%d flags=%s err_mask=%s",
+                  __entry->ata_port, __entry->ata_dev, __entry->tag,
+                  __parse_qc_flags(__entry->qc_flags),
+                  __parse_eh_err_mask(__entry->eh_err_mask))
+);
+
+#endif /*  _TRACE_LIBATA_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/migrate.h b/include/trace/events/migrate.h
index dd2b5467d905..539b25a76111 100644
--- a/include/trace/events/migrate.h
+++ b/include/trace/events/migrate.h
@@ -7,18 +7,40 @@
 #include <linux/tracepoint.h>
 
 #define MIGRATE_MODE                                            \
-        {MIGRATE_ASYNC,         "MIGRATE_ASYNC"},               \
-        {MIGRATE_SYNC_LIGHT,    "MIGRATE_SYNC_LIGHT"},          \
-        {MIGRATE_SYNC,          "MIGRATE_SYNC"}         
+        EM( MIGRATE_ASYNC,      "MIGRATE_ASYNC")                \
+        EM( MIGRATE_SYNC_LIGHT, "MIGRATE_SYNC_LIGHT")           \
+        EMe(MIGRATE_SYNC,       "MIGRATE_SYNC")
+
 
 #define MIGRATE_REASON                                          \
-        {MR_COMPACTION,         "compaction"},                  \
-        {MR_MEMORY_FAILURE,     "memory_failure"},              \
-        {MR_MEMORY_HOTPLUG,     "memory_hotplug"},              \
-        {MR_SYSCALL,            "syscall_or_cpuset"},           \
-        {MR_MEMPOLICY_MBIND,    "mempolicy_mbind"},             \
-        {MR_NUMA_MISPLACED,     "numa_misplaced"},              \
-        {MR_CMA,                "cma"}
+        EM( MR_COMPACTION,      "compaction")                   \
+        EM( MR_MEMORY_FAILURE,  "memory_failure")               \
+        EM( MR_MEMORY_HOTPLUG,  "memory_hotplug")               \
+        EM( MR_SYSCALL,         "syscall_or_cpuset")            \
+        EM( MR_MEMPOLICY_MBIND, "mempolicy_mbind")              \
+        EM( MR_NUMA_MISPLACED,  "numa_misplaced")               \
+        EMe(MR_CMA,             "cma")
+
+/*
+ * First define the enums in the above macros to be exported to userspace
+ * via TRACE_DEFINE_ENUM().
+ */
+#undef EM
+#undef EMe
+#define EM(a, b)        TRACE_DEFINE_ENUM(a);
+#define EMe(a, b)       TRACE_DEFINE_ENUM(a);
+
+MIGRATE_MODE
+MIGRATE_REASON
+
+/*
+ * Now redefine the EM() and EMe() macros to map the enums to the strings
+ * that will be printed in the output.
+ */
+#undef EM
+#undef EMe
+#define EM(a, b)        {a, b},
+#define EMe(a, b)       {a, b}
 
 TRACE_EVENT(mm_migrate_pages,
 
diff --git a/include/trace/events/module.h b/include/trace/events/module.h
index 81c4c183d348..28c45997e451 100644
--- a/include/trace/events/module.h
+++ b/include/trace/events/module.h
@@ -84,7 +84,7 @@ DECLARE_EVENT_CLASS(module_refcnt,
                 __assign_str(name, mod->name);
         ),
 
-        TP_printk("%s call_site=%pf refcnt=%d",
+        TP_printk("%s call_site=%ps refcnt=%d",
                   __get_str(name), (void *)__entry->ip, __entry->refcnt)
 );
 
@@ -121,7 +121,7 @@ TRACE_EVENT(module_request,
                 __assign_str(name, name);
         ),
 
-        TP_printk("%s wait=%d call_site=%pf",
+        TP_printk("%s wait=%d call_site=%ps",
                   __get_str(name), (int)__entry->wait, (void *)__entry->ip)
 );
 
diff --git a/include/trace/events/random.h b/include/trace/events/random.h
index 805af6db41cc..4684de344c5d 100644
--- a/include/trace/events/random.h
+++ b/include/trace/events/random.h
@@ -22,7 +22,7 @@ TRACE_EVENT(add_device_randomness,
                 __entry->IP             = IP;
         ),
 
-        TP_printk("bytes %d caller %pF",
+        TP_printk("bytes %d caller %pS",
                 __entry->bytes, (void *)__entry->IP)
 );
 
@@ -43,7 +43,7 @@ DECLARE_EVENT_CLASS(random__mix_pool_bytes,
                 __entry->IP             = IP;
         ),
 
-        TP_printk("%s pool: bytes %d caller %pF",
+        TP_printk("%s pool: bytes %d caller %pS",
                   __entry->pool_name, __entry->bytes, (void *)__entry->IP)
 );
 
@@ -82,7 +82,7 @@ TRACE_EVENT(credit_entropy_bits,
         ),
 
         TP_printk("%s pool: bits %d entropy_count %d entropy_total %d "
-                  "caller %pF", __entry->pool_name, __entry->bits,
+                  "caller %pS", __entry->pool_name, __entry->bits,
                   __entry->entropy_count, __entry->entropy_total,
                   (void *)__entry->IP)
 );
@@ -207,7 +207,7 @@ DECLARE_EVENT_CLASS(random__get_random_bytes,
                 __entry->IP             = IP;
         ),
 
-        TP_printk("nbytes %d caller %pF", __entry->nbytes, (void *)__entry->IP)
+        TP_printk("nbytes %d caller %pS", __entry->nbytes, (void *)__entry->IP)
 );
 
 DEFINE_EVENT(random__get_random_bytes, get_random_bytes,
@@ -242,7 +242,7 @@ DECLARE_EVENT_CLASS(random__extract_entropy,
                 __entry->IP             = IP;
         ),
 
-        TP_printk("%s pool: nbytes %d entropy_count %d caller %pF",
+        TP_printk("%s pool: nbytes %d entropy_count %d caller %pS",
                   __entry->pool_name, __entry->nbytes, __entry->entropy_count,
                   (void *)__entry->IP)
 );
diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h
deleted file mode 100644
index 23d561512f64..000000000000
--- a/include/trace/events/regmap.h
+++ /dev/null
@@ -1,252 +0,0 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM regmap
-
-#if !defined(_TRACE_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_REGMAP_H
-
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-struct device;
-struct regmap;
-
-/*
- * Log register events
- */
-DECLARE_EVENT_CLASS(regmap_reg,
-
-        TP_PROTO(struct device *dev, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(dev, reg, val),
-
-        TP_STRUCT__entry(
-                __string(       name,           dev_name(dev)   )
-                __field(        unsigned int,   reg             )
-                __field(        unsigned int,   val             )
-        ),
-
-        TP_fast_assign(
-                __assign_str(name, dev_name(dev));
-                __entry->reg = reg;
-                __entry->val = val;
-        ),
-
-        TP_printk("%s reg=%x val=%x", __get_str(name),
-                  (unsigned int)__entry->reg,
-                  (unsigned int)__entry->val)
-);
-
-DEFINE_EVENT(regmap_reg, regmap_reg_write,
-
-        TP_PROTO(struct device *dev, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(dev, reg, val)
-
-);
-
-DEFINE_EVENT(regmap_reg, regmap_reg_read,
-
-        TP_PROTO(struct device *dev, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(dev, reg, val)
-
-);
-
-DEFINE_EVENT(regmap_reg, regmap_reg_read_cache,
-
-        TP_PROTO(struct device *dev, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(dev, reg, val)
-
-);
-
-DECLARE_EVENT_CLASS(regmap_block,
-
-        TP_PROTO(struct device *dev, unsigned int reg, int count),
-
-        TP_ARGS(dev, reg, count),
-
-        TP_STRUCT__entry(
-                __string(       name,           dev_name(dev)   )
-                __field(        unsigned int,   reg             )
-                __field(        int,            count           )
-        ),
-
-        TP_fast_assign(
-                __assign_str(name, dev_name(dev));
-                __entry->reg = reg;
-                __entry->count = count;
-        ),
-
-        TP_printk("%s reg=%x count=%d", __get_str(name),
-                  (unsigned int)__entry->reg,
-                  (int)__entry->count)
-);
-
-DEFINE_EVENT(regmap_block, regmap_hw_read_start,
-
-        TP_PROTO(struct device *dev, unsigned int reg, int count),
-
-        TP_ARGS(dev, reg, count)
-);
-
-DEFINE_EVENT(regmap_block, regmap_hw_read_done,
-
-        TP_PROTO(struct device *dev, unsigned int reg, int count),
-
-        TP_ARGS(dev, reg, count)
-);
-
-DEFINE_EVENT(regmap_block, regmap_hw_write_start,
-
-        TP_PROTO(struct device *dev, unsigned int reg, int count),
-
-        TP_ARGS(dev, reg, count)
-);
-
-DEFINE_EVENT(regmap_block, regmap_hw_write_done,
-
-        TP_PROTO(struct device *dev, unsigned int reg, int count),
-
-        TP_ARGS(dev, reg, count)
-);
-
-TRACE_EVENT(regcache_sync,
-
-        TP_PROTO(struct device *dev, const char *type,
-                 const char *status),
-
-        TP_ARGS(dev, type, status),
-
-        TP_STRUCT__entry(
-                __string(       name,           dev_name(dev)   )
-                __string(       status,         status          )
-                __string(       type,           type            )
-                __field(        int,            type            )
-        ),
-
-        TP_fast_assign(
-                __assign_str(name, dev_name(dev));
-                __assign_str(status, status);
-                __assign_str(type, type);
-        ),
-
-        TP_printk("%s type=%s status=%s", __get_str(name),
-                  __get_str(type), __get_str(status))
-);
-
-DECLARE_EVENT_CLASS(regmap_bool,
-
-        TP_PROTO(struct device *dev, bool flag),
-
-        TP_ARGS(dev, flag),
-
-        TP_STRUCT__entry(
-                __string(       name,           dev_name(dev)   )
-                __field(        int,            flag            )
-        ),
-
-        TP_fast_assign(
-                __assign_str(name, dev_name(dev));
-                __entry->flag = flag;
-        ),
-
-        TP_printk("%s flag=%d", __get_str(name),
-                  (int)__entry->flag)
-);
-
-DEFINE_EVENT(regmap_bool, regmap_cache_only,
-
-        TP_PROTO(struct device *dev, bool flag),
-
-        TP_ARGS(dev, flag)
-
-);
-
-DEFINE_EVENT(regmap_bool, regmap_cache_bypass,
-
-        TP_PROTO(struct device *dev, bool flag),
-
-        TP_ARGS(dev, flag)
-
-);
-
-DECLARE_EVENT_CLASS(regmap_async,
-
-        TP_PROTO(struct device *dev),
-
-        TP_ARGS(dev),
-
-        TP_STRUCT__entry(
-                __string(       name,           dev_name(dev)   )
-        ),
-
-        TP_fast_assign(
-                __assign_str(name, dev_name(dev));
-        ),
-
-        TP_printk("%s", __get_str(name))
-);
-
-DEFINE_EVENT(regmap_block, regmap_async_write_start,
-
-        TP_PROTO(struct device *dev, unsigned int reg, int count),
-
-        TP_ARGS(dev, reg, count)
-);
-
-DEFINE_EVENT(regmap_async, regmap_async_io_complete,
-
-        TP_PROTO(struct device *dev),
-
-        TP_ARGS(dev)
-
-);
-
-DEFINE_EVENT(regmap_async, regmap_async_complete_start,
-
-        TP_PROTO(struct device *dev),
-
-        TP_ARGS(dev)
-
-);
-
-DEFINE_EVENT(regmap_async, regmap_async_complete_done,
-
-        TP_PROTO(struct device *dev),
-
-        TP_ARGS(dev)
-
-);
-
-TRACE_EVENT(regcache_drop_region,
-
-        TP_PROTO(struct device *dev, unsigned int from,
-                 unsigned int to),
-
-        TP_ARGS(dev, from, to),
-
-        TP_STRUCT__entry(
-                __string(       name,           dev_name(dev)   )
-                __field(        unsigned int,   from            )
-                __field(        unsigned int,   to              )
-        ),
-
-        TP_fast_assign(
-                __assign_str(name, dev_name(dev));
-                __entry->from = from;
-                __entry->to = to;
-        ),
-
-        TP_printk("%s %u-%u", __get_str(name), (unsigned int)__entry->from,
-                  (unsigned int)__entry->to)
-);
-
-#endif /* _TRACE_REGMAP_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index b9c1dc6c825a..fd1a02cb3c82 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -179,27 +179,53 @@ DEFINE_EVENT(rpc_task_queued, rpc_task_wakeup,
 
 );
 
+/*
+ * First define the enums in the below macros to be exported to userspace
+ * via TRACE_DEFINE_ENUM().
+ */
+#undef EM
+#undef EMe
+#define EM(a, b)        TRACE_DEFINE_ENUM(a);
+#define EMe(a, b)       TRACE_DEFINE_ENUM(a);
+
+#define RPC_SHOW_SOCKET                         \
+        EM( SS_FREE, "FREE" )                   \
+        EM( SS_UNCONNECTED, "UNCONNECTED" )     \
+        EM( SS_CONNECTING, "CONNECTING," )      \
+        EM( SS_CONNECTED, "CONNECTED," )        \
+        EMe(SS_DISCONNECTING, "DISCONNECTING" )
+
 #define rpc_show_socket_state(state) \
-        __print_symbolic(state, \
-                { SS_FREE, "FREE" }, \
-                { SS_UNCONNECTED, "UNCONNECTED" }, \
-                { SS_CONNECTING, "CONNECTING," }, \
-                { SS_CONNECTED, "CONNECTED," }, \
-                { SS_DISCONNECTING, "DISCONNECTING" })
+        __print_symbolic(state, RPC_SHOW_SOCKET)
+
+RPC_SHOW_SOCKET
+
+#define RPC_SHOW_SOCK                           \
+        EM( TCP_ESTABLISHED, "ESTABLISHED" )    \
+        EM( TCP_SYN_SENT, "SYN_SENT" )          \
+        EM( TCP_SYN_RECV, "SYN_RECV" )          \
+        EM( TCP_FIN_WAIT1, "FIN_WAIT1" )        \
+        EM( TCP_FIN_WAIT2, "FIN_WAIT2" )        \
+        EM( TCP_TIME_WAIT, "TIME_WAIT" )        \
+        EM( TCP_CLOSE, "CLOSE" )                \
+        EM( TCP_CLOSE_WAIT, "CLOSE_WAIT" )      \
+        EM( TCP_LAST_ACK, "LAST_ACK" )          \
+        EM( TCP_LISTEN, "LISTEN" )              \
+        EMe( TCP_CLOSING, "CLOSING" )
 
 #define rpc_show_sock_state(state) \
-        __print_symbolic(state, \
-                { TCP_ESTABLISHED, "ESTABLISHED" }, \
-                { TCP_SYN_SENT, "SYN_SENT" }, \
-                { TCP_SYN_RECV, "SYN_RECV" }, \
-                { TCP_FIN_WAIT1, "FIN_WAIT1" }, \
-                { TCP_FIN_WAIT2, "FIN_WAIT2" }, \
-                { TCP_TIME_WAIT, "TIME_WAIT" }, \
-                { TCP_CLOSE, "CLOSE" }, \
-                { TCP_CLOSE_WAIT, "CLOSE_WAIT" }, \
-                { TCP_LAST_ACK, "LAST_ACK" }, \
-                { TCP_LISTEN, "LISTEN" }, \
-                { TCP_CLOSING, "CLOSING" })
+        __print_symbolic(state, RPC_SHOW_SOCK)
+
+RPC_SHOW_SOCK
+
+/*
+ * Now redefine the EM() and EMe() macros to map the enums to the strings
+ * that will be printed in the output.
+ */
+#undef EM
+#undef EMe
+#define EM(a, b)        {a, b},
+#define EMe(a, b)       {a, b}
 
 DECLARE_EVENT_CLASS(xs_socket_event,
 
diff --git a/include/trace/events/tlb.h b/include/trace/events/tlb.h
index 0e7635765153..4250f364a6ca 100644
--- a/include/trace/events/tlb.h
+++ b/include/trace/events/tlb.h
@@ -7,11 +7,31 @@
 #include <linux/mm_types.h>
 #include <linux/tracepoint.h>
 
-#define TLB_FLUSH_REASON        \
-        { TLB_FLUSH_ON_TASK_SWITCH,     "flush on task switch" },       \
-        { TLB_REMOTE_SHOOTDOWN,         "remote shootdown" },           \
-        { TLB_LOCAL_SHOOTDOWN,          "local shootdown" },            \
-        { TLB_LOCAL_MM_SHOOTDOWN,       "local mm shootdown" }
+#define TLB_FLUSH_REASON                                                \
+        EM(  TLB_FLUSH_ON_TASK_SWITCH,  "flush on task switch" )        \
+        EM(  TLB_REMOTE_SHOOTDOWN,      "remote shootdown" )            \
+        EM(  TLB_LOCAL_SHOOTDOWN,       "local shootdown" )             \
+        EMe( TLB_LOCAL_MM_SHOOTDOWN,    "local mm shootdown" )
+
+/*
+ * First define the enums in TLB_FLUSH_REASON to be exported to userspace
+ * via TRACE_DEFINE_ENUM().
+ */
+#undef EM
+#undef EMe
+#define EM(a,b)         TRACE_DEFINE_ENUM(a);
+#define EMe(a,b)        TRACE_DEFINE_ENUM(a);
+
+TLB_FLUSH_REASON
+
+/*
+ * Now redefine the EM() and EMe() macros to map the enums to the strings
+ * that will be printed in the output.
+ */
+#undef EM
+#undef EMe
+#define EM(a,b)         { a, b },
+#define EMe(a,b)        { a, b }
 
 TRACE_EVENT_CONDITION(tlb_flush,
 
diff --git a/include/trace/events/v4l2.h b/include/trace/events/v4l2.h
index b9bb1f204693..20112170ff11 100644
--- a/include/trace/events/v4l2.h
+++ b/include/trace/events/v4l2.h
@@ -6,33 +6,58 @@
 
 #include <linux/tracepoint.h>
 
-#define show_type(type)                                                        \
-        __print_symbolic(type,                                                 \
-                { V4L2_BUF_TYPE_VIDEO_CAPTURE,        "VIDEO_CAPTURE" },       \
-                { V4L2_BUF_TYPE_VIDEO_OUTPUT,         "VIDEO_OUTPUT" },        \
-                { V4L2_BUF_TYPE_VIDEO_OVERLAY,        "VIDEO_OVERLAY" },       \
-                { V4L2_BUF_TYPE_VBI_CAPTURE,          "VBI_CAPTURE" },         \
-                { V4L2_BUF_TYPE_VBI_OUTPUT,           "VBI_OUTPUT" },          \
-                { V4L2_BUF_TYPE_SLICED_VBI_CAPTURE,   "SLICED_VBI_CAPTURE" },  \
-                { V4L2_BUF_TYPE_SLICED_VBI_OUTPUT,    "SLICED_VBI_OUTPUT" },   \
-                { V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY, "VIDEO_OUTPUT_OVERLAY" },\
-                { V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, "VIDEO_CAPTURE_MPLANE" },\
-                { V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,  "VIDEO_OUTPUT_MPLANE" }, \
-                { V4L2_BUF_TYPE_SDR_CAPTURE,          "SDR_CAPTURE" },         \
-                { V4L2_BUF_TYPE_PRIVATE,              "PRIVATE" })
+/* Enums require being exported to userspace, for user tool parsing */
+#undef EM
+#undef EMe
+#define EM(a, b)        TRACE_DEFINE_ENUM(a);
+#define EMe(a, b)       TRACE_DEFINE_ENUM(a);
+
+#define show_type(type)                                                 \
+        __print_symbolic(type, SHOW_TYPE)
+
+#define SHOW_TYPE                                                       \
+        EM( V4L2_BUF_TYPE_VIDEO_CAPTURE,        "VIDEO_CAPTURE" )       \
+        EM( V4L2_BUF_TYPE_VIDEO_OUTPUT,         "VIDEO_OUTPUT" )        \
+        EM( V4L2_BUF_TYPE_VIDEO_OVERLAY,        "VIDEO_OVERLAY" )       \
+        EM( V4L2_BUF_TYPE_VBI_CAPTURE,          "VBI_CAPTURE" )         \
+        EM( V4L2_BUF_TYPE_VBI_OUTPUT,           "VBI_OUTPUT" )          \
+        EM( V4L2_BUF_TYPE_SLICED_VBI_CAPTURE,   "SLICED_VBI_CAPTURE" )  \
+        EM( V4L2_BUF_TYPE_SLICED_VBI_OUTPUT,    "SLICED_VBI_OUTPUT" )   \
+        EM( V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY, "VIDEO_OUTPUT_OVERLAY" ) \
+        EM( V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, "VIDEO_CAPTURE_MPLANE" ) \
+        EM( V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,  "VIDEO_OUTPUT_MPLANE" ) \
+        EM( V4L2_BUF_TYPE_SDR_CAPTURE,          "SDR_CAPTURE" )         \
+        EMe(V4L2_BUF_TYPE_PRIVATE,              "PRIVATE" )
+
+SHOW_TYPE
 
 #define show_field(field)                                               \
-        __print_symbolic(field,                                         \
-                { V4L2_FIELD_ANY,               "ANY" },                \
-                { V4L2_FIELD_NONE,              "NONE" },               \
-                { V4L2_FIELD_TOP,               "TOP" },                \
-                { V4L2_FIELD_BOTTOM,            "BOTTOM" },             \
-                { V4L2_FIELD_INTERLACED,        "INTERLACED" },         \
-                { V4L2_FIELD_SEQ_TB,            "SEQ_TB" },             \
-                { V4L2_FIELD_SEQ_BT,            "SEQ_BT" },             \
-                { V4L2_FIELD_ALTERNATE,         "ALTERNATE" },          \
-                { V4L2_FIELD_INTERLACED_TB,     "INTERLACED_TB" },      \
-                { V4L2_FIELD_INTERLACED_BT,     "INTERLACED_BT" })
+        __print_symbolic(field, SHOW_FIELD)
+
+#define SHOW_FIELD                                                      \
+        EM( V4L2_FIELD_ANY,             "ANY" )                         \
+        EM( V4L2_FIELD_NONE,            "NONE" )                        \
+        EM( V4L2_FIELD_TOP,             "TOP" )                         \
+        EM( V4L2_FIELD_BOTTOM,          "BOTTOM" )                      \
+        EM( V4L2_FIELD_INTERLACED,      "INTERLACED" )                  \
+        EM( V4L2_FIELD_SEQ_TB,          "SEQ_TB" )                      \
+        EM( V4L2_FIELD_SEQ_BT,          "SEQ_BT" )                      \
+        EM( V4L2_FIELD_ALTERNATE,       "ALTERNATE" )                   \
+        EM( V4L2_FIELD_INTERLACED_TB,   "INTERLACED_TB" )               \
+        EMe( V4L2_FIELD_INTERLACED_BT,  "INTERLACED_BT" )
+
+SHOW_FIELD
+
+/*
+ * Now redefine the EM() and EMe() macros to map the enums to the strings
+ * that will be printed in the output.
+ */
+#undef EM
+#undef EMe
+#define EM(a, b)        {a, b},
+#define EMe(a, b)       {a, b}
+
+/* V4L2_TC_TYPE_* are macros, not defines, they do not need processing */
 
 #define show_timecode_type(type)                                        \
         __print_symbolic(type,                                          \
diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index 69590b6ffc09..f66476b96264 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -336,18 +336,18 @@ TRACE_EVENT(mm_vmscan_writepage,
         TP_ARGS(page, reclaim_flags),
 
         TP_STRUCT__entry(
-                __field(struct page *, page)
+                __field(unsigned long, pfn)
                 __field(int, reclaim_flags)
         ),
 
         TP_fast_assign(
-                __entry->page = page;
+                __entry->pfn = page_to_pfn(page);
                 __entry->reclaim_flags = reclaim_flags;
         ),
 
         TP_printk("page=%p pfn=%lu flags=%s",
-                __entry->page,
-                page_to_pfn(__entry->page),
+                pfn_to_page(__entry->pfn),
+                __entry->pfn,
                 show_reclaim_flags(__entry->reclaim_flags))
 );
 
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 5a14ead59696..880dd7437172 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -23,15 +23,32 @@
                 {I_REFERENCED,          "I_REFERENCED"}         \
         )
 
+/* enums need to be exported to user space */
+#undef EM
+#undef EMe
+#define EM(a,b)         TRACE_DEFINE_ENUM(a);
+#define EMe(a,b)        TRACE_DEFINE_ENUM(a);
+
 #define WB_WORK_REASON                                                  \
-                {WB_REASON_BACKGROUND,          "background"},          \
-                {WB_REASON_TRY_TO_FREE_PAGES,   "try_to_free_pages"},   \
-                {WB_REASON_SYNC,                "sync"},                \
-                {WB_REASON_PERIODIC,            "periodic"},            \
-                {WB_REASON_LAPTOP_TIMER,        "laptop_timer"},        \
-                {WB_REASON_FREE_MORE_MEM,       "free_more_memory"},    \
-                {WB_REASON_FS_FREE_SPACE,       "fs_free_space"},       \
-                {WB_REASON_FORKER_THREAD,       "forker_thread"}
+        EM( WB_REASON_BACKGROUND,               "background")           \
+        EM( WB_REASON_TRY_TO_FREE_PAGES,        "try_to_free_pages")    \
+        EM( WB_REASON_SYNC,                     "sync")                 \
+        EM( WB_REASON_PERIODIC,                 "periodic")             \
+        EM( WB_REASON_LAPTOP_TIMER,             "laptop_timer")         \
+        EM( WB_REASON_FREE_MORE_MEM,            "free_more_memory")     \
+        EM( WB_REASON_FS_FREE_SPACE,            "fs_free_space")        \
+        EMe(WB_REASON_FORKER_THREAD,            "forker_thread")
+
+WB_WORK_REASON
+
+/*
+ * Now redefine the EM() and EMe() macros to map the enums to the strings
+ * that will be printed in the output.
+ */
+#undef EM
+#undef EMe
+#define EM(a,b)         { a, b },
+#define EMe(a,b)        { a, b }
 
 struct wb_writeback_work;
 
diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h
index d06b6da5c1e3..bce990f5a35d 100644
--- a/include/trace/events/xen.h
+++ b/include/trace/events/xen.h
@@ -224,7 +224,7 @@ TRACE_EVENT(xen_mmu_pmd_clear,
             TP_printk("pmdp %p", __entry->pmdp)
         );
 
-#if PAGETABLE_LEVELS >= 4
+#if CONFIG_PGTABLE_LEVELS >= 4
 
 TRACE_EVENT(xen_mmu_set_pud,
             TP_PROTO(pud_t *pudp, pud_t pudval),
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 41bf65f04dd9..37d4b10b111d 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -18,6 +18,34 @@
 
 #include <linux/ftrace_event.h>
 
+#ifndef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR TRACE_SYSTEM
+#endif
+
+#define __app__(x, y) str__##x##y
+#define __app(x, y) __app__(x, y)
+
+#define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
+
+#define TRACE_MAKE_SYSTEM_STR()                         \
+        static const char TRACE_SYSTEM_STRING[] =       \
+                __stringify(TRACE_SYSTEM)
+
+TRACE_MAKE_SYSTEM_STR();
+
+#undef TRACE_DEFINE_ENUM
+#define TRACE_DEFINE_ENUM(a)                            \
+        static struct trace_enum_map __used __initdata  \
+        __##TRACE_SYSTEM##_##a =                        \
+        {                                               \
+                .system = TRACE_SYSTEM_STRING,          \
+                .enum_string = #a,                      \
+                .enum_value = a                         \
+        };                                              \
+        static struct trace_enum_map __used             \
+        __attribute__((section("_ftrace_enum_map")))    \
+        *TRACE_SYSTEM##_##a = &__##TRACE_SYSTEM##_##a
+
 /*
  * DECLARE_EVENT_CLASS can be used to add a generic function
  * handlers for events. That is, if all events have the same
@@ -105,7 +133,6 @@
 
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
-
 /*
  * Stage 2 of the trace events.
  *
@@ -122,6 +149,9 @@
  * The size of an array is also encoded, in the higher 16 bits of <item>.
  */
 
+#undef TRACE_DEFINE_ENUM
+#define TRACE_DEFINE_ENUM(a)
+
 #undef __field
 #define __field(type, item)
 
@@ -539,7 +569,7 @@ static inline notrace int ftrace_get_offsets_##call(			\
  *      .trace                  = ftrace_raw_output_<call>, <-- stage 2
  * };
  *
- * static const char print_fmt_<call>[] = <TP_printk>;
+ * static char print_fmt_<call>[] = <TP_printk>;
  *
  * static struct ftrace_event_class __used event_class_<template> = {
  *      .system                 = "<system>",
@@ -690,9 +720,9 @@ static inline void ftrace_test_probe_##call(void)			\
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
 _TRACE_PERF_PROTO(call, PARAMS(proto));                                 \
-static const char print_fmt_##call[] = print;                           \
+static char print_fmt_##call[] = print;                                 \
 static struct ftrace_event_class __used __refdata event_class_##call = { \
-        .system                 = __stringify(TRACE_SYSTEM),            \
+        .system                 = TRACE_SYSTEM_STRING,                  \
         .define_fields          = ftrace_define_fields_##call,          \
         .fields                 = LIST_HEAD_INIT(event_class_##call.fields),\
         .raw_init               = trace_event_raw_init,                 \
@@ -719,7 +749,7 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
 #undef DEFINE_EVENT_PRINT
 #define DEFINE_EVENT_PRINT(template, call, proto, args, print)          \
                                                                         \
-static const char print_fmt_##call[] = print;                           \
+static char print_fmt_##call[] = print;                                 \
                                                                         \
 static struct ftrace_event_call __used event_##call = {                 \
         .class                  = &event_class_##template,              \
@@ -735,6 +765,7 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
 
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
+#undef TRACE_SYSTEM_VAR
 
 #ifdef CONFIG_PERF_EVENTS
 
diff --git a/include/uapi/asm-generic/errno.h b/include/uapi/asm-generic/errno.h
index 1e1ea6e6e7a5..88e0914cf2d9 100644
--- a/include/uapi/asm-generic/errno.h
+++ b/include/uapi/asm-generic/errno.h
@@ -6,7 +6,16 @@
 #define EDEADLK         35      /* Resource deadlock would occur */
 #define ENAMETOOLONG    36      /* File name too long */
 #define ENOLCK          37      /* No record locks available */
-#define ENOSYS          38      /* Function not implemented */
+
+/*
+ * This error code is special: arch syscall entry code will return
+ * -ENOSYS if users try to call a syscall that doesn't exist.  To keep
+ * failures of syscalls that really do exist distinguishable from
+ * failures due to attempts to use a nonexistent syscall, syscall
+ * implementations should refrain from returning -ENOSYS.
+ */
+#define ENOSYS          38      /* Invalid system call number */
+
 #define ENOTEMPTY       39      /* Directory not empty */
 #define ELOOP           40      /* Too many symbolic links encountered */
 #define EWOULDBLOCK     EAGAIN  /* Operation would block */
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
index 01b2d6d0e355..ff6ef62d084b 100644
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
@@ -630,6 +630,7 @@ struct drm_gem_open {
  */
 #define DRM_CAP_CURSOR_WIDTH            0x8
 #define DRM_CAP_CURSOR_HEIGHT           0x9
+#define DRM_CAP_ADDFB2_MODIFIERS        0x10
 
 /** DRM_IOCTL_GET_CAP ioctl argument type */
 struct drm_get_cap {
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index a284f11a8ef5..07735822a28f 100644
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -129,4 +129,82 @@
 #define DRM_FORMAT_YUV444       fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */
 #define DRM_FORMAT_YVU444       fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */
 
+
+/*
+ * Format Modifiers:
+ *
+ * Format modifiers describe, typically, a re-ordering or modification
+ * of the data in a plane of an FB.  This can be used to express tiled/
+ * swizzled formats, or compression, or a combination of the two.
+ *
+ * The upper 8 bits of the format modifier are a vendor-id as assigned
+ * below.  The lower 56 bits are assigned as vendor sees fit.
+ */
+
+/* Vendor Ids: */
+#define DRM_FORMAT_MOD_NONE           0
+#define DRM_FORMAT_MOD_VENDOR_INTEL   0x01
+#define DRM_FORMAT_MOD_VENDOR_AMD     0x02
+#define DRM_FORMAT_MOD_VENDOR_NV      0x03
+#define DRM_FORMAT_MOD_VENDOR_SAMSUNG 0x04
+#define DRM_FORMAT_MOD_VENDOR_QCOM    0x05
+/* add more to the end as needed */
+
+#define fourcc_mod_code(vendor, val) \
+        ((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
+
+/*
+ * Format Modifier tokens:
+ *
+ * When adding a new token please document the layout with a code comment,
+ * similar to the fourcc codes above. drm_fourcc.h is considered the
+ * authoritative source for all of these.
+ */
+
+/* Intel framebuffer modifiers */
+
+/*
+ * Intel X-tiling layout
+ *
+ * This is a tiled layout using 4Kb tiles (except on gen2 where the tiles 2Kb)
+ * in row-major layout. Within the tile bytes are laid out row-major, with
+ * a platform-dependent stride. On top of that the memory can apply
+ * platform-depending swizzling of some higher address bits into bit6.
+ *
+ * This format is highly platforms specific and not useful for cross-driver
+ * sharing. It exists since on a given platform it does uniquely identify the
+ * layout in a simple way for i915-specific userspace.
+ */
+#define I915_FORMAT_MOD_X_TILED fourcc_mod_code(INTEL, 1)
+
+/*
+ * Intel Y-tiling layout
+ *
+ * This is a tiled layout using 4Kb tiles (except on gen2 where the tiles 2Kb)
+ * in row-major layout. Within the tile bytes are laid out in OWORD (16 bytes)
+ * chunks column-major, with a platform-dependent height. On top of that the
+ * memory can apply platform-depending swizzling of some higher address bits
+ * into bit6.
+ *
+ * This format is highly platforms specific and not useful for cross-driver
+ * sharing. It exists since on a given platform it does uniquely identify the
+ * layout in a simple way for i915-specific userspace.
+ */
+#define I915_FORMAT_MOD_Y_TILED fourcc_mod_code(INTEL, 2)
+
+/*
+ * Intel Yf-tiling layout
+ *
+ * This is a tiled layout using 4Kb tiles in row-major layout.
+ * Within the tile pixels are laid out in 16 256 byte units / sub-tiles which
+ * are arranged in four groups (two wide, two high) with column-major layout.
+ * Each group therefore consits out of four 256 byte units, which are also laid
+ * out as 2x2 column-major.
+ * 256 byte units are made out of four 64 byte blocks of pixels, producing
+ * either a square block or a 2:1 unit.
+ * 64 byte blocks of pixels contain four pixel rows of 16 bytes, where the width
+ * in pixel depends on the pixel depth.
+ */
+#define I915_FORMAT_MOD_Yf_TILED fourcc_mod_code(INTEL, 3)
+
 #endif /* DRM_FOURCC_H */
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index ca788e01dab2..dbeba949462a 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -336,6 +336,7 @@ struct drm_mode_fb_cmd {
 };
 
 #define DRM_MODE_FB_INTERLACED  (1<<0) /* for interlaced framebuffers */
+#define DRM_MODE_FB_MODIFIERS   (1<<1) /* enables ->modifer[] */
 
 struct drm_mode_fb_cmd2 {
         __u32 fb_id;
@@ -356,10 +357,18 @@ struct drm_mode_fb_cmd2 {
          * So it would consist of Y as offsets[0] and UV as
          * offsets[1].  Note that offsets[0] will generally
          * be 0 (but this is not required).
+         *
+         * To accommodate tiled, compressed, etc formats, a per-plane
+         * modifier can be specified.  The default value of zero
+         * indicates "native" format as specified by the fourcc.
+         * Vendor specific modifier token.  This allows, for example,
+         * different tiling/swizzling pattern on different planes.
+         * See discussion above of DRM_FORMAT_MOD_xxx.
          */
         __u32 handles[4];
         __u32 pitches[4]; /* pitch for each plane */
         __u32 offsets[4]; /* offset of each plane */
+        __u64 modifier[4]; /* ie, tiling, compressed (per plane) */
 };
 
 #define DRM_MODE_FB_DIRTY_ANNOTATE_COPY 0x01
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 6eed16b92a24..551b6737f5df 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -270,7 +270,7 @@ typedef struct _drm_i915_sarea {
 #define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE        DRM_IOW(DRM_COMMAND_BASE + DRM_I915_OVERLAY_PUT_IMAGE, struct drm_intel_overlay_put_image)
 #define DRM_IOCTL_I915_OVERLAY_ATTRS    DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs)
 #define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
-#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
+#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
 #define DRM_IOCTL_I915_GEM_WAIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait)
 #define DRM_IOCTL_I915_GEM_CONTEXT_CREATE       DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)
 #define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY      DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)
@@ -347,6 +347,9 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
 #define I915_PARAM_MMAP_VERSION          30
 #define I915_PARAM_HAS_BSD2              31
+#define I915_PARAM_REVISION              32
+#define I915_PARAM_SUBSLICE_TOTAL        33
+#define I915_PARAM_EU_TOTAL              34
 
 typedef struct drm_i915_getparam {
         int param;
diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h
index 0d7608dc1a34..5507eead5863 100644
--- a/include/uapi/drm/nouveau_drm.h
+++ b/include/uapi/drm/nouveau_drm.h
@@ -39,6 +39,7 @@
 #define NOUVEAU_GEM_DOMAIN_VRAM      (1 << 1)
 #define NOUVEAU_GEM_DOMAIN_GART      (1 << 2)
 #define NOUVEAU_GEM_DOMAIN_MAPPABLE  (1 << 3)
+#define NOUVEAU_GEM_DOMAIN_COHERENT  (1 << 4)
 
 #define NOUVEAU_GEM_TILE_COMP        0x00030000 /* nv50-only */
 #define NOUVEAU_GEM_TILE_LAYOUT_MASK 0x0000ff00
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h
index 50d0fb41a3bf..871e73f99a4d 100644
--- a/include/uapi/drm/radeon_drm.h
+++ b/include/uapi/drm/radeon_drm.h
@@ -1034,6 +1034,10 @@ struct drm_radeon_cs {
 #define RADEON_INFO_VRAM_USAGE          0x1e
 #define RADEON_INFO_GTT_USAGE           0x1f
 #define RADEON_INFO_ACTIVE_CU_COUNT     0x20
+#define RADEON_INFO_CURRENT_GPU_TEMP    0x21
+#define RADEON_INFO_CURRENT_GPU_SCLK    0x22
+#define RADEON_INFO_CURRENT_GPU_MCLK    0x23
+#define RADEON_INFO_READ_REG            0x24
 
 struct drm_radeon_info {
         uint32_t                request;
diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h
index c15d781ecc0f..5391780c2b05 100644
--- a/include/uapi/drm/tegra_drm.h
+++ b/include/uapi/drm/tegra_drm.h
@@ -36,7 +36,8 @@ struct drm_tegra_gem_create {
 
 struct drm_tegra_gem_mmap {
         __u32 handle;
-        __u32 offset;
+        __u32 pad;
+        __u64 offset;
 };
 
 struct drm_tegra_syncpt_read {
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 68ceb97c458c..1a0006a76b00 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -6,6 +6,7 @@ header-y += caif/
 header-y += dvb/
 header-y += hdlc/
 header-y += hsi/
+header-y += iio/
 header-y += isdn/
 header-y += mmc/
 header-y += nfsd/
@@ -430,6 +431,7 @@ header-y += virtio_blk.h
 header-y += virtio_config.h
 header-y += virtio_console.h
 header-y += virtio_ids.h
+header-y += virtio_input.h
 header-y += virtio_net.h
 header-y += virtio_pci.h
 header-y += virtio_ring.h
@@ -446,5 +448,6 @@ header-y += wireless.h
 header-y += x25.h
 header-y += xattr.h
 header-y += xfrm.h
+header-y += xilinx-v4l2-controls.h
 header-y += zorro.h
 header-y += zorro_ids.h
diff --git a/include/uapi/linux/am437x-vpfe.h b/include/uapi/linux/am437x-vpfe.h
index 9b03033f9cd6..d75774317b9b 100644
--- a/include/uapi/linux/am437x-vpfe.h
+++ b/include/uapi/linux/am437x-vpfe.h
@@ -21,6 +21,8 @@
 #ifndef AM437X_VPFE_USER_H
 #define AM437X_VPFE_USER_H
 
+#include <linux/videodev2.h>
+
 enum vpfe_ccdc_data_size {
         VPFE_CCDC_DATA_16BITS = 0,
         VPFE_CCDC_DATA_15BITS,
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 45da7ec7d274..a9ebdf5701e8 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -118,8 +118,13 @@ enum bpf_map_type {
 enum bpf_prog_type {
         BPF_PROG_TYPE_UNSPEC,
         BPF_PROG_TYPE_SOCKET_FILTER,
+        BPF_PROG_TYPE_KPROBE,
+        BPF_PROG_TYPE_SCHED_CLS,
+        BPF_PROG_TYPE_SCHED_ACT,
 };
 
+#define BPF_PSEUDO_MAP_FD       1
+
 /* flags for BPF_MAP_UPDATE_ELEM command */
 #define BPF_ANY         0 /* create new element or update existing */
 #define BPF_NOEXIST     1 /* create new element if it didn't exist */
@@ -151,6 +156,7 @@ union bpf_attr {
                 __u32           log_level;      /* verbosity level of verifier */
                 __u32           log_size;       /* size of user buffer */
                 __aligned_u64   log_buf;        /* user supplied buffer */
+                __u32           kern_version;   /* checked when prog_type=kprobe */
         };
 } __attribute__((aligned(8)));
 
@@ -162,7 +168,64 @@ enum bpf_func_id {
         BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */
         BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */
         BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */
+        BPF_FUNC_probe_read,      /* int bpf_probe_read(void *dst, int size, void *src) */
+        BPF_FUNC_ktime_get_ns,    /* u64 bpf_ktime_get_ns(void) */
+        BPF_FUNC_trace_printk,    /* int bpf_trace_printk(const char *fmt, int fmt_size, ...) */
+        BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */
+        BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */
+
+        /**
+         * skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet
+         * @skb: pointer to skb
+         * @offset: offset within packet from skb->mac_header
+         * @from: pointer where to copy bytes from
+         * @len: number of bytes to store into packet
+         * @flags: bit 0 - if true, recompute skb->csum
+         *         other bits - reserved
+         * Return: 0 on success
+         */
+        BPF_FUNC_skb_store_bytes,
+
+        /**
+         * l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum
+         * @skb: pointer to skb
+         * @offset: offset within packet where IP checksum is located
+         * @from: old value of header field
+         * @to: new value of header field
+         * @flags: bits 0-3 - size of header field
+         *         other bits - reserved
+         * Return: 0 on success
+         */
+        BPF_FUNC_l3_csum_replace,
+
+        /**
+         * l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum
+         * @skb: pointer to skb
+         * @offset: offset within packet where TCP/UDP checksum is located
+         * @from: old value of header field
+         * @to: new value of header field
+         * @flags: bits 0-3 - size of header field
+         *         bit 4 - is pseudo header
+         *         other bits - reserved
+         * Return: 0 on success
+         */
+        BPF_FUNC_l4_csum_replace,
         __BPF_FUNC_MAX_ID,
 };
 
+/* user accessible mirror of in-kernel sk_buff.
+ * new fields can only be added to the end of this structure
+ */
+struct __sk_buff {
+        __u32 len;
+        __u32 pkt_type;
+        __u32 mark;
+        __u32 queue_mapping;
+        __u32 protocol;
+        __u32 vlan_present;
+        __u32 vlan_tci;
+        __u32 vlan_proto;
+        __u32 priority;
+};
+
 #endif /* _UAPI__LINUX_BPF_H__ */
diff --git a/include/uapi/linux/can/raw.h b/include/uapi/linux/can/raw.h
index 78ec76fd89a6..8735f1080385 100644
--- a/include/uapi/linux/can/raw.h
+++ b/include/uapi/linux/can/raw.h
@@ -57,6 +57,7 @@ enum {
         CAN_RAW_LOOPBACK,       /* local loopback (default:on)       */
         CAN_RAW_RECV_OWN_MSGS,  /* receive my own msgs (default:off) */
         CAN_RAW_FD_FRAMES,      /* allow CAN FD frames (default:off) */
+        CAN_RAW_JOIN_FILTERS,   /* all filters must match to trigger */
 };
 
 #endif /* !_UAPI_CAN_RAW_H */
diff --git a/include/uapi/linux/dcbnl.h b/include/uapi/linux/dcbnl.h
index e711f20dc522..6497d7933d5b 100644
--- a/include/uapi/linux/dcbnl.h
+++ b/include/uapi/linux/dcbnl.h
@@ -78,6 +78,70 @@ struct ieee_maxrate {
         __u64   tc_maxrate[IEEE_8021QAZ_MAX_TCS];
 };
 
+enum dcbnl_cndd_states {
+        DCB_CNDD_RESET = 0,
+        DCB_CNDD_EDGE,
+        DCB_CNDD_INTERIOR,
+        DCB_CNDD_INTERIOR_READY,
+};
+
+/* This structure contains the IEEE 802.1Qau QCN managed object.
+ *
+ *@rpg_enable: enable QCN RP
+ *@rppp_max_rps: maximum number of RPs allowed for this CNPV on this port
+ *@rpg_time_reset: time between rate increases if no CNMs received.
+ *                 given in u-seconds
+ *@rpg_byte_reset: transmitted data between rate increases if no CNMs received.
+ *                 given in Bytes
+ *@rpg_threshold: The number of times rpByteStage or rpTimeStage can count
+ *                 before RP rate control state machine advances states
+ *@rpg_max_rate: the maxinun rate, in Mbits per second,
+ *               at which an RP can transmit
+ *@rpg_ai_rate: The rate, in Mbits per second,
+ *              used to increase rpTargetRate in the RPR_ACTIVE_INCREASE
+ *@rpg_hai_rate: The rate, in Mbits per second,
+ *               used to increase rpTargetRate in the RPR_HYPER_INCREASE state
+ *@rpg_gd: Upon CNM receive, flow rate is limited to (Fb/Gd)*CurrentRate.
+ *         rpgGd is given as log2(Gd), where Gd may only be powers of 2
+ *@rpg_min_dec_fac: The minimum factor by which the current transmit rate
+ *                  can be changed by reception of a CNM.
+ *                  value is given as percentage (1-100)
+ *@rpg_min_rate: The minimum value, in bits per second, for rate to limit
+ *@cndd_state_machine: The state of the congestion notification domain
+ *                     defense state machine, as defined by IEEE 802.3Qau
+ *                     section 32.1.1. In the interior ready state,
+ *                     the QCN capable hardware may add CN-TAG TLV to the
+ *                     outgoing traffic, to specifically identify outgoing
+ *                     flows.
+ */
+
+struct ieee_qcn {
+        __u8 rpg_enable[IEEE_8021QAZ_MAX_TCS];
+        __u32 rppp_max_rps[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_time_reset[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_byte_reset[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_threshold[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_max_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_ai_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_hai_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_gd[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_min_dec_fac[IEEE_8021QAZ_MAX_TCS];
+        __u32 rpg_min_rate[IEEE_8021QAZ_MAX_TCS];
+        __u32 cndd_state_machine[IEEE_8021QAZ_MAX_TCS];
+};
+
+/* This structure contains the IEEE 802.1Qau QCN statistics.
+ *
+ *@rppp_rp_centiseconds: the number of RP-centiseconds accumulated
+ *                       by RPs at this priority level on this Port
+ *@rppp_created_rps: number of active RPs(flows) that react to CNMs
+ */
+
+struct ieee_qcn_stats {
+        __u64 rppp_rp_centiseconds[IEEE_8021QAZ_MAX_TCS];
+        __u32 rppp_created_rps[IEEE_8021QAZ_MAX_TCS];
+};
+
 /* This structure contains the IEEE 802.1Qaz PFC managed object
  *
  * @pfc_cap: Indicates the number of traffic classes on the local device
@@ -334,6 +398,8 @@ enum ieee_attrs {
         DCB_ATTR_IEEE_PEER_PFC,
         DCB_ATTR_IEEE_PEER_APP,
         DCB_ATTR_IEEE_MAXRATE,
+        DCB_ATTR_IEEE_QCN,
+        DCB_ATTR_IEEE_QCN_STATS,
         __DCB_ATTR_IEEE_MAX
 };
 #define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1)
diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h
index 889f3a5b7b18..eac8c3641f39 100644
--- a/include/uapi/linux/dm-ioctl.h
+++ b/include/uapi/linux/dm-ioctl.h
@@ -267,9 +267,9 @@ enum {
 #define DM_DEV_SET_GEOMETRY     _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 
 #define DM_VERSION_MAJOR        4
-#define DM_VERSION_MINOR        30
+#define DM_VERSION_MINOR        31
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2014-12-22)"
+#define DM_VERSION_EXTRA        "-ioctl (2015-3-12)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
diff --git a/include/uapi/linux/falloc.h b/include/uapi/linux/falloc.h
index d1197ae3723c..3e445a760f14 100644
--- a/include/uapi/linux/falloc.h
+++ b/include/uapi/linux/falloc.h
@@ -41,4 +41,21 @@
  */
 #define FALLOC_FL_ZERO_RANGE            0x10
 
+/*
+ * FALLOC_FL_INSERT_RANGE is use to insert space within the file size without
+ * overwriting any existing data. The contents of the file beyond offset are
+ * shifted towards right by len bytes to create a hole.  As such, this
+ * operation will increase the size of the file by len bytes.
+ *
+ * Different filesystems may implement different limitations on the granularity
+ * of the operation. Most will limit operations to filesystem block size
+ * boundaries, but this boundary may be larger or smaller depending on
+ * the filesystem and/or the configuration of the filesystem or file.
+ *
+ * Attempting to insert space using this flag at OR beyond the end of
+ * the file is considered an illegal operation - just use ftruncate(2) or
+ * fallocate(2) with mode 0 for such type of operations.
+ */
+#define FALLOC_FL_INSERT_RANGE          0x20
+
 #endif /* _UAPI_FALLOC_H_ */
diff --git a/include/uapi/linux/filter.h b/include/uapi/linux/filter.h
index 47785d5ecf17..c97340e43dd6 100644
--- a/include/uapi/linux/filter.h
+++ b/include/uapi/linux/filter.h
@@ -77,9 +77,13 @@ struct sock_fprog {	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_VLAN_TAG_PRESENT 48
 #define SKF_AD_PAY_OFFSET       52
 #define SKF_AD_RANDOM   56
-#define SKF_AD_MAX      60
-#define SKF_NET_OFF   (-0x100000)
-#define SKF_LL_OFF    (-0x200000)
+#define SKF_AD_VLAN_TPID        60
+#define SKF_AD_MAX      64
 
+#define SKF_NET_OFF     (-0x100000)
+#define SKF_LL_OFF      (-0x200000)
+
+#define BPF_NET_OFF     SKF_NET_OFF
+#define BPF_LL_OFF      SKF_LL_OFF
 
 #endif /* _UAPI__LINUX_FILTER_H__ */
diff --git a/include/uapi/linux/fou.h b/include/uapi/linux/fou.h
index c303588bb767..d2947c52dc67 100644
--- a/include/uapi/linux/fou.h
+++ b/include/uapi/linux/fou.h
@@ -25,6 +25,7 @@ enum {
         FOU_CMD_UNSPEC,
         FOU_CMD_ADD,
         FOU_CMD_DEL,
+        FOU_CMD_GET,
 
         __FOU_CMD_MAX,
 };
diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild
index 30ab3cd3b8a5..a16a00544258 100644
--- a/include/uapi/linux/hsi/Kbuild
+++ b/include/uapi/linux/hsi/Kbuild
@@ -1,2 +1,2 @@
 # UAPI Header export list
-header-y += hsi_char.h
+header-y += hsi_char.h cs-protocol.h
diff --git a/include/uapi/linux/hsi/cs-protocol.h b/include/uapi/linux/hsi/cs-protocol.h
new file mode 100644
index 000000000000..4957bba57cbe
--- /dev/null
+++ b/include/uapi/linux/hsi/cs-protocol.h
@@ -0,0 +1,113 @@
+/*
+ * cmt-speech interface definitions
+ *
+ * Copyright (C) 2008,2009,2010 Nokia Corporation. All rights reserved.
+ *
+ * Contact: Kai Vehmanen <kai.vehmanen@nokia.com>
+ * Original author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef _CS_PROTOCOL_H
+#define _CS_PROTOCOL_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+/* chardev parameters */
+#define CS_DEV_FILE_NAME                "/dev/cmt_speech"
+
+/* user-space API versioning */
+#define CS_IF_VERSION                   2
+
+/* APE kernel <-> user space messages */
+#define CS_CMD_SHIFT                    28
+#define CS_DOMAIN_SHIFT                 24
+
+#define CS_CMD_MASK                     0xff000000
+#define CS_PARAM_MASK                   0xffffff
+
+#define CS_CMD(id, dom) \
+        (((id) << CS_CMD_SHIFT) | ((dom) << CS_DOMAIN_SHIFT))
+
+#define CS_ERROR                        CS_CMD(1, 0)
+#define CS_RX_DATA_RECEIVED             CS_CMD(2, 0)
+#define CS_TX_DATA_READY                CS_CMD(3, 0)
+#define CS_TX_DATA_SENT                 CS_CMD(4, 0)
+
+/* params to CS_ERROR indication */
+#define CS_ERR_PEER_RESET               0
+
+/* ioctl interface */
+
+/* parameters to CS_CONFIG_BUFS ioctl */
+#define CS_FEAT_TSTAMP_RX_CTRL          (1 << 0)
+#define CS_FEAT_ROLLING_RX_COUNTER      (2 << 0)
+
+/* parameters to CS_GET_STATE ioctl */
+#define CS_STATE_CLOSED                 0
+#define CS_STATE_OPENED                 1 /* resource allocated */
+#define CS_STATE_CONFIGURED             2 /* data path active */
+
+/* maximum number of TX/RX buffers */
+#define CS_MAX_BUFFERS_SHIFT            4
+#define CS_MAX_BUFFERS                  (1 << CS_MAX_BUFFERS_SHIFT)
+
+/* Parameters for setting up the data buffers */
+struct cs_buffer_config {
+        __u32 rx_bufs;  /* number of RX buffer slots */
+        __u32 tx_bufs;  /* number of TX buffer slots */
+        __u32 buf_size; /* bytes */
+        __u32 flags;    /* see CS_FEAT_* */
+        __u32 reserved[4];
+};
+
+/*
+ * Struct describing the layout and contents of the driver mmap area.
+ * This information is meant as read-only information for the application.
+ */
+struct cs_mmap_config_block {
+        __u32 reserved1;
+        __u32 buf_size;         /* 0=disabled, otherwise the transfer size */
+        __u32 rx_bufs;          /* # of RX buffers */
+        __u32 tx_bufs;          /* # of TX buffers */
+        __u32 reserved2;
+        /* array of offsets within the mmap area for each RX and TX buffer */
+        __u32 rx_offsets[CS_MAX_BUFFERS];
+        __u32 tx_offsets[CS_MAX_BUFFERS];
+        __u32 rx_ptr;
+        __u32 rx_ptr_boundary;
+        __u32 reserved3[2];
+        /*
+         * if enabled with CS_FEAT_TSTAMP_RX_CTRL, monotonic
+         * timestamp taken when the last control command was received
+         */
+        struct timespec tstamp_rx_ctrl;
+};
+
+#define CS_IO_MAGIC             'C'
+
+#define CS_IOW(num, dtype)      _IOW(CS_IO_MAGIC, num, dtype)
+#define CS_IOR(num, dtype)      _IOR(CS_IO_MAGIC, num, dtype)
+#define CS_IOWR(num, dtype)     _IOWR(CS_IO_MAGIC, num, dtype)
+#define CS_IO(num)              _IO(CS_IO_MAGIC, num)
+
+#define CS_GET_STATE            CS_IOR(21, unsigned int)
+#define CS_SET_WAKELINE         CS_IOW(23, unsigned int)
+#define CS_GET_IF_VERSION       CS_IOR(30, unsigned int)
+#define CS_CONFIG_BUFS          CS_IOW(31, struct cs_buffer_config)
+
+#endif /* _CS_PROTOCOL_H */
diff --git a/include/uapi/linux/if_addr.h b/include/uapi/linux/if_addr.h
index dea10a87dfd1..4318ab1635ce 100644
--- a/include/uapi/linux/if_addr.h
+++ b/include/uapi/linux/if_addr.h
@@ -50,6 +50,8 @@ enum {
 #define IFA_F_PERMANENT         0x80
 #define IFA_F_MANAGETEMPADDR    0x100
 #define IFA_F_NOPREFIXROUTE     0x200
+#define IFA_F_MCAUTOJOIN        0x400
+#define IFA_F_STABLE_PRIVACY    0x800
 
 struct ifa_cacheinfo {
         __u32   ifa_prefered;
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index dfd0bb22e554..d9cd19214b98 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -147,6 +147,7 @@ enum {
         IFLA_CARRIER_CHANGES,
         IFLA_PHYS_SWITCH_ID,
         IFLA_LINK_NETNSID,
+        IFLA_PHYS_PORT_NAME,
         __IFLA_MAX
 };
 
@@ -215,6 +216,7 @@ enum {
 enum in6_addr_gen_mode {
         IN6_ADDR_GEN_MODE_EUI64,
         IN6_ADDR_GEN_MODE_NONE,
+        IN6_ADDR_GEN_MODE_STABLE_PRIVACY,
 };
 
 /* Bridge section */
@@ -224,6 +226,9 @@ enum {
         IFLA_BR_FORWARD_DELAY,
         IFLA_BR_HELLO_TIME,
         IFLA_BR_MAX_AGE,
+        IFLA_BR_AGEING_TIME,
+        IFLA_BR_STP_STATE,
+        IFLA_BR_PRIORITY,
         __IFLA_BR_MAX,
 };
 
@@ -247,6 +252,7 @@ enum {
         IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
         IFLA_BRPORT_PROXYARP,   /* proxy ARP */
         IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */
+        IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */
         __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -459,6 +465,9 @@ enum {
         IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
         IFLA_VF_LINK_STATE,     /* link state enable/disable/auto switch */
         IFLA_VF_RATE,           /* Min and Max TX Bandwidth Allocation */
+        IFLA_VF_RSS_QUERY_EN,   /* RSS Redirection Table and Hash Key query
+                                 * on/off switch
+                                 */
         __IFLA_VF_MAX,
 };
 
@@ -503,6 +512,11 @@ struct ifla_vf_link_state {
         __u32 link_state;
 };
 
+struct ifla_vf_rss_query_en {
+        __u32 vf;
+        __u32 setting;
+};
+
 /* VF ports management section
  *
  *      Nested layout of set/get msg is:
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h
index da2d668b8cf1..053bd102fbe0 100644
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
@@ -99,6 +99,7 @@ struct tpacket_auxdata {
 #define TP_STATUS_VLAN_VALID            (1 << 4) /* auxdata has valid tp_vlan_tci */
 #define TP_STATUS_BLK_TMO               (1 << 5)
 #define TP_STATUS_VLAN_TPID_VALID       (1 << 6) /* auxdata has valid tp_vlan_tpid */
+#define TP_STATUS_CSUM_VALID            (1 << 7)
 
 /* Tx ring - header status */
 #define TP_STATUS_AVAILABLE           0
diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild
new file mode 100644
index 000000000000..86f76d84c44f
--- /dev/null
+++ b/include/uapi/linux/iio/Kbuild
@@ -0,0 +1,3 @@
+# UAPI Header export list
+header-y += events.h
+header-y += types.h
diff --git a/include/uapi/linux/iio/events.h b/include/uapi/linux/iio/events.h
new file mode 100644
index 000000000000..00bbdaed2f97
--- /dev/null
+++ b/include/uapi/linux/iio/events.h
@@ -0,0 +1,42 @@
+/* The industrial I/O - event passing to userspace
+ *
+ * Copyright (c) 2008-2011 Jonathan Cameron
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef _UAPI_IIO_EVENTS_H_
+#define _UAPI_IIO_EVENTS_H_
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/**
+ * struct iio_event_data - The actual event being pushed to userspace
+ * @id:         event identifier
+ * @timestamp:  best estimate of time of event occurrence (often from
+ *              the interrupt handler)
+ */
+struct iio_event_data {
+        __u64   id;
+        __s64   timestamp;
+};
+
+#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)
+
+#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
+
+#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0x7F)
+
+#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
+
+/* Event code number extraction depends on which type of event we have.
+ * Perhaps review this function in the future*/
+#define IIO_EVENT_CODE_EXTRACT_CHAN(mask) ((__s16)(mask & 0xFFFF))
+#define IIO_EVENT_CODE_EXTRACT_CHAN2(mask) ((__s16)(((mask) >> 16) & 0xFFFF))
+
+#define IIO_EVENT_CODE_EXTRACT_MODIFIER(mask) ((mask >> 40) & 0xFF)
+#define IIO_EVENT_CODE_EXTRACT_DIFF(mask) (((mask) >> 55) & 0x1)
+
+#endif /* _UAPI_IIO_EVENTS_H_ */
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
new file mode 100644
index 000000000000..5c4601935005
--- /dev/null
+++ b/include/uapi/linux/iio/types.h
@@ -0,0 +1,92 @@
+/* industrial I/O data types needed both in and out of kernel
+ *
+ * Copyright (c) 2008 Jonathan Cameron
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#ifndef _UAPI_IIO_TYPES_H_
+#define _UAPI_IIO_TYPES_H_
+
+enum iio_chan_type {
+        IIO_VOLTAGE,
+        IIO_CURRENT,
+        IIO_POWER,
+        IIO_ACCEL,
+        IIO_ANGL_VEL,
+        IIO_MAGN,
+        IIO_LIGHT,
+        IIO_INTENSITY,
+        IIO_PROXIMITY,
+        IIO_TEMP,
+        IIO_INCLI,
+        IIO_ROT,
+        IIO_ANGL,
+        IIO_TIMESTAMP,
+        IIO_CAPACITANCE,
+        IIO_ALTVOLTAGE,
+        IIO_CCT,
+        IIO_PRESSURE,
+        IIO_HUMIDITYRELATIVE,
+        IIO_ACTIVITY,
+        IIO_STEPS,
+        IIO_ENERGY,
+        IIO_DISTANCE,
+        IIO_VELOCITY,
+};
+
+enum iio_modifier {
+        IIO_NO_MOD,
+        IIO_MOD_X,
+        IIO_MOD_Y,
+        IIO_MOD_Z,
+        IIO_MOD_X_AND_Y,
+        IIO_MOD_X_AND_Z,
+        IIO_MOD_Y_AND_Z,
+        IIO_MOD_X_AND_Y_AND_Z,
+        IIO_MOD_X_OR_Y,
+        IIO_MOD_X_OR_Z,
+        IIO_MOD_Y_OR_Z,
+        IIO_MOD_X_OR_Y_OR_Z,
+        IIO_MOD_LIGHT_BOTH,
+        IIO_MOD_LIGHT_IR,
+        IIO_MOD_ROOT_SUM_SQUARED_X_Y,
+        IIO_MOD_SUM_SQUARED_X_Y_Z,
+        IIO_MOD_LIGHT_CLEAR,
+        IIO_MOD_LIGHT_RED,
+        IIO_MOD_LIGHT_GREEN,
+        IIO_MOD_LIGHT_BLUE,
+        IIO_MOD_QUATERNION,
+        IIO_MOD_TEMP_AMBIENT,
+        IIO_MOD_TEMP_OBJECT,
+        IIO_MOD_NORTH_MAGN,
+        IIO_MOD_NORTH_TRUE,
+        IIO_MOD_NORTH_MAGN_TILT_COMP,
+        IIO_MOD_NORTH_TRUE_TILT_COMP,
+        IIO_MOD_RUNNING,
+        IIO_MOD_JOGGING,
+        IIO_MOD_WALKING,
+        IIO_MOD_STILL,
+        IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z,
+};
+
+enum iio_event_type {
+        IIO_EV_TYPE_THRESH,
+        IIO_EV_TYPE_MAG,
+        IIO_EV_TYPE_ROC,
+        IIO_EV_TYPE_THRESH_ADAPTIVE,
+        IIO_EV_TYPE_MAG_ADAPTIVE,
+        IIO_EV_TYPE_CHANGE,
+};
+
+enum iio_event_direction {
+        IIO_EV_DIR_EITHER,
+        IIO_EV_DIR_RISING,
+        IIO_EV_DIR_FALLING,
+        IIO_EV_DIR_NONE,
+};
+
+#endif /* _UAPI_IIO_TYPES_H_ */
+
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index b0a813079852..731417c025f6 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -369,7 +369,8 @@ struct input_keymap_entry {
 #define KEY_MSDOS               151
 #define KEY_COFFEE              152     /* AL Terminal Lock/Screensaver */
 #define KEY_SCREENLOCK          KEY_COFFEE
-#define KEY_DIRECTION           153
+#define KEY_ROTATE_DISPLAY      153     /* Display orientation for e.g. tablets */
+#define KEY_DIRECTION           KEY_ROTATE_DISPLAY
 #define KEY_CYCLEWINDOWS        154
 #define KEY_MAIL                155
 #define KEY_BOOKMARKS           156     /* AC Bookmarks */
@@ -702,6 +703,10 @@ struct input_keymap_entry {
 #define KEY_NUMERIC_9           0x209
 #define KEY_NUMERIC_STAR        0x20a
 #define KEY_NUMERIC_POUND       0x20b
+#define KEY_NUMERIC_A           0x20c   /* Phone key A - HUT Telephony 0xb9 */
+#define KEY_NUMERIC_B           0x20d
+#define KEY_NUMERIC_C           0x20e
+#define KEY_NUMERIC_D           0x20f
 
 #define KEY_CAMERA_FOCUS        0x210
 #define KEY_WPS_BUTTON          0x211   /* WiFi Protected Setup key */
@@ -973,7 +978,8 @@ struct input_keymap_entry {
  */
 #define MT_TOOL_FINGER          0
 #define MT_TOOL_PEN             1
-#define MT_TOOL_MAX             1
+#define MT_TOOL_PALM            2
+#define MT_TOOL_MAX             2
 
 /*
  * Values describing the status of a force-feedback effect
diff --git a/include/uapi/linux/ip_vs.h b/include/uapi/linux/ip_vs.h
index cabe95d5b461..3199243f2028 100644
--- a/include/uapi/linux/ip_vs.h
+++ b/include/uapi/linux/ip_vs.h
@@ -358,6 +358,8 @@ enum {
 
         IPVS_SVC_ATTR_PE_NAME,          /* name of ct retriever */
 
+        IPVS_SVC_ATTR_STATS64,          /* nested attribute for service stats */
+
         __IPVS_SVC_ATTR_MAX,
 };
 
@@ -387,6 +389,8 @@ enum {
 
         IPVS_DEST_ATTR_ADDR_FAMILY,     /* Address family of address */
 
+        IPVS_DEST_ATTR_STATS64,         /* nested attribute for dest stats */
+
         __IPVS_DEST_ATTR_MAX,
 };
 
@@ -410,7 +414,8 @@ enum {
 /*
  * Attributes used to describe service or destination entry statistics
  *
- * Used inside nested attributes IPVS_SVC_ATTR_STATS and IPVS_DEST_ATTR_STATS
+ * Used inside nested attributes IPVS_SVC_ATTR_STATS, IPVS_DEST_ATTR_STATS,
+ * IPVS_SVC_ATTR_STATS64 and IPVS_DEST_ATTR_STATS64.
  */
 enum {
         IPVS_STATS_ATTR_UNSPEC = 0,
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 437a6a4b125a..5efa54ae567c 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -170,6 +170,7 @@ enum {
         DEVCONF_ACCEPT_RA_FROM_LOCAL,
         DEVCONF_USE_OPTIMISTIC,
         DEVCONF_ACCEPT_RA_MTU,
+        DEVCONF_STABLE_SECRET,
         DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 805570650062..4b60056776d1 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -147,6 +147,16 @@ struct kvm_pit_config {
 
 #define KVM_PIT_SPEAKER_DUMMY     1
 
+struct kvm_s390_skeys {
+        __u64 start_gfn;
+        __u64 count;
+        __u64 skeydata_addr;
+        __u32 flags;
+        __u32 reserved[9];
+};
+#define KVM_S390_GET_SKEYS_NONE   1
+#define KVM_S390_SKEYS_MAX        1048576
+
 #define KVM_EXIT_UNKNOWN          0
 #define KVM_EXIT_EXCEPTION        1
 #define KVM_EXIT_IO               2
@@ -172,6 +182,7 @@ struct kvm_pit_config {
 #define KVM_EXIT_S390_TSCH        22
 #define KVM_EXIT_EPR              23
 #define KVM_EXIT_SYSTEM_EVENT     24
+#define KVM_EXIT_S390_STSI        25
 
 /* For KVM_EXIT_INTERNAL_ERROR */
 /* Emulate instruction failed. */
@@ -309,6 +320,15 @@ struct kvm_run {
                         __u32 type;
                         __u64 flags;
                 } system_event;
+                /* KVM_EXIT_S390_STSI */
+                struct {
+                        __u64 addr;
+                        __u8 ar;
+                        __u8 reserved;
+                        __u8 fc;
+                        __u8 sel1;
+                        __u16 sel2;
+                } s390_stsi;
                 /* Fix the size of the union. */
                 char padding[256];
         };
@@ -324,7 +344,7 @@ struct kvm_run {
         __u64 kvm_dirty_regs;
         union {
                 struct kvm_sync_regs regs;
-                char padding[1024];
+                char padding[2048];
         } s;
 };
 
@@ -365,6 +385,24 @@ struct kvm_translation {
         __u8  pad[5];
 };
 
+/* for KVM_S390_MEM_OP */
+struct kvm_s390_mem_op {
+        /* in */
+        __u64 gaddr;            /* the guest address */
+        __u64 flags;            /* flags */
+        __u32 size;             /* amount of bytes */
+        __u32 op;               /* type of operation */
+        __u64 buf;              /* buffer in userspace */
+        __u8 ar;                /* the access register number */
+        __u8 reserved[31];      /* should be set to 0 */
+};
+/* types for kvm_s390_mem_op->op */
+#define KVM_S390_MEMOP_LOGICAL_READ     0
+#define KVM_S390_MEMOP_LOGICAL_WRITE    1
+/* flags for kvm_s390_mem_op->flags */
+#define KVM_S390_MEMOP_F_CHECK_ONLY             (1ULL << 0)
+#define KVM_S390_MEMOP_F_INJECT_EXCEPTION       (1ULL << 1)
+
 /* for KVM_INTERRUPT */
 struct kvm_interrupt {
         /* in */
@@ -520,6 +558,13 @@ struct kvm_s390_irq {
         } u;
 };
 
+struct kvm_s390_irq_state {
+        __u64 buf;
+        __u32 flags;
+        __u32 len;
+        __u32 reserved[4];
+};
+
 /* for KVM_SET_GUEST_DEBUG */
 
 #define KVM_GUESTDBG_ENABLE             0x00000001
@@ -760,6 +805,15 @@ struct kvm_ppc_smmu_info {
 #define KVM_CAP_PPC_ENABLE_HCALL 104
 #define KVM_CAP_CHECK_EXTENSION_VM 105
 #define KVM_CAP_S390_USER_SIGP 106
+#define KVM_CAP_S390_VECTOR_REGISTERS 107
+#define KVM_CAP_S390_MEM_OP 108
+#define KVM_CAP_S390_USER_STSI 109
+#define KVM_CAP_S390_SKEYS 110
+#define KVM_CAP_MIPS_FPU 111
+#define KVM_CAP_MIPS_MSA 112
+#define KVM_CAP_S390_INJECT_IRQ 113
+#define KVM_CAP_S390_IRQ_STATE 114
+#define KVM_CAP_PPC_HWRNG 115
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
@@ -1135,6 +1189,16 @@ struct kvm_s390_ucas_mapping {
 #define KVM_ARM_VCPU_INIT         _IOW(KVMIO,  0xae, struct kvm_vcpu_init)
 #define KVM_ARM_PREFERRED_TARGET  _IOR(KVMIO,  0xaf, struct kvm_vcpu_init)
 #define KVM_GET_REG_LIST          _IOWR(KVMIO, 0xb0, struct kvm_reg_list)
+/* Available with KVM_CAP_S390_MEM_OP */
+#define KVM_S390_MEM_OP           _IOW(KVMIO,  0xb1, struct kvm_s390_mem_op)
+/* Available with KVM_CAP_S390_SKEYS */
+#define KVM_S390_GET_SKEYS      _IOW(KVMIO, 0xb2, struct kvm_s390_skeys)
+#define KVM_S390_SET_SKEYS      _IOW(KVMIO, 0xb3, struct kvm_s390_skeys)
+/* Available with KVM_CAP_S390_INJECT_IRQ */
+#define KVM_S390_IRQ              _IOW(KVMIO,  0xb4, struct kvm_s390_irq)
+/* Available with KVM_CAP_S390_IRQ_STATE */
+#define KVM_S390_SET_IRQ_STATE    _IOW(KVMIO, 0xb5, struct kvm_s390_irq_state)
+#define KVM_S390_GET_IRQ_STATE    _IOW(KVMIO, 0xb6, struct kvm_s390_irq_state)
 
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU     (1 << 0)
 #define KVM_DEV_ASSIGN_PCI_2_3          (1 << 1)
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 7d664ea85ebd..7b1425a6b370 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -58,6 +58,8 @@
 
 #define STACK_END_MAGIC         0x57AC6E9D
 
+#define TRACEFS_MAGIC          0x74726163
+
 #define V9FS_MAGIC              0x01021997
 
 #define BDEVFS_MAGIC            0x62646576
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 23b40908be30..190d491d5b13 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -33,22 +33,32 @@
 
 #define MEDIA_BUS_FMT_FIXED                     0x0001
 
-/* RGB - next is        0x100e */
+/* RGB - next is        0x1018 */
+#define MEDIA_BUS_FMT_RGB444_1X12               0x1016
 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE       0x1001
 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE       0x1002
 #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE       0x1003
 #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE       0x1004
+#define MEDIA_BUS_FMT_RGB565_1X16               0x1017
 #define MEDIA_BUS_FMT_BGR565_2X8_BE             0x1005
 #define MEDIA_BUS_FMT_BGR565_2X8_LE             0x1006
 #define MEDIA_BUS_FMT_RGB565_2X8_BE             0x1007
 #define MEDIA_BUS_FMT_RGB565_2X8_LE             0x1008
 #define MEDIA_BUS_FMT_RGB666_1X18               0x1009
+#define MEDIA_BUS_FMT_RBG888_1X24               0x100e
+#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI        0x1015
+#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG         0x1010
+#define MEDIA_BUS_FMT_BGR888_1X24               0x1013
+#define MEDIA_BUS_FMT_GBR888_1X24               0x1014
 #define MEDIA_BUS_FMT_RGB888_1X24               0x100a
 #define MEDIA_BUS_FMT_RGB888_2X12_BE            0x100b
 #define MEDIA_BUS_FMT_RGB888_2X12_LE            0x100c
+#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG         0x1011
+#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA        0x1012
 #define MEDIA_BUS_FMT_ARGB8888_1X32             0x100d
+#define MEDIA_BUS_FMT_RGB888_1X32_PADHI         0x100f
 
-/* YUV (including grey) - next is       0x2024 */
+/* YUV (including grey) - next is       0x2026 */
 #define MEDIA_BUS_FMT_Y8_1X8                    0x2001
 #define MEDIA_BUS_FMT_UV8_1X8                   0x2015
 #define MEDIA_BUS_FMT_UYVY8_1_5X8               0x2002
@@ -65,6 +75,10 @@
 #define MEDIA_BUS_FMT_YUYV10_2X10               0x200b
 #define MEDIA_BUS_FMT_YVYU10_2X10               0x200c
 #define MEDIA_BUS_FMT_Y12_1X12                  0x2013
+#define MEDIA_BUS_FMT_UYVY12_2X12               0x201c
+#define MEDIA_BUS_FMT_VYUY12_2X12               0x201d
+#define MEDIA_BUS_FMT_YUYV12_2X12               0x201e
+#define MEDIA_BUS_FMT_YVYU12_2X12               0x201f
 #define MEDIA_BUS_FMT_UYVY8_1X16                0x200f
 #define MEDIA_BUS_FMT_VYUY8_1X16                0x2010
 #define MEDIA_BUS_FMT_YUYV8_1X16                0x2011
@@ -74,16 +88,14 @@
 #define MEDIA_BUS_FMT_VYUY10_1X20               0x201b
 #define MEDIA_BUS_FMT_YUYV10_1X20               0x200d
 #define MEDIA_BUS_FMT_YVYU10_1X20               0x200e
-#define MEDIA_BUS_FMT_YUV10_1X30                0x2016
-#define MEDIA_BUS_FMT_AYUV8_1X32                0x2017
-#define MEDIA_BUS_FMT_UYVY12_2X12               0x201c
-#define MEDIA_BUS_FMT_VYUY12_2X12               0x201d
-#define MEDIA_BUS_FMT_YUYV12_2X12               0x201e
-#define MEDIA_BUS_FMT_YVYU12_2X12               0x201f
+#define MEDIA_BUS_FMT_VUY8_1X24                 0x2024
+#define MEDIA_BUS_FMT_YUV8_1X24                 0x2025
 #define MEDIA_BUS_FMT_UYVY12_1X24               0x2020
 #define MEDIA_BUS_FMT_VYUY12_1X24               0x2021
 #define MEDIA_BUS_FMT_YUYV12_1X24               0x2022
 #define MEDIA_BUS_FMT_YVYU12_1X24               0x2023
+#define MEDIA_BUS_FMT_YUV10_1X30                0x2016
+#define MEDIA_BUS_FMT_AYUV8_1X32                0x2017
 
 /* Bayer - next is      0x3019 */
 #define MEDIA_BUS_FMT_SBGGR8_1X8                0x3001
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index d847c760e8f0..4e816be3de39 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -50,7 +50,14 @@ struct media_device_info {
 #define MEDIA_ENT_T_DEVNODE_V4L         (MEDIA_ENT_T_DEVNODE + 1)
 #define MEDIA_ENT_T_DEVNODE_FB          (MEDIA_ENT_T_DEVNODE + 2)
 #define MEDIA_ENT_T_DEVNODE_ALSA        (MEDIA_ENT_T_DEVNODE + 3)
-#define MEDIA_ENT_T_DEVNODE_DVB         (MEDIA_ENT_T_DEVNODE + 4)
+#define MEDIA_ENT_T_DEVNODE_DVB_FE      (MEDIA_ENT_T_DEVNODE + 4)
+#define MEDIA_ENT_T_DEVNODE_DVB_DEMUX   (MEDIA_ENT_T_DEVNODE + 5)
+#define MEDIA_ENT_T_DEVNODE_DVB_DVR     (MEDIA_ENT_T_DEVNODE + 6)
+#define MEDIA_ENT_T_DEVNODE_DVB_CA      (MEDIA_ENT_T_DEVNODE + 7)
+#define MEDIA_ENT_T_DEVNODE_DVB_NET     (MEDIA_ENT_T_DEVNODE + 8)
+
+/* Legacy symbol. Use it to avoid userspace compilation breakages */
+#define MEDIA_ENT_T_DEVNODE_DVB         MEDIA_ENT_T_DEVNODE_DVB_FE
 
 #define MEDIA_ENT_T_V4L2_SUBDEV         (2 << MEDIA_ENT_TYPE_SHIFT)
 #define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR  (MEDIA_ENT_T_V4L2_SUBDEV + 1)
@@ -59,6 +66,8 @@ struct media_device_info {
 /* A converter of analogue video to its digital representation. */
 #define MEDIA_ENT_T_V4L2_SUBDEV_DECODER (MEDIA_ENT_T_V4L2_SUBDEV + 4)
 
+#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER   (MEDIA_ENT_T_V4L2_SUBDEV + 5)
+
 #define MEDIA_ENT_FL_DEFAULT            (1 << 0)
 
 struct media_entity_desc {
@@ -78,17 +87,48 @@ struct media_entity_desc {
                 struct {
                         __u32 major;
                         __u32 minor;
-                } v4l;
-                struct {
-                        __u32 major;
-                        __u32 minor;
-                } fb;
+                } dev;
+
+#if 1
+                /*
+                 * TODO: this shouldn't have been added without
+                 * actual drivers that use this. When the first real driver
+                 * appears that sets this information, special attention
+                 * should be given whether this information is 1) enough, and
+                 * 2) can deal with udev rules that rename devices. The struct
+                 * dev would not be sufficient for this since that does not
+                 * contain the subdevice information. In addition, struct dev
+                 * can only refer to a single device, and not to multiple (e.g.
+                 * pcm and mixer devices).
+                 *
+                 * So for now mark this as a to do.
+                 */
                 struct {
                         __u32 card;
                         __u32 device;
                         __u32 subdevice;
                 } alsa;
+#endif
+
+#if 1
+                /*
+                 * DEPRECATED: previous node specifications. Kept just to
+                 * avoid breaking compilation, but media_entity_desc.dev
+                 * should be used instead. In particular, alsa and dvb
+                 * fields below are wrong: for all devnodes, there should
+                 * be just major/minor inside the struct, as this is enough
+                 * to represent any devnode, no matter what type.
+                 */
+                struct {
+                        __u32 major;
+                        __u32 minor;
+                } v4l;
+                struct {
+                        __u32 major;
+                        __u32 minor;
+                } fb;
                 int dvb;
+#endif
 
                 /* Sub-device specifications */
                 /* Nothing needed yet */
diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h
index 3873a35509aa..2e35c61bbdd1 100644
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
@@ -126,6 +126,7 @@ enum {
         NDTPA_PROXY_QLEN,               /* u32 */
         NDTPA_LOCKTIME,                 /* u64, msecs */
         NDTPA_QUEUE_LENBYTES,           /* u32 */
+        NDTPA_MCAST_REPROBES,           /* u32 */
         __NDTPA_MAX
 };
 #define NDTPA_MAX (__NDTPA_MAX - 1)
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index 832bc46db78b..5fa1cd04762e 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -1,19 +1,49 @@
 #ifndef _LINUX_NF_TABLES_H
 #define _LINUX_NF_TABLES_H
 
+#define NFT_TABLE_MAXNAMELEN    32
 #define NFT_CHAIN_MAXNAMELEN    32
 #define NFT_USERDATA_MAXLEN     256
 
+/**
+ * enum nft_registers - nf_tables registers
+ *
+ * nf_tables used to have five registers: a verdict register and four data
+ * registers of size 16. The data registers have been changed to 16 registers
+ * of size 4. For compatibility reasons, the NFT_REG_[1-4] registers still
+ * map to areas of size 16, the 4 byte registers are addressed using
+ * NFT_REG32_00 - NFT_REG32_15.
+ */
 enum nft_registers {
         NFT_REG_VERDICT,
         NFT_REG_1,
         NFT_REG_2,
         NFT_REG_3,
         NFT_REG_4,
-        __NFT_REG_MAX
+        __NFT_REG_MAX,
+
+        NFT_REG32_00    = 8,
+        MFT_REG32_01,
+        NFT_REG32_02,
+        NFT_REG32_03,
+        NFT_REG32_04,
+        NFT_REG32_05,
+        NFT_REG32_06,
+        NFT_REG32_07,
+        NFT_REG32_08,
+        NFT_REG32_09,
+        NFT_REG32_10,
+        NFT_REG32_11,
+        NFT_REG32_12,
+        NFT_REG32_13,
+        NFT_REG32_14,
+        NFT_REG32_15,
 };
 #define NFT_REG_MAX     (__NFT_REG_MAX - 1)
 
+#define NFT_REG_SIZE    16
+#define NFT_REG32_SIZE  4
+
 /**
  * enum nft_verdicts - nf_tables internal verdicts
  *
@@ -207,12 +237,16 @@ enum nft_rule_compat_attributes {
  * @NFT_SET_CONSTANT: set contents may not change while bound
  * @NFT_SET_INTERVAL: set contains intervals
  * @NFT_SET_MAP: set is used as a dictionary
+ * @NFT_SET_TIMEOUT: set uses timeouts
+ * @NFT_SET_EVAL: set contains expressions for evaluation
  */
 enum nft_set_flags {
         NFT_SET_ANONYMOUS               = 0x1,
         NFT_SET_CONSTANT                = 0x2,
         NFT_SET_INTERVAL                = 0x4,
         NFT_SET_MAP                     = 0x8,
+        NFT_SET_TIMEOUT                 = 0x10,
+        NFT_SET_EVAL                    = 0x20,
 };
 
 /**
@@ -251,6 +285,8 @@ enum nft_set_desc_attributes {
  * @NFTA_SET_POLICY: selection policy (NLA_U32)
  * @NFTA_SET_DESC: set description (NLA_NESTED)
  * @NFTA_SET_ID: uniquely identifies a set in a transaction (NLA_U32)
+ * @NFTA_SET_TIMEOUT: default timeout value (NLA_U64)
+ * @NFTA_SET_GC_INTERVAL: garbage collection interval (NLA_U32)
  */
 enum nft_set_attributes {
         NFTA_SET_UNSPEC,
@@ -264,6 +300,8 @@ enum nft_set_attributes {
         NFTA_SET_POLICY,
         NFTA_SET_DESC,
         NFTA_SET_ID,
+        NFTA_SET_TIMEOUT,
+        NFTA_SET_GC_INTERVAL,
         __NFTA_SET_MAX
 };
 #define NFTA_SET_MAX            (__NFTA_SET_MAX - 1)
@@ -283,12 +321,20 @@ enum nft_set_elem_flags {
  * @NFTA_SET_ELEM_KEY: key value (NLA_NESTED: nft_data)
  * @NFTA_SET_ELEM_DATA: data value of mapping (NLA_NESTED: nft_data_attributes)
  * @NFTA_SET_ELEM_FLAGS: bitmask of nft_set_elem_flags (NLA_U32)
+ * @NFTA_SET_ELEM_TIMEOUT: timeout value (NLA_U64)
+ * @NFTA_SET_ELEM_EXPIRATION: expiration time (NLA_U64)
+ * @NFTA_SET_ELEM_USERDATA: user data (NLA_BINARY)
+ * @NFTA_SET_ELEM_EXPR: expression (NLA_NESTED: nft_expr_attributes)
  */
 enum nft_set_elem_attributes {
         NFTA_SET_ELEM_UNSPEC,
         NFTA_SET_ELEM_KEY,
         NFTA_SET_ELEM_DATA,
         NFTA_SET_ELEM_FLAGS,
+        NFTA_SET_ELEM_TIMEOUT,
+        NFTA_SET_ELEM_EXPIRATION,
+        NFTA_SET_ELEM_USERDATA,
+        NFTA_SET_ELEM_EXPR,
         __NFTA_SET_ELEM_MAX
 };
 #define NFTA_SET_ELEM_MAX       (__NFTA_SET_ELEM_MAX - 1)
@@ -346,6 +392,9 @@ enum nft_data_attributes {
 };
 #define NFTA_DATA_MAX           (__NFTA_DATA_MAX - 1)
 
+/* Maximum length of a value */
+#define NFT_DATA_VALUE_MAXLEN   64
+
 /**
  * enum nft_verdict_attributes - nf_tables verdict netlink attributes
  *
@@ -504,6 +553,35 @@ enum nft_lookup_attributes {
 };
 #define NFTA_LOOKUP_MAX         (__NFTA_LOOKUP_MAX - 1)
 
+enum nft_dynset_ops {
+        NFT_DYNSET_OP_ADD,
+        NFT_DYNSET_OP_UPDATE,
+};
+
+/**
+ * enum nft_dynset_attributes - dynset expression attributes
+ *
+ * @NFTA_DYNSET_SET_NAME: name of set the to add data to (NLA_STRING)
+ * @NFTA_DYNSET_SET_ID: uniquely identifier of the set in the transaction (NLA_U32)
+ * @NFTA_DYNSET_OP: operation (NLA_U32)
+ * @NFTA_DYNSET_SREG_KEY: source register of the key (NLA_U32)
+ * @NFTA_DYNSET_SREG_DATA: source register of the data (NLA_U32)
+ * @NFTA_DYNSET_TIMEOUT: timeout value for the new element (NLA_U64)
+ * @NFTA_DYNSET_EXPR: expression (NLA_NESTED: nft_expr_attributes)
+ */
+enum nft_dynset_attributes {
+        NFTA_DYNSET_UNSPEC,
+        NFTA_DYNSET_SET_NAME,
+        NFTA_DYNSET_SET_ID,
+        NFTA_DYNSET_OP,
+        NFTA_DYNSET_SREG_KEY,
+        NFTA_DYNSET_SREG_DATA,
+        NFTA_DYNSET_TIMEOUT,
+        NFTA_DYNSET_EXPR,
+        __NFTA_DYNSET_MAX,
+};
+#define NFTA_DYNSET_MAX         (__NFTA_DYNSET_MAX - 1)
+
 /**
  * enum nft_payload_bases - nf_tables payload expression offset bases
  *
diff --git a/include/uapi/linux/netfilter_bridge/ebtables.h b/include/uapi/linux/netfilter_bridge/ebtables.h
index ba993360dbe9..773dfe8924c7 100644
--- a/include/uapi/linux/netfilter_bridge/ebtables.h
+++ b/include/uapi/linux/netfilter_bridge/ebtables.h
@@ -12,9 +12,7 @@
 
 #ifndef _UAPI__LINUX_BRIDGE_EFF_H
 #define _UAPI__LINUX_BRIDGE_EFF_H
-#include <linux/if.h>
 #include <linux/netfilter_bridge.h>
-#include <linux/if_ether.h>
 
 #define EBT_TABLE_MAXNAMELEN 32
 #define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h
index 35f5f4c6c260..adc0aff83fbb 100644
--- a/include/uapi/linux/nfs4.h
+++ b/include/uapi/linux/nfs4.h
@@ -162,13 +162,6 @@
  */
 #define NFS4_MAX_BACK_CHANNEL_OPS 2
 
-enum nfs4_acl_whotype {
-        NFS4_ACL_WHO_NAMED = 0,
-        NFS4_ACL_WHO_OWNER,
-        NFS4_ACL_WHO_GROUP,
-        NFS4_ACL_WHO_EVERYONE,
-};
-
 #endif /* _UAPI_LINUX_NFS4_H */
 
 /*
diff --git a/include/uapi/linux/nfs_idmap.h b/include/uapi/linux/nfs_idmap.h
index 8d4b1c7b24d4..038e36c96669 100644
--- a/include/uapi/linux/nfs_idmap.h
+++ b/include/uapi/linux/nfs_idmap.h
@@ -1,5 +1,5 @@
 /*
- * include/linux/nfs_idmap.h
+ * include/uapi/linux/nfs_idmap.h
  *
  *  UID and GID to name mapping for clients.
  *
diff --git a/include/uapi/linux/nfsd/debug.h b/include/uapi/linux/nfsd/debug.h
index 0bf130a1c58d..28ec6c9c421a 100644
--- a/include/uapi/linux/nfsd/debug.h
+++ b/include/uapi/linux/nfsd/debug.h
@@ -12,14 +12,6 @@
 #include <linux/sunrpc/debug.h>
 
 /*
- * Enable debugging for nfsd.
- * Requires RPC_DEBUG.
- */
-#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
-# define NFSD_DEBUG             1
-#endif
-
-/*
  * knfsd debug flags
  */
 #define NFSDDBG_SOCK            0x0001
diff --git a/include/uapi/linux/nfsd/export.h b/include/uapi/linux/nfsd/export.h
index 4742f2cb42f2..0df7bd5d2fb1 100644
--- a/include/uapi/linux/nfsd/export.h
+++ b/include/uapi/linux/nfsd/export.h
@@ -21,6 +21,9 @@
 
 /*
  * Export flags.
+ *
+ * Please update the expflags[] array in fs/nfsd/export.c when adding
+ * a new flag.
  */
 #define NFSEXP_READONLY         0x0001
 #define NFSEXP_INSECURE_PORT    0x0002
@@ -47,7 +50,7 @@
  * exported filesystem.
  */
 #define NFSEXP_V4ROOT           0x10000
-#define NFSEXP_NOPNFS           0x20000
+#define NFSEXP_PNFS             0x20000
 
 /* All flags that we claim to support.  (Note we don't support NOACL.) */
 #define NFSEXP_ALLFLAGS         0x3FE7F
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 68b294e83944..241220c43e86 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -25,6 +25,19 @@
  *
  */
 
+/*
+ * This header file defines the userspace API to the wireless stack. Please
+ * be careful not to break things - i.e. don't move anything around or so
+ * unless you can demonstrate that it breaks neither API nor ABI.
+ *
+ * Additions to the API should be accompanied by actual implementations in
+ * an upstream driver, so that example implementations exist in case there
+ * are ever concerns about the precise semantics of the API or changes are
+ * needed, and to ensure that code for dead (no longer implemented) API
+ * can actually be identified and removed.
+ * Nonetheless, semantics should also be documented carefully in this file.
+ */
+
 #include <linux/types.h>
 
 #define NL80211_GENL_NAME "nl80211"
@@ -1684,6 +1697,10 @@ enum nl80211_commands {
  *      If set during scheduled scan start then the new scan req will be
  *      owned by the netlink socket that created it and the scheduled scan will
  *      be stopped when the socket is closed.
+ *      If set during configuration of regulatory indoor operation then the
+ *      regulatory indoor configuration would be owned by the netlink socket
+ *      that configured the indoor setting, and the indoor operation would be
+ *      cleared when the socket is closed.
  *
  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
  *      the TDLS link initiator.
@@ -1737,8 +1754,12 @@ enum nl80211_commands {
  *      should be contained in the result as the sum of the respective counters
  *      over all channels.
  *
- * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before a scheduled scan (or a
- *      WoWLAN net-detect scan) is started, u32 in seconds.
+ * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a
+ *      scheduled scan (or a WoWLAN net-detect scan) is started, u32
+ *      in seconds.
+
+ * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
+ *      is operating in an indoor environment.
  *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2107,6 +2128,8 @@ enum nl80211_attrs {
 
         NL80211_ATTR_SCHED_SCAN_DELAY,
 
+        NL80211_ATTR_REG_INDOOR,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -3092,7 +3115,8 @@ enum nl80211_mesh_power_mode {
  *
  * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've
  *      established peering with for longer than this time (in seconds), then
- *      remove it from the STA's list of peers.  Default is 30 minutes.
+ *      remove it from the STA's list of peers. You may set this to 0 to disable
+ *      the removal of the STA. Default is 30 minutes.
  *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
  */
@@ -3694,6 +3718,8 @@ struct nl80211_pattern_support {
  * @NL80211_WOWLAN_TRIG_ANY: wake up on any activity, do not really put
  *      the chip into a special state -- works best with chips that have
  *      support for low-power operation already (flag)
+ *      Note that this mode is incompatible with all of the others, if
+ *      any others are even supported by the device.
  * @NL80211_WOWLAN_TRIG_DISCONNECT: wake up on disconnect, the way disconnect
  *      is detected is implementation-specific (flag)
  * @NL80211_WOWLAN_TRIG_MAGIC_PKT: wake up on magic packet (6x 0xff, followed
@@ -4327,11 +4353,13 @@ enum nl80211_feature_flags {
 
 /**
  * enum nl80211_ext_feature_index - bit index of extended features.
+ * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
  *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
  */
 enum nl80211_ext_feature_index {
+        NL80211_EXT_FEATURE_VHT_IBSS,
 
         /* add new features before the definition below */
         NUM_NL80211_EXT_FEATURES,
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 9b79abbd1ab8..309211b3eb67 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -152,21 +152,42 @@ enum perf_event_sample_format {
  * The branch types can be combined, however BRANCH_ANY covers all types
  * of branches and therefore it supersedes all the other types.
  */
+enum perf_branch_sample_type_shift {
+        PERF_SAMPLE_BRANCH_USER_SHIFT           = 0, /* user branches */
+        PERF_SAMPLE_BRANCH_KERNEL_SHIFT         = 1, /* kernel branches */
+        PERF_SAMPLE_BRANCH_HV_SHIFT             = 2, /* hypervisor branches */
+
+        PERF_SAMPLE_BRANCH_ANY_SHIFT            = 3, /* any branch types */
+        PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT       = 4, /* any call branch */
+        PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT     = 5, /* any return branch */
+        PERF_SAMPLE_BRANCH_IND_CALL_SHIFT       = 6, /* indirect calls */
+        PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT       = 7, /* transaction aborts */
+        PERF_SAMPLE_BRANCH_IN_TX_SHIFT          = 8, /* in transaction */
+        PERF_SAMPLE_BRANCH_NO_TX_SHIFT          = 9, /* not in transaction */
+        PERF_SAMPLE_BRANCH_COND_SHIFT           = 10, /* conditional branches */
+
+        PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT     = 11, /* call/ret stack */
+
+        PERF_SAMPLE_BRANCH_MAX_SHIFT            /* non-ABI */
+};
+
 enum perf_branch_sample_type {
-        PERF_SAMPLE_BRANCH_USER         = 1U << 0, /* user branches */
-        PERF_SAMPLE_BRANCH_KERNEL       = 1U << 1, /* kernel branches */
-        PERF_SAMPLE_BRANCH_HV           = 1U << 2, /* hypervisor branches */
-
-        PERF_SAMPLE_BRANCH_ANY          = 1U << 3, /* any branch types */
-        PERF_SAMPLE_BRANCH_ANY_CALL     = 1U << 4, /* any call branch */
-        PERF_SAMPLE_BRANCH_ANY_RETURN   = 1U << 5, /* any return branch */
-        PERF_SAMPLE_BRANCH_IND_CALL     = 1U << 6, /* indirect calls */
-        PERF_SAMPLE_BRANCH_ABORT_TX     = 1U << 7, /* transaction aborts */
-        PERF_SAMPLE_BRANCH_IN_TX        = 1U << 8, /* in transaction */
-        PERF_SAMPLE_BRANCH_NO_TX        = 1U << 9, /* not in transaction */
-        PERF_SAMPLE_BRANCH_COND         = 1U << 10, /* conditional branches */
-
-        PERF_SAMPLE_BRANCH_MAX          = 1U << 11, /* non-ABI */
+        PERF_SAMPLE_BRANCH_USER         = 1U << PERF_SAMPLE_BRANCH_USER_SHIFT,
+        PERF_SAMPLE_BRANCH_KERNEL       = 1U << PERF_SAMPLE_BRANCH_KERNEL_SHIFT,
+        PERF_SAMPLE_BRANCH_HV           = 1U << PERF_SAMPLE_BRANCH_HV_SHIFT,
+
+        PERF_SAMPLE_BRANCH_ANY          = 1U << PERF_SAMPLE_BRANCH_ANY_SHIFT,
+        PERF_SAMPLE_BRANCH_ANY_CALL     = 1U << PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT,
+        PERF_SAMPLE_BRANCH_ANY_RETURN   = 1U << PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT,
+        PERF_SAMPLE_BRANCH_IND_CALL     = 1U << PERF_SAMPLE_BRANCH_IND_CALL_SHIFT,
+        PERF_SAMPLE_BRANCH_ABORT_TX     = 1U << PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT,
+        PERF_SAMPLE_BRANCH_IN_TX        = 1U << PERF_SAMPLE_BRANCH_IN_TX_SHIFT,
+        PERF_SAMPLE_BRANCH_NO_TX        = 1U << PERF_SAMPLE_BRANCH_NO_TX_SHIFT,
+        PERF_SAMPLE_BRANCH_COND         = 1U << PERF_SAMPLE_BRANCH_COND_SHIFT,
+
+        PERF_SAMPLE_BRANCH_CALL_STACK   = 1U << PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT,
+
+        PERF_SAMPLE_BRANCH_MAX          = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
 };
 
 #define PERF_SAMPLE_BRANCH_PLM_ALL \
@@ -240,6 +261,7 @@ enum perf_event_read_format {
 #define PERF_ATTR_SIZE_VER3     96      /* add: sample_regs_user */
                                         /* add: sample_stack_user */
 #define PERF_ATTR_SIZE_VER4     104     /* add: sample_regs_intr */
+#define PERF_ATTR_SIZE_VER5     112     /* add: aux_watermark */
 
 /*
  * Hardware event_id to monitor via a performance monitoring event:
@@ -305,7 +327,8 @@ struct perf_event_attr {
                                 exclude_callchain_user   : 1, /* exclude user callchains */
                                 mmap2          :  1, /* include mmap with inode data     */
                                 comm_exec      :  1, /* flag comm events that are due to an exec */
-                                __reserved_1   : 39;
+                                use_clockid    :  1, /* use @clockid for time fields */
+                                __reserved_1   : 38;
 
         union {
                 __u32           wakeup_events;    /* wakeup every n events */
@@ -334,8 +357,7 @@ struct perf_event_attr {
          */
         __u32   sample_stack_user;
 
-        /* Align to u64. */
-        __u32   __reserved_2;
+        __s32   clockid;
         /*
          * Defines set of regs to dump for each sample
          * state captured on:
@@ -345,6 +367,12 @@ struct perf_event_attr {
          * See asm/perf_regs.h for details.
          */
         __u64   sample_regs_intr;
+
+        /*
+         * Wakeup watermark for AUX area
+         */
+        __u32   aux_watermark;
+        __u32   __reserved_2;   /* align to __u64 */
 };
 
 #define perf_flags(attr)        (*(&(attr)->read_format + 1))
@@ -360,6 +388,7 @@ struct perf_event_attr {
 #define PERF_EVENT_IOC_SET_OUTPUT       _IO ('$', 5)
 #define PERF_EVENT_IOC_SET_FILTER       _IOW('$', 6, char *)
 #define PERF_EVENT_IOC_ID               _IOR('$', 7, __u64 *)
+#define PERF_EVENT_IOC_SET_BPF          _IOW('$', 8, __u32)
 
 enum perf_event_ioc_flags {
         PERF_IOC_FLAG_GROUP             = 1U << 0,
@@ -500,9 +529,30 @@ struct perf_event_mmap_page {
          * In this case the kernel will not over-write unread data.
          *
          * See perf_output_put_handle() for the data ordering.
+         *
+         * data_{offset,size} indicate the location and size of the perf record
+         * buffer within the mmapped area.
          */
         __u64   data_head;              /* head in the data section */
         __u64   data_tail;              /* user-space written tail */
+        __u64   data_offset;            /* where the buffer starts */
+        __u64   data_size;              /* data buffer size */
+
+        /*
+         * AUX area is defined by aux_{offset,size} fields that should be set
+         * by the userspace, so that
+         *
+         *   aux_offset >= data_offset + data_size
+         *
+         * prior to mmap()ing it. Size of the mmap()ed area should be aux_size.
+         *
+         * Ring buffer pointers aux_{head,tail} have the same semantics as
+         * data_{head,tail} and same ordering rules apply.
+         */
+        __u64   aux_head;
+        __u64   aux_tail;
+        __u64   aux_offset;
+        __u64   aux_size;
 };
 
 #define PERF_RECORD_MISC_CPUMODE_MASK           (7 << 0)
@@ -725,6 +775,31 @@ enum perf_event_type {
          */
         PERF_RECORD_MMAP2                       = 10,
 
+        /*
+         * Records that new data landed in the AUX buffer part.
+         *
+         * struct {
+         *      struct perf_event_header        header;
+         *
+         *      u64                             aux_offset;
+         *      u64                             aux_size;
+         *      u64                             flags;
+         *      struct sample_id                sample_id;
+         * };
+         */
+        PERF_RECORD_AUX                         = 11,
+
+        /*
+         * Indicates that instruction trace has started
+         *
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             pid;
+         *      u32                             tid;
+         * };
+         */
+        PERF_RECORD_ITRACE_START                = 12,
+
         PERF_RECORD_MAX,                        /* non-ABI */
 };
 
@@ -742,6 +817,12 @@ enum perf_callchain_context {
         PERF_CONTEXT_MAX                = (__u64)-4095,
 };
 
+/**
+ * PERF_RECORD_AUX::flags bits
+ */
+#define PERF_AUX_FLAG_TRUNCATED         0x01    /* record was truncated to fit */
+#define PERF_AUX_FLAG_OVERWRITE         0x02    /* snapshot from overwrite mode */
+
 #define PERF_FLAG_FD_NO_GROUP           (1UL << 0)
 #define PERF_FLAG_FD_OUTPUT             (1UL << 1)
 #define PERF_FLAG_PID_CGROUP            (1UL << 2) /* pid=cgroup id, per-cpu mode only */
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 25731dfb3fcc..bf08e76bf505 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -397,6 +397,8 @@ enum {
         TCA_BPF_CLASSID,
         TCA_BPF_OPS_LEN,
         TCA_BPF_OPS,
+        TCA_BPF_FD,
+        TCA_BPF_NAME,
         __TCA_BPF_MAX,
 };
 
diff --git a/include/uapi/linux/quota.h b/include/uapi/linux/quota.h
index 1f49b8341c99..9c95b2c1c88a 100644
--- a/include/uapi/linux/quota.h
+++ b/include/uapi/linux/quota.h
@@ -36,11 +36,12 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 
-#define __DQUOT_VERSION__       "dquot_6.5.2"
+#define __DQUOT_VERSION__       "dquot_6.6.0"
 
-#define MAXQUOTAS 2
+#define MAXQUOTAS 3
 #define USRQUOTA  0             /* element used for user quotas */
 #define GRPQUOTA  1             /* element used for group quotas */
+#define PRJQUOTA  2             /* element used for project quotas */
 
 /*
  * Definitions for the default names of the quotas files.
@@ -48,6 +49,7 @@
 #define INITQFNAMES { \
         "user",    /* USRQUOTA */ \
         "group",   /* GRPQUOTA */ \
+        "project", /* PRJQUOTA */ \
         "undefined", \
 };
 
diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h
index 49f4210d4394..2ae6131e69a5 100644
--- a/include/uapi/linux/raid/md_p.h
+++ b/include/uapi/linux/raid/md_p.h
@@ -78,6 +78,12 @@
 #define MD_DISK_ACTIVE          1 /* disk is running or spare disk */
 #define MD_DISK_SYNC            2 /* disk is in sync with the raid set */
 #define MD_DISK_REMOVED         3 /* disk is in sync with the raid set */
+#define MD_DISK_CLUSTER_ADD     4 /* Initiate a disk add across the cluster
+                                   * For clustered enviroments only.
+                                   */
+#define MD_DISK_CANDIDATE       5 /* disk is added as spare (local) until confirmed
+                                   * For clustered enviroments only.
+                                   */
 
 #define MD_DISK_WRITEMOSTLY     9 /* disk is "write-mostly" is RAID1 config.
                                    * read requests will only be sent here in
@@ -101,6 +107,7 @@ typedef struct mdp_device_descriptor_s {
 #define MD_SB_CLEAN             0
 #define MD_SB_ERRORS            1
 
+#define MD_SB_CLUSTERED         5 /* MD is clustered */
 #define MD_SB_BITMAP_PRESENT    8 /* bitmap may be present nearby */
 
 /*
diff --git a/include/uapi/linux/raid/md_u.h b/include/uapi/linux/raid/md_u.h
index 74e7c60c4716..1cb8aa6850b5 100644
--- a/include/uapi/linux/raid/md_u.h
+++ b/include/uapi/linux/raid/md_u.h
@@ -62,6 +62,7 @@
 #define STOP_ARRAY              _IO (MD_MAJOR, 0x32)
 #define STOP_ARRAY_RO           _IO (MD_MAJOR, 0x33)
 #define RESTART_ARRAY_RW        _IO (MD_MAJOR, 0x34)
+#define CLUSTERED_DISK_NACK     _IO (MD_MAJOR, 0x35)
 
 /* 63 partitions with the alternate major number (mdp) */
 #define MdpMinorShift 6
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 5cc5d66bf519..974db03f7b1a 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -134,6 +134,8 @@ enum {
 
         RTM_NEWNSID = 88,
 #define RTM_NEWNSID RTM_NEWNSID
+        RTM_DELNSID = 89,
+#define RTM_DELNSID RTM_DELNSID
         RTM_GETNSID = 90,
 #define RTM_GETNSID RTM_GETNSID
 
@@ -303,6 +305,9 @@ enum rtattr_type_t {
         RTA_TABLE,
         RTA_MARK,
         RTA_MFC_STATS,
+        RTA_VIA,
+        RTA_NEWDST,
+        RTA_PREF,
         __RTA_MAX
 };
 
@@ -332,6 +337,7 @@ struct rtnexthop {
 #define RTNH_F_DEAD             1       /* Nexthop is dead (used by multipath)  */
 #define RTNH_F_PERVASIVE        2       /* Do recursive gateway lookup  */
 #define RTNH_F_ONLINK           4       /* Gateway is forced on link    */
+#define RTNH_F_EXTERNAL         8       /* Route installed externally   */
 
 /* Macros to handle hexthops */
 
@@ -344,6 +350,12 @@ struct rtnexthop {
 #define RTNH_SPACE(len) RTNH_ALIGN(RTNH_LENGTH(len))
 #define RTNH_DATA(rtnh)   ((struct rtattr*)(((char*)(rtnh)) + RTNH_LENGTH(0)))
 
+/* RTA_VIA */
+struct rtvia {
+        __kernel_sa_family_t    rtvia_family;
+        __u8                    rtvia_addr[0];
+};
+
 /* RTM_CACHEINFO */
 
 struct rta_cacheinfo {
@@ -623,6 +635,10 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV6_NETCONF    RTNLGRP_IPV6_NETCONF
         RTNLGRP_MDB,
 #define RTNLGRP_MDB             RTNLGRP_MDB
+        RTNLGRP_MPLS_ROUTE,
+#define RTNLGRP_MPLS_ROUTE      RTNLGRP_MPLS_ROUTE
+        RTNLGRP_NSID,
+#define RTNLGRP_NSID            RTNLGRP_NSID
         __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h
index 5e0d0ed61cf3..25331f9faa76 100644
--- a/include/uapi/linux/serial.h
+++ b/include/uapi/linux/serial.h
@@ -65,6 +65,10 @@ struct serial_struct {
 #define SERIAL_IO_PORT  0
 #define SERIAL_IO_HUB6  1
 #define SERIAL_IO_MEM   2
+#define SERIAL_IO_MEM32   3
+#define SERIAL_IO_AU      4
+#define SERIAL_IO_TSI     5
+#define SERIAL_IO_MEM32BE 6
 
 #define UART_CLEAR_FIFO         0x01
 #define UART_USE_FIFO           0x02
diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h
index 00adb01fa5f3..e9b4cb0cd7ed 100644
--- a/include/uapi/linux/serial_reg.h
+++ b/include/uapi/linux/serial_reg.h
@@ -242,25 +242,6 @@
 #define UART_FCR_PXAR32 0xc0    /* receive FIFO threshold = 32 */
 
 /*
- * Intel MID on-chip HSU (High Speed UART) defined bits
- */
-#define UART_FCR_HSU_64_1B      0x00    /* receive FIFO treshold = 1 */
-#define UART_FCR_HSU_64_16B     0x40    /* receive FIFO treshold = 16 */
-#define UART_FCR_HSU_64_32B     0x80    /* receive FIFO treshold = 32 */
-#define UART_FCR_HSU_64_56B     0xc0    /* receive FIFO treshold = 56 */
-
-#define UART_FCR_HSU_16_1B      0x00    /* receive FIFO treshold = 1 */
-#define UART_FCR_HSU_16_4B      0x40    /* receive FIFO treshold = 4 */
-#define UART_FCR_HSU_16_8B      0x80    /* receive FIFO treshold = 8 */
-#define UART_FCR_HSU_16_14B     0xc0    /* receive FIFO treshold = 14 */
-
-#define UART_FCR_HSU_64B_FIFO   0x20    /* chose 64 bytes FIFO */
-#define UART_FCR_HSU_16B_FIFO   0x00    /* chose 16 bytes FIFO */
-
-#define UART_FCR_HALF_EMPT_TXI  0x00    /* trigger TX_EMPT IRQ for half empty */
-#define UART_FCR_FULL_EMPT_TXI  0x08    /* trigger TX_EMPT IRQ for full empty */
-
-/*
  * These register definitions are for the 16C950
  */
 #define UART_ASR        0x01    /* Additional Status Register */
diff --git a/include/uapi/linux/target_core_user.h b/include/uapi/linux/target_core_user.h
index b483d1909d3e..b67f99d3c520 100644
--- a/include/uapi/linux/target_core_user.h
+++ b/include/uapi/linux/target_core_user.h
@@ -6,7 +6,7 @@
 #include <linux/types.h>
 #include <linux/uio.h>
 
-#define TCMU_VERSION "1.0"
+#define TCMU_VERSION "2.0"
 
 /*
  * Ring Design
@@ -39,9 +39,13 @@
  * should process the next packet the same way, and so on.
  */
 
-#define TCMU_MAILBOX_VERSION 1
+#define TCMU_MAILBOX_VERSION 2
 #define ALIGN_SIZE 64 /* Should be enough for most CPUs */
 
+/* See https://gcc.gnu.org/onlinedocs/cpp/Stringification.html */
+#define xstr(s) str(s)
+#define str(s) #s
+
 struct tcmu_mailbox {
         __u16 version;
         __u16 flags;
@@ -64,31 +68,36 @@ enum tcmu_opcode {
  * Only a few opcodes, and length is 8-byte aligned, so use low bits for opcode.
  */
 struct tcmu_cmd_entry_hdr {
-                __u32 len_op;
+        __u32 len_op;
+        __u16 cmd_id;
+        __u8 kflags;
+#define TCMU_UFLAG_UNKNOWN_OP 0x1
+        __u8 uflags;
+
 } __packed;
 
 #define TCMU_OP_MASK 0x7
 
-static inline enum tcmu_opcode tcmu_hdr_get_op(struct tcmu_cmd_entry_hdr *hdr)
+static inline enum tcmu_opcode tcmu_hdr_get_op(__u32 len_op)
 {
-        return hdr->len_op & TCMU_OP_MASK;
+        return len_op & TCMU_OP_MASK;
 }
 
-static inline void tcmu_hdr_set_op(struct tcmu_cmd_entry_hdr *hdr, enum tcmu_opcode op)
+static inline void tcmu_hdr_set_op(__u32 *len_op, enum tcmu_opcode op)
 {
-        hdr->len_op &= ~TCMU_OP_MASK;
-        hdr->len_op |= (op & TCMU_OP_MASK);
+        *len_op &= ~TCMU_OP_MASK;
+        *len_op |= (op & TCMU_OP_MASK);
 }
 
-static inline __u32 tcmu_hdr_get_len(struct tcmu_cmd_entry_hdr *hdr)
+static inline __u32 tcmu_hdr_get_len(__u32 len_op)
 {
-        return hdr->len_op & ~TCMU_OP_MASK;
+        return len_op & ~TCMU_OP_MASK;
 }
 
-static inline void tcmu_hdr_set_len(struct tcmu_cmd_entry_hdr *hdr, __u32 len)
+static inline void tcmu_hdr_set_len(__u32 *len_op, __u32 len)
 {
-        hdr->len_op &= TCMU_OP_MASK;
-        hdr->len_op |= len;
+        *len_op &= TCMU_OP_MASK;
+        *len_op |= len;
 }
 
 /* Currently the same as SCSI_SENSE_BUFFERSIZE */
@@ -97,13 +106,14 @@ static inline void tcmu_hdr_set_len(struct tcmu_cmd_entry_hdr *hdr, __u32 len)
 struct tcmu_cmd_entry {
         struct tcmu_cmd_entry_hdr hdr;
 
-        uint16_t cmd_id;
-        uint16_t __pad1;
-
         union {
                 struct {
+                        uint32_t iov_cnt;
+                        uint32_t iov_bidi_cnt;
+                        uint32_t iov_dif_cnt;
                         uint64_t cdb_off;
-                        uint64_t iov_cnt;
+                        uint64_t __pad1;
+                        uint64_t __pad2;
                         struct iovec iov[0];
                 } req;
                 struct {
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild
index 19d5219b0b99..242cf0c6e33d 100644
--- a/include/uapi/linux/tc_act/Kbuild
+++ b/include/uapi/linux/tc_act/Kbuild
@@ -9,3 +9,4 @@ header-y += tc_pedit.h
 header-y += tc_skbedit.h
 header-y += tc_vlan.h
 header-y += tc_bpf.h
+header-y += tc_connmark.h
diff --git a/include/uapi/linux/tc_act/tc_bpf.h b/include/uapi/linux/tc_act/tc_bpf.h
index 5288bd77e63b..07f17cc70bb3 100644
--- a/include/uapi/linux/tc_act/tc_bpf.h
+++ b/include/uapi/linux/tc_act/tc_bpf.h
@@ -24,6 +24,8 @@ enum {
         TCA_ACT_BPF_PARMS,
         TCA_ACT_BPF_OPS_LEN,
         TCA_ACT_BPF_OPS,
+        TCA_ACT_BPF_FD,
+        TCA_ACT_BPF_NAME,
         __TCA_ACT_BPF_MAX,
 };
 #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
diff --git a/include/uapi/linux/tipc_netlink.h b/include/uapi/linux/tipc_netlink.h
index 8d723824ad69..d4c8f142ba63 100644
--- a/include/uapi/linux/tipc_netlink.h
+++ b/include/uapi/linux/tipc_netlink.h
@@ -83,11 +83,20 @@ enum {
         TIPC_NLA_BEARER_NAME,           /* string */
         TIPC_NLA_BEARER_PROP,           /* nest */
         TIPC_NLA_BEARER_DOMAIN,         /* u32 */
+        TIPC_NLA_BEARER_UDP_OPTS,       /* nest */
 
         __TIPC_NLA_BEARER_MAX,
         TIPC_NLA_BEARER_MAX = __TIPC_NLA_BEARER_MAX - 1
 };
 
+enum {
+        TIPC_NLA_UDP_UNSPEC,
+        TIPC_NLA_UDP_LOCAL,             /* sockaddr_storage */
+        TIPC_NLA_UDP_REMOTE,            /* sockaddr_storage */
+
+        __TIPC_NLA_UDP_MAX,
+        TIPC_NLA_UDP_MAX = __TIPC_NLA_UDP_MAX - 1
+};
 /* Socket info */
 enum {
         TIPC_NLA_SOCK_UNSPEC,
diff --git a/include/uapi/linux/v4l2-dv-timings.h b/include/uapi/linux/v4l2-dv-timings.h
index 6c8f159e416e..c039f1d68a09 100644
--- a/include/uapi/linux/v4l2-dv-timings.h
+++ b/include/uapi/linux/v4l2-dv-timings.h
@@ -48,14 +48,15 @@
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(720, 480, 1, 0, \
                 13500000, 19, 62, 57, 4, 3, 15, 4, 3, 16, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_720X480P59_94 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(720, 480, 0, 0, \
                 27000000, 16, 62, 60, 9, 6, 30, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 /* Note: these are the nominal timings, for HDMI links this format is typically
@@ -64,14 +65,15 @@
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(720, 576, 1, 0, \
                 13500000, 12, 63, 69, 2, 3, 19, 2, 3, 20, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_720X576P50 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(720, 576, 0, 0, \
                 27000000, 12, 64, 68, 5, 5, 39, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1280X720P24 { \
@@ -88,7 +90,7 @@
         V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 2420, 40, 220, 5, 5, 20, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1280X720P30 { \
@@ -96,7 +98,8 @@
         V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1280X720P50 { \
@@ -104,7 +107,7 @@
         V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 440, 40, 220, 5, 5, 20, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1280X720P60 { \
@@ -112,7 +115,8 @@
         V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 110, 40, 220, 5, 5, 20, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P24 { \
@@ -120,7 +124,8 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 638, 44, 148, 4, 5, 36, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P25 { \
@@ -128,7 +133,7 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P30 { \
@@ -136,7 +141,8 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080I50 { \
@@ -144,7 +150,8 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 1, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 528, 44, 148, 2, 5, 15, 2, 5, 16, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P50 { \
@@ -152,7 +159,7 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 148500000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080I60 { \
@@ -161,7 +168,8 @@
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 88, 44, 148, 2, 5, 15, 2, 5, 16, \
                 V4L2_DV_BT_STD_CEA861, \
-                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_HALF_LINE) \
+                V4L2_DV_FL_CAN_REDUCE_FPS | \
+                V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P60 { \
@@ -170,77 +178,83 @@
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 148500000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
                 V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \
-                V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P24 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 1276, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P25 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P30 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P50 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 594000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P60 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 594000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P24 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 1020, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P25 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P30 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P50 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 594000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P60 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 594000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 
diff --git a/include/uapi/linux/v4l2-subdev.h b/include/uapi/linux/v4l2-subdev.h
index e0a7e3da498a..dbce2b554e02 100644
--- a/include/uapi/linux/v4l2-subdev.h
+++ b/include/uapi/linux/v4l2-subdev.h
@@ -69,12 +69,14 @@ struct v4l2_subdev_crop {
  * @pad: pad number, as reported by the media API
  * @index: format index during enumeration
  * @code: format code (MEDIA_BUS_FMT_ definitions)
+ * @which: format type (from enum v4l2_subdev_format_whence)
  */
 struct v4l2_subdev_mbus_code_enum {
         __u32 pad;
         __u32 index;
         __u32 code;
-        __u32 reserved[9];
+        __u32 which;
+        __u32 reserved[8];
 };
 
 /**
@@ -82,6 +84,7 @@ struct v4l2_subdev_mbus_code_enum {
  * @pad: pad number, as reported by the media API
  * @index: format index during enumeration
  * @code: format code (MEDIA_BUS_FMT_ definitions)
+ * @which: format type (from enum v4l2_subdev_format_whence)
  */
 struct v4l2_subdev_frame_size_enum {
         __u32 index;
@@ -91,7 +94,8 @@ struct v4l2_subdev_frame_size_enum {
         __u32 max_width;
         __u32 min_height;
         __u32 max_height;
-        __u32 reserved[9];
+        __u32 which;
+        __u32 reserved[8];
 };
 
 /**
@@ -113,6 +117,7 @@ struct v4l2_subdev_frame_interval {
  * @width: frame width in pixels
  * @height: frame height in pixels
  * @interval: frame interval in seconds
+ * @which: format type (from enum v4l2_subdev_format_whence)
  */
 struct v4l2_subdev_frame_interval_enum {
         __u32 index;
@@ -121,7 +126,8 @@ struct v4l2_subdev_frame_interval_enum {
         __u32 width;
         __u32 height;
         struct v4l2_fract interval;
-        __u32 reserved[9];
+        __u32 which;
+        __u32 reserved[8];
 };
 
 /**
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index 82889c30f4f5..b57b750c222f 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -160,6 +160,8 @@ struct vfio_device_info {
         __u32   flags;
 #define VFIO_DEVICE_FLAGS_RESET (1 << 0)        /* Device supports reset */
 #define VFIO_DEVICE_FLAGS_PCI   (1 << 1)        /* vfio-pci device */
+#define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2)     /* vfio-platform device */
+#define VFIO_DEVICE_FLAGS_AMBA  (1 << 3)        /* vfio-amba device */
         __u32   num_regions;    /* Max region index + 1 */
         __u32   num_irqs;       /* Max IRQ index + 1 */
 };
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index fbdc3602ee27..fa376f7666ba 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -268,9 +268,10 @@ enum v4l2_ycbcr_encoding {
 
 enum v4l2_quantization {
         /*
-         * The default for R'G'B' quantization is always full range. For
-         * Y'CbCr the quantization is always limited range, except for
-         * SYCC, XV601, XV709 or JPEG: those are full range.
+         * The default for R'G'B' quantization is always full range, except
+         * for the BT2020 colorspace. For Y'CbCr the quantization is always
+         * limited range, except for COLORSPACE_JPEG, SYCC, XV601 or XV709:
+         * those are full range.
          */
         V4L2_QUANTIZATION_DEFAULT     = 0,
         V4L2_QUANTIZATION_FULL_RANGE  = 1,
@@ -1187,6 +1188,12 @@ struct v4l2_bt_timings {
    exactly the same number of half-lines. Whether half-lines can be detected
    or used depends on the hardware. */
 #define V4L2_DV_FL_HALF_LINE                    (1 << 3)
+/* If set, then this is a Consumer Electronics (CE) video format. Such formats
+ * differ from other formats (commonly called IT formats) in that if RGB
+ * encoding is used then by default the RGB values use limited range (i.e.
+ * use the range 16-235) as opposed to 0-255. All formats defined in CEA-861
+ * except for the 640x480 format are CE formats. */
+#define V4L2_DV_FL_IS_CE_VIDEO                  (1 << 4)
 
 /* A few useful defines to calculate the total blanking and frame sizes */
 #define V4L2_DV_BT_BLANKING_WIDTH(bt) \
@@ -1456,6 +1463,7 @@ struct v4l2_querymenu {
 #define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
 #define V4L2_CTRL_FLAG_VOLATILE         0x0080
 #define V4L2_CTRL_FLAG_HAS_PAYLOAD      0x0100
+#define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE 0x0200
 
 /*  Query flags, to be ORed with the control ID */
 #define V4L2_CTRL_FLAG_NEXT_CTRL        0x80000000
@@ -1841,8 +1849,8 @@ struct v4l2_mpeg_vbi_fmt_ivtv {
  */
 struct v4l2_plane_pix_format {
         __u32           sizeimage;
-        __u16           bytesperline;
-        __u16           reserved[7];
+        __u32           bytesperline;
+        __u16           reserved[6];
 } __attribute__ ((packed));
 
 /**
diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h
index 4b0488f20b2e..984169a819ee 100644
--- a/include/uapi/linux/virtio_balloon.h
+++ b/include/uapi/linux/virtio_balloon.h
@@ -25,6 +25,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE. */
+#include <linux/types.h>
 #include <linux/virtio_ids.h>
 #include <linux/virtio_config.h>
 
@@ -38,9 +39,9 @@
 
 struct virtio_balloon_config {
         /* Number of pages host wants Guest to give up. */
-        __le32 num_pages;
+        __u32 num_pages;
         /* Number of pages we've actually got in balloon. */
-        __le32 actual;
+        __u32 actual;
 };
 
 #define VIRTIO_BALLOON_S_SWAP_IN  0   /* Amount of memory swapped in */
@@ -51,9 +52,32 @@ struct virtio_balloon_config {
 #define VIRTIO_BALLOON_S_MEMTOT   5   /* Total amount of memory */
 #define VIRTIO_BALLOON_S_NR       6
 
+/*
+ * Memory statistics structure.
+ * Driver fills an array of these structures and passes to device.
+ *
+ * NOTE: fields are laid out in a way that would make compiler add padding
+ * between and after fields, so we have to use compiler-specific attributes to
+ * pack it, to disable this padding. This also often causes compiler to
+ * generate suboptimal code.
+ *
+ * We maintain this statistics structure format for backwards compatibility,
+ * but don't follow this example.
+ *
+ * If implementing a similar structure, do something like the below instead:
+ *     struct virtio_balloon_stat {
+ *         __virtio16 tag;
+ *         __u8 reserved[6];
+ *         __virtio64 val;
+ *     };
+ *
+ * In other words, add explicit reserved fields to align field and
+ * structure boundaries at field size, avoiding compiler padding
+ * without the packed attribute.
+ */
 struct virtio_balloon_stat {
-        __u16 tag;
-        __u64 val;
+        __virtio16 tag;
+        __virtio64 val;
 } __attribute__((packed));
 
 #endif /* _LINUX_VIRTIO_BALLOON_H */
diff --git a/include/uapi/linux/virtio_blk.h b/include/uapi/linux/virtio_blk.h
index 3c53eec4ae22..19c66fcbab8a 100644
--- a/include/uapi/linux/virtio_blk.h
+++ b/include/uapi/linux/virtio_blk.h
@@ -60,7 +60,7 @@ struct virtio_blk_config {
         __u32 size_max;
         /* The maximum number of segments (if VIRTIO_BLK_F_SEG_MAX) */
         __u32 seg_max;
-        /* geometry the device (if VIRTIO_BLK_F_GEOMETRY) */
+        /* geometry of the device (if VIRTIO_BLK_F_GEOMETRY) */
         struct virtio_blk_geometry {
                 __u16 cylinders;
                 __u8 heads;
@@ -119,7 +119,11 @@ struct virtio_blk_config {
 #define VIRTIO_BLK_T_BARRIER    0x80000000
 #endif /* !VIRTIO_BLK_NO_LEGACY */
 
-/* This is the first element of the read scatter-gather list. */
+/*
+ * This comes first in the read scatter-gather list.
+ * For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated,
+ * this is the first element of the read scatter-gather list.
+ */
 struct virtio_blk_outhdr {
         /* VIRTIO_BLK_T* */
         __virtio32 type;
diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
index 284fc3a05f7b..5f60aa4be50a 100644
--- a/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@ -39,5 +39,6 @@
 #define VIRTIO_ID_9P            9 /* 9p virtio console */
 #define VIRTIO_ID_RPROC_SERIAL 11 /* virtio remoteproc serial link */
 #define VIRTIO_ID_CAIF         12 /* Virtio caif */
+#define VIRTIO_ID_INPUT        18 /* virtio input */
 
 #endif /* _LINUX_VIRTIO_IDS_H */
diff --git a/include/uapi/linux/virtio_input.h b/include/uapi/linux/virtio_input.h
new file mode 100644
index 000000000000..a7fe5c8fb135
--- /dev/null
+++ b/include/uapi/linux/virtio_input.h
@@ -0,0 +1,76 @@
+#ifndef _LINUX_VIRTIO_INPUT_H
+#define _LINUX_VIRTIO_INPUT_H
+/* This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE. */
+
+#include <linux/types.h>
+
+enum virtio_input_config_select {
+        VIRTIO_INPUT_CFG_UNSET      = 0x00,
+        VIRTIO_INPUT_CFG_ID_NAME    = 0x01,
+        VIRTIO_INPUT_CFG_ID_SERIAL  = 0x02,
+        VIRTIO_INPUT_CFG_ID_DEVIDS  = 0x03,
+        VIRTIO_INPUT_CFG_PROP_BITS  = 0x10,
+        VIRTIO_INPUT_CFG_EV_BITS    = 0x11,
+        VIRTIO_INPUT_CFG_ABS_INFO   = 0x12,
+};
+
+struct virtio_input_absinfo {
+        __u32 min;
+        __u32 max;
+        __u32 fuzz;
+        __u32 flat;
+        __u32 res;
+};
+
+struct virtio_input_devids {
+        __u16 bustype;
+        __u16 vendor;
+        __u16 product;
+        __u16 version;
+};
+
+struct virtio_input_config {
+        __u8    select;
+        __u8    subsel;
+        __u8    size;
+        __u8    reserved[5];
+        union {
+                char string[128];
+                __u8 bitmap[128];
+                struct virtio_input_absinfo abs;
+                struct virtio_input_devids ids;
+        } u;
+};
+
+struct virtio_input_event {
+        __le16 type;
+        __le16 code;
+        __le32 value;
+};
+
+#endif /* _LINUX_VIRTIO_INPUT_H */
diff --git a/include/uapi/linux/virtio_scsi.h b/include/uapi/linux/virtio_scsi.h
index 42b9370771b0..cc18ef8825c0 100644
--- a/include/uapi/linux/virtio_scsi.h
+++ b/include/uapi/linux/virtio_scsi.h
@@ -29,8 +29,16 @@
 
 #include <linux/virtio_types.h>
 
-#define VIRTIO_SCSI_CDB_SIZE   32
-#define VIRTIO_SCSI_SENSE_SIZE 96
+/* Default values of the CDB and sense data size configuration fields */
+#define VIRTIO_SCSI_CDB_DEFAULT_SIZE   32
+#define VIRTIO_SCSI_SENSE_DEFAULT_SIZE 96
+
+#ifndef VIRTIO_SCSI_CDB_SIZE
+#define VIRTIO_SCSI_CDB_SIZE VIRTIO_SCSI_CDB_DEFAULT_SIZE
+#endif
+#ifndef VIRTIO_SCSI_SENSE_SIZE
+#define VIRTIO_SCSI_SENSE_SIZE VIRTIO_SCSI_SENSE_DEFAULT_SIZE
+#endif
 
 /* SCSI command request, followed by data-out */
 struct virtio_scsi_cmd_req {
diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 02d5125a5ee8..2cd9e608d0d1 100644
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_XFRM_H
 #define _LINUX_XFRM_H
 
+#include <linux/in6.h>
 #include <linux/types.h>
 
 /* All of the structures in this file may not change size as they are
@@ -13,6 +14,7 @@
 typedef union {
         __be32          a4;
         __be32          a6[4];
+        struct in6_addr in6;
 } xfrm_address_t;
 
 /* Ident of a specific xfrm_state. It is used on input to lookup
diff --git a/include/uapi/linux/xilinx-v4l2-controls.h b/include/uapi/linux/xilinx-v4l2-controls.h
new file mode 100644
index 000000000000..fb495b91e800
--- /dev/null
+++ b/include/uapi/linux/xilinx-v4l2-controls.h
@@ -0,0 +1,73 @@
+/*
+ * Xilinx Controls Header
+ *
+ * Copyright (C) 2013-2015 Ideas on Board
+ * Copyright (C) 2013-2015 Xilinx, Inc.
+ *
+ * Contacts: Hyun Kwon <hyun.kwon@xilinx.com>
+ *           Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ */
+
+#ifndef __UAPI_XILINX_V4L2_CONTROLS_H__
+#define __UAPI_XILINX_V4L2_CONTROLS_H__
+
+#include <linux/v4l2-controls.h>
+
+#define V4L2_CID_XILINX_OFFSET  0xc000
+#define V4L2_CID_XILINX_BASE    (V4L2_CID_USER_BASE + V4L2_CID_XILINX_OFFSET)
+
+/*
+ * Private Controls for Xilinx Video IPs
+ */
+
+/*
+ * Xilinx TPG Video IP
+ */
+
+#define V4L2_CID_XILINX_TPG                     (V4L2_CID_USER_BASE + 0xc000)
+
+/* Draw cross hairs */
+#define V4L2_CID_XILINX_TPG_CROSS_HAIRS         (V4L2_CID_XILINX_TPG + 1)
+/* Enable a moving box */
+#define V4L2_CID_XILINX_TPG_MOVING_BOX          (V4L2_CID_XILINX_TPG + 2)
+/* Mask out a color component */
+#define V4L2_CID_XILINX_TPG_COLOR_MASK          (V4L2_CID_XILINX_TPG + 3)
+/* Enable a stuck pixel feature */
+#define V4L2_CID_XILINX_TPG_STUCK_PIXEL         (V4L2_CID_XILINX_TPG + 4)
+/* Enable a noisy output */
+#define V4L2_CID_XILINX_TPG_NOISE               (V4L2_CID_XILINX_TPG + 5)
+/* Enable the motion feature */
+#define V4L2_CID_XILINX_TPG_MOTION              (V4L2_CID_XILINX_TPG + 6)
+/* Configure the motion speed of moving patterns */
+#define V4L2_CID_XILINX_TPG_MOTION_SPEED        (V4L2_CID_XILINX_TPG + 7)
+/* The row of horizontal cross hair location */
+#define V4L2_CID_XILINX_TPG_CROSS_HAIR_ROW      (V4L2_CID_XILINX_TPG + 8)
+/* The colum of vertical cross hair location */
+#define V4L2_CID_XILINX_TPG_CROSS_HAIR_COLUMN   (V4L2_CID_XILINX_TPG + 9)
+/* Set starting point of sine wave for horizontal component */
+#define V4L2_CID_XILINX_TPG_ZPLATE_HOR_START    (V4L2_CID_XILINX_TPG + 10)
+/* Set speed of the horizontal component */
+#define V4L2_CID_XILINX_TPG_ZPLATE_HOR_SPEED    (V4L2_CID_XILINX_TPG + 11)
+/* Set starting point of sine wave for vertical component */
+#define V4L2_CID_XILINX_TPG_ZPLATE_VER_START    (V4L2_CID_XILINX_TPG + 12)
+/* Set speed of the vertical component */
+#define V4L2_CID_XILINX_TPG_ZPLATE_VER_SPEED    (V4L2_CID_XILINX_TPG + 13)
+/* Moving box size */
+#define V4L2_CID_XILINX_TPG_BOX_SIZE            (V4L2_CID_XILINX_TPG + 14)
+/* Moving box color */
+#define V4L2_CID_XILINX_TPG_BOX_COLOR           (V4L2_CID_XILINX_TPG + 15)
+/* Upper limit count of generated stuck pixels */
+#define V4L2_CID_XILINX_TPG_STUCK_PIXEL_THRESH  (V4L2_CID_XILINX_TPG + 16)
+/* Noise level */
+#define V4L2_CID_XILINX_TPG_NOISE_GAIN          (V4L2_CID_XILINX_TPG + 17)
+
+#endif /* __UAPI_XILINX_V4L2_CONTROLS_H__ */
diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h
index 09c8a00ea503..5a5fa4956ebd 100644
--- a/include/uapi/sound/asequencer.h
+++ b/include/uapi/sound/asequencer.h
@@ -22,6 +22,7 @@
 #ifndef _UAPI__SOUND_ASEQUENCER_H
 #define _UAPI__SOUND_ASEQUENCER_H
 
+#include <sound/asound.h>
 
 /** version of the sequencer */
 #define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1)
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
index 0e88e7a0f0eb..a45be6bdcf5b 100644
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
@@ -25,6 +25,9 @@
 
 #include <linux/types.h>
 
+#ifndef __KERNEL__
+#include <stdlib.h>
+#endif
 
 /*
  *  protocol version
@@ -140,7 +143,7 @@ struct snd_hwdep_dsp_image {
  *                                                                           *
  *****************************************************************************/
 
-#define SNDRV_PCM_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 12)
+#define SNDRV_PCM_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 13)
 
 typedef unsigned long snd_pcm_uframes_t;
 typedef signed long snd_pcm_sframes_t;
@@ -267,10 +270,17 @@ typedef int __bitwise snd_pcm_subformat_t;
 #define SNDRV_PCM_INFO_JOINT_DUPLEX     0x00200000      /* playback and capture stream are somewhat correlated */
 #define SNDRV_PCM_INFO_SYNC_START       0x00400000      /* pcm support some kind of sync go */
 #define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP 0x00800000      /* period wakeup can be disabled */
-#define SNDRV_PCM_INFO_HAS_WALL_CLOCK   0x01000000      /* has audio wall clock for audio/system time sync */
+#define SNDRV_PCM_INFO_HAS_WALL_CLOCK   0x01000000      /* (Deprecated)has audio wall clock for audio/system time sync */
+#define SNDRV_PCM_INFO_HAS_LINK_ATIME              0x01000000  /* report hardware link audio time, reset on startup */
+#define SNDRV_PCM_INFO_HAS_LINK_ABSOLUTE_ATIME     0x02000000  /* report absolute hardware link audio time, not reset on startup */
+#define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME    0x04000000  /* report estimated link audio time */
+#define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000  /* report synchronized audio/system time */
+
 #define SNDRV_PCM_INFO_DRAIN_TRIGGER    0x40000000              /* internal kernel flag - trigger in drain */
 #define SNDRV_PCM_INFO_FIFO_IN_FRAMES   0x80000000      /* internal kernel flag - FIFO size is in frames */
 
+
+
 typedef int __bitwise snd_pcm_state_t;
 #define SNDRV_PCM_STATE_OPEN            ((__force snd_pcm_state_t) 0) /* stream is open */
 #define SNDRV_PCM_STATE_SETUP           ((__force snd_pcm_state_t) 1) /* stream has a setup */
@@ -408,6 +418,22 @@ struct snd_pcm_channel_info {
         unsigned int step;              /* samples distance in bits */
 };
 
+enum {
+        /*
+         *  first definition for backwards compatibility only,
+         *  maps to wallclock/link time for HDAudio playback and DEFAULT/DMA time for everything else
+         */
+        SNDRV_PCM_AUDIO_TSTAMP_TYPE_COMPAT = 0,
+
+        /* timestamp definitions */
+        SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT = 1,           /* DMA time, reported as per hw_ptr */
+        SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK = 2,              /* link time reported by sample or wallclock counter, reset on startup */
+        SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE = 3,     /* link time reported by sample or wallclock counter, not reset on startup */
+        SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED = 4,    /* link time estimated indirectly */
+        SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED = 5, /* link time synchronized with system time */
+        SNDRV_PCM_AUDIO_TSTAMP_TYPE_LAST = SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED
+};
+
 struct snd_pcm_status {
         snd_pcm_state_t state;          /* stream state */
         struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */
@@ -419,9 +445,11 @@ struct snd_pcm_status {
         snd_pcm_uframes_t avail_max;    /* max frames available on hw since last status */
         snd_pcm_uframes_t overrange;    /* count of ADC (capture) overrange detections from last status */
         snd_pcm_state_t suspended_state; /* suspended stream state */
-        __u32 reserved_alignment;       /* must be filled with zero */
-        struct timespec audio_tstamp;   /* from sample counter or wall clock */
-        unsigned char reserved[56-sizeof(struct timespec)]; /* must be filled with zero */
+        __u32 audio_tstamp_data;         /* needed for 64-bit alignment, used for configs/report to/from userspace */
+        struct timespec audio_tstamp;   /* sample counter, wall clock, PHC or on-demand sync'ed */
+        struct timespec driver_tstamp;  /* useful in case reference system tstamp is reported with delay */
+        __u32 audio_tstamp_accuracy;    /* in ns units, only valid if indicated in audio_tstamp_data */
+        unsigned char reserved[52-2*sizeof(struct timespec)]; /* must be filled with zero */
 };
 
 struct snd_pcm_mmap_status {
@@ -534,6 +562,7 @@ enum {
 #define SNDRV_PCM_IOCTL_DELAY           _IOR('A', 0x21, snd_pcm_sframes_t)
 #define SNDRV_PCM_IOCTL_HWSYNC          _IO('A', 0x22)
 #define SNDRV_PCM_IOCTL_SYNC_PTR        _IOWR('A', 0x23, struct snd_pcm_sync_ptr)
+#define SNDRV_PCM_IOCTL_STATUS_EXT      _IOWR('A', 0x24, struct snd_pcm_status)
 #define SNDRV_PCM_IOCTL_CHANNEL_INFO    _IOR('A', 0x32, struct snd_pcm_channel_info)
 #define SNDRV_PCM_IOCTL_PREPARE         _IO('A', 0x40)
 #define SNDRV_PCM_IOCTL_RESET           _IO('A', 0x41)
@@ -835,7 +864,7 @@ struct snd_ctl_elem_id {
         snd_ctl_elem_iface_t iface;     /* interface identifier */
         unsigned int device;            /* device/client number */
         unsigned int subdevice;         /* subdevice (substream) number */
-        unsigned char name[44];         /* ASCII name of item */
+        unsigned char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];              /* ASCII name of item */
         unsigned int index;             /* index of item */
 };
 
diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h
index 22ed8cb7800b..e00d8cbfc628 100644
--- a/include/uapi/sound/compress_offload.h
+++ b/include/uapi/sound/compress_offload.h
@@ -75,7 +75,7 @@ struct snd_compr_tstamp {
 /**
  * struct snd_compr_avail - avail descriptor
  * @avail: Number of bytes available in ring buffer for writing/reading
- * @tstamp: timestamp infomation
+ * @tstamp: timestamp information
  */
 struct snd_compr_avail {
         __u64 avail;
diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h
index d1bbaf78457a..ec1535bb6aed 100644
--- a/include/uapi/sound/emu10k1.h
+++ b/include/uapi/sound/emu10k1.h
@@ -23,8 +23,7 @@
 #define _UAPI__SOUND_EMU10K1_H
 
 #include <linux/types.h>
-
-
+#include <sound/asound.h>
 
 /*
  * ---- FX8010 ----
diff --git a/include/uapi/sound/hdspm.h b/include/uapi/sound/hdspm.h
index b357f1a5e29c..5737332d38f2 100644
--- a/include/uapi/sound/hdspm.h
+++ b/include/uapi/sound/hdspm.h
@@ -20,6 +20,12 @@
  *   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
 
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index 73390c120cad..85dedca3dcfb 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -39,7 +39,7 @@ struct ipu_di_signal_cfg {
 
         struct videomode mode;
 
-        u32 pixel_fmt;
+        u32 bus_format;
         u32 v_to_h_sync;
 
 #define IPU_DI_CLKMODE_SYNC     (1 << 0)
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 60de61fea8e3..f001a356fd98 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -129,14 +129,13 @@ enum omap_rfbi_te_mode {
 };
 
 enum omap_dss_signal_level {
-        OMAPDSS_SIG_ACTIVE_HIGH = 0,
-        OMAPDSS_SIG_ACTIVE_LOW  = 1,
+        OMAPDSS_SIG_ACTIVE_LOW,
+        OMAPDSS_SIG_ACTIVE_HIGH,
 };
 
 enum omap_dss_signal_edge {
-        OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
-        OMAPDSS_DRIVE_SIG_RISING_EDGE,
         OMAPDSS_DRIVE_SIG_FALLING_EDGE,
+        OMAPDSS_DRIVE_SIG_RISING_EDGE,
 };
 
 enum omap_dss_venc_type {
@@ -689,6 +688,7 @@ struct omapdss_dsi_ops {
 };
 
 struct omap_dss_device {
+        struct kobject kobj;
         struct device *dev;
 
         struct module *owner;
diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h
index a20e4a3a8b15..0530e5a4c6b1 100644
--- a/include/video/samsung_fimd.h
+++ b/include/video/samsung_fimd.h
@@ -289,6 +289,11 @@
 #define VIDISD14C_ALPHA1_B_LIMIT                0xf
 #define VIDISD14C_ALPHA1_B(_x)                  ((_x) << 0)
 
+#define VIDW_ALPHA                              0x021c
+#define VIDW_ALPHA_R(_x)                        ((_x) << 16)
+#define VIDW_ALPHA_G(_x)                        ((_x) << 8)
+#define VIDW_ALPHA_B(_x)                        ((_x) << 0)
+
 /* Video buffer addresses */
 #define VIDW_BUF_START(_buff)                   (0xA0 + ((_buff) * 8))
 #define VIDW_BUF_START1(_buff)                  (0xA4 + ((_buff) * 8))
@@ -436,6 +441,12 @@
 #define BLENDCON_NEW_8BIT_ALPHA_VALUE           (1 << 0)
 #define BLENDCON_NEW_4BIT_ALPHA_VALUE           (0 << 0)
 
+/* Display port clock control */
+#define DP_MIE_CLKCON                           0x27c
+#define DP_MIE_CLK_DISABLE                      0x0
+#define DP_MIE_CLK_DP_ENABLE                    0x2
+#define DP_MIE_CLK_MIE_ENABLE                   0x3
+
 /* Notes on per-window bpp settings
  *
  * Value        Win0     Win1     Win2     Win3     Win 4
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index f68719f405af..a48378958062 100644
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -67,7 +67,7 @@
 #define __HYPERVISOR_vcpu_op              24
 #define __HYPERVISOR_set_segment_base     25 /* x86/64 only */
 #define __HYPERVISOR_mmuext_op            26
-#define __HYPERVISOR_acm_op               27
+#define __HYPERVISOR_xsm_op               27
 #define __HYPERVISOR_nmi_op               28
 #define __HYPERVISOR_sched_op             29
 #define __HYPERVISOR_callback_op          30
@@ -75,7 +75,11 @@
 #define __HYPERVISOR_event_channel_op     32
 #define __HYPERVISOR_physdev_op           33
 #define __HYPERVISOR_hvm_op               34
+#define __HYPERVISOR_sysctl               35
+#define __HYPERVISOR_domctl               36
+#define __HYPERVISOR_kexec_op             37
 #define __HYPERVISOR_tmem_op              38
+#define __HYPERVISOR_xc_reserved_op       39 /* reserved for XenClient */
 
 /* Architecture-specific hypercall definitions. */
 #define __HYPERVISOR_arch_0               48
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 7491ee5d8164..c643e6a94c9a 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -27,13 +27,58 @@ int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order,
 void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order);
 
 struct vm_area_struct;
+
+/*
+ * xen_remap_domain_mfn_array() - map an array of foreign frames
+ * @vma:     VMA to map the pages into
+ * @addr:    Address at which to map the pages
+ * @gfn:     Array of GFNs to map
+ * @nr:      Number entries in the GFN array
+ * @err_ptr: Returns per-GFN error status.
+ * @prot:    page protection mask
+ * @domid:   Domain owning the pages
+ * @pages:   Array of pages if this domain has an auto-translated physmap
+ *
+ * @gfn and @err_ptr may point to the same buffer, the GFNs will be
+ * overwritten by the error codes after they are mapped.
+ *
+ * Returns the number of successfully mapped frames, or a -ve error
+ * code.
+ */
+int xen_remap_domain_mfn_array(struct vm_area_struct *vma,
+                               unsigned long addr,
+                               xen_pfn_t *gfn, int nr,
+                               int *err_ptr, pgprot_t prot,
+                               unsigned domid,
+                               struct page **pages);
+
+/* xen_remap_domain_mfn_range() - map a range of foreign frames
+ * @vma:     VMA to map the pages into
+ * @addr:    Address at which to map the pages
+ * @gfn:     First GFN to map.
+ * @nr:      Number frames to map
+ * @prot:    page protection mask
+ * @domid:   Domain owning the pages
+ * @pages:   Array of pages if this domain has an auto-translated physmap
+ *
+ * Returns the number of successfully mapped frames, or a -ve error
+ * code.
+ */
 int xen_remap_domain_mfn_range(struct vm_area_struct *vma,
                                unsigned long addr,
-                               xen_pfn_t mfn, int nr,
+                               xen_pfn_t gfn, int nr,
                                pgprot_t prot, unsigned domid,
                                struct page **pages);
 int xen_unmap_domain_mfn_range(struct vm_area_struct *vma,
                                int numpgs, struct page **pages);
+int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
+                              unsigned long addr,
+                              xen_pfn_t *gfn, int nr,
+                              int *err_ptr, pgprot_t prot,
+                              unsigned domid,
+                              struct page **pages);
+int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma,
+                              int nr, struct page **pages);
 
 bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);
 
@@ -46,4 +91,30 @@ static inline efi_system_table_t __init *xen_efi_probe(void)
 }
 #endif
 
+#ifdef CONFIG_PREEMPT
+
+static inline void xen_preemptible_hcall_begin(void)
+{
+}
+
+static inline void xen_preemptible_hcall_end(void)
+{
+}
+
+#else
+
+DECLARE_PER_CPU(bool, xen_in_preemptible_hcall);
+
+static inline void xen_preemptible_hcall_begin(void)
+{
+        __this_cpu_write(xen_in_preemptible_hcall, true);
+}
+
+static inline void xen_preemptible_hcall_end(void)
+{
+        __this_cpu_write(xen_in_preemptible_hcall, false);
+}
+
+#endif /* CONFIG_PREEMPT */
+
 #endif /* INCLUDE_XEN_OPS_H */
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
index b78f21caf55a..289c0b5f08fe 100644
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h
@@ -46,6 +46,10 @@
 #include <xen/interface/io/xenbus.h>
 #include <xen/interface/io/xs_wire.h>
 
+#define XENBUS_MAX_RING_PAGE_ORDER 4
+#define XENBUS_MAX_RING_PAGES      (1U << XENBUS_MAX_RING_PAGE_ORDER)
+#define INVALID_GRANT_HANDLE       (~0U)
+
 /* Register callback to watch this node. */
 struct xenbus_watch
 {
@@ -114,9 +118,9 @@ int __must_check __xenbus_register_backend(struct xenbus_driver *drv,
                                            const char *mod_name);
 
 #define xenbus_register_frontend(drv) \
-        __xenbus_register_frontend(drv, THIS_MODULE, KBUILD_MODNAME);
+        __xenbus_register_frontend(drv, THIS_MODULE, KBUILD_MODNAME)
 #define xenbus_register_backend(drv) \
-        __xenbus_register_backend(drv, THIS_MODULE, KBUILD_MODNAME);
+        __xenbus_register_backend(drv, THIS_MODULE, KBUILD_MODNAME)
 
 void xenbus_unregister_driver(struct xenbus_driver *drv);
 
@@ -199,15 +203,19 @@ int xenbus_watch_pathfmt(struct xenbus_device *dev, struct xenbus_watch *watch,
                          const char *pathfmt, ...);
 
 int xenbus_switch_state(struct xenbus_device *dev, enum xenbus_state new_state);
-int xenbus_grant_ring(struct xenbus_device *dev, unsigned long ring_mfn);
-int xenbus_map_ring_valloc(struct xenbus_device *dev,
-                           int gnt_ref, void **vaddr);
-int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
-                           grant_handle_t *handle, void *vaddr);
+int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
+                      unsigned int nr_pages, grant_ref_t *grefs);
+int xenbus_map_ring_valloc(struct xenbus_device *dev, grant_ref_t *gnt_refs,
+                           unsigned int nr_grefs, void **vaddr);
+int xenbus_map_ring(struct xenbus_device *dev,
+                    grant_ref_t *gnt_refs, unsigned int nr_grefs,
+                    grant_handle_t *handles, unsigned long *vaddrs,
+                    bool *leaked);
 
 int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr);
 int xenbus_unmap_ring(struct xenbus_device *dev,
-                      grant_handle_t handle, void *vaddr);
+                      grant_handle_t *handles, unsigned int nr_handles,
+                      unsigned long *vaddrs);
 
 int xenbus_alloc_evtchn(struct xenbus_device *dev, int *port);
 int xenbus_free_evtchn(struct xenbus_device *dev, int port);