328 files changed, 11337 insertions, 3387 deletions

diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 932a60d6ed82..5a0a3e5daf85 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -219,6 +219,24 @@
 
 /******************************************************************************
  *
+ * Miscellaneous constants
+ *
+ *****************************************************************************/
+
+/* UUID constants */
+
+#define UUID_BUFFER_LENGTH          16  /* Length of UUID in memory */
+#define UUID_STRING_LENGTH          36  /* Total length of a UUID string */
+
+/* Positions for required hyphens (dashes) in UUID strings */
+
+#define UUID_HYPHEN1_OFFSET         8
+#define UUID_HYPHEN2_OFFSET         13
+#define UUID_HYPHEN3_OFFSET         18
+#define UUID_HYPHEN4_OFFSET         23
+
+/******************************************************************************
+ *
  * ACPI AML Debugger
  *
  *****************************************************************************/
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h
index 3dd6e838dc30..c728113374f5 100644
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
@@ -55,6 +55,7 @@
 #define METHOD_NAME__HID        "_HID"
 #define METHOD_NAME__INI        "_INI"
 #define METHOD_NAME__PLD        "_PLD"
+#define METHOD_NAME__DSD        "_DSD"
 #define METHOD_NAME__PRS        "_PRS"
 #define METHOD_NAME__PRT        "_PRT"
 #define METHOD_NAME__PRW        "_PRW"
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index b5714580801a..bcfd808b1098 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -315,12 +315,19 @@ struct acpi_device_wakeup_flags {
         u8 notifier_present:1;  /* Wake-up notify handler has been installed */
 };
 
+struct acpi_device_wakeup_context {
+        struct work_struct work;
+        struct device *dev;
+};
+
 struct acpi_device_wakeup {
         acpi_handle gpe_device;
         u64 gpe_number;
         u64 sleep_state;
         struct list_head resources;
         struct acpi_device_wakeup_flags flags;
+        struct acpi_device_wakeup_context context;
+        struct wakeup_source *ws;
         int prepare_count;
 };
 
@@ -372,15 +379,9 @@ static inline void acpi_set_device_status(struct acpi_device *adev, u32 sta)
 }
 
 static inline void acpi_set_hp_context(struct acpi_device *adev,
-                                       struct acpi_hotplug_context *hp,
-                                       int (*notify)(struct acpi_device *, u32),
-                                       void (*uevent)(struct acpi_device *, u32),
-                                       void (*fixup)(struct acpi_device *))
+                                       struct acpi_hotplug_context *hp)
 {
         hp->self = adev;
-        hp->notify = notify;
-        hp->uevent = uevent;
-        hp->fixup = fixup;
         adev->hp = hp;
 }
 
@@ -487,6 +488,8 @@ struct acpi_bus_type {
 };
 int register_acpi_bus_type(struct acpi_bus_type *);
 int unregister_acpi_bus_type(struct acpi_bus_type *);
+int acpi_bind_one(struct device *dev, struct acpi_device *adev);
+int acpi_unbind_one(struct device *dev);
 
 struct acpi_pci_root {
         struct acpi_device * device;
@@ -510,20 +513,18 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state);
 int acpi_disable_wakeup_device_power(struct acpi_device *dev);
 
 #ifdef CONFIG_PM
-acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
-                                 acpi_notify_handler handler, void *context);
-acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
-                                    acpi_notify_handler handler);
+acpi_status acpi_add_pm_notifier(struct acpi_device *adev, struct device *dev,
+                                 void (*work_func)(struct work_struct *work));
+acpi_status acpi_remove_pm_notifier(struct acpi_device *adev);
 int acpi_pm_device_sleep_state(struct device *, int *, int);
 #else
 static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
-                                               acpi_notify_handler handler,
-                                               void *context)
+                                               struct device *dev,
+                                               void (*work_func)(struct work_struct *work))
 {
         return AE_SUPPORT;
 }
-static inline acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
-                                                  acpi_notify_handler handler)
+static inline acpi_status acpi_remove_pm_notifier(struct acpi_device *adev)
 {
         return AE_SUPPORT;
 }
@@ -538,13 +539,8 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m)
 #endif
 
 #ifdef CONFIG_PM_RUNTIME
-int __acpi_device_run_wake(struct acpi_device *, bool);
 int acpi_pm_device_run_wake(struct device *, bool);
 #else
-static inline int __acpi_device_run_wake(struct acpi_device *adev, bool en)
-{
-        return -ENODEV;
-}
 static inline int acpi_pm_device_run_wake(struct device *dev, bool enable)
 {
         return -ENODEV;
@@ -552,14 +548,8 @@ static inline int acpi_pm_device_run_wake(struct device *dev, bool enable)
 #endif
 
 #ifdef CONFIG_PM_SLEEP
-int __acpi_device_sleep_wake(struct acpi_device *, u32, bool);
 int acpi_pm_device_sleep_wake(struct device *, bool);
 #else
-static inline int __acpi_device_sleep_wake(struct acpi_device *adev,
-                                           u32 target_state, bool enable)
-{
-        return -ENODEV;
-}
 static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
 {
         return -ENODEV;
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index f6f5f8af2112..03b3e6d405ff 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -399,4 +399,35 @@ char *acpi_os_get_next_filename(void *dir_handle);
 void acpi_os_close_directory(void *dir_handle);
 #endif
 
+/*
+ * File I/O and related support
+ */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_open_file
+ACPI_FILE acpi_os_open_file(const char *path, u8 modes);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_close_file
+void acpi_os_close_file(ACPI_FILE file);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_read_file
+int
+acpi_os_read_file(ACPI_FILE file,
+                  void *buffer, acpi_size size, acpi_size count);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_write_file
+int
+acpi_os_write_file(ACPI_FILE file,
+                   void *buffer, acpi_size size, acpi_size count);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_file_offset
+long acpi_os_get_file_offset(ACPI_FILE file);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_set_file_offset
+acpi_status acpi_os_set_file_offset(ACPI_FILE file, long offset, u8 from);
+#endif
+
 #endif                          /* __ACPIOSXF_H__ */
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 35b525c19711..b7c89d47efbe 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -46,15 +46,13 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20140424
+#define ACPI_CA_VERSION                 0x20140724
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
 #include <acpi/actbl.h>
 #include <acpi/acbuffer.h>
 
-extern u8 acpi_gbl_permanent_mmap;
-
 /*****************************************************************************
  *
  * Macros used for ACPICA globals and configuration
@@ -335,6 +333,23 @@ ACPI_GLOBAL(u8, acpi_gbl_system_awake_and_running);
 
 #endif                          /* ACPI_DEBUG_OUTPUT */
 
+/*
+ * Application prototypes
+ *
+ * All interfaces used by application will be configured
+ * out of the ACPICA build unless the ACPI_APPLICATION
+ * flag is defined.
+ */
+#ifdef ACPI_APPLICATION
+#define ACPI_APP_DEPENDENT_RETURN_VOID(prototype) \
+        prototype;
+
+#else
+#define ACPI_APP_DEPENDENT_RETURN_VOID(prototype) \
+        static ACPI_INLINE prototype {return;}
+
+#endif                          /* ACPI_APPLICATION */
+
 /*****************************************************************************
  *
  * ACPICA public interface prototypes
@@ -658,6 +673,10 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                                 u32 gpe_number))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
+                                acpi_mark_gpe_for_wake(acpi_handle gpe_device,
+                                                       u32 gpe_number))
+
+ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
                                 acpi_setup_gpe_for_wake(acpi_handle
                                                         parent_device,
                                                         acpi_handle gpe_device,
@@ -861,21 +880,32 @@ ACPI_DBG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(6)
                                                      const char *module_name,
                                                      u32 component_id,
                                                      const char *format, ...))
+ACPI_APP_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(1)
+                                void ACPI_INTERNAL_VAR_XFACE
+                                acpi_log_error(const char *format, ...))
 
 /*
  * Divergences
  */
-acpi_status acpi_get_id(acpi_handle object, acpi_owner_id * out_type);
+ACPI_GLOBAL(u8, acpi_gbl_permanent_mmap);
 
-acpi_status acpi_unload_table_id(acpi_owner_id id);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_id(acpi_handle object,
+                                        acpi_owner_id * out_type))
 
-acpi_status
-acpi_get_table_with_size(acpi_string signature,
-               u32 instance, struct acpi_table_header **out_table,
-               acpi_size *tbl_size);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_unload_table_id(acpi_owner_id id))
 
-acpi_status
-acpi_get_data_full(acpi_handle object, acpi_object_handler handler, void **data,
-                   void (*callback)(void *));
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_table_with_size(acpi_string signature,
+                                                     u32 instance,
+                                                     struct acpi_table_header
+                                                     **out_table,
+                                                     acpi_size *tbl_size))
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+                            acpi_get_data_full(acpi_handle object,
+                                               acpi_object_handler handler,
+                                               void **data,
+                                               void (*callback)(void *)))
 
 #endif                          /* __ACXFACE_H__ */
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 1cc7ef13c01a..bee19d8170c5 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -270,7 +270,8 @@ struct acpi_table_fadt {
         u32 flags;              /* Miscellaneous flag bits (see below for individual flags) */
         struct acpi_generic_address reset_register;     /* 64-bit address of the Reset register */
         u8 reset_value;         /* Value to write to the reset_register port to reset the system */
-        u8 reserved4[3];        /* Reserved, must be zero */
+        u16 arm_boot_flags;     /* ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */
+        u8 minor_revision;      /* FADT Minor Revision (ACPI 5.1) */
         u64 Xfacs;              /* 64-bit physical address of FACS */
         u64 Xdsdt;              /* 64-bit physical address of DSDT */
         struct acpi_generic_address xpm1a_event_block;  /* 64-bit Extended Power Mgt 1a Event Reg Blk address */
@@ -285,7 +286,7 @@ struct acpi_table_fadt {
         struct acpi_generic_address sleep_status;       /* 64-bit Sleep Status register (ACPI 5.0) */
 };
 
-/* Masks for FADT Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */
+/* Masks for FADT IA-PC Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */
 
 #define ACPI_FADT_LEGACY_DEVICES    (1)         /* 00: [V2] System has LPC or ISA bus devices */
 #define ACPI_FADT_8042              (1<<1)      /* 01: [V3] System has an 8042 controller on port 60/64 */
@@ -296,6 +297,11 @@ struct acpi_table_fadt {
 
 #define FADT2_REVISION_ID               3
 
+/* Masks for FADT ARM Boot Architecture Flags (arm_boot_flags) ACPI 5.1 */
+
+#define ACPI_FADT_PSCI_COMPLIANT    (1) /* 00: [V5+] PSCI 0.2+ is implemented */
+#define ACPI_FADT_PSCI_USE_HVC      (1<<1)      /* 01: [V5+] HVC must be used instead of SMC as the PSCI conduit */
+
 /* Masks for FADT flags */
 
 #define ACPI_FADT_WBINVD            (1) /* 00: [V1] The WBINVD instruction works properly */
@@ -399,7 +405,7 @@ struct acpi_table_desc {
  *     FADT V5  size: 0x10C
  */
 #define ACPI_FADT_V1_SIZE       (u32) (ACPI_FADT_OFFSET (flags) + 4)
-#define ACPI_FADT_V2_SIZE       (u32) (ACPI_FADT_OFFSET (reserved4[0]) + 3)
+#define ACPI_FADT_V2_SIZE       (u32) (ACPI_FADT_OFFSET (minor_revision) + 1)
 #define ACPI_FADT_V3_SIZE       (u32) (ACPI_FADT_OFFSET (sleep_control))
 #define ACPI_FADT_V5_SIZE       (u32) (sizeof (struct acpi_table_fadt))
 
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 4ad7da805180..7626bfeac2cb 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -604,7 +604,7 @@ struct acpi_hest_generic {
 
 /* Generic Error Status block */
 
-struct acpi_generic_status {
+struct acpi_hest_generic_status {
         u32 block_status;
         u32 raw_data_offset;
         u32 raw_data_length;
@@ -614,15 +614,15 @@ struct acpi_generic_status {
 
 /* Values for block_status flags above */
 
-#define ACPI_GEN_ERR_UC                 BIT(0)
-#define ACPI_GEN_ERR_CE                 BIT(1)
-#define ACPI_GEN_ERR_MULTI_UC           BIT(2)
-#define ACPI_GEN_ERR_MULTI_CE           BIT(3)
-#define ACPI_GEN_ERR_COUNT_SHIFT        (0xFF<<4) /* 8 bits, error count */
+#define ACPI_HEST_UNCORRECTABLE             (1)
+#define ACPI_HEST_CORRECTABLE               (1<<1)
+#define ACPI_HEST_MULTIPLE_UNCORRECTABLE    (1<<2)
+#define ACPI_HEST_MULTIPLE_CORRECTABLE      (1<<3)
+#define ACPI_HEST_ERROR_ENTRY_COUNT         (0xFF<<4)   /* 8 bits, error count */
 
 /* Generic Error Data entry */
 
-struct acpi_generic_data {
+struct acpi_hest_generic_data {
         u8 section_type[16];
         u32 error_severity;
         u16 revision;
@@ -671,7 +671,9 @@ enum acpi_madt_type {
         ACPI_MADT_TYPE_LOCAL_X2APIC_NMI = 10,
         ACPI_MADT_TYPE_GENERIC_INTERRUPT = 11,
         ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR = 12,
-        ACPI_MADT_TYPE_RESERVED = 13    /* 13 and greater are reserved */
+        ACPI_MADT_TYPE_GENERIC_MSI_FRAME = 13,
+        ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14,
+        ACPI_MADT_TYPE_RESERVED = 15    /* 15 and greater are reserved */
 };
 
 /*
@@ -797,15 +799,26 @@ struct acpi_madt_local_x2apic_nmi {
 struct acpi_madt_generic_interrupt {
         struct acpi_subtable_header header;
         u16 reserved;           /* reserved - must be zero */
-        u32 gic_id;
+        u32 cpu_interface_number;
         u32 uid;
         u32 flags;
         u32 parking_version;
         u32 performance_interrupt;
         u64 parked_address;
         u64 base_address;
+        u64 gicv_base_address;
+        u64 gich_base_address;
+        u32 vgic_interrupt;
+        u64 gicr_base_address;
+        u64 arm_mpidr;
 };
 
+/* Masks for Flags field above */
+
+/* ACPI_MADT_ENABLED                    (1)      Processor is usable if set */
+#define ACPI_MADT_PERFORMANCE_IRQ_MODE  (1<<1)  /* 01: Performance Interrupt Mode */
+#define ACPI_MADT_VGIC_IRQ_MODE         (1<<2)  /* 02: VGIC Maintenance Interrupt mode */
+
 /* 12: Generic Distributor (ACPI 5.0) */
 
 struct acpi_madt_generic_distributor {
@@ -817,11 +830,36 @@ struct acpi_madt_generic_distributor {
         u32 reserved2;          /* reserved - must be zero */
 };
 
+/* 13: Generic MSI Frame (ACPI 5.1) */
+
+struct acpi_madt_generic_msi_frame {
+        struct acpi_subtable_header header;
+        u16 reserved;           /* reserved - must be zero */
+        u32 msi_frame_id;
+        u64 base_address;
+        u32 flags;
+        u16 spi_count;
+        u16 spi_base;
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_MADT_OVERRIDE_SPI_VALUES   (1)
+
+/* 14: Generic Redistributor (ACPI 5.1) */
+
+struct acpi_madt_generic_redistributor {
+        struct acpi_subtable_header header;
+        u16 reserved;           /* reserved - must be zero */
+        u64 base_address;
+        u32 length;
+};
+
 /*
  * Common flags fields for MADT subtables
  */
 
-/* MADT Local APIC flags (lapic_flags) and GIC flags */
+/* MADT Local APIC flags */
 
 #define ACPI_MADT_ENABLED           (1) /* 00: Processor is usable if set */
 
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 860e5c883eb3..ecff62405f17 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -396,7 +396,7 @@ struct acpi_table_dbgp {
  *        Version 1
  *
  * Conforms to "Intel Virtualization Technology for Directed I/O",
- * Version 1.2, Sept. 2008
+ * Version 2.2, Sept. 2013
  *
  ******************************************************************************/
 
@@ -423,9 +423,9 @@ struct acpi_dmar_header {
 enum acpi_dmar_type {
         ACPI_DMAR_TYPE_HARDWARE_UNIT = 0,
         ACPI_DMAR_TYPE_RESERVED_MEMORY = 1,
-        ACPI_DMAR_TYPE_ATSR = 2,
-        ACPI_DMAR_HARDWARE_AFFINITY = 3,
-        ACPI_DMAR_TYPE_ANDD = 4,
+        ACPI_DMAR_TYPE_ROOT_ATS = 2,
+        ACPI_DMAR_TYPE_HARDWARE_AFFINITY = 3,
+        ACPI_DMAR_TYPE_NAMESPACE = 4,
         ACPI_DMAR_TYPE_RESERVED = 5     /* 5 and greater are reserved */
 };
 
@@ -439,7 +439,7 @@ struct acpi_dmar_device_scope {
         u8 bus;
 };
 
-/* Values for entry_type in struct acpi_dmar_device_scope */
+/* Values for entry_type in struct acpi_dmar_device_scope - device types */
 
 enum acpi_dmar_scope_type {
         ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
@@ -447,7 +447,7 @@ enum acpi_dmar_scope_type {
         ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
         ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
         ACPI_DMAR_SCOPE_TYPE_HPET = 4,
-        ACPI_DMAR_SCOPE_TYPE_ACPI = 5,
+        ACPI_DMAR_SCOPE_TYPE_NAMESPACE = 5,
         ACPI_DMAR_SCOPE_TYPE_RESERVED = 6       /* 6 and greater are reserved */
 };
 
@@ -516,7 +516,7 @@ struct acpi_dmar_andd {
         struct acpi_dmar_header header;
         u8 reserved[3];
         u8 device_number;
-        u8 object_name[];
+        char device_name[1];
 };
 
 /*******************************************************************************
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index c2295cc4a5c0..787bcc814463 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -241,33 +241,96 @@ struct acpi_s3pt_suspend {
 
 /*******************************************************************************
  *
- * GTDT - Generic Timer Description Table (ACPI 5.0)
- *        Version 1
+ * GTDT - Generic Timer Description Table (ACPI 5.1)
+ *        Version 2
  *
  ******************************************************************************/
 
 struct acpi_table_gtdt {
         struct acpi_table_header header;        /* Common ACPI table header */
-        u64 address;
-        u32 flags;
-        u32 secure_pl1_interrupt;
-        u32 secure_pl1_flags;
-        u32 non_secure_pl1_interrupt;
-        u32 non_secure_pl1_flags;
+        u64 counter_block_addresss;
+        u32 reserved;
+        u32 secure_el1_interrupt;
+        u32 secure_el1_flags;
+        u32 non_secure_el1_interrupt;
+        u32 non_secure_el1_flags;
         u32 virtual_timer_interrupt;
         u32 virtual_timer_flags;
-        u32 non_secure_pl2_interrupt;
-        u32 non_secure_pl2_flags;
+        u32 non_secure_el2_interrupt;
+        u32 non_secure_el2_flags;
+        u64 counter_read_block_address;
+        u32 platform_timer_count;
+        u32 platform_timer_offset;
 };
 
-/* Values for Flags field above */
+/* Flag Definitions: Timer Block Physical Timers and Virtual timers */
+
+#define ACPI_GTDT_INTERRUPT_MODE        (1)
+#define ACPI_GTDT_INTERRUPT_POLARITY    (1<<1)
+#define ACPI_GTDT_ALWAYS_ON             (1<<2)
+
+/* Common GTDT subtable header */
+
+struct acpi_gtdt_header {
+        u8 type;
+        u16 length;
+};
 
-#define ACPI_GTDT_MAPPED_BLOCK_PRESENT      1
+/* Values for GTDT subtable type above */
 
-/* Values for all "TimerFlags" fields above */
+enum acpi_gtdt_type {
+        ACPI_GTDT_TYPE_TIMER_BLOCK = 0,
+        ACPI_GTDT_TYPE_WATCHDOG = 1,
+        ACPI_GTDT_TYPE_RESERVED = 2     /* 2 and greater are reserved */
+};
+
+/* GTDT Subtables, correspond to Type in struct acpi_gtdt_header */
+
+/* 0: Generic Timer Block */
+
+struct acpi_gtdt_timer_block {
+        struct acpi_gtdt_header header;
+        u8 reserved;
+        u64 block_address;
+        u32 timer_count;
+        u32 timer_offset;
+};
+
+/* Timer Sub-Structure, one per timer */
+
+struct acpi_gtdt_timer_entry {
+        u8 frame_number;
+        u8 reserved[3];
+        u64 base_address;
+        u64 el0_base_address;
+        u32 timer_interrupt;
+        u32 timer_flags;
+        u32 virtual_timer_interrupt;
+        u32 virtual_timer_flags;
+        u32 common_flags;
+};
 
-#define ACPI_GTDT_INTERRUPT_MODE            1
-#define ACPI_GTDT_INTERRUPT_POLARITY        2
+/* Flag Definitions: common_flags above */
+
+#define ACPI_GTDT_GT_IS_SECURE_TIMER    (1)
+#define ACPI_GTDT_GT_ALWAYS_ON          (1<<1)
+
+/* 1: SBSA Generic Watchdog Structure */
+
+struct acpi_gtdt_watchdog {
+        struct acpi_gtdt_header header;
+        u8 reserved;
+        u64 refresh_frame_address;
+        u64 control_frame_address;
+        u32 timer_interrupt;
+        u32 timer_flags;
+};
+
+/* Flag Definitions: timer_flags above */
+
+#define ACPI_GTDT_WATCHDOG_IRQ_MODE         (1)
+#define ACPI_GTDT_WATCHDOG_IRQ_POLARITY     (1<<1)
+#define ACPI_GTDT_WATCHDOG_SECURE           (1<<2)
 
 /*******************************************************************************
  *
@@ -385,7 +448,8 @@ struct acpi_table_pcct {
 
 enum acpi_pcct_type {
         ACPI_PCCT_TYPE_GENERIC_SUBSPACE = 0,
-        ACPI_PCCT_TYPE_RESERVED = 1     /* 1 and greater are reserved */
+        ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE = 1,
+        ACPI_PCCT_TYPE_RESERVED = 2     /* 2 and greater are reserved */
 };
 
 /*
@@ -407,6 +471,28 @@ struct acpi_pcct_subspace {
         u16 min_turnaround_time;
 };
 
+/* 1: HW-reduced Communications Subspace (ACPI 5.1) */
+
+struct acpi_pcct_hw_reduced {
+        struct acpi_subtable_header header;
+        u32 doorbell_interrupt;
+        u8 flags;
+        u8 reserved;
+        u64 base_address;
+        u64 length;
+        struct acpi_generic_address doorbell_register;
+        u64 preserve_mask;
+        u64 write_mask;
+        u32 latency;
+        u32 max_access_rate;
+        u16 min_turnaround_time;
+};
+
+/* Values for doorbell flags above */
+
+#define ACPI_PCCT_INTERRUPT_POLARITY    (1)
+#define ACPI_PCCT_INTERRUPT_MODE        (1<<1)
+
 /*
  * PCC memory structures (not part of the ACPI table)
  */
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 19b26bb69a70..ac03ec81d342 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -126,6 +126,7 @@
 typedef unsigned char u8;
 typedef unsigned char u8;
 typedef unsigned short u16;
+typedef short s16;
 typedef COMPILER_DEPENDENT_UINT64 u64;
 typedef COMPILER_DEPENDENT_INT64 s64;
 
@@ -516,7 +517,7 @@ typedef u64 acpi_integer;
 
 #define ACPI_TO_POINTER(i)              ACPI_ADD_PTR (void, (void *) NULL,(acpi_size) i)
 #define ACPI_TO_INTEGER(p)              ACPI_PTR_DIFF (p, (void *) NULL)
-#define ACPI_OFFSET(d, f)               (acpi_size) ACPI_PTR_DIFF (&(((d *)0)->f), (void *) NULL)
+#define ACPI_OFFSET(d, f)               ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) NULL)
 #define ACPI_PHYSADDR_TO_PTR(i)         ACPI_TO_POINTER(i)
 #define ACPI_PTR_TO_PHYSADDR(i)         ACPI_TO_INTEGER(i)
 
@@ -611,8 +612,9 @@ typedef u64 acpi_integer;
 #define ACPI_NOTIFY_RESERVED            (u8) 0x0A
 #define ACPI_NOTIFY_LOCALITY_UPDATE     (u8) 0x0B
 #define ACPI_NOTIFY_SHUTDOWN_REQUEST    (u8) 0x0C
+#define ACPI_NOTIFY_AFFINITY_UPDATE     (u8) 0x0D
 
-#define ACPI_NOTIFY_MAX                 0x0C
+#define ACPI_NOTIFY_MAX                 0x0D
 
 /*
  * Types associated with ACPI names and objects. The first group of
@@ -1244,4 +1246,17 @@ struct acpi_memory_list {
 #define ACPI_OSI_WIN_7                  0x0B
 #define ACPI_OSI_WIN_8                  0x0C
 
+/* Definitions of file IO */
+
+#define ACPI_FILE_READING               0x01
+#define ACPI_FILE_WRITING               0x02
+#define ACPI_FILE_BINARY                0x04
+
+#define ACPI_FILE_BEGIN                 0x01
+#define ACPI_FILE_END                   0x02
+
+/* Definitions of getopt */
+
+#define ACPI_OPT_END                    -1
+
 #endif                          /* __ACTYPES_H__ */
diff --git a/include/acpi/apei.h b/include/acpi/apei.h
index 04f349d8da73..76284bb560a6 100644
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
@@ -42,5 +42,9 @@ ssize_t erst_read(u64 record_id, struct cper_record_header *record,
                   size_t buflen);
 int erst_clear(u64 record_id);
 
+int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data);
+void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err);
+void arch_apei_flush_tlb_one(unsigned long addr);
+
 #endif
 #endif
diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h
index dfd60d0bfd27..720446cb243e 100644
--- a/include/acpi/ghes.h
+++ b/include/acpi/ghes.h
@@ -14,7 +14,7 @@
 
 struct ghes {
         struct acpi_hest_generic *generic;
-        struct acpi_generic_status *estatus;
+        struct acpi_hest_generic_status *estatus;
         u64 buffer_paddr;
         unsigned long flags;
         union {
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index e863dd5c4e04..5f8cc1fa3278 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -87,20 +87,14 @@
 #define ACPI_DBG_TRACK_ALLOCATIONS
 #endif
 
-/* acpi_names configuration. Single threaded with debugger output enabled. */
-
-#ifdef ACPI_NAMES_APP
-#define ACPI_DEBUGGER
-#define ACPI_APPLICATION
-#define ACPI_SINGLE_THREADED
-#endif
-
 /*
- * acpi_bin/acpi_dump/acpi_src/acpi_xtract/Example configuration. All single
- * threaded, with no debug output.
+ * acpi_bin/acpi_dump/acpi_help/acpi_names/acpi_src/acpi_xtract/Example configuration.
+ * All single threaded.
  */
 #if (defined ACPI_BIN_APP)      || \
         (defined ACPI_DUMP_APP)     || \
+        (defined ACPI_HELP_APP)     || \
+        (defined ACPI_NAMES_APP)    || \
         (defined ACPI_SRC_APP)      || \
         (defined ACPI_XTRACT_APP)   || \
         (defined ACPI_EXAMPLE_APP)
@@ -108,12 +102,40 @@
 #define ACPI_SINGLE_THREADED
 #endif
 
+/* acpi_help configuration. Error messages disabled. */
+
 #ifdef ACPI_HELP_APP
-#define ACPI_APPLICATION
-#define ACPI_SINGLE_THREADED
 #define ACPI_NO_ERROR_MESSAGES
 #endif
 
+/* acpi_names configuration. Debug output enabled. */
+
+#ifdef ACPI_NAMES_APP
+#define ACPI_DEBUG_OUTPUT
+#endif
+
+/* acpi_exec/acpi_names/Example configuration. Native RSDP used. */
+
+#if (defined ACPI_EXEC_APP)     || \
+        (defined ACPI_EXAMPLE_APP)  || \
+        (defined ACPI_NAMES_APP)
+#define ACPI_USE_NATIVE_RSDP_POINTER
+#endif
+
+/* acpi_dump configuration. Native mapping used if provied by OSPMs */
+
+#ifdef ACPI_DUMP_APP
+#define ACPI_USE_NATIVE_MEMORY_MAPPING
+#define USE_NATIVE_ALLOCATE_ZEROED
+#endif
+
+/* acpi_names/Example configuration. Hardware disabled */
+
+#if (defined ACPI_EXAMPLE_APP)  || \
+        (defined ACPI_NAMES_APP)
+#define ACPI_REDUCED_HARDWARE 1
+#endif
+
 /* Linkable ACPICA library */
 
 #ifdef ACPI_LIBRARY
@@ -185,6 +207,9 @@
 #elif defined(_AED_EFI)
 #include "acefi.h"
 
+#elif defined(_GNU_EFI)
+#include "acefi.h"
+
 #elif defined(__HAIKU__)
 #include "achaiku.h"
 
@@ -399,8 +424,12 @@ typedef char *va_list;
 #ifdef ACPI_APPLICATION
 #include <stdio.h>
 #define ACPI_FILE              FILE *
+#define ACPI_FILE_OUT          stdout
+#define ACPI_FILE_ERR          stderr
 #else
 #define ACPI_FILE              void *
+#define ACPI_FILE_OUT          NULL
+#define ACPI_FILE_ERR          NULL
 #endif                          /* ACPI_APPLICATION */
 #endif                          /* ACPI_FILE */
 
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index cd1f052d55bb..1ba7c190c2cc 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -44,6 +44,16 @@
 #ifndef __ACLINUX_H__
 #define __ACLINUX_H__
 
+#ifdef __KERNEL__
+
+/* ACPICA external files should not include ACPICA headers directly. */
+
+#if !defined(BUILDING_ACPICA) && !defined(_LINUX_ACPI_H)
+#error "Please don't include <acpi/acpi.h> directly, include <linux/acpi.h> instead."
+#endif
+
+#endif
+
 /* Common (in-kernel/user-space) ACPICA configuration */
 
 #define ACPI_USE_SYSTEM_CLIBRARY
@@ -70,7 +80,9 @@
 #ifdef EXPORT_ACPI_INTERFACES
 #include <linux/export.h>
 #endif
+#ifdef CONFIG_ACPI
 #include <asm/acenv.h>
+#endif
 
 #ifndef CONFIG_ACPI
 
diff --git a/include/acpi/platform/aclinuxex.h b/include/acpi/platform/aclinuxex.h
index 191e741cfa0e..568d4b886712 100644
--- a/include/acpi/platform/aclinuxex.h
+++ b/include/acpi/platform/aclinuxex.h
@@ -46,6 +46,28 @@
 
 #ifdef __KERNEL__
 
+#ifndef ACPI_USE_NATIVE_DIVIDE
+
+#ifndef ACPI_DIV_64_BY_32
+#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \
+        do { \
+                u64 (__n) = ((u64) n_hi) << 32 | (n_lo); \
+                (r32) = do_div ((__n), (d32)); \
+                (q32) = (u32) (__n); \
+        } while (0)
+#endif
+
+#ifndef ACPI_SHIFT_RIGHT_64
+#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \
+        do { \
+                (n_lo) >>= 1; \
+                (n_lo) |= (((n_hi) & 1) << 31); \
+                (n_hi) >>= 1; \
+        } while (0)
+#endif
+
+#endif
+
 /*
  * Overrides for in-kernel ACPICA
  */
diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h
index a6806a94250d..2e29d13fc154 100644
--- a/include/asm-generic/io-64-nonatomic-hi-lo.h
+++ b/include/asm-generic/io-64-nonatomic-hi-lo.h
@@ -4,8 +4,7 @@
 #include <linux/io.h>
 #include <asm-generic/int-ll64.h>
 
-#ifndef readq
-static inline __u64 readq(const volatile void __iomem *addr)
+static inline __u64 hi_lo_readq(const volatile void __iomem *addr)
 {
         const volatile u32 __iomem *p = addr;
         u32 low, high;
@@ -15,14 +14,19 @@ static inline __u64 readq(const volatile void __iomem *addr)
 
         return low + ((u64)high << 32);
 }
-#endif
 
-#ifndef writeq
-static inline void writeq(__u64 val, volatile void __iomem *addr)
+static inline void hi_lo_writeq(__u64 val, volatile void __iomem *addr)
 {
         writel(val >> 32, addr + 4);
         writel(val, addr);
 }
+
+#ifndef readq
+#define readq hi_lo_readq
+#endif
+
+#ifndef writeq
+#define writeq hi_lo_writeq
 #endif
 
 #endif  /* _ASM_IO_64_NONATOMIC_HI_LO_H_ */
diff --git a/include/asm-generic/io-64-nonatomic-lo-hi.h b/include/asm-generic/io-64-nonatomic-lo-hi.h
index ca546b1ff8b5..0efacff0a1ce 100644
--- a/include/asm-generic/io-64-nonatomic-lo-hi.h
+++ b/include/asm-generic/io-64-nonatomic-lo-hi.h
@@ -4,8 +4,7 @@
 #include <linux/io.h>
 #include <asm-generic/int-ll64.h>
 
-#ifndef readq
-static inline __u64 readq(const volatile void __iomem *addr)
+static inline __u64 lo_hi_readq(const volatile void __iomem *addr)
 {
         const volatile u32 __iomem *p = addr;
         u32 low, high;
@@ -15,14 +14,19 @@ static inline __u64 readq(const volatile void __iomem *addr)
 
         return low + ((u64)high << 32);
 }
-#endif
 
-#ifndef writeq
-static inline void writeq(__u64 val, volatile void __iomem *addr)
+static inline void lo_hi_writeq(__u64 val, volatile void __iomem *addr)
 {
         writel(val, addr);
         writel(val >> 32, addr + 4);
 }
+
+#ifndef readq
+#define readq lo_hi_readq
+#endif
+
+#ifndef writeq
+#define writeq lo_hi_writeq
 #endif
 
 #endif  /* _ASM_IO_64_NONATOMIC_LO_HI_H_ */
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h
index 0703aa75b5e8..4d9f233c4ba8 100644
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@ -36,93 +36,385 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
 #endif
 
 /*
- * Add a offset to a pointer but keep the pointer as is.
- *
- * Only S390 provides its own means of moving the pointer.
+ * Arch may define arch_raw_cpu_ptr() to provide more efficient address
+ * translations for raw_cpu_ptr().
  */
-#ifndef SHIFT_PERCPU_PTR
-/* Weird cast keeps both GCC and sparse happy. */
-#define SHIFT_PERCPU_PTR(__p, __offset) ({                              \
-        __verify_pcpu_ptr((__p));                                       \
-        RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)); \
-})
+#ifndef arch_raw_cpu_ptr
+#define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset)
 #endif
 
-/*
- * A percpu variable may point to a discarded regions. The following are
- * established ways to produce a usable pointer from the percpu variable
- * offset.
- */
-#define per_cpu(var, cpu) \
-        (*SHIFT_PERCPU_PTR(&(var), per_cpu_offset(cpu)))
-
-#ifndef raw_cpu_ptr
-#define raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset)
+#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA
+extern void setup_per_cpu_areas(void);
 #endif
-#ifdef CONFIG_DEBUG_PREEMPT
-#define this_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, my_cpu_offset)
+
+#endif  /* SMP */
+
+#ifndef PER_CPU_BASE_SECTION
+#ifdef CONFIG_SMP
+#define PER_CPU_BASE_SECTION ".data..percpu"
 #else
-#define this_cpu_ptr(ptr) raw_cpu_ptr(ptr)
+#define PER_CPU_BASE_SECTION ".data"
+#endif
 #endif
 
-#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
-#define __raw_get_cpu_var(var) (*raw_cpu_ptr(&(var)))
+#ifndef PER_CPU_ATTRIBUTES
+#define PER_CPU_ATTRIBUTES
+#endif
 
-#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA
-extern void setup_per_cpu_areas(void);
+#ifndef PER_CPU_DEF_ATTRIBUTES
+#define PER_CPU_DEF_ATTRIBUTES
 #endif
 
-#else /* ! SMP */
+#define raw_cpu_generic_to_op(pcp, val, op)                             \
+do {                                                                    \
+        *raw_cpu_ptr(&(pcp)) op val;                                    \
+} while (0)
 
-#define VERIFY_PERCPU_PTR(__p) ({                       \
-        __verify_pcpu_ptr((__p));                       \
-        (typeof(*(__p)) __kernel __force *)(__p);       \
+#define raw_cpu_generic_add_return(pcp, val)                            \
+({                                                                      \
+        raw_cpu_add(pcp, val);                                          \
+        raw_cpu_read(pcp);                                              \
 })
 
-#define per_cpu(var, cpu)       (*((void)(cpu), VERIFY_PERCPU_PTR(&(var))))
-#define __get_cpu_var(var)      (*VERIFY_PERCPU_PTR(&(var)))
-#define __raw_get_cpu_var(var)  (*VERIFY_PERCPU_PTR(&(var)))
-#define this_cpu_ptr(ptr)       per_cpu_ptr(ptr, 0)
-#define raw_cpu_ptr(ptr)        this_cpu_ptr(ptr)
+#define raw_cpu_generic_xchg(pcp, nval)                                 \
+({                                                                      \
+        typeof(pcp) __ret;                                              \
+        __ret = raw_cpu_read(pcp);                                      \
+        raw_cpu_write(pcp, nval);                                       \
+        __ret;                                                          \
+})
 
-#endif  /* SMP */
+#define raw_cpu_generic_cmpxchg(pcp, oval, nval)                        \
+({                                                                      \
+        typeof(pcp) __ret;                                              \
+        __ret = raw_cpu_read(pcp);                                      \
+        if (__ret == (oval))                                            \
+                raw_cpu_write(pcp, nval);                               \
+        __ret;                                                          \
+})
 
-#ifndef PER_CPU_BASE_SECTION
-#ifdef CONFIG_SMP
-#define PER_CPU_BASE_SECTION ".data..percpu"
-#else
-#define PER_CPU_BASE_SECTION ".data"
+#define raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+({                                                                      \
+        int __ret = 0;                                                  \
+        if (raw_cpu_read(pcp1) == (oval1) &&                            \
+                         raw_cpu_read(pcp2)  == (oval2)) {              \
+                raw_cpu_write(pcp1, nval1);                             \
+                raw_cpu_write(pcp2, nval2);                             \
+                __ret = 1;                                              \
+        }                                                               \
+        (__ret);                                                        \
+})
+
+#define this_cpu_generic_read(pcp)                                      \
+({                                                                      \
+        typeof(pcp) __ret;                                              \
+        preempt_disable();                                              \
+        __ret = *this_cpu_ptr(&(pcp));                                  \
+        preempt_enable();                                               \
+        __ret;                                                          \
+})
+
+#define this_cpu_generic_to_op(pcp, val, op)                            \
+do {                                                                    \
+        unsigned long __flags;                                          \
+        raw_local_irq_save(__flags);                                    \
+        *raw_cpu_ptr(&(pcp)) op val;                                    \
+        raw_local_irq_restore(__flags);                                 \
+} while (0)
+
+#define this_cpu_generic_add_return(pcp, val)                           \
+({                                                                      \
+        typeof(pcp) __ret;                                              \
+        unsigned long __flags;                                          \
+        raw_local_irq_save(__flags);                                    \
+        raw_cpu_add(pcp, val);                                          \
+        __ret = raw_cpu_read(pcp);                                      \
+        raw_local_irq_restore(__flags);                                 \
+        __ret;                                                          \
+})
+
+#define this_cpu_generic_xchg(pcp, nval)                                \
+({                                                                      \
+        typeof(pcp) __ret;                                              \
+        unsigned long __flags;                                          \
+        raw_local_irq_save(__flags);                                    \
+        __ret = raw_cpu_read(pcp);                                      \
+        raw_cpu_write(pcp, nval);                                       \
+        raw_local_irq_restore(__flags);                                 \
+        __ret;                                                          \
+})
+
+#define this_cpu_generic_cmpxchg(pcp, oval, nval)                       \
+({                                                                      \
+        typeof(pcp) __ret;                                              \
+        unsigned long __flags;                                          \
+        raw_local_irq_save(__flags);                                    \
+        __ret = raw_cpu_read(pcp);                                      \
+        if (__ret == (oval))                                            \
+                raw_cpu_write(pcp, nval);                               \
+        raw_local_irq_restore(__flags);                                 \
+        __ret;                                                          \
+})
+
+#define this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+({                                                                      \
+        int __ret;                                                      \
+        unsigned long __flags;                                          \
+        raw_local_irq_save(__flags);                                    \
+        __ret = raw_cpu_generic_cmpxchg_double(pcp1, pcp2,              \
+                        oval1, oval2, nval1, nval2);                    \
+        raw_local_irq_restore(__flags);                                 \
+        __ret;                                                          \
+})
+
+#ifndef raw_cpu_read_1
+#define raw_cpu_read_1(pcp)             (*raw_cpu_ptr(&(pcp)))
 #endif
+#ifndef raw_cpu_read_2
+#define raw_cpu_read_2(pcp)             (*raw_cpu_ptr(&(pcp)))
+#endif
+#ifndef raw_cpu_read_4
+#define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
+#endif
+#ifndef raw_cpu_read_8
+#define raw_cpu_read_8(pcp)             (*raw_cpu_ptr(&(pcp)))
 #endif
 
-#ifdef CONFIG_SMP
+#ifndef raw_cpu_write_1
+#define raw_cpu_write_1(pcp, val)       raw_cpu_generic_to_op(pcp, val, =)
+#endif
+#ifndef raw_cpu_write_2
+#define raw_cpu_write_2(pcp, val)       raw_cpu_generic_to_op(pcp, val, =)
+#endif
+#ifndef raw_cpu_write_4
+#define raw_cpu_write_4(pcp, val)       raw_cpu_generic_to_op(pcp, val, =)
+#endif
+#ifndef raw_cpu_write_8
+#define raw_cpu_write_8(pcp, val)       raw_cpu_generic_to_op(pcp, val, =)
+#endif
 
-#ifdef MODULE
-#define PER_CPU_SHARED_ALIGNED_SECTION ""
-#define PER_CPU_ALIGNED_SECTION ""
-#else
-#define PER_CPU_SHARED_ALIGNED_SECTION "..shared_aligned"
-#define PER_CPU_ALIGNED_SECTION "..shared_aligned"
+#ifndef raw_cpu_add_1
+#define raw_cpu_add_1(pcp, val)         raw_cpu_generic_to_op(pcp, val, +=)
+#endif
+#ifndef raw_cpu_add_2
+#define raw_cpu_add_2(pcp, val)         raw_cpu_generic_to_op(pcp, val, +=)
+#endif
+#ifndef raw_cpu_add_4
+#define raw_cpu_add_4(pcp, val)         raw_cpu_generic_to_op(pcp, val, +=)
+#endif
+#ifndef raw_cpu_add_8
+#define raw_cpu_add_8(pcp, val)         raw_cpu_generic_to_op(pcp, val, +=)
 #endif
-#define PER_CPU_FIRST_SECTION "..first"
 
-#else
+#ifndef raw_cpu_and_1
+#define raw_cpu_and_1(pcp, val)         raw_cpu_generic_to_op(pcp, val, &=)
+#endif
+#ifndef raw_cpu_and_2
+#define raw_cpu_and_2(pcp, val)         raw_cpu_generic_to_op(pcp, val, &=)
+#endif
+#ifndef raw_cpu_and_4
+#define raw_cpu_and_4(pcp, val)         raw_cpu_generic_to_op(pcp, val, &=)
+#endif
+#ifndef raw_cpu_and_8
+#define raw_cpu_and_8(pcp, val)         raw_cpu_generic_to_op(pcp, val, &=)
+#endif
+
+#ifndef raw_cpu_or_1
+#define raw_cpu_or_1(pcp, val)          raw_cpu_generic_to_op(pcp, val, |=)
+#endif
+#ifndef raw_cpu_or_2
+#define raw_cpu_or_2(pcp, val)          raw_cpu_generic_to_op(pcp, val, |=)
+#endif
+#ifndef raw_cpu_or_4
+#define raw_cpu_or_4(pcp, val)          raw_cpu_generic_to_op(pcp, val, |=)
+#endif
+#ifndef raw_cpu_or_8
+#define raw_cpu_or_8(pcp, val)          raw_cpu_generic_to_op(pcp, val, |=)
+#endif
 
-#define PER_CPU_SHARED_ALIGNED_SECTION ""
-#define PER_CPU_ALIGNED_SECTION "..shared_aligned"
-#define PER_CPU_FIRST_SECTION ""
+#ifndef raw_cpu_add_return_1
+#define raw_cpu_add_return_1(pcp, val)  raw_cpu_generic_add_return(pcp, val)
+#endif
+#ifndef raw_cpu_add_return_2
+#define raw_cpu_add_return_2(pcp, val)  raw_cpu_generic_add_return(pcp, val)
+#endif
+#ifndef raw_cpu_add_return_4
+#define raw_cpu_add_return_4(pcp, val)  raw_cpu_generic_add_return(pcp, val)
+#endif
+#ifndef raw_cpu_add_return_8
+#define raw_cpu_add_return_8(pcp, val)  raw_cpu_generic_add_return(pcp, val)
+#endif
 
+#ifndef raw_cpu_xchg_1
+#define raw_cpu_xchg_1(pcp, nval)       raw_cpu_generic_xchg(pcp, nval)
+#endif
+#ifndef raw_cpu_xchg_2
+#define raw_cpu_xchg_2(pcp, nval)       raw_cpu_generic_xchg(pcp, nval)
+#endif
+#ifndef raw_cpu_xchg_4
+#define raw_cpu_xchg_4(pcp, nval)       raw_cpu_generic_xchg(pcp, nval)
+#endif
+#ifndef raw_cpu_xchg_8
+#define raw_cpu_xchg_8(pcp, nval)       raw_cpu_generic_xchg(pcp, nval)
 #endif
 
-#ifndef PER_CPU_ATTRIBUTES
-#define PER_CPU_ATTRIBUTES
+#ifndef raw_cpu_cmpxchg_1
+#define raw_cpu_cmpxchg_1(pcp, oval, nval) \
+        raw_cpu_generic_cmpxchg(pcp, oval, nval)
+#endif
+#ifndef raw_cpu_cmpxchg_2
+#define raw_cpu_cmpxchg_2(pcp, oval, nval) \
+        raw_cpu_generic_cmpxchg(pcp, oval, nval)
+#endif
+#ifndef raw_cpu_cmpxchg_4
+#define raw_cpu_cmpxchg_4(pcp, oval, nval) \
+        raw_cpu_generic_cmpxchg(pcp, oval, nval)
+#endif
+#ifndef raw_cpu_cmpxchg_8
+#define raw_cpu_cmpxchg_8(pcp, oval, nval) \
+        raw_cpu_generic_cmpxchg(pcp, oval, nval)
 #endif
 
-#ifndef PER_CPU_DEF_ATTRIBUTES
-#define PER_CPU_DEF_ATTRIBUTES
+#ifndef raw_cpu_cmpxchg_double_1
+#define raw_cpu_cmpxchg_double_1(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
+#endif
+#ifndef raw_cpu_cmpxchg_double_2
+#define raw_cpu_cmpxchg_double_2(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
+#endif
+#ifndef raw_cpu_cmpxchg_double_4
+#define raw_cpu_cmpxchg_double_4(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
+#endif
+#ifndef raw_cpu_cmpxchg_double_8
+#define raw_cpu_cmpxchg_double_8(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
+#endif
+
+#ifndef this_cpu_read_1
+#define this_cpu_read_1(pcp)            this_cpu_generic_read(pcp)
+#endif
+#ifndef this_cpu_read_2
+#define this_cpu_read_2(pcp)            this_cpu_generic_read(pcp)
+#endif
+#ifndef this_cpu_read_4
+#define this_cpu_read_4(pcp)            this_cpu_generic_read(pcp)
+#endif
+#ifndef this_cpu_read_8
+#define this_cpu_read_8(pcp)            this_cpu_generic_read(pcp)
 #endif
 
-/* Keep until we have removed all uses of __this_cpu_ptr */
-#define __this_cpu_ptr raw_cpu_ptr
+#ifndef this_cpu_write_1
+#define this_cpu_write_1(pcp, val)      this_cpu_generic_to_op(pcp, val, =)
+#endif
+#ifndef this_cpu_write_2
+#define this_cpu_write_2(pcp, val)      this_cpu_generic_to_op(pcp, val, =)
+#endif
+#ifndef this_cpu_write_4
+#define this_cpu_write_4(pcp, val)      this_cpu_generic_to_op(pcp, val, =)
+#endif
+#ifndef this_cpu_write_8
+#define this_cpu_write_8(pcp, val)      this_cpu_generic_to_op(pcp, val, =)
+#endif
+
+#ifndef this_cpu_add_1
+#define this_cpu_add_1(pcp, val)        this_cpu_generic_to_op(pcp, val, +=)
+#endif
+#ifndef this_cpu_add_2
+#define this_cpu_add_2(pcp, val)        this_cpu_generic_to_op(pcp, val, +=)
+#endif
+#ifndef this_cpu_add_4
+#define this_cpu_add_4(pcp, val)        this_cpu_generic_to_op(pcp, val, +=)
+#endif
+#ifndef this_cpu_add_8
+#define this_cpu_add_8(pcp, val)        this_cpu_generic_to_op(pcp, val, +=)
+#endif
+
+#ifndef this_cpu_and_1
+#define this_cpu_and_1(pcp, val)        this_cpu_generic_to_op(pcp, val, &=)
+#endif
+#ifndef this_cpu_and_2
+#define this_cpu_and_2(pcp, val)        this_cpu_generic_to_op(pcp, val, &=)
+#endif
+#ifndef this_cpu_and_4
+#define this_cpu_and_4(pcp, val)        this_cpu_generic_to_op(pcp, val, &=)
+#endif
+#ifndef this_cpu_and_8
+#define this_cpu_and_8(pcp, val)        this_cpu_generic_to_op(pcp, val, &=)
+#endif
+
+#ifndef this_cpu_or_1
+#define this_cpu_or_1(pcp, val)         this_cpu_generic_to_op(pcp, val, |=)
+#endif
+#ifndef this_cpu_or_2
+#define this_cpu_or_2(pcp, val)         this_cpu_generic_to_op(pcp, val, |=)
+#endif
+#ifndef this_cpu_or_4
+#define this_cpu_or_4(pcp, val)         this_cpu_generic_to_op(pcp, val, |=)
+#endif
+#ifndef this_cpu_or_8
+#define this_cpu_or_8(pcp, val)         this_cpu_generic_to_op(pcp, val, |=)
+#endif
+
+#ifndef this_cpu_add_return_1
+#define this_cpu_add_return_1(pcp, val) this_cpu_generic_add_return(pcp, val)
+#endif
+#ifndef this_cpu_add_return_2
+#define this_cpu_add_return_2(pcp, val) this_cpu_generic_add_return(pcp, val)
+#endif
+#ifndef this_cpu_add_return_4
+#define this_cpu_add_return_4(pcp, val) this_cpu_generic_add_return(pcp, val)
+#endif
+#ifndef this_cpu_add_return_8
+#define this_cpu_add_return_8(pcp, val) this_cpu_generic_add_return(pcp, val)
+#endif
+
+#ifndef this_cpu_xchg_1
+#define this_cpu_xchg_1(pcp, nval)      this_cpu_generic_xchg(pcp, nval)
+#endif
+#ifndef this_cpu_xchg_2
+#define this_cpu_xchg_2(pcp, nval)      this_cpu_generic_xchg(pcp, nval)
+#endif
+#ifndef this_cpu_xchg_4
+#define this_cpu_xchg_4(pcp, nval)      this_cpu_generic_xchg(pcp, nval)
+#endif
+#ifndef this_cpu_xchg_8
+#define this_cpu_xchg_8(pcp, nval)      this_cpu_generic_xchg(pcp, nval)
+#endif
+
+#ifndef this_cpu_cmpxchg_1
+#define this_cpu_cmpxchg_1(pcp, oval, nval) \
+        this_cpu_generic_cmpxchg(pcp, oval, nval)
+#endif
+#ifndef this_cpu_cmpxchg_2
+#define this_cpu_cmpxchg_2(pcp, oval, nval) \
+        this_cpu_generic_cmpxchg(pcp, oval, nval)
+#endif
+#ifndef this_cpu_cmpxchg_4
+#define this_cpu_cmpxchg_4(pcp, oval, nval) \
+        this_cpu_generic_cmpxchg(pcp, oval, nval)
+#endif
+#ifndef this_cpu_cmpxchg_8
+#define this_cpu_cmpxchg_8(pcp, oval, nval) \
+        this_cpu_generic_cmpxchg(pcp, oval, nval)
+#endif
+
+#ifndef this_cpu_cmpxchg_double_1
+#define this_cpu_cmpxchg_double_1(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
+#endif
+#ifndef this_cpu_cmpxchg_double_2
+#define this_cpu_cmpxchg_double_2(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
+#endif
+#ifndef this_cpu_cmpxchg_double_4
+#define this_cpu_cmpxchg_double_4(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
+#endif
+#ifndef this_cpu_cmpxchg_double_8
+#define this_cpu_cmpxchg_double_8(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
+#endif
 
 #endif /* _ASM_GENERIC_PERCPU_H_ */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c1c0b0cf39b4..5ba0360663a7 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -268,6 +268,9 @@
                 VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .;         \
                 *(.pci_fixup_suspend)                                   \
                 VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .;           \
+                VMLINUX_SYMBOL(__start_pci_fixups_suspend_late) = .;    \
+                *(.pci_fixup_suspend_late)                              \
+                VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .;      \
         }                                                               \
                                                                         \
         /* Built-in firmware blobs */                                   \
diff --git a/include/clocksource/pxa.h b/include/clocksource/pxa.h
new file mode 100644
index 000000000000..1efbe5a66958
--- /dev/null
+++ b/include/clocksource/pxa.h
@@ -0,0 +1,18 @@
+/*
+ * PXA clocksource, clockevents, and OST interrupt handlers.
+ *
+ * Copyright (C) 2014 Robert Jarzmik
+ *
+ * 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.
+ *
+ */
+
+#ifndef _CLOCKSOURCE_PXA_H
+#define _CLOCKSOURCE_PXA_H
+
+extern void pxa_timer_nodt_init(int irq, void __iomem *base,
+                           unsigned long clock_tick_rate);
+
+#endif
diff --git a/include/crypto/aead.h b/include/crypto/aead.h
index 0edf949f6369..94b19be67574 100644
--- a/include/crypto/aead.h
+++ b/include/crypto/aead.h
@@ -75,9 +75,9 @@ static inline void aead_givcrypt_free(struct aead_givcrypt_request *req)
 
 static inline void aead_givcrypt_set_callback(
         struct aead_givcrypt_request *req, u32 flags,
-        crypto_completion_t complete, void *data)
+        crypto_completion_t compl, void *data)
 {
-        aead_request_set_callback(&req->areq, flags, complete, data);
+        aead_request_set_callback(&req->areq, flags, compl, data);
 }
 
 static inline void aead_givcrypt_set_crypt(struct aead_givcrypt_request *req,
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 016c2f110f63..623a59c1ff5a 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -410,4 +410,10 @@ static inline int crypto_memneq(const void *a, const void *b, size_t size)
         return __crypto_memneq(a, b, size) != 0UL ? 1 : 0;
 }
 
+static inline void crypto_yield(u32 flags)
+{
+        if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)
+                cond_resched();
+}
+
 #endif  /* _CRYPTO_ALGAPI_H */
diff --git a/include/crypto/des.h b/include/crypto/des.h
index 2971c6304ade..fc6274c6bb26 100644
--- a/include/crypto/des.h
+++ b/include/crypto/des.h
@@ -16,4 +16,7 @@
 
 extern unsigned long des_ekey(u32 *pe, const u8 *k);
 
+extern int __des3_ede_setkey(u32 *expkey, u32 *flags, const u8 *key,
+                             unsigned int keylen);
+
 #endif /* __CRYPTO_DES_H */
diff --git a/include/crypto/drbg.h b/include/crypto/drbg.h
new file mode 100644
index 000000000000..831d786976c5
--- /dev/null
+++ b/include/crypto/drbg.h
@@ -0,0 +1,290 @@
+/*
+ * DRBG based on NIST SP800-90A
+ *
+ * Copyright Stephan Mueller <smueller@chronox.de>, 2014
+ *
+ * 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, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 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. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * ALTERNATIVELY, this product may be distributed under the terms of
+ * the GNU General Public License, in which case the provisions of the GPL are
+ * required INSTEAD OF the above restrictions.  (This clause is
+ * necessary due to a potential bad interaction between the GPL and
+ * the restrictions contained in a BSD-style copyright.)
+ *
+ * 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, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+
+#ifndef _DRBG_H
+#define _DRBG_H
+
+
+#include <linux/random.h>
+#include <linux/scatterlist.h>
+#include <crypto/hash.h>
+#include <linux/module.h>
+#include <linux/crypto.h>
+#include <linux/slab.h>
+#include <crypto/internal/rng.h>
+#include <crypto/rng.h>
+#include <linux/fips.h>
+#include <linux/spinlock.h>
+#include <linux/list.h>
+
+/*
+ * Concatenation Helper and string operation helper
+ *
+ * SP800-90A requires the concatenation of different data. To avoid copying
+ * buffers around or allocate additional memory, the following data structure
+ * is used to point to the original memory with its size. In addition, it
+ * is used to build a linked list. The linked list defines the concatenation
+ * of individual buffers. The order of memory block referenced in that
+ * linked list determines the order of concatenation.
+ */
+struct drbg_string {
+        const unsigned char *buf;
+        size_t len;
+        struct list_head list;
+};
+
+static inline void drbg_string_fill(struct drbg_string *string,
+                                    const unsigned char *buf, size_t len)
+{
+        string->buf = buf;
+        string->len = len;
+        INIT_LIST_HEAD(&string->list);
+}
+
+struct drbg_state;
+typedef uint32_t drbg_flag_t;
+
+struct drbg_core {
+        drbg_flag_t flags;      /* flags for the cipher */
+        __u8 statelen;          /* maximum state length */
+        /*
+         * maximum length of personalization string or additional input
+         * string -- exponent for base 2
+         */
+        __u8 max_addtllen;
+        /* maximum bits per RNG request -- exponent for base 2*/
+        __u8 max_bits;
+        /* maximum number of requests -- exponent for base 2 */
+        __u8 max_req;
+        __u8 blocklen_bytes;    /* block size of output in bytes */
+        char cra_name[CRYPTO_MAX_ALG_NAME]; /* mapping to kernel crypto API */
+         /* kernel crypto API backend cipher name */
+        char backend_cra_name[CRYPTO_MAX_ALG_NAME];
+};
+
+struct drbg_state_ops {
+        int (*update)(struct drbg_state *drbg, struct list_head *seed,
+                      int reseed);
+        int (*generate)(struct drbg_state *drbg,
+                        unsigned char *buf, unsigned int buflen,
+                        struct list_head *addtl);
+        int (*crypto_init)(struct drbg_state *drbg);
+        int (*crypto_fini)(struct drbg_state *drbg);
+
+};
+
+struct drbg_test_data {
+        struct drbg_string *testentropy; /* TEST PARAMETER: test entropy */
+};
+
+struct drbg_state {
+        spinlock_t drbg_lock;   /* lock around DRBG */
+        unsigned char *V;       /* internal state 10.1.1.1 1a) */
+        /* hash: static value 10.1.1.1 1b) hmac / ctr: key */
+        unsigned char *C;
+        /* Number of RNG requests since last reseed -- 10.1.1.1 1c) */
+        size_t reseed_ctr;
+         /* some memory the DRBG can use for its operation */
+        unsigned char *scratchpad;
+        void *priv_data;        /* Cipher handle */
+        bool seeded;            /* DRBG fully seeded? */
+        bool pr;                /* Prediction resistance enabled? */
+#ifdef CONFIG_CRYPTO_FIPS
+        bool fips_primed;       /* Continuous test primed? */
+        unsigned char *prev;    /* FIPS 140-2 continuous test value */
+#endif
+        const struct drbg_state_ops *d_ops;
+        const struct drbg_core *core;
+        struct drbg_test_data *test_data;
+};
+
+static inline __u8 drbg_statelen(struct drbg_state *drbg)
+{
+        if (drbg && drbg->core)
+                return drbg->core->statelen;
+        return 0;
+}
+
+static inline __u8 drbg_blocklen(struct drbg_state *drbg)
+{
+        if (drbg && drbg->core)
+                return drbg->core->blocklen_bytes;
+        return 0;
+}
+
+static inline __u8 drbg_keylen(struct drbg_state *drbg)
+{
+        if (drbg && drbg->core)
+                return (drbg->core->statelen - drbg->core->blocklen_bytes);
+        return 0;
+}
+
+static inline size_t drbg_max_request_bytes(struct drbg_state *drbg)
+{
+        /* max_bits is in bits, but buflen is in bytes */
+        return (1 << (drbg->core->max_bits - 3));
+}
+
+static inline size_t drbg_max_addtl(struct drbg_state *drbg)
+{
+        return (1UL<<(drbg->core->max_addtllen));
+}
+
+static inline size_t drbg_max_requests(struct drbg_state *drbg)
+{
+        return (1UL<<(drbg->core->max_req));
+}
+
+/*
+ * kernel crypto API input data structure for DRBG generate in case dlen
+ * is set to 0
+ */
+struct drbg_gen {
+        unsigned char *outbuf;  /* output buffer for random numbers */
+        unsigned int outlen;    /* size of output buffer */
+        struct drbg_string *addtl;      /* additional information string */
+        struct drbg_test_data *test_data;       /* test data */
+};
+
+/*
+ * This is a wrapper to the kernel crypto API function of
+ * crypto_rng_get_bytes() to allow the caller to provide additional data.
+ *
+ * @drng DRBG handle -- see crypto_rng_get_bytes
+ * @outbuf output buffer -- see crypto_rng_get_bytes
+ * @outlen length of output buffer -- see crypto_rng_get_bytes
+ * @addtl_input additional information string input buffer
+ * @addtllen length of additional information string buffer
+ *
+ * return
+ *      see crypto_rng_get_bytes
+ */
+static inline int crypto_drbg_get_bytes_addtl(struct crypto_rng *drng,
+                        unsigned char *outbuf, unsigned int outlen,
+                        struct drbg_string *addtl)
+{
+        int ret;
+        struct drbg_gen genbuf;
+        genbuf.outbuf = outbuf;
+        genbuf.outlen = outlen;
+        genbuf.addtl = addtl;
+        genbuf.test_data = NULL;
+        ret = crypto_rng_get_bytes(drng, (u8 *)&genbuf, 0);
+        return ret;
+}
+
+/*
+ * TEST code
+ *
+ * This is a wrapper to the kernel crypto API function of
+ * crypto_rng_get_bytes() to allow the caller to provide additional data and
+ * allow furnishing of test_data
+ *
+ * @drng DRBG handle -- see crypto_rng_get_bytes
+ * @outbuf output buffer -- see crypto_rng_get_bytes
+ * @outlen length of output buffer -- see crypto_rng_get_bytes
+ * @addtl_input additional information string input buffer
+ * @addtllen length of additional information string buffer
+ * @test_data filled test data
+ *
+ * return
+ *      see crypto_rng_get_bytes
+ */
+static inline int crypto_drbg_get_bytes_addtl_test(struct crypto_rng *drng,
+                        unsigned char *outbuf, unsigned int outlen,
+                        struct drbg_string *addtl,
+                        struct drbg_test_data *test_data)
+{
+        int ret;
+        struct drbg_gen genbuf;
+        genbuf.outbuf = outbuf;
+        genbuf.outlen = outlen;
+        genbuf.addtl = addtl;
+        genbuf.test_data = test_data;
+        ret = crypto_rng_get_bytes(drng, (u8 *)&genbuf, 0);
+        return ret;
+}
+
+/*
+ * TEST code
+ *
+ * This is a wrapper to the kernel crypto API function of
+ * crypto_rng_reset() to allow the caller to provide test_data
+ *
+ * @drng DRBG handle -- see crypto_rng_reset
+ * @pers personalization string input buffer
+ * @perslen length of additional information string buffer
+ * @test_data filled test data
+ *
+ * return
+ *      see crypto_rng_reset
+ */
+static inline int crypto_drbg_reset_test(struct crypto_rng *drng,
+                                         struct drbg_string *pers,
+                                         struct drbg_test_data *test_data)
+{
+        int ret;
+        struct drbg_gen genbuf;
+        genbuf.outbuf = NULL;
+        genbuf.outlen = 0;
+        genbuf.addtl = pers;
+        genbuf.test_data = test_data;
+        ret = crypto_rng_reset(drng, (u8 *)&genbuf, 0);
+        return ret;
+}
+
+/* DRBG type flags */
+#define DRBG_CTR        ((drbg_flag_t)1<<0)
+#define DRBG_HMAC       ((drbg_flag_t)1<<1)
+#define DRBG_HASH       ((drbg_flag_t)1<<2)
+#define DRBG_TYPE_MASK  (DRBG_CTR | DRBG_HMAC | DRBG_HASH)
+/* DRBG strength flags */
+#define DRBG_STRENGTH128        ((drbg_flag_t)1<<3)
+#define DRBG_STRENGTH192        ((drbg_flag_t)1<<4)
+#define DRBG_STRENGTH256        ((drbg_flag_t)1<<5)
+#define DRBG_STRENGTH_MASK      (DRBG_STRENGTH128 | DRBG_STRENGTH192 | \
+                                 DRBG_STRENGTH256)
+
+enum drbg_prefixes {
+        DRBG_PREFIX0 = 0x00,
+        DRBG_PREFIX1,
+        DRBG_PREFIX2,
+        DRBG_PREFIX3
+};
+
+#endif /* _DRBG_H */
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index 26cb1eb16f4c..a39195539601 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -238,10 +238,10 @@ static inline struct ahash_request *ahash_request_cast(
 
 static inline void ahash_request_set_callback(struct ahash_request *req,
                                               u32 flags,
-                                              crypto_completion_t complete,
+                                              crypto_completion_t compl,
                                               void *data)
 {
-        req->base.complete = complete;
+        req->base.complete = compl;
         req->base.data = data;
         req->base.flags = flags;
 }
diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h
index 06e8b32d541c..b3a46c515d1b 100644
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
@@ -81,8 +81,7 @@ static inline int skcipher_enqueue_givcrypt(
 static inline struct skcipher_givcrypt_request *skcipher_dequeue_givcrypt(
         struct crypto_queue *queue)
 {
-        return __crypto_dequeue_request(
-                queue, offsetof(struct skcipher_givcrypt_request, creq.base));
+        return skcipher_givcrypt_cast(crypto_dequeue_request(queue));
 }
 
 static inline void *skcipher_givcrypt_reqctx(
diff --git a/include/crypto/pkcs7.h b/include/crypto/pkcs7.h
new file mode 100644
index 000000000000..691c79172a26
--- /dev/null
+++ b/include/crypto/pkcs7.h
@@ -0,0 +1,36 @@
+/* PKCS#7 crypto data parser
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+struct key;
+struct pkcs7_message;
+
+/*
+ * pkcs7_parser.c
+ */
+extern struct pkcs7_message *pkcs7_parse_message(const void *data,
+                                                 size_t datalen);
+extern void pkcs7_free_message(struct pkcs7_message *pkcs7);
+
+extern int pkcs7_get_content_data(const struct pkcs7_message *pkcs7,
+                                  const void **_data, size_t *_datalen,
+                                  bool want_wrapper);
+
+/*
+ * pkcs7_trust.c
+ */
+extern int pkcs7_validate_trust(struct pkcs7_message *pkcs7,
+                                struct key *trust_keyring,
+                                bool *_trusted);
+
+/*
+ * pkcs7_verify.c
+ */
+extern int pkcs7_verify(struct pkcs7_message *pkcs7);
diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h
index fc09732613ad..0d164c6af539 100644
--- a/include/crypto/public_key.h
+++ b/include/crypto/public_key.h
@@ -98,4 +98,8 @@ struct key;
 extern int verify_signature(const struct key *key,
                             const struct public_key_signature *sig);
 
+extern struct key *x509_request_asymmetric_key(struct key *keyring,
+                                               const char *issuer,
+                                               const char *key_id);
+
 #endif /* _LINUX_PUBLIC_KEY_H */
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 6a626a507b8c..7ef512f8631c 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -25,12 +25,6 @@
 #include <linux/scatterlist.h>
 #include <linux/sched.h>
 
-static inline void crypto_yield(u32 flags)
-{
-        if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)
-                cond_resched();
-}
-
 static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num,
                                         struct scatterlist *sg2)
 {
diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h
index 25fd6126522d..07d245f073d1 100644
--- a/include/crypto/skcipher.h
+++ b/include/crypto/skcipher.h
@@ -86,9 +86,9 @@ static inline void skcipher_givcrypt_free(struct skcipher_givcrypt_request *req)
 
 static inline void skcipher_givcrypt_set_callback(
         struct skcipher_givcrypt_request *req, u32 flags,
-        crypto_completion_t complete, void *data)
+        crypto_completion_t compl, void *data)
 {
-        ablkcipher_request_set_callback(&req->creq, flags, complete, data);
+        ablkcipher_request_set_callback(&req->creq, flags, compl, data);
 }
 
 static inline void skcipher_givcrypt_set_crypt(
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 8af71a8e2c00..e41f17ea1f13 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -83,6 +83,7 @@ struct drm_device;
 
 struct device_node;
 struct videomode;
+struct reservation_object;
 
 #include <drm/drm_os_linux.h>
 #include <drm/drm_hashtab.h>
@@ -923,6 +924,8 @@ struct drm_driver {
         /* low-level interface used by drm_gem_prime_{import,export} */
         int (*gem_prime_pin)(struct drm_gem_object *obj);
         void (*gem_prime_unpin)(struct drm_gem_object *obj);
+        struct reservation_object * (*gem_prime_res_obj)(
+                                struct drm_gem_object *obj);
         struct sg_table *(*gem_prime_get_sg_table)(struct drm_gem_object *obj);
         struct drm_gem_object *(*gem_prime_import_sg_table)(
                                 struct drm_device *dev, size_t size,
diff --git a/include/dt-bindings/clock/clps711x-clock.h b/include/dt-bindings/clock/clps711x-clock.h
new file mode 100644
index 000000000000..0c4c80b63242
--- /dev/null
+++ b/include/dt-bindings/clock/clps711x-clock.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>
+ *
+ * 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_CLPS711X_H
+#define __DT_BINDINGS_CLOCK_CLPS711X_H
+
+#define CLPS711X_CLK_DUMMY      0
+#define CLPS711X_CLK_CPU        1
+#define CLPS711X_CLK_BUS        2
+#define CLPS711X_CLK_PLL        3
+#define CLPS711X_CLK_TIMERREF   4
+#define CLPS711X_CLK_TIMER1     5
+#define CLPS711X_CLK_TIMER2     6
+#define CLPS711X_CLK_PWM        7
+#define CLPS711X_CLK_SPIREF     8
+#define CLPS711X_CLK_SPI        9
+#define CLPS711X_CLK_UART       10
+#define CLPS711X_CLK_TICK       11
+#define CLPS711X_CLK_MAX        12
+
+#endif
diff --git a/include/dt-bindings/clock/exynos4.h b/include/dt-bindings/clock/exynos4.h
index 1106ca540a96..459bd2bd411f 100644
--- a/include/dt-bindings/clock/exynos4.h
+++ b/include/dt-bindings/clock/exynos4.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- * Author: Andrzej Haja <a.hajda@samsung.com>
+ * Author: Andrzej Hajda <a.hajda@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
@@ -34,6 +34,11 @@
 #define CLK_MOUT_CORE           19
 #define CLK_MOUT_APLL           20
 #define CLK_SCLK_HDMIPHY        22
+#define CLK_OUT_DMC             23
+#define CLK_OUT_TOP             24
+#define CLK_OUT_LEFTBUS         25
+#define CLK_OUT_RIGHTBUS        26
+#define CLK_OUT_CPU             27
 
 /* gate for special clocks (sclk) */
 #define CLK_SCLK_FIMC0          128
@@ -230,6 +235,24 @@
 #define CLK_MOUT_G3D            394
 #define CLK_ACLK400_MCUISP      395 /* Exynos4x12 only */
 
+/* gate clocks - ppmu */
+#define CLK_PPMULEFT            400
+#define CLK_PPMURIGHT           401
+#define CLK_PPMUCAMIF           402
+#define CLK_PPMUTV              403
+#define CLK_PPMUMFC_L           404
+#define CLK_PPMUMFC_R           405
+#define CLK_PPMUG3D             406
+#define CLK_PPMUIMAGE           407
+#define CLK_PPMULCD0            408
+#define CLK_PPMULCD1            409 /* Exynos4210 only */
+#define CLK_PPMUFILE            410
+#define CLK_PPMUGPS             411
+#define CLK_PPMUDMC0            412
+#define CLK_PPMUDMC1            413
+#define CLK_PPMUCPU             414
+#define CLK_PPMUACP             415
+
 /* div clocks */
 #define CLK_DIV_ISP0            450 /* Exynos4x12 only */
 #define CLK_DIV_ISP1            451 /* Exynos4x12 only */
diff --git a/include/dt-bindings/clock/exynos5250.h b/include/dt-bindings/clock/exynos5250.h
index be6e97c54f54..4273891dc78e 100644
--- a/include/dt-bindings/clock/exynos5250.h
+++ b/include/dt-bindings/clock/exynos5250.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- * Author: Andrzej Haja <a.hajda@samsung.com>
+ * Author: Andrzej Hajda <a.hajda@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
diff --git a/include/dt-bindings/clock/exynos5420.h b/include/dt-bindings/clock/exynos5420.h
index 21d51ae1d242..8dc0913f1775 100644
--- a/include/dt-bindings/clock/exynos5420.h
+++ b/include/dt-bindings/clock/exynos5420.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- * Author: Andrzej Haja <a.hajda@samsung.com>
+ * Author: Andrzej Hajda <a.hajda@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
diff --git a/include/dt-bindings/clock/exynos5440.h b/include/dt-bindings/clock/exynos5440.h
index 70cd85077fa9..c66fc405a79a 100644
--- a/include/dt-bindings/clock/exynos5440.h
+++ b/include/dt-bindings/clock/exynos5440.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- * Author: Andrzej Haja <a.hajda-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
+ * Author: Andrzej Hajda <a.hajda@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
diff --git a/include/dt-bindings/clock/qcom,gcc-apq8084.h b/include/dt-bindings/clock/qcom,gcc-apq8084.h
new file mode 100644
index 000000000000..2c0da566c46a
--- /dev/null
+++ b/include/dt-bindings/clock/qcom,gcc-apq8084.h
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#ifndef _DT_BINDINGS_CLK_APQ_GCC_8084_H
+#define _DT_BINDINGS_CLK_APQ_GCC_8084_H
+
+#define GPLL0                                           0
+#define GPLL0_VOTE                                      1
+#define GPLL1                                           2
+#define GPLL1_VOTE                                      3
+#define GPLL2                                           4
+#define GPLL2_VOTE                                      5
+#define GPLL3                                           6
+#define GPLL3_VOTE                                      7
+#define GPLL4                                           8
+#define GPLL4_VOTE                                      9
+#define CONFIG_NOC_CLK_SRC                              10
+#define PERIPH_NOC_CLK_SRC                              11
+#define SYSTEM_NOC_CLK_SRC                              12
+#define BLSP_UART_SIM_CLK_SRC                           13
+#define QDSS_TSCTR_CLK_SRC                              14
+#define UFS_AXI_CLK_SRC                                 15
+#define RPM_CLK_SRC                                     16
+#define KPSS_AHB_CLK_SRC                                17
+#define QDSS_AT_CLK_SRC                                 18
+#define BIMC_DDR_CLK_SRC                                19
+#define USB30_MASTER_CLK_SRC                            20
+#define USB30_SEC_MASTER_CLK_SRC                        21
+#define USB_HSIC_AHB_CLK_SRC                            22
+#define MMSS_BIMC_GFX_CLK_SRC                           23
+#define QDSS_STM_CLK_SRC                                24
+#define ACC_CLK_SRC                                     25
+#define SEC_CTRL_CLK_SRC                                26
+#define BLSP1_QUP1_I2C_APPS_CLK_SRC                     27
+#define BLSP1_QUP1_SPI_APPS_CLK_SRC                     28
+#define BLSP1_QUP2_I2C_APPS_CLK_SRC                     29
+#define BLSP1_QUP2_SPI_APPS_CLK_SRC                     30
+#define BLSP1_QUP3_I2C_APPS_CLK_SRC                     31
+#define BLSP1_QUP3_SPI_APPS_CLK_SRC                     32
+#define BLSP1_QUP4_I2C_APPS_CLK_SRC                     33
+#define BLSP1_QUP4_SPI_APPS_CLK_SRC                     34
+#define BLSP1_QUP5_I2C_APPS_CLK_SRC                     35
+#define BLSP1_QUP5_SPI_APPS_CLK_SRC                     36
+#define BLSP1_QUP6_I2C_APPS_CLK_SRC                     37
+#define BLSP1_QUP6_SPI_APPS_CLK_SRC                     38
+#define BLSP1_UART1_APPS_CLK_SRC                        39
+#define BLSP1_UART2_APPS_CLK_SRC                        40
+#define BLSP1_UART3_APPS_CLK_SRC                        41
+#define BLSP1_UART4_APPS_CLK_SRC                        42
+#define BLSP1_UART5_APPS_CLK_SRC                        43
+#define BLSP1_UART6_APPS_CLK_SRC                        44
+#define BLSP2_QUP1_I2C_APPS_CLK_SRC                     45
+#define BLSP2_QUP1_SPI_APPS_CLK_SRC                     46
+#define BLSP2_QUP2_I2C_APPS_CLK_SRC                     47
+#define BLSP2_QUP2_SPI_APPS_CLK_SRC                     48
+#define BLSP2_QUP3_I2C_APPS_CLK_SRC                     49
+#define BLSP2_QUP3_SPI_APPS_CLK_SRC                     50
+#define BLSP2_QUP4_I2C_APPS_CLK_SRC                     51
+#define BLSP2_QUP4_SPI_APPS_CLK_SRC                     52
+#define BLSP2_QUP5_I2C_APPS_CLK_SRC                     53
+#define BLSP2_QUP5_SPI_APPS_CLK_SRC                     54
+#define BLSP2_QUP6_I2C_APPS_CLK_SRC                     55
+#define BLSP2_QUP6_SPI_APPS_CLK_SRC                     56
+#define BLSP2_UART1_APPS_CLK_SRC                        57
+#define BLSP2_UART2_APPS_CLK_SRC                        58
+#define BLSP2_UART3_APPS_CLK_SRC                        59
+#define BLSP2_UART4_APPS_CLK_SRC                        60
+#define BLSP2_UART5_APPS_CLK_SRC                        61
+#define BLSP2_UART6_APPS_CLK_SRC                        62
+#define CE1_CLK_SRC                                     63
+#define CE2_CLK_SRC                                     64
+#define CE3_CLK_SRC                                     65
+#define GP1_CLK_SRC                                     66
+#define GP2_CLK_SRC                                     67
+#define GP3_CLK_SRC                                     68
+#define PDM2_CLK_SRC                                    69
+#define QDSS_TRACECLKIN_CLK_SRC                         70
+#define RBCPR_CLK_SRC                                   71
+#define SATA_ASIC0_CLK_SRC                              72
+#define SATA_PMALIVE_CLK_SRC                            73
+#define SATA_RX_CLK_SRC                                 74
+#define SATA_RX_OOB_CLK_SRC                             75
+#define SDCC1_APPS_CLK_SRC                              76
+#define SDCC2_APPS_CLK_SRC                              77
+#define SDCC3_APPS_CLK_SRC                              78
+#define SDCC4_APPS_CLK_SRC                              79
+#define GCC_SNOC_BUS_TIMEOUT0_AHB_CLK                   80
+#define SPMI_AHB_CLK_SRC                                81
+#define SPMI_SER_CLK_SRC                                82
+#define TSIF_REF_CLK_SRC                                83
+#define USB30_MOCK_UTMI_CLK_SRC                         84
+#define USB30_SEC_MOCK_UTMI_CLK_SRC                     85
+#define USB_HS_SYSTEM_CLK_SRC                           86
+#define USB_HSIC_CLK_SRC                                87
+#define USB_HSIC_IO_CAL_CLK_SRC                         88
+#define USB_HSIC_MOCK_UTMI_CLK_SRC                      89
+#define USB_HSIC_SYSTEM_CLK_SRC                         90
+#define GCC_BAM_DMA_AHB_CLK                             91
+#define GCC_BAM_DMA_INACTIVITY_TIMERS_CLK               92
+#define DDR_CLK_SRC                                     93
+#define GCC_BIMC_CFG_AHB_CLK                            94
+#define GCC_BIMC_CLK                                    95
+#define GCC_BIMC_KPSS_AXI_CLK                           96
+#define GCC_BIMC_SLEEP_CLK                              97
+#define GCC_BIMC_SYSNOC_AXI_CLK                         98
+#define GCC_BIMC_XO_CLK                                 99
+#define GCC_BLSP1_AHB_CLK                               100
+#define GCC_BLSP1_SLEEP_CLK                             101
+#define GCC_BLSP1_QUP1_I2C_APPS_CLK                     102
+#define GCC_BLSP1_QUP1_SPI_APPS_CLK                     103
+#define GCC_BLSP1_QUP2_I2C_APPS_CLK                     104
+#define GCC_BLSP1_QUP2_SPI_APPS_CLK                     105
+#define GCC_BLSP1_QUP3_I2C_APPS_CLK                     106
+#define GCC_BLSP1_QUP3_SPI_APPS_CLK                     107
+#define GCC_BLSP1_QUP4_I2C_APPS_CLK                     108
+#define GCC_BLSP1_QUP4_SPI_APPS_CLK                     109
+#define GCC_BLSP1_QUP5_I2C_APPS_CLK                     110
+#define GCC_BLSP1_QUP5_SPI_APPS_CLK                     111
+#define GCC_BLSP1_QUP6_I2C_APPS_CLK                     112
+#define GCC_BLSP1_QUP6_SPI_APPS_CLK                     113
+#define GCC_BLSP1_UART1_APPS_CLK                        114
+#define GCC_BLSP1_UART1_SIM_CLK                         115
+#define GCC_BLSP1_UART2_APPS_CLK                        116
+#define GCC_BLSP1_UART2_SIM_CLK                         117
+#define GCC_BLSP1_UART3_APPS_CLK                        118
+#define GCC_BLSP1_UART3_SIM_CLK                         119
+#define GCC_BLSP1_UART4_APPS_CLK                        120
+#define GCC_BLSP1_UART4_SIM_CLK                         121
+#define GCC_BLSP1_UART5_APPS_CLK                        122
+#define GCC_BLSP1_UART5_SIM_CLK                         123
+#define GCC_BLSP1_UART6_APPS_CLK                        124
+#define GCC_BLSP1_UART6_SIM_CLK                         125
+#define GCC_BLSP2_AHB_CLK                               126
+#define GCC_BLSP2_SLEEP_CLK                             127
+#define GCC_BLSP2_QUP1_I2C_APPS_CLK                     128
+#define GCC_BLSP2_QUP1_SPI_APPS_CLK                     129
+#define GCC_BLSP2_QUP2_I2C_APPS_CLK                     130
+#define GCC_BLSP2_QUP2_SPI_APPS_CLK                     131
+#define GCC_BLSP2_QUP3_I2C_APPS_CLK                     132
+#define GCC_BLSP2_QUP3_SPI_APPS_CLK                     133
+#define GCC_BLSP2_QUP4_I2C_APPS_CLK                     134
+#define GCC_BLSP2_QUP4_SPI_APPS_CLK                     135
+#define GCC_BLSP2_QUP5_I2C_APPS_CLK                     136
+#define GCC_BLSP2_QUP5_SPI_APPS_CLK                     137
+#define GCC_BLSP2_QUP6_I2C_APPS_CLK                     138
+#define GCC_BLSP2_QUP6_SPI_APPS_CLK                     139
+#define GCC_BLSP2_UART1_APPS_CLK                        140
+#define GCC_BLSP2_UART1_SIM_CLK                         141
+#define GCC_BLSP2_UART2_APPS_CLK                        142
+#define GCC_BLSP2_UART2_SIM_CLK                         143
+#define GCC_BLSP2_UART3_APPS_CLK                        144
+#define GCC_BLSP2_UART3_SIM_CLK                         145
+#define GCC_BLSP2_UART4_APPS_CLK                        146
+#define GCC_BLSP2_UART4_SIM_CLK                         147
+#define GCC_BLSP2_UART5_APPS_CLK                        148
+#define GCC_BLSP2_UART5_SIM_CLK                         149
+#define GCC_BLSP2_UART6_APPS_CLK                        150
+#define GCC_BLSP2_UART6_SIM_CLK                         151
+#define GCC_BOOT_ROM_AHB_CLK                            152
+#define GCC_CE1_AHB_CLK                                 153
+#define GCC_CE1_AXI_CLK                                 154
+#define GCC_CE1_CLK                                     155
+#define GCC_CE2_AHB_CLK                                 156
+#define GCC_CE2_AXI_CLK                                 157
+#define GCC_CE2_CLK                                     158
+#define GCC_CE3_AHB_CLK                                 159
+#define GCC_CE3_AXI_CLK                                 160
+#define GCC_CE3_CLK                                     161
+#define GCC_CNOC_BUS_TIMEOUT0_AHB_CLK                   162
+#define GCC_CNOC_BUS_TIMEOUT1_AHB_CLK                   163
+#define GCC_CNOC_BUS_TIMEOUT2_AHB_CLK                   164
+#define GCC_CNOC_BUS_TIMEOUT3_AHB_CLK                   165
+#define GCC_CNOC_BUS_TIMEOUT4_AHB_CLK                   166
+#define GCC_CNOC_BUS_TIMEOUT5_AHB_CLK                   167
+#define GCC_CNOC_BUS_TIMEOUT6_AHB_CLK                   168
+#define GCC_CNOC_BUS_TIMEOUT7_AHB_CLK                   169
+#define GCC_CFG_NOC_AHB_CLK                             170
+#define GCC_CFG_NOC_DDR_CFG_CLK                         171
+#define GCC_CFG_NOC_RPM_AHB_CLK                         172
+#define GCC_COPSS_SMMU_AHB_CLK                          173
+#define GCC_COPSS_SMMU_AXI_CLK                          174
+#define GCC_DCD_XO_CLK                                  175
+#define GCC_BIMC_DDR_CH0_CLK                            176
+#define GCC_BIMC_DDR_CH1_CLK                            177
+#define GCC_BIMC_DDR_CPLL0_CLK                          178
+#define GCC_BIMC_DDR_CPLL1_CLK                          179
+#define GCC_BIMC_GFX_CLK                                180
+#define GCC_DDR_DIM_CFG_CLK                             181
+#define GCC_DDR_DIM_SLEEP_CLK                           182
+#define GCC_DEHR_CLK                                    183
+#define GCC_AHB_CLK                                     184
+#define GCC_IM_SLEEP_CLK                                185
+#define GCC_XO_CLK                                      186
+#define GCC_XO_DIV4_CLK                                 187
+#define GCC_GP1_CLK                                     188
+#define GCC_GP2_CLK                                     189
+#define GCC_GP3_CLK                                     190
+#define GCC_IMEM_AXI_CLK                                191
+#define GCC_IMEM_CFG_AHB_CLK                            192
+#define GCC_KPSS_AHB_CLK                                193
+#define GCC_KPSS_AXI_CLK                                194
+#define GCC_LPASS_MPORT_AXI_CLK                         195
+#define GCC_LPASS_Q6_AXI_CLK                            196
+#define GCC_LPASS_SWAY_CLK                              197
+#define GCC_MMSS_BIMC_GFX_CLK                           198
+#define GCC_MMSS_NOC_AT_CLK                             199
+#define GCC_MMSS_NOC_CFG_AHB_CLK                        200
+#define GCC_MMSS_VPU_MAPLE_SYS_NOC_AXI_CLK              201
+#define GCC_OCMEM_NOC_CFG_AHB_CLK                       202
+#define GCC_OCMEM_SYS_NOC_AXI_CLK                       203
+#define GCC_MPM_AHB_CLK                                 204
+#define GCC_MSG_RAM_AHB_CLK                             205
+#define GCC_NOC_CONF_XPU_AHB_CLK                        206
+#define GCC_PDM2_CLK                                    207
+#define GCC_PDM_AHB_CLK                                 208
+#define GCC_PDM_XO4_CLK                                 209
+#define GCC_PERIPH_NOC_AHB_CLK                          210
+#define GCC_PERIPH_NOC_AT_CLK                           211
+#define GCC_PERIPH_NOC_CFG_AHB_CLK                      212
+#define GCC_PERIPH_NOC_USB_HSIC_AHB_CLK                 213
+#define GCC_PERIPH_NOC_MPU_CFG_AHB_CLK                  214
+#define GCC_PERIPH_XPU_AHB_CLK                          215
+#define GCC_PNOC_BUS_TIMEOUT0_AHB_CLK                   216
+#define GCC_PNOC_BUS_TIMEOUT1_AHB_CLK                   217
+#define GCC_PNOC_BUS_TIMEOUT2_AHB_CLK                   218
+#define GCC_PNOC_BUS_TIMEOUT3_AHB_CLK                   219
+#define GCC_PNOC_BUS_TIMEOUT4_AHB_CLK                   220
+#define GCC_PRNG_AHB_CLK                                221
+#define GCC_QDSS_AT_CLK                                 222
+#define GCC_QDSS_CFG_AHB_CLK                            223
+#define GCC_QDSS_DAP_AHB_CLK                            224
+#define GCC_QDSS_DAP_CLK                                225
+#define GCC_QDSS_ETR_USB_CLK                            226
+#define GCC_QDSS_STM_CLK                                227
+#define GCC_QDSS_TRACECLKIN_CLK                         228
+#define GCC_QDSS_TSCTR_DIV16_CLK                        229
+#define GCC_QDSS_TSCTR_DIV2_CLK                         230
+#define GCC_QDSS_TSCTR_DIV3_CLK                         231
+#define GCC_QDSS_TSCTR_DIV4_CLK                         232
+#define GCC_QDSS_TSCTR_DIV8_CLK                         233
+#define GCC_QDSS_RBCPR_XPU_AHB_CLK                      234
+#define GCC_RBCPR_AHB_CLK                               235
+#define GCC_RBCPR_CLK                                   236
+#define GCC_RPM_BUS_AHB_CLK                             237
+#define GCC_RPM_PROC_HCLK                               238
+#define GCC_RPM_SLEEP_CLK                               239
+#define GCC_RPM_TIMER_CLK                               240
+#define GCC_SATA_ASIC0_CLK                              241
+#define GCC_SATA_AXI_CLK                                242
+#define GCC_SATA_CFG_AHB_CLK                            243
+#define GCC_SATA_PMALIVE_CLK                            244
+#define GCC_SATA_RX_CLK                                 245
+#define GCC_SATA_RX_OOB_CLK                             246
+#define GCC_SDCC1_AHB_CLK                               247
+#define GCC_SDCC1_APPS_CLK                              248
+#define GCC_SDCC1_CDCCAL_FF_CLK                         249
+#define GCC_SDCC1_CDCCAL_SLEEP_CLK                      250
+#define GCC_SDCC2_AHB_CLK                               251
+#define GCC_SDCC2_APPS_CLK                              252
+#define GCC_SDCC2_INACTIVITY_TIMERS_CLK                 253
+#define GCC_SDCC3_AHB_CLK                               254
+#define GCC_SDCC3_APPS_CLK                              255
+#define GCC_SDCC3_INACTIVITY_TIMERS_CLK                 256
+#define GCC_SDCC4_AHB_CLK                               257
+#define GCC_SDCC4_APPS_CLK                              258
+#define GCC_SDCC4_INACTIVITY_TIMERS_CLK                 259
+#define GCC_SEC_CTRL_ACC_CLK                            260
+#define GCC_SEC_CTRL_AHB_CLK                            261
+#define GCC_SEC_CTRL_BOOT_ROM_PATCH_CLK                 262
+#define GCC_SEC_CTRL_CLK                                263
+#define GCC_SEC_CTRL_SENSE_CLK                          264
+#define GCC_SNOC_BUS_TIMEOUT2_AHB_CLK                   265
+#define GCC_SNOC_BUS_TIMEOUT3_AHB_CLK                   266
+#define GCC_SPDM_BIMC_CY_CLK                            267
+#define GCC_SPDM_CFG_AHB_CLK                            268
+#define GCC_SPDM_DEBUG_CY_CLK                           269
+#define GCC_SPDM_FF_CLK                                 270
+#define GCC_SPDM_MSTR_AHB_CLK                           271
+#define GCC_SPDM_PNOC_CY_CLK                            272
+#define GCC_SPDM_RPM_CY_CLK                             273
+#define GCC_SPDM_SNOC_CY_CLK                            274
+#define GCC_SPMI_AHB_CLK                                275
+#define GCC_SPMI_CNOC_AHB_CLK                           276
+#define GCC_SPMI_SER_CLK                                277
+#define GCC_SPSS_AHB_CLK                                278
+#define GCC_SNOC_CNOC_AHB_CLK                           279
+#define GCC_SNOC_PNOC_AHB_CLK                           280
+#define GCC_SYS_NOC_AT_CLK                              281
+#define GCC_SYS_NOC_AXI_CLK                             282
+#define GCC_SYS_NOC_KPSS_AHB_CLK                        283
+#define GCC_SYS_NOC_QDSS_STM_AXI_CLK                    284
+#define GCC_SYS_NOC_UFS_AXI_CLK                         285
+#define GCC_SYS_NOC_USB3_AXI_CLK                        286
+#define GCC_SYS_NOC_USB3_SEC_AXI_CLK                    287
+#define GCC_TCSR_AHB_CLK                                288
+#define GCC_TLMM_AHB_CLK                                289
+#define GCC_TLMM_CLK                                    290
+#define GCC_TSIF_AHB_CLK                                291
+#define GCC_TSIF_INACTIVITY_TIMERS_CLK                  292
+#define GCC_TSIF_REF_CLK                                293
+#define GCC_UFS_AHB_CLK                                 294
+#define GCC_UFS_AXI_CLK                                 295
+#define GCC_UFS_RX_CFG_CLK                              296
+#define GCC_UFS_RX_SYMBOL_0_CLK                         297
+#define GCC_UFS_RX_SYMBOL_1_CLK                         298
+#define GCC_UFS_TX_CFG_CLK                              299
+#define GCC_UFS_TX_SYMBOL_0_CLK                         300
+#define GCC_UFS_TX_SYMBOL_1_CLK                         301
+#define GCC_USB2A_PHY_SLEEP_CLK                         302
+#define GCC_USB2B_PHY_SLEEP_CLK                         303
+#define GCC_USB30_MASTER_CLK                            304
+#define GCC_USB30_MOCK_UTMI_CLK                         305
+#define GCC_USB30_SLEEP_CLK                             306
+#define GCC_USB30_SEC_MASTER_CLK                        307
+#define GCC_USB30_SEC_MOCK_UTMI_CLK                     308
+#define GCC_USB30_SEC_SLEEP_CLK                         309
+#define GCC_USB_HS_AHB_CLK                              310
+#define GCC_USB_HS_INACTIVITY_TIMERS_CLK                311
+#define GCC_USB_HS_SYSTEM_CLK                           312
+#define GCC_USB_HSIC_AHB_CLK                            313
+#define GCC_USB_HSIC_CLK                                314
+#define GCC_USB_HSIC_IO_CAL_CLK                         315
+#define GCC_USB_HSIC_IO_CAL_SLEEP_CLK                   316
+#define GCC_USB_HSIC_MOCK_UTMI_CLK                      317
+#define GCC_USB_HSIC_SYSTEM_CLK                         318
+#define PCIE_0_AUX_CLK_SRC                              319
+#define PCIE_0_PIPE_CLK_SRC                             320
+#define PCIE_1_AUX_CLK_SRC                              321
+#define PCIE_1_PIPE_CLK_SRC                             322
+#define GCC_PCIE_0_AUX_CLK                              323
+#define GCC_PCIE_0_CFG_AHB_CLK                          324
+#define GCC_PCIE_0_MSTR_AXI_CLK                         325
+#define GCC_PCIE_0_PIPE_CLK                             326
+#define GCC_PCIE_0_SLV_AXI_CLK                          327
+#define GCC_PCIE_1_AUX_CLK                              328
+#define GCC_PCIE_1_CFG_AHB_CLK                          329
+#define GCC_PCIE_1_MSTR_AXI_CLK                         330
+#define GCC_PCIE_1_PIPE_CLK                             331
+#define GCC_PCIE_1_SLV_AXI_CLK                          332
+
+#endif
diff --git a/include/dt-bindings/clock/qcom,gcc-ipq806x.h b/include/dt-bindings/clock/qcom,gcc-ipq806x.h
new file mode 100644
index 000000000000..b857cadb0bd4
--- /dev/null
+++ b/include/dt-bindings/clock/qcom,gcc-ipq806x.h
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#ifndef _DT_BINDINGS_CLK_GCC_IPQ806X_H
+#define _DT_BINDINGS_CLK_GCC_IPQ806X_H
+
+#define AFAB_CLK_SRC                            0
+#define QDSS_STM_CLK                            1
+#define SCSS_A_CLK                              2
+#define SCSS_H_CLK                              3
+#define AFAB_CORE_CLK                           4
+#define SCSS_XO_SRC_CLK                         5
+#define AFAB_EBI1_CH0_A_CLK                     6
+#define AFAB_EBI1_CH1_A_CLK                     7
+#define AFAB_AXI_S0_FCLK                        8
+#define AFAB_AXI_S1_FCLK                        9
+#define AFAB_AXI_S2_FCLK                        10
+#define AFAB_AXI_S3_FCLK                        11
+#define AFAB_AXI_S4_FCLK                        12
+#define SFAB_CORE_CLK                           13
+#define SFAB_AXI_S0_FCLK                        14
+#define SFAB_AXI_S1_FCLK                        15
+#define SFAB_AXI_S2_FCLK                        16
+#define SFAB_AXI_S3_FCLK                        17
+#define SFAB_AXI_S4_FCLK                        18
+#define SFAB_AXI_S5_FCLK                        19
+#define SFAB_AHB_S0_FCLK                        20
+#define SFAB_AHB_S1_FCLK                        21
+#define SFAB_AHB_S2_FCLK                        22
+#define SFAB_AHB_S3_FCLK                        23
+#define SFAB_AHB_S4_FCLK                        24
+#define SFAB_AHB_S5_FCLK                        25
+#define SFAB_AHB_S6_FCLK                        26
+#define SFAB_AHB_S7_FCLK                        27
+#define QDSS_AT_CLK_SRC                         28
+#define QDSS_AT_CLK                             29
+#define QDSS_TRACECLKIN_CLK_SRC                 30
+#define QDSS_TRACECLKIN_CLK                     31
+#define QDSS_TSCTR_CLK_SRC                      32
+#define QDSS_TSCTR_CLK                          33
+#define SFAB_ADM0_M0_A_CLK                      34
+#define SFAB_ADM0_M1_A_CLK                      35
+#define SFAB_ADM0_M2_H_CLK                      36
+#define ADM0_CLK                                37
+#define ADM0_PBUS_CLK                           38
+#define IMEM0_A_CLK                             39
+#define QDSS_H_CLK                              40
+#define PCIE_A_CLK                              41
+#define PCIE_AUX_CLK                            42
+#define PCIE_H_CLK                              43
+#define PCIE_PHY_CLK                            44
+#define SFAB_CLK_SRC                            45
+#define SFAB_LPASS_Q6_A_CLK                     46
+#define SFAB_AFAB_M_A_CLK                       47
+#define AFAB_SFAB_M0_A_CLK                      48
+#define AFAB_SFAB_M1_A_CLK                      49
+#define SFAB_SATA_S_H_CLK                       50
+#define DFAB_CLK_SRC                            51
+#define DFAB_CLK                                52
+#define SFAB_DFAB_M_A_CLK                       53
+#define DFAB_SFAB_M_A_CLK                       54
+#define DFAB_SWAY0_H_CLK                        55
+#define DFAB_SWAY1_H_CLK                        56
+#define DFAB_ARB0_H_CLK                         57
+#define DFAB_ARB1_H_CLK                         58
+#define PPSS_H_CLK                              59
+#define PPSS_PROC_CLK                           60
+#define PPSS_TIMER0_CLK                         61
+#define PPSS_TIMER1_CLK                         62
+#define PMEM_A_CLK                              63
+#define DMA_BAM_H_CLK                           64
+#define SIC_H_CLK                               65
+#define SPS_TIC_H_CLK                           66
+#define CFPB_2X_CLK_SRC                         67
+#define CFPB_CLK                                68
+#define CFPB0_H_CLK                             69
+#define CFPB1_H_CLK                             70
+#define CFPB2_H_CLK                             71
+#define SFAB_CFPB_M_H_CLK                       72
+#define CFPB_MASTER_H_CLK                       73
+#define SFAB_CFPB_S_H_CLK                       74
+#define CFPB_SPLITTER_H_CLK                     75
+#define TSIF_H_CLK                              76
+#define TSIF_INACTIVITY_TIMERS_CLK              77
+#define TSIF_REF_SRC                            78
+#define TSIF_REF_CLK                            79
+#define CE1_H_CLK                               80
+#define CE1_CORE_CLK                            81
+#define CE1_SLEEP_CLK                           82
+#define CE2_H_CLK                               83
+#define CE2_CORE_CLK                            84
+#define SFPB_H_CLK_SRC                          85
+#define SFPB_H_CLK                              86
+#define SFAB_SFPB_M_H_CLK                       87
+#define SFAB_SFPB_S_H_CLK                       88
+#define RPM_PROC_CLK                            89
+#define RPM_BUS_H_CLK                           90
+#define RPM_SLEEP_CLK                           91
+#define RPM_TIMER_CLK                           92
+#define RPM_MSG_RAM_H_CLK                       93
+#define PMIC_ARB0_H_CLK                         94
+#define PMIC_ARB1_H_CLK                         95
+#define PMIC_SSBI2_SRC                          96
+#define PMIC_SSBI2_CLK                          97
+#define SDC1_H_CLK                              98
+#define SDC2_H_CLK                              99
+#define SDC3_H_CLK                              100
+#define SDC4_H_CLK                              101
+#define SDC1_SRC                                102
+#define SDC1_CLK                                103
+#define SDC2_SRC                                104
+#define SDC2_CLK                                105
+#define SDC3_SRC                                106
+#define SDC3_CLK                                107
+#define SDC4_SRC                                108
+#define SDC4_CLK                                109
+#define USB_HS1_H_CLK                           110
+#define USB_HS1_XCVR_SRC                        111
+#define USB_HS1_XCVR_CLK                        112
+#define USB_HSIC_H_CLK                          113
+#define USB_HSIC_XCVR_SRC                       114
+#define USB_HSIC_XCVR_CLK                       115
+#define USB_HSIC_SYSTEM_CLK_SRC                 116
+#define USB_HSIC_SYSTEM_CLK                     117
+#define CFPB0_C0_H_CLK                          118
+#define CFPB0_D0_H_CLK                          119
+#define CFPB0_C1_H_CLK                          120
+#define CFPB0_D1_H_CLK                          121
+#define USB_FS1_H_CLK                           122
+#define USB_FS1_XCVR_SRC                        123
+#define USB_FS1_XCVR_CLK                        124
+#define USB_FS1_SYSTEM_CLK                      125
+#define GSBI_COMMON_SIM_SRC                     126
+#define GSBI1_H_CLK                             127
+#define GSBI2_H_CLK                             128
+#define GSBI3_H_CLK                             129
+#define GSBI4_H_CLK                             130
+#define GSBI5_H_CLK                             131
+#define GSBI6_H_CLK                             132
+#define GSBI7_H_CLK                             133
+#define GSBI1_QUP_SRC                           134
+#define GSBI1_QUP_CLK                           135
+#define GSBI2_QUP_SRC                           136
+#define GSBI2_QUP_CLK                           137
+#define GSBI3_QUP_SRC                           138
+#define GSBI3_QUP_CLK                           139
+#define GSBI4_QUP_SRC                           140
+#define GSBI4_QUP_CLK                           141
+#define GSBI5_QUP_SRC                           142
+#define GSBI5_QUP_CLK                           143
+#define GSBI6_QUP_SRC                           144
+#define GSBI6_QUP_CLK                           145
+#define GSBI7_QUP_SRC                           146
+#define GSBI7_QUP_CLK                           147
+#define GSBI1_UART_SRC                          148
+#define GSBI1_UART_CLK                          149
+#define GSBI2_UART_SRC                          150
+#define GSBI2_UART_CLK                          151
+#define GSBI3_UART_SRC                          152
+#define GSBI3_UART_CLK                          153
+#define GSBI4_UART_SRC                          154
+#define GSBI4_UART_CLK                          155
+#define GSBI5_UART_SRC                          156
+#define GSBI5_UART_CLK                          157
+#define GSBI6_UART_SRC                          158
+#define GSBI6_UART_CLK                          159
+#define GSBI7_UART_SRC                          160
+#define GSBI7_UART_CLK                          161
+#define GSBI1_SIM_CLK                           162
+#define GSBI2_SIM_CLK                           163
+#define GSBI3_SIM_CLK                           164
+#define GSBI4_SIM_CLK                           165
+#define GSBI5_SIM_CLK                           166
+#define GSBI6_SIM_CLK                           167
+#define GSBI7_SIM_CLK                           168
+#define USB_HSIC_HSIC_CLK_SRC                   169
+#define USB_HSIC_HSIC_CLK                       170
+#define USB_HSIC_HSIO_CAL_CLK                   171
+#define SPDM_CFG_H_CLK                          172
+#define SPDM_MSTR_H_CLK                         173
+#define SPDM_FF_CLK_SRC                         174
+#define SPDM_FF_CLK                             175
+#define SEC_CTRL_CLK                            176
+#define SEC_CTRL_ACC_CLK_SRC                    177
+#define SEC_CTRL_ACC_CLK                        178
+#define TLMM_H_CLK                              179
+#define TLMM_CLK                                180
+#define SATA_H_CLK                              181
+#define SATA_CLK_SRC                            182
+#define SATA_RXOOB_CLK                          183
+#define SATA_PMALIVE_CLK                        184
+#define SATA_PHY_REF_CLK                        185
+#define SATA_A_CLK                              186
+#define SATA_PHY_CFG_CLK                        187
+#define TSSC_CLK_SRC                            188
+#define TSSC_CLK                                189
+#define PDM_SRC                                 190
+#define PDM_CLK                                 191
+#define GP0_SRC                                 192
+#define GP0_CLK                                 193
+#define GP1_SRC                                 194
+#define GP1_CLK                                 195
+#define GP2_SRC                                 196
+#define GP2_CLK                                 197
+#define MPM_CLK                                 198
+#define EBI1_CLK_SRC                            199
+#define EBI1_CH0_CLK                            200
+#define EBI1_CH1_CLK                            201
+#define EBI1_2X_CLK                             202
+#define EBI1_CH0_DQ_CLK                         203
+#define EBI1_CH1_DQ_CLK                         204
+#define EBI1_CH0_CA_CLK                         205
+#define EBI1_CH1_CA_CLK                         206
+#define EBI1_XO_CLK                             207
+#define SFAB_SMPSS_S_H_CLK                      208
+#define PRNG_SRC                                209
+#define PRNG_CLK                                210
+#define PXO_SRC                                 211
+#define SPDM_CY_PORT0_CLK                       212
+#define SPDM_CY_PORT1_CLK                       213
+#define SPDM_CY_PORT2_CLK                       214
+#define SPDM_CY_PORT3_CLK                       215
+#define SPDM_CY_PORT4_CLK                       216
+#define SPDM_CY_PORT5_CLK                       217
+#define SPDM_CY_PORT6_CLK                       218
+#define SPDM_CY_PORT7_CLK                       219
+#define PLL0                                    220
+#define PLL0_VOTE                               221
+#define PLL3                                    222
+#define PLL3_VOTE                               223
+#define PLL4                                    224
+#define PLL4_VOTE                               225
+#define PLL8                                    226
+#define PLL8_VOTE                               227
+#define PLL9                                    228
+#define PLL10                                   229
+#define PLL11                                   230
+#define PLL12                                   231
+#define PLL14                                   232
+#define PLL14_VOTE                              233
+#define PLL18                                   234
+#define CE5_SRC                                 235
+#define CE5_H_CLK                               236
+#define CE5_CORE_CLK                            237
+#define CE3_SLEEP_CLK                           238
+#define SFAB_AHB_S8_FCLK                        239
+#define SPDM_CY_PORT8_CLK                       246
+#define PCIE_ALT_REF_SRC                        247
+#define PCIE_ALT_REF_CLK                        248
+#define PCIE_1_A_CLK                            249
+#define PCIE_1_AUX_CLK                          250
+#define PCIE_1_H_CLK                            251
+#define PCIE_1_PHY_CLK                          252
+#define PCIE_1_ALT_REF_SRC                      253
+#define PCIE_1_ALT_REF_CLK                      254
+#define PCIE_2_A_CLK                            255
+#define PCIE_2_AUX_CLK                          256
+#define PCIE_2_H_CLK                            257
+#define PCIE_2_PHY_CLK                          258
+#define PCIE_2_ALT_REF_SRC                      259
+#define PCIE_2_ALT_REF_CLK                      260
+#define EBI2_CLK                                261
+#define USB30_SLEEP_CLK                         262
+#define USB30_UTMI_SRC                          263
+#define USB30_0_UTMI_CLK                        264
+#define USB30_1_UTMI_CLK                        265
+#define USB30_MASTER_SRC                        266
+#define USB30_0_MASTER_CLK                      267
+#define USB30_1_MASTER_CLK                      268
+#define GMAC_CORE1_CLK_SRC                      269
+#define GMAC_CORE2_CLK_SRC                      270
+#define GMAC_CORE3_CLK_SRC                      271
+#define GMAC_CORE4_CLK_SRC                      272
+#define GMAC_CORE1_CLK                          273
+#define GMAC_CORE2_CLK                          274
+#define GMAC_CORE3_CLK                          275
+#define GMAC_CORE4_CLK                          276
+#define UBI32_CORE1_CLK_SRC                     277
+#define UBI32_CORE2_CLK_SRC                     278
+#define UBI32_CORE1_CLK                         279
+#define UBI32_CORE2_CLK                         280
+
+#endif
diff --git a/include/dt-bindings/clock/qcom,gcc-msm8960.h b/include/dt-bindings/clock/qcom,gcc-msm8960.h
index f9f547146a15..7d20eedfee98 100644
--- a/include/dt-bindings/clock/qcom,gcc-msm8960.h
+++ b/include/dt-bindings/clock/qcom,gcc-msm8960.h
@@ -308,5 +308,16 @@
 #define PLL13                                   292
 #define PLL14                                   293
 #define PLL14_VOTE                              294
+#define USB_HS3_H_CLK                           295
+#define USB_HS3_XCVR_SRC                        296
+#define USB_HS3_XCVR_CLK                        297
+#define USB_HS4_H_CLK                           298
+#define USB_HS4_XCVR_SRC                        299
+#define USB_HS4_XCVR_CLK                        300
+#define SATA_PHY_CFG_CLK                        301
+#define SATA_A_CLK                              302
+#define CE3_SRC                                 303
+#define CE3_CORE_CLK                            304
+#define CE3_H_CLK                               305
 
 #endif
diff --git a/include/dt-bindings/clock/qcom,mmcc-apq8084.h b/include/dt-bindings/clock/qcom,mmcc-apq8084.h
new file mode 100644
index 000000000000..a929f86d0ddd
--- /dev/null
+++ b/include/dt-bindings/clock/qcom,mmcc-apq8084.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#ifndef _DT_BINDINGS_CLK_APQ_MMCC_8084_H
+#define _DT_BINDINGS_CLK_APQ_MMCC_8084_H
+
+#define MMSS_AHB_CLK_SRC                0
+#define MMSS_AXI_CLK_SRC                1
+#define MMPLL0                          2
+#define MMPLL0_VOTE                     3
+#define MMPLL1                          4
+#define MMPLL1_VOTE                     5
+#define MMPLL2                          6
+#define MMPLL3                          7
+#define MMPLL4                          8
+#define CSI0_CLK_SRC                    9
+#define CSI1_CLK_SRC                    10
+#define CSI2_CLK_SRC                    11
+#define CSI3_CLK_SRC                    12
+#define VCODEC0_CLK_SRC                 13
+#define VFE0_CLK_SRC                    14
+#define VFE1_CLK_SRC                    15
+#define MDP_CLK_SRC                     16
+#define PCLK0_CLK_SRC                   17
+#define PCLK1_CLK_SRC                   18
+#define OCMEMNOC_CLK_SRC                19
+#define GFX3D_CLK_SRC                   20
+#define JPEG0_CLK_SRC                   21
+#define JPEG1_CLK_SRC                   22
+#define JPEG2_CLK_SRC                   23
+#define EDPPIXEL_CLK_SRC                24
+#define EXTPCLK_CLK_SRC                 25
+#define VP_CLK_SRC                      26
+#define CCI_CLK_SRC                     27
+#define CAMSS_GP0_CLK_SRC               28
+#define CAMSS_GP1_CLK_SRC               29
+#define MCLK0_CLK_SRC                   30
+#define MCLK1_CLK_SRC                   31
+#define MCLK2_CLK_SRC                   32
+#define MCLK3_CLK_SRC                   33
+#define CSI0PHYTIMER_CLK_SRC            34
+#define CSI1PHYTIMER_CLK_SRC            35
+#define CSI2PHYTIMER_CLK_SRC            36
+#define CPP_CLK_SRC                     37
+#define BYTE0_CLK_SRC                   38
+#define BYTE1_CLK_SRC                   39
+#define EDPAUX_CLK_SRC                  40
+#define EDPLINK_CLK_SRC                 41
+#define ESC0_CLK_SRC                    42
+#define ESC1_CLK_SRC                    43
+#define HDMI_CLK_SRC                    44
+#define VSYNC_CLK_SRC                   45
+#define RBCPR_CLK_SRC                   46
+#define RBBMTIMER_CLK_SRC               47
+#define MAPLE_CLK_SRC                   48
+#define VDP_CLK_SRC                     49
+#define VPU_BUS_CLK_SRC                 50
+#define MMSS_CXO_CLK                    51
+#define MMSS_SLEEPCLK_CLK               52
+#define AVSYNC_AHB_CLK                  53
+#define AVSYNC_EDPPIXEL_CLK             54
+#define AVSYNC_EXTPCLK_CLK              55
+#define AVSYNC_PCLK0_CLK                56
+#define AVSYNC_PCLK1_CLK                57
+#define AVSYNC_VP_CLK                   58
+#define CAMSS_AHB_CLK                   59
+#define CAMSS_CCI_CCI_AHB_CLK           60
+#define CAMSS_CCI_CCI_CLK               61
+#define CAMSS_CSI0_AHB_CLK              62
+#define CAMSS_CSI0_CLK                  63
+#define CAMSS_CSI0PHY_CLK               64
+#define CAMSS_CSI0PIX_CLK               65
+#define CAMSS_CSI0RDI_CLK               66
+#define CAMSS_CSI1_AHB_CLK              67
+#define CAMSS_CSI1_CLK                  68
+#define CAMSS_CSI1PHY_CLK               69
+#define CAMSS_CSI1PIX_CLK               70
+#define CAMSS_CSI1RDI_CLK               71
+#define CAMSS_CSI2_AHB_CLK              72
+#define CAMSS_CSI2_CLK                  73
+#define CAMSS_CSI2PHY_CLK               74
+#define CAMSS_CSI2PIX_CLK               75
+#define CAMSS_CSI2RDI_CLK               76
+#define CAMSS_CSI3_AHB_CLK              77
+#define CAMSS_CSI3_CLK                  78
+#define CAMSS_CSI3PHY_CLK               79
+#define CAMSS_CSI3PIX_CLK               80
+#define CAMSS_CSI3RDI_CLK               81
+#define CAMSS_CSI_VFE0_CLK              82
+#define CAMSS_CSI_VFE1_CLK              83
+#define CAMSS_GP0_CLK                   84
+#define CAMSS_GP1_CLK                   85
+#define CAMSS_ISPIF_AHB_CLK             86
+#define CAMSS_JPEG_JPEG0_CLK            87
+#define CAMSS_JPEG_JPEG1_CLK            88
+#define CAMSS_JPEG_JPEG2_CLK            89
+#define CAMSS_JPEG_JPEG_AHB_CLK         90
+#define CAMSS_JPEG_JPEG_AXI_CLK         91
+#define CAMSS_MCLK0_CLK                 92
+#define CAMSS_MCLK1_CLK                 93
+#define CAMSS_MCLK2_CLK                 94
+#define CAMSS_MCLK3_CLK                 95
+#define CAMSS_MICRO_AHB_CLK             96
+#define CAMSS_PHY0_CSI0PHYTIMER_CLK     97
+#define CAMSS_PHY1_CSI1PHYTIMER_CLK     98
+#define CAMSS_PHY2_CSI2PHYTIMER_CLK     99
+#define CAMSS_TOP_AHB_CLK               100
+#define CAMSS_VFE_CPP_AHB_CLK           101
+#define CAMSS_VFE_CPP_CLK               102
+#define CAMSS_VFE_VFE0_CLK              103
+#define CAMSS_VFE_VFE1_CLK              104
+#define CAMSS_VFE_VFE_AHB_CLK           105
+#define CAMSS_VFE_VFE_AXI_CLK           106
+#define MDSS_AHB_CLK                    107
+#define MDSS_AXI_CLK                    108
+#define MDSS_BYTE0_CLK                  109
+#define MDSS_BYTE1_CLK                  110
+#define MDSS_EDPAUX_CLK                 111
+#define MDSS_EDPLINK_CLK                112
+#define MDSS_EDPPIXEL_CLK               113
+#define MDSS_ESC0_CLK                   114
+#define MDSS_ESC1_CLK                   115
+#define MDSS_EXTPCLK_CLK                116
+#define MDSS_HDMI_AHB_CLK               117
+#define MDSS_HDMI_CLK                   118
+#define MDSS_MDP_CLK                    119
+#define MDSS_MDP_LUT_CLK                120
+#define MDSS_PCLK0_CLK                  121
+#define MDSS_PCLK1_CLK                  122
+#define MDSS_VSYNC_CLK                  123
+#define MMSS_RBCPR_AHB_CLK              124
+#define MMSS_RBCPR_CLK                  125
+#define MMSS_SPDM_AHB_CLK               126
+#define MMSS_SPDM_AXI_CLK               127
+#define MMSS_SPDM_CSI0_CLK              128
+#define MMSS_SPDM_GFX3D_CLK             129
+#define MMSS_SPDM_JPEG0_CLK             130
+#define MMSS_SPDM_JPEG1_CLK             131
+#define MMSS_SPDM_JPEG2_CLK             132
+#define MMSS_SPDM_MDP_CLK               133
+#define MMSS_SPDM_PCLK0_CLK             134
+#define MMSS_SPDM_PCLK1_CLK             135
+#define MMSS_SPDM_VCODEC0_CLK           136
+#define MMSS_SPDM_VFE0_CLK              137
+#define MMSS_SPDM_VFE1_CLK              138
+#define MMSS_SPDM_RM_AXI_CLK            139
+#define MMSS_SPDM_RM_OCMEMNOC_CLK       140
+#define MMSS_MISC_AHB_CLK               141
+#define MMSS_MMSSNOC_AHB_CLK            142
+#define MMSS_MMSSNOC_BTO_AHB_CLK        143
+#define MMSS_MMSSNOC_AXI_CLK            144
+#define MMSS_S0_AXI_CLK                 145
+#define OCMEMCX_AHB_CLK                 146
+#define OCMEMCX_OCMEMNOC_CLK            147
+#define OXILI_OCMEMGX_CLK               148
+#define OXILI_GFX3D_CLK                 149
+#define OXILI_RBBMTIMER_CLK             150
+#define OXILICX_AHB_CLK                 151
+#define VENUS0_AHB_CLK                  152
+#define VENUS0_AXI_CLK                  153
+#define VENUS0_CORE0_VCODEC_CLK         154
+#define VENUS0_CORE1_VCODEC_CLK         155
+#define VENUS0_OCMEMNOC_CLK             156
+#define VENUS0_VCODEC0_CLK              157
+#define VPU_AHB_CLK                     158
+#define VPU_AXI_CLK                     159
+#define VPU_BUS_CLK                     160
+#define VPU_CXO_CLK                     161
+#define VPU_MAPLE_CLK                   162
+#define VPU_SLEEP_CLK                   163
+#define VPU_VDP_CLK                     164
+
+#endif
diff --git a/include/dt-bindings/clock/qcom,mmcc-msm8960.h b/include/dt-bindings/clock/qcom,mmcc-msm8960.h
index 5868ef14a777..85041b28f97f 100644
--- a/include/dt-bindings/clock/qcom,mmcc-msm8960.h
+++ b/include/dt-bindings/clock/qcom,mmcc-msm8960.h
@@ -133,5 +133,13 @@
 #define CSIPHY0_TIMER_CLK                               116
 #define PLL1                                            117
 #define PLL2                                            118
+#define RGB_TV_CLK                                      119
+#define NPL_TV_CLK                                      120
+#define VCAP_AHB_CLK                                    121
+#define VCAP_AXI_CLK                                    122
+#define VCAP_SRC                                        123
+#define VCAP_CLK                                        124
+#define VCAP_NPL_CLK                                    125
+#define PLL15                                           126
 
 #endif
diff --git a/include/dt-bindings/clock/rk3066a-cru.h b/include/dt-bindings/clock/rk3066a-cru.h
new file mode 100644
index 000000000000..bc1ed1dbd855
--- /dev/null
+++ b/include/dt-bindings/clock/rk3066a-cru.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Heiko Stuebner <heiko@sntech.de>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include <dt-bindings/clock/rk3188-cru-common.h>
+
+/* soft-reset indices */
+#define SRST_SRST1              0
+#define SRST_SRST2              1
+
+#define SRST_L2MEM              18
+#define SRST_I2S0               23
+#define SRST_I2S1               24
+#define SRST_I2S2               25
+#define SRST_TIMER2             29
+
+#define SRST_GPIO4              36
+#define SRST_GPIO6              38
+
+#define SRST_TSADC              92
+
+#define SRST_HDMI               96
+#define SRST_HDMI_APB           97
+#define SRST_CIF1               111
diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h
new file mode 100644
index 000000000000..750ee60e75fb
--- /dev/null
+++ b/include/dt-bindings/clock/rk3188-cru-common.h
@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Heiko Stuebner <heiko@sntech.de>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+/* core clocks from */
+#define PLL_APLL                1
+#define PLL_DPLL                2
+#define PLL_CPLL                3
+#define PLL_GPLL                4
+#define CORE_PERI               5
+#define CORE_L2C                6
+
+/* sclk gates (special clocks) */
+#define SCLK_UART0              64
+#define SCLK_UART1              65
+#define SCLK_UART2              66
+#define SCLK_UART3              67
+#define SCLK_MAC                68
+#define SCLK_SPI0               69
+#define SCLK_SPI1               70
+#define SCLK_SARADC             71
+#define SCLK_SDMMC              72
+#define SCLK_SDIO               73
+#define SCLK_EMMC               74
+#define SCLK_I2S0               75
+#define SCLK_I2S1               76
+#define SCLK_I2S2               77
+#define SCLK_SPDIF              78
+#define SCLK_CIF0               79
+#define SCLK_CIF1               80
+#define SCLK_OTGPHY0            81
+#define SCLK_OTGPHY1            82
+#define SCLK_HSADC              83
+#define SCLK_TIMER0             84
+#define SCLK_TIMER1             85
+#define SCLK_TIMER2             86
+#define SCLK_TIMER3             87
+#define SCLK_TIMER4             88
+#define SCLK_TIMER5             89
+#define SCLK_TIMER6             90
+#define SCLK_JTAG               91
+#define SCLK_SMC                92
+
+#define DCLK_LCDC0              190
+#define DCLK_LCDC1              191
+
+/* aclk gates */
+#define ACLK_DMA1               192
+#define ACLK_DMA2               193
+#define ACLK_GPS                194
+#define ACLK_LCDC0              195
+#define ACLK_LCDC1              196
+#define ACLK_GPU                197
+#define ACLK_SMC                198
+#define ACLK_CIF                199
+#define ACLK_IPP                200
+#define ACLK_RGA                201
+#define ACLK_CIF0               202
+
+/* pclk gates */
+#define PCLK_GRF                320
+#define PCLK_PMU                321
+#define PCLK_TIMER0             322
+#define PCLK_TIMER1             323
+#define PCLK_TIMER2             324
+#define PCLK_TIMER3             325
+#define PCLK_PWM01              326
+#define PCLK_PWM23              327
+#define PCLK_SPI0               328
+#define PCLK_SPI1               329
+#define PCLK_SARADC             330
+#define PCLK_WDT                331
+#define PCLK_UART0              332
+#define PCLK_UART1              333
+#define PCLK_UART2              334
+#define PCLK_UART3              335
+#define PCLK_I2C0               336
+#define PCLK_I2C1               337
+#define PCLK_I2C2               338
+#define PCLK_I2C3               339
+#define PCLK_I2C4               340
+#define PCLK_GPIO0              341
+#define PCLK_GPIO1              342
+#define PCLK_GPIO2              343
+#define PCLK_GPIO3              344
+#define PCLK_GPIO4              345
+#define PCLK_GPIO6              346
+#define PCLK_EFUSE              347
+#define PCLK_TZPC               348
+#define PCLK_TSADC              349
+
+/* hclk gates */
+#define HCLK_SDMMC              448
+#define HCLK_SDIO               449
+#define HCLK_EMMC               450
+#define HCLK_OTG0               451
+#define HCLK_EMAC               452
+#define HCLK_SPDIF              453
+#define HCLK_I2S0               454
+#define HCLK_I2S1               455
+#define HCLK_I2S2               456
+#define HCLK_OTG1               457
+#define HCLK_HSIC               458
+#define HCLK_HSADC              459
+#define HCLK_PIDF               460
+#define HCLK_LCDC0              461
+#define HCLK_LCDC1              462
+#define HCLK_ROM                463
+#define HCLK_CIF0               464
+#define HCLK_IPP                465
+#define HCLK_RGA                466
+#define HCLK_NANDC0             467
+
+#define CLK_NR_CLKS             (HCLK_NANDC0 + 1)
+
+/* soft-reset indices */
+#define SRST_MCORE              2
+#define SRST_CORE0              3
+#define SRST_CORE1              4
+#define SRST_MCORE_DBG          7
+#define SRST_CORE0_DBG          8
+#define SRST_CORE1_DBG          9
+#define SRST_CORE0_WDT          12
+#define SRST_CORE1_WDT          13
+#define SRST_STRC_SYS           14
+#define SRST_L2C                15
+
+#define SRST_CPU_AHB            17
+#define SRST_AHB2APB            19
+#define SRST_DMA1               20
+#define SRST_INTMEM             21
+#define SRST_ROM                22
+#define SRST_SPDIF              26
+#define SRST_TIMER0             27
+#define SRST_TIMER1             28
+#define SRST_EFUSE              30
+
+#define SRST_GPIO0              32
+#define SRST_GPIO1              33
+#define SRST_GPIO2              34
+#define SRST_GPIO3              35
+
+#define SRST_UART0              39
+#define SRST_UART1              40
+#define SRST_UART2              41
+#define SRST_UART3              42
+#define SRST_I2C0               43
+#define SRST_I2C1               44
+#define SRST_I2C2               45
+#define SRST_I2C3               46
+#define SRST_I2C4               47
+
+#define SRST_PWM0               48
+#define SRST_PWM1               49
+#define SRST_DAP_PO             50
+#define SRST_DAP                51
+#define SRST_DAP_SYS            52
+#define SRST_TPIU_ATB           53
+#define SRST_PMU_APB            54
+#define SRST_GRF                55
+#define SRST_PMU                56
+#define SRST_PERI_AXI           57
+#define SRST_PERI_AHB           58
+#define SRST_PERI_APB           59
+#define SRST_PERI_NIU           60
+#define SRST_CPU_PERI           61
+#define SRST_EMEM_PERI          62
+#define SRST_USB_PERI           63
+
+#define SRST_DMA2               64
+#define SRST_SMC                65
+#define SRST_MAC                66
+#define SRST_NANC0              68
+#define SRST_USBOTG0            69
+#define SRST_USBPHY0            70
+#define SRST_OTGC0              71
+#define SRST_USBOTG1            72
+#define SRST_USBPHY1            73
+#define SRST_OTGC1              74
+#define SRST_HSADC              76
+#define SRST_PIDFILTER          77
+#define SRST_DDR_MSCH           79
+
+#define SRST_TZPC               80
+#define SRST_SDMMC              81
+#define SRST_SDIO               82
+#define SRST_EMMC               83
+#define SRST_SPI0               84
+#define SRST_SPI1               85
+#define SRST_WDT                86
+#define SRST_SARADC             87
+#define SRST_DDRPHY             88
+#define SRST_DDRPHY_APB         89
+#define SRST_DDRCTL             90
+#define SRST_DDRCTL_APB         91
+#define SRST_DDRPUB             93
+
+#define SRST_VIO0_AXI           98
+#define SRST_VIO0_AHB           99
+#define SRST_LCDC0_AXI          100
+#define SRST_LCDC0_AHB          101
+#define SRST_LCDC0_DCLK         102
+#define SRST_LCDC1_AXI          103
+#define SRST_LCDC1_AHB          104
+#define SRST_LCDC1_DCLK         105
+#define SRST_IPP_AXI            106
+#define SRST_IPP_AHB            107
+#define SRST_RGA_AXI            108
+#define SRST_RGA_AHB            109
+#define SRST_CIF0               110
+
+#define SRST_VCODEC_AXI         112
+#define SRST_VCODEC_AHB         113
+#define SRST_VIO1_AXI           114
+#define SRST_VCODEC_CPU         115
+#define SRST_VCODEC_NIU         116
+#define SRST_GPU                120
+#define SRST_GPU_NIU            122
+#define SRST_TFUN_ATB           125
+#define SRST_TFUN_APB           126
+#define SRST_CTI4_APB           127
+
+#define SRST_TPIU_APB           128
+#define SRST_TRACE              129
+#define SRST_CORE_DBG           130
+#define SRST_DBG_APB            131
+#define SRST_CTI0               132
+#define SRST_CTI0_APB           133
+#define SRST_CTI1               134
+#define SRST_CTI1_APB           135
+#define SRST_PTM_CORE0          136
+#define SRST_PTM_CORE1          137
+#define SRST_PTM0               138
+#define SRST_PTM0_ATB           139
+#define SRST_PTM1               140
+#define SRST_PTM1_ATB           141
+#define SRST_CTM                142
+#define SRST_TS                 143
diff --git a/include/dt-bindings/clock/rk3188-cru.h b/include/dt-bindings/clock/rk3188-cru.h
new file mode 100644
index 000000000000..9fac8edd3f9d
--- /dev/null
+++ b/include/dt-bindings/clock/rk3188-cru.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Heiko Stuebner <heiko@sntech.de>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include <dt-bindings/clock/rk3188-cru-common.h>
+
+/* soft-reset indices */
+#define SRST_PTM_CORE2          0
+#define SRST_PTM_CORE3          1
+#define SRST_CORE2              5
+#define SRST_CORE3              6
+#define SRST_CORE2_DBG          10
+#define SRST_CORE3_DBG          11
+
+#define SRST_TIMER2             16
+#define SRST_TIMER4             23
+#define SRST_I2S0               24
+#define SRST_TIMER5             25
+#define SRST_TIMER3             29
+#define SRST_TIMER6             31
+
+#define SRST_PTM3               36
+#define SRST_PTM3_ATB           37
+
+#define SRST_GPS                67
+#define SRST_HSICPHY            75
+#define SRST_TIMER              78
+
+#define SRST_PTM2               92
+#define SRST_CORE2_WDT          94
+#define SRST_CORE3_WDT          95
+
+#define SRST_PTM2_ATB           111
+
+#define SRST_HSIC               117
+#define SRST_CTI2               118
+#define SRST_CTI2_APB           119
+#define SRST_GPU_BRIDGE         121
+#define SRST_CTI3               123
+#define SRST_CTI3_APB           124
diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h
new file mode 100644
index 000000000000..ebcb460ea4ad
--- /dev/null
+++ b/include/dt-bindings/clock/rk3288-cru.h
@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Heiko Stuebner <heiko@sntech.de>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+/* core clocks */
+#define PLL_APLL                1
+#define PLL_DPLL                2
+#define PLL_CPLL                3
+#define PLL_GPLL                4
+#define PLL_NPLL                5
+
+/* sclk gates (special clocks) */
+#define SCLK_GPU                64
+#define SCLK_SPI0               65
+#define SCLK_SPI1               66
+#define SCLK_SPI2               67
+#define SCLK_SDMMC              68
+#define SCLK_SDIO0              69
+#define SCLK_SDIO1              70
+#define SCLK_EMMC               71
+#define SCLK_TSADC              72
+#define SCLK_SARADC             73
+#define SCLK_PS2C               74
+#define SCLK_NANDC0             75
+#define SCLK_NANDC1             76
+#define SCLK_UART0              77
+#define SCLK_UART1              78
+#define SCLK_UART2              79
+#define SCLK_UART3              80
+#define SCLK_UART4              81
+#define SCLK_I2S0               82
+#define SCLK_SPDIF              83
+#define SCLK_SPDIF8CH           84
+#define SCLK_TIMER0             85
+#define SCLK_TIMER1             86
+#define SCLK_TIMER2             87
+#define SCLK_TIMER3             88
+#define SCLK_TIMER4             89
+#define SCLK_TIMER5             90
+#define SCLK_TIMER6             91
+#define SCLK_HSADC              92
+#define SCLK_OTGPHY0            93
+#define SCLK_OTGPHY1            94
+#define SCLK_OTGPHY2            95
+#define SCLK_OTG_ADP            96
+#define SCLK_HSICPHY480M        97
+#define SCLK_HSICPHY12M         98
+#define SCLK_MACREF             99
+#define SCLK_LCDC_PWM0          100
+#define SCLK_LCDC_PWM1          101
+#define SCLK_MAC_RX             102
+#define SCLK_MAC_TX             103
+
+#define DCLK_VOP0               190
+#define DCLK_VOP1               191
+
+/* aclk gates */
+#define ACLK_GPU                192
+#define ACLK_DMAC1              193
+#define ACLK_DMAC2              194
+#define ACLK_MMU                195
+#define ACLK_GMAC               196
+#define ACLK_VOP0               197
+#define ACLK_VOP1               198
+#define ACLK_CRYPTO             199
+#define ACLK_RGA                200
+
+/* pclk gates */
+#define PCLK_GPIO0              320
+#define PCLK_GPIO1              321
+#define PCLK_GPIO2              322
+#define PCLK_GPIO3              323
+#define PCLK_GPIO4              324
+#define PCLK_GPIO5              325
+#define PCLK_GPIO6              326
+#define PCLK_GPIO7              327
+#define PCLK_GPIO8              328
+#define PCLK_GRF                329
+#define PCLK_SGRF               330
+#define PCLK_PMU                331
+#define PCLK_I2C0               332
+#define PCLK_I2C1               333
+#define PCLK_I2C2               334
+#define PCLK_I2C3               335
+#define PCLK_I2C4               336
+#define PCLK_I2C5               337
+#define PCLK_SPI0               338
+#define PCLK_SPI1               339
+#define PCLK_SPI2               340
+#define PCLK_UART0              341
+#define PCLK_UART1              342
+#define PCLK_UART2              343
+#define PCLK_UART3              344
+#define PCLK_UART4              345
+#define PCLK_TSADC              346
+#define PCLK_SARADC             347
+#define PCLK_SIM                348
+#define PCLK_GMAC               349
+#define PCLK_PWM                350
+#define PCLK_RKPWM              351
+#define PCLK_PS2C               352
+#define PCLK_TIMER              353
+#define PCLK_TZPC               354
+
+/* hclk gates */
+#define HCLK_GPS                448
+#define HCLK_OTG0               449
+#define HCLK_USBHOST0           450
+#define HCLK_USBHOST1           451
+#define HCLK_HSIC               452
+#define HCLK_NANDC0             453
+#define HCLK_NANDC1             454
+#define HCLK_TSP                455
+#define HCLK_SDMMC              456
+#define HCLK_SDIO0              457
+#define HCLK_SDIO1              458
+#define HCLK_EMMC               459
+#define HCLK_HSADC              460
+#define HCLK_CRYPTO             461
+#define HCLK_I2S0               462
+#define HCLK_SPDIF              463
+#define HCLK_SPDIF8CH           464
+#define HCLK_VOP0               465
+#define HCLK_VOP1               466
+#define HCLK_ROM                467
+#define HCLK_IEP                468
+#define HCLK_ISP                469
+#define HCLK_RGA                470
+
+#define CLK_NR_CLKS             (HCLK_RGA + 1)
+
+/* soft-reset indices */
+#define SRST_CORE0              0
+#define SRST_CORE1              1
+#define SRST_CORE2              2
+#define SRST_CORE3              3
+#define SRST_CORE0_PO           4
+#define SRST_CORE1_PO           5
+#define SRST_CORE2_PO           6
+#define SRST_CORE3_PO           7
+#define SRST_PDCORE_STRSYS      8
+#define SRST_PDBUS_STRSYS       9
+#define SRST_L2C                10
+#define SRST_TOPDBG             11
+#define SRST_CORE0_DBG          12
+#define SRST_CORE1_DBG          13
+#define SRST_CORE2_DBG          14
+#define SRST_CORE3_DBG          15
+
+#define SRST_PDBUG_AHB_ARBITOR  16
+#define SRST_EFUSE256           17
+#define SRST_DMAC1              18
+#define SRST_INTMEM             19
+#define SRST_ROM                20
+#define SRST_SPDIF8CH           21
+#define SRST_TIMER              22
+#define SRST_I2S0               23
+#define SRST_SPDIF              24
+#define SRST_TIMER0             25
+#define SRST_TIMER1             26
+#define SRST_TIMER2             27
+#define SRST_TIMER3             28
+#define SRST_TIMER4             29
+#define SRST_TIMER5             30
+#define SRST_EFUSE              31
+
+#define SRST_GPIO0              32
+#define SRST_GPIO1              33
+#define SRST_GPIO2              34
+#define SRST_GPIO3              35
+#define SRST_GPIO4              36
+#define SRST_GPIO5              37
+#define SRST_GPIO6              38
+#define SRST_GPIO7              39
+#define SRST_GPIO8              40
+#define SRST_I2C0               42
+#define SRST_I2C1               43
+#define SRST_I2C2               44
+#define SRST_I2C3               45
+#define SRST_I2C4               46
+#define SRST_I2C5               47
+
+#define SRST_DWPWM              48
+#define SRST_MMC_PERI           49
+#define SRST_PERIPH_MMU         50
+#define SRST_DAP                51
+#define SRST_DAP_SYS            52
+#define SRST_TPIU               53
+#define SRST_PMU_APB            54
+#define SRST_GRF                55
+#define SRST_PMU                56
+#define SRST_PERIPH_AXI         57
+#define SRST_PERIPH_AHB         58
+#define SRST_PERIPH_APB         59
+#define SRST_PERIPH_NIU         60
+#define SRST_PDPERI_AHB_ARBI    61
+#define SRST_EMEM               62
+#define SRST_USB_PERI           63
+
+#define SRST_DMAC2              64
+#define SRST_MAC                66
+#define SRST_GPS                67
+#define SRST_RKPWM              69
+#define SRST_CCP                71
+#define SRST_USBHOST0           72
+#define SRST_HSIC               73
+#define SRST_HSIC_AUX           74
+#define SRST_HSIC_PHY           75
+#define SRST_HSADC              76
+#define SRST_NANDC0             77
+#define SRST_NANDC1             78
+
+#define SRST_TZPC               80
+#define SRST_SPI0               83
+#define SRST_SPI1               84
+#define SRST_SPI2               85
+#define SRST_SARADC             87
+#define SRST_PDALIVE_NIU        88
+#define SRST_PDPMU_INTMEM       89
+#define SRST_PDPMU_NIU          90
+#define SRST_SGRF               91
+
+#define SRST_VIO_ARBI           96
+#define SRST_RGA_NIU            97
+#define SRST_VIO0_NIU_AXI       98
+#define SRST_VIO_NIU_AHB        99
+#define SRST_LCDC0_AXI          100
+#define SRST_LCDC0_AHB          101
+#define SRST_LCDC0_DCLK         102
+#define SRST_VIO1_NIU_AXI       103
+#define SRST_VIP                104
+#define SRST_RGA_CORE           105
+#define SRST_IEP_AXI            106
+#define SRST_IEP_AHB            107
+#define SRST_RGA_AXI            108
+#define SRST_RGA_AHB            109
+#define SRST_ISP                110
+#define SRST_EDP                111
+
+#define SRST_VCODEC_AXI         112
+#define SRST_VCODEC_AHB         113
+#define SRST_VIO_H2P            114
+#define SRST_MIPIDSI0           115
+#define SRST_MIPIDSI1           116
+#define SRST_MIPICSI            117
+#define SRST_LVDS_PHY           118
+#define SRST_LVDS_CON           119
+#define SRST_GPU                120
+#define SRST_HDMI               121
+#define SRST_CORE_PVTM          124
+#define SRST_GPU_PVTM           125
+
+#define SRST_MMC0               128
+#define SRST_SDIO0              129
+#define SRST_SDIO1              130
+#define SRST_EMMC               131
+#define SRST_USBOTG_AHB         132
+#define SRST_USBOTG_PHY         133
+#define SRST_USBOTG_CON         134
+#define SRST_USBHOST0_AHB       135
+#define SRST_USBHOST0_PHY       136
+#define SRST_USBHOST0_CON       137
+#define SRST_USBHOST1_AHB       138
+#define SRST_USBHOST1_PHY       139
+#define SRST_USBHOST1_CON       140
+#define SRST_USB_ADP            141
+#define SRST_ACC_EFUSE          142
diff --git a/include/dt-bindings/mfd/palmas.h b/include/dt-bindings/mfd/palmas.h
new file mode 100644
index 000000000000..2c8ac4841385
--- /dev/null
+++ b/include/dt-bindings/mfd/palmas.h
@@ -0,0 +1,18 @@
+/*
+ * This header provides macros for Palmas device bindings.
+ *
+ * Copyright (c) 2013, NVIDIA Corporation.
+ *
+ * Author: Laxman Dewangan <ldewangan@nvidia.com>
+ *
+ */
+
+#ifndef __DT_BINDINGS_PALMAS_H__
+#define __DT_BINDINGS_PALMAS_H
+
+/* External control pins */
+#define PALMAS_EXT_CONTROL_PIN_ENABLE1  1
+#define PALMAS_EXT_CONTROL_PIN_ENABLE2  2
+#define PALMAS_EXT_CONTROL_PIN_NSLEEP   3
+
+#endif /* __DT_BINDINGS_PALMAS_H */
diff --git a/include/dt-bindings/phy/phy-miphy365x.h b/include/dt-bindings/phy/phy-miphy365x.h
new file mode 100644
index 000000000000..8ef8aba6edd6
--- /dev/null
+++ b/include/dt-bindings/phy/phy-miphy365x.h
@@ -0,0 +1,14 @@
+/*
+ * 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/dra.h b/include/dt-bindings/pinctrl/dra.h
index 002a2855c046..3d33794e4f3e 100644
--- a/include/dt-bindings/pinctrl/dra.h
+++ b/include/dt-bindings/pinctrl/dra.h
@@ -30,7 +30,8 @@
 #define MUX_MODE14      0xe
 #define MUX_MODE15      0xf
 
-#define PULL_ENA                (1 << 16)
+#define PULL_ENA                (0 << 16)
+#define PULL_DIS                (1 << 16)
 #define PULL_UP                 (1 << 17)
 #define INPUT_EN                (1 << 18)
 #define SLEWCONTROL             (1 << 19)
@@ -38,10 +39,10 @@
 #define WAKEUP_EVENT            (1 << 25)
 
 /* Active pin states */
-#define PIN_OUTPUT              0
+#define PIN_OUTPUT              (0 | PULL_DIS)
 #define PIN_OUTPUT_PULLUP       (PIN_OUTPUT | PULL_ENA | PULL_UP)
 #define PIN_OUTPUT_PULLDOWN     (PIN_OUTPUT | PULL_ENA)
-#define PIN_INPUT               INPUT_EN
+#define PIN_INPUT               (INPUT_EN | PULL_DIS)
 #define PIN_INPUT_SLEW          (INPUT_EN | SLEWCONTROL)
 #define PIN_INPUT_PULLUP        (PULL_ENA | INPUT_EN | PULL_UP)
 #define PIN_INPUT_PULLDOWN      (PULL_ENA | INPUT_EN)
diff --git a/include/dt-bindings/reset/qcom,gcc-apq8084.h b/include/dt-bindings/reset/qcom,gcc-apq8084.h
new file mode 100644
index 000000000000..527caaf48e3d
--- /dev/null
+++ b/include/dt-bindings/reset/qcom,gcc-apq8084.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#ifndef _DT_BINDINGS_RESET_APQ_GCC_8084_H
+#define _DT_BINDINGS_RESET_APQ_GCC_8084_H
+
+#define GCC_SYSTEM_NOC_BCR              0
+#define GCC_CONFIG_NOC_BCR              1
+#define GCC_PERIPH_NOC_BCR              2
+#define GCC_IMEM_BCR                    3
+#define GCC_MMSS_BCR                    4
+#define GCC_QDSS_BCR                    5
+#define GCC_USB_30_BCR                  6
+#define GCC_USB3_PHY_BCR                7
+#define GCC_USB_HS_HSIC_BCR             8
+#define GCC_USB_HS_BCR                  9
+#define GCC_USB2A_PHY_BCR               10
+#define GCC_USB2B_PHY_BCR               11
+#define GCC_SDCC1_BCR                   12
+#define GCC_SDCC2_BCR                   13
+#define GCC_SDCC3_BCR                   14
+#define GCC_SDCC4_BCR                   15
+#define GCC_BLSP1_BCR                   16
+#define GCC_BLSP1_QUP1_BCR              17
+#define GCC_BLSP1_UART1_BCR             18
+#define GCC_BLSP1_QUP2_BCR              19
+#define GCC_BLSP1_UART2_BCR             20
+#define GCC_BLSP1_QUP3_BCR              21
+#define GCC_BLSP1_UART3_BCR             22
+#define GCC_BLSP1_QUP4_BCR              23
+#define GCC_BLSP1_UART4_BCR             24
+#define GCC_BLSP1_QUP5_BCR              25
+#define GCC_BLSP1_UART5_BCR             26
+#define GCC_BLSP1_QUP6_BCR              27
+#define GCC_BLSP1_UART6_BCR             28
+#define GCC_BLSP2_BCR                   29
+#define GCC_BLSP2_QUP1_BCR              30
+#define GCC_BLSP2_UART1_BCR             31
+#define GCC_BLSP2_QUP2_BCR              32
+#define GCC_BLSP2_UART2_BCR             33
+#define GCC_BLSP2_QUP3_BCR              34
+#define GCC_BLSP2_UART3_BCR             35
+#define GCC_BLSP2_QUP4_BCR              36
+#define GCC_BLSP2_UART4_BCR             37
+#define GCC_BLSP2_QUP5_BCR              38
+#define GCC_BLSP2_UART5_BCR             39
+#define GCC_BLSP2_QUP6_BCR              40
+#define GCC_BLSP2_UART6_BCR             41
+#define GCC_PDM_BCR                     42
+#define GCC_PRNG_BCR                    43
+#define GCC_BAM_DMA_BCR                 44
+#define GCC_TSIF_BCR                    45
+#define GCC_TCSR_BCR                    46
+#define GCC_BOOT_ROM_BCR                47
+#define GCC_MSG_RAM_BCR                 48
+#define GCC_TLMM_BCR                    49
+#define GCC_MPM_BCR                     50
+#define GCC_MPM_AHB_RESET               51
+#define GCC_MPM_NON_AHB_RESET           52
+#define GCC_SEC_CTRL_BCR                53
+#define GCC_SPMI_BCR                    54
+#define GCC_SPDM_BCR                    55
+#define GCC_CE1_BCR                     56
+#define GCC_CE2_BCR                     57
+#define GCC_BIMC_BCR                    58
+#define GCC_SNOC_BUS_TIMEOUT0_BCR       59
+#define GCC_SNOC_BUS_TIMEOUT2_BCR       60
+#define GCC_PNOC_BUS_TIMEOUT0_BCR       61
+#define GCC_PNOC_BUS_TIMEOUT1_BCR       62
+#define GCC_PNOC_BUS_TIMEOUT2_BCR       63
+#define GCC_PNOC_BUS_TIMEOUT3_BCR       64
+#define GCC_PNOC_BUS_TIMEOUT4_BCR       65
+#define GCC_CNOC_BUS_TIMEOUT0_BCR       66
+#define GCC_CNOC_BUS_TIMEOUT1_BCR       67
+#define GCC_CNOC_BUS_TIMEOUT2_BCR       68
+#define GCC_CNOC_BUS_TIMEOUT3_BCR       69
+#define GCC_CNOC_BUS_TIMEOUT4_BCR       70
+#define GCC_CNOC_BUS_TIMEOUT5_BCR       71
+#define GCC_CNOC_BUS_TIMEOUT6_BCR       72
+#define GCC_DEHR_BCR                    73
+#define GCC_RBCPR_BCR                   74
+#define GCC_MSS_RESTART                 75
+#define GCC_LPASS_RESTART               76
+#define GCC_WCSS_RESTART                77
+#define GCC_VENUS_RESTART               78
+#define GCC_COPSS_SMMU_BCR              79
+#define GCC_SPSS_BCR                    80
+#define GCC_PCIE_0_BCR                  81
+#define GCC_PCIE_0_PHY_BCR              82
+#define GCC_PCIE_1_BCR                  83
+#define GCC_PCIE_1_PHY_BCR              84
+#define GCC_USB_30_SEC_BCR              85
+#define GCC_USB3_SEC_PHY_BCR            86
+#define GCC_SATA_BCR                    87
+#define GCC_CE3_BCR                     88
+#define GCC_UFS_BCR                     89
+#define GCC_USB30_PHY_COM_BCR           90
+
+#endif
diff --git a/include/dt-bindings/reset/qcom,gcc-ipq806x.h b/include/dt-bindings/reset/qcom,gcc-ipq806x.h
new file mode 100644
index 000000000000..0ad5ef930b5d
--- /dev/null
+++ b/include/dt-bindings/reset/qcom,gcc-ipq806x.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#ifndef _DT_BINDINGS_RESET_IPQ_806X_H
+#define _DT_BINDINGS_RESET_IPQ_806X_H
+
+#define QDSS_STM_RESET                                  0
+#define AFAB_SMPSS_S_RESET                              1
+#define AFAB_SMPSS_M1_RESET                             2
+#define AFAB_SMPSS_M0_RESET                             3
+#define AFAB_EBI1_CH0_RESET                             4
+#define AFAB_EBI1_CH1_RESET                             5
+#define SFAB_ADM0_M0_RESET                              6
+#define SFAB_ADM0_M1_RESET                              7
+#define SFAB_ADM0_M2_RESET                              8
+#define ADM0_C2_RESET                                   9
+#define ADM0_C1_RESET                                   10
+#define ADM0_C0_RESET                                   11
+#define ADM0_PBUS_RESET                                 12
+#define ADM0_RESET                                      13
+#define QDSS_CLKS_SW_RESET                              14
+#define QDSS_POR_RESET                                  15
+#define QDSS_TSCTR_RESET                                16
+#define QDSS_HRESET_RESET                               17
+#define QDSS_AXI_RESET                                  18
+#define QDSS_DBG_RESET                                  19
+#define SFAB_PCIE_M_RESET                               20
+#define SFAB_PCIE_S_RESET                               21
+#define PCIE_EXT_RESET                                  22
+#define PCIE_PHY_RESET                                  23
+#define PCIE_PCI_RESET                                  24
+#define PCIE_POR_RESET                                  25
+#define PCIE_HCLK_RESET                                 26
+#define PCIE_ACLK_RESET                                 27
+#define SFAB_LPASS_RESET                                28
+#define SFAB_AFAB_M_RESET                               29
+#define AFAB_SFAB_M0_RESET                              30
+#define AFAB_SFAB_M1_RESET                              31
+#define SFAB_SATA_S_RESET                               32
+#define SFAB_DFAB_M_RESET                               33
+#define DFAB_SFAB_M_RESET                               34
+#define DFAB_SWAY0_RESET                                35
+#define DFAB_SWAY1_RESET                                36
+#define DFAB_ARB0_RESET                                 37
+#define DFAB_ARB1_RESET                                 38
+#define PPSS_PROC_RESET                                 39
+#define PPSS_RESET                                      40
+#define DMA_BAM_RESET                                   41
+#define SPS_TIC_H_RESET                                 42
+#define SFAB_CFPB_M_RESET                               43
+#define SFAB_CFPB_S_RESET                               44
+#define TSIF_H_RESET                                    45
+#define CE1_H_RESET                                     46
+#define CE1_CORE_RESET                                  47
+#define CE1_SLEEP_RESET                                 48
+#define CE2_H_RESET                                     49
+#define CE2_CORE_RESET                                  50
+#define SFAB_SFPB_M_RESET                               51
+#define SFAB_SFPB_S_RESET                               52
+#define RPM_PROC_RESET                                  53
+#define PMIC_SSBI2_RESET                                54
+#define SDC1_RESET                                      55
+#define SDC2_RESET                                      56
+#define SDC3_RESET                                      57
+#define SDC4_RESET                                      58
+#define USB_HS1_RESET                                   59
+#define USB_HSIC_RESET                                  60
+#define USB_FS1_XCVR_RESET                              61
+#define USB_FS1_RESET                                   62
+#define GSBI1_RESET                                     63
+#define GSBI2_RESET                                     64
+#define GSBI3_RESET                                     65
+#define GSBI4_RESET                                     66
+#define GSBI5_RESET                                     67
+#define GSBI6_RESET                                     68
+#define GSBI7_RESET                                     69
+#define SPDM_RESET                                      70
+#define SEC_CTRL_RESET                                  71
+#define TLMM_H_RESET                                    72
+#define SFAB_SATA_M_RESET                               73
+#define SATA_RESET                                      74
+#define TSSC_RESET                                      75
+#define PDM_RESET                                       76
+#define MPM_H_RESET                                     77
+#define MPM_RESET                                       78
+#define SFAB_SMPSS_S_RESET                              79
+#define PRNG_RESET                                      80
+#define SFAB_CE3_M_RESET                                81
+#define SFAB_CE3_S_RESET                                82
+#define CE3_SLEEP_RESET                                 83
+#define PCIE_1_M_RESET                                  84
+#define PCIE_1_S_RESET                                  85
+#define PCIE_1_EXT_RESET                                86
+#define PCIE_1_PHY_RESET                                87
+#define PCIE_1_PCI_RESET                                88
+#define PCIE_1_POR_RESET                                89
+#define PCIE_1_HCLK_RESET                               90
+#define PCIE_1_ACLK_RESET                               91
+#define PCIE_2_M_RESET                                  92
+#define PCIE_2_S_RESET                                  93
+#define PCIE_2_EXT_RESET                                94
+#define PCIE_2_PHY_RESET                                95
+#define PCIE_2_PCI_RESET                                96
+#define PCIE_2_POR_RESET                                97
+#define PCIE_2_HCLK_RESET                               98
+#define PCIE_2_ACLK_RESET                               99
+#define SFAB_USB30_S_RESET                              100
+#define SFAB_USB30_M_RESET                              101
+#define USB30_0_PORT2_HS_PHY_RESET                      102
+#define USB30_0_MASTER_RESET                            103
+#define USB30_0_SLEEP_RESET                             104
+#define USB30_0_UTMI_PHY_RESET                          105
+#define USB30_0_POWERON_RESET                           106
+#define USB30_0_PHY_RESET                               107
+#define USB30_1_MASTER_RESET                            108
+#define USB30_1_SLEEP_RESET                             109
+#define USB30_1_UTMI_PHY_RESET                          110
+#define USB30_1_POWERON_RESET                           111
+#define USB30_1_PHY_RESET                               112
+#define NSSFB0_RESET                                    113
+#define NSSFB1_RESET                                    114
+#endif
diff --git a/include/dt-bindings/reset/qcom,gcc-msm8960.h b/include/dt-bindings/reset/qcom,gcc-msm8960.h
index 07edd0e65eed..47c8686955da 100644
--- a/include/dt-bindings/reset/qcom,gcc-msm8960.h
+++ b/include/dt-bindings/reset/qcom,gcc-msm8960.h
@@ -114,5 +114,21 @@
 #define SFAB_SMPSS_S_RESET                              97
 #define PRNG_RESET                                      98
 #define RIVA_RESET                                      99
+#define USB_HS3_RESET                                   100
+#define USB_HS4_RESET                                   101
+#define CE3_RESET                                       102
+#define PCIE_EXT_PCI_RESET                              103
+#define PCIE_PHY_RESET                                  104
+#define PCIE_PCI_RESET                                  105
+#define PCIE_POR_RESET                                  106
+#define PCIE_HCLK_RESET                                 107
+#define PCIE_ACLK_RESET                                 108
+#define CE3_H_RESET                                     109
+#define SFAB_CE3_M_RESET                                110
+#define SFAB_CE3_S_RESET                                111
+#define SATA_RESET                                      112
+#define CE3_SLEEP_RESET                                 113
+#define GSS_SLP_RESET                                   114
+#define GSS_RESET                                       115
 
 #endif
diff --git a/include/dt-bindings/reset/qcom,mmcc-apq8084.h b/include/dt-bindings/reset/qcom,mmcc-apq8084.h
new file mode 100644
index 000000000000..c1671396531d
--- /dev/null
+++ b/include/dt-bindings/reset/qcom,mmcc-apq8084.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#ifndef _DT_BINDINGS_RESET_APQ_MMCC_8084_H
+#define _DT_BINDINGS_RESET_APQ_MMCC_8084_H
+
+#define MMSS_SPDM_RESET                 0
+#define MMSS_SPDM_RM_RESET              1
+#define VENUS0_RESET                    2
+#define VPU_RESET                       3
+#define MDSS_RESET                      4
+#define AVSYNC_RESET                    5
+#define CAMSS_PHY0_RESET                6
+#define CAMSS_PHY1_RESET                7
+#define CAMSS_PHY2_RESET                8
+#define CAMSS_CSI0_RESET                9
+#define CAMSS_CSI0PHY_RESET             10
+#define CAMSS_CSI0RDI_RESET             11
+#define CAMSS_CSI0PIX_RESET             12
+#define CAMSS_CSI1_RESET                13
+#define CAMSS_CSI1PHY_RESET             14
+#define CAMSS_CSI1RDI_RESET             15
+#define CAMSS_CSI1PIX_RESET             16
+#define CAMSS_CSI2_RESET                17
+#define CAMSS_CSI2PHY_RESET             18
+#define CAMSS_CSI2RDI_RESET             19
+#define CAMSS_CSI2PIX_RESET             20
+#define CAMSS_CSI3_RESET                21
+#define CAMSS_CSI3PHY_RESET             22
+#define CAMSS_CSI3RDI_RESET             23
+#define CAMSS_CSI3PIX_RESET             24
+#define CAMSS_ISPIF_RESET               25
+#define CAMSS_CCI_RESET                 26
+#define CAMSS_MCLK0_RESET               27
+#define CAMSS_MCLK1_RESET               28
+#define CAMSS_MCLK2_RESET               29
+#define CAMSS_MCLK3_RESET               30
+#define CAMSS_GP0_RESET                 31
+#define CAMSS_GP1_RESET                 32
+#define CAMSS_TOP_RESET                 33
+#define CAMSS_AHB_RESET                 34
+#define CAMSS_MICRO_RESET               35
+#define CAMSS_JPEG_RESET                36
+#define CAMSS_VFE_RESET                 37
+#define CAMSS_CSI_VFE0_RESET            38
+#define CAMSS_CSI_VFE1_RESET            39
+#define OXILI_RESET                     40
+#define OXILICX_RESET                   41
+#define OCMEMCX_RESET                   42
+#define MMSS_RBCRP_RESET                43
+#define MMSSNOCAHB_RESET                44
+#define MMSSNOCAXI_RESET                45
+
+#endif
diff --git a/include/dt-bindings/reset/qcom,mmcc-msm8960.h b/include/dt-bindings/reset/qcom,mmcc-msm8960.h
index ba36ec680118..11741113a841 100644
--- a/include/dt-bindings/reset/qcom,mmcc-msm8960.h
+++ b/include/dt-bindings/reset/qcom,mmcc-msm8960.h
@@ -89,5 +89,13 @@
 #define CSI2_RESET                                      72
 #define CSI_RDI1_RESET                                  73
 #define CSI_RDI2_RESET                                  74
+#define GFX3D_AXI_RESET                                 75
+#define VCAP_AXI_RESET                                  76
+#define SMMU_VCAP_AHB_RESET                             77
+#define VCAP_AHB_RESET                                  78
+#define CSI_RDI_RESET                                   79
+#define CSI_PIX_RESET                                   80
+#define VCAP_NPL_RESET                                  81
+#define VCAP_RESET                                      82
 
 #endif
diff --git a/include/keys/big_key-type.h b/include/keys/big_key-type.h
index d69bc8af3292..e0970a578188 100644
--- a/include/keys/big_key-type.h
+++ b/include/keys/big_key-type.h
@@ -16,7 +16,8 @@
 
 extern struct key_type key_type_big_key;
 
-extern int big_key_instantiate(struct key *key, struct key_preparsed_payload *prep);
+extern int big_key_preparse(struct key_preparsed_payload *prep);
+extern void big_key_free_preparse(struct key_preparsed_payload *prep);
 extern void big_key_revoke(struct key *key);
 extern void big_key_destroy(struct key *key);
 extern void big_key_describe(const struct key *big_key, struct seq_file *m);
diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
index 8dabc399bd1d..72665eb80692 100644
--- a/include/keys/system_keyring.h
+++ b/include/keys/system_keyring.h
@@ -17,7 +17,15 @@
 #include <linux/key.h>
 
 extern struct key *system_trusted_keyring;
-
+static inline struct key *get_system_trusted_keyring(void)
+{
+        return system_trusted_keyring;
+}
+#else
+static inline struct key *get_system_trusted_keyring(void)
+{
+        return NULL;
+}
 #endif
 
 #endif /* _KEYS_SYSTEM_KEYRING_H */
diff --git a/include/keys/user-type.h b/include/keys/user-type.h
index 5e452c84f1e6..3ab1873a4bfa 100644
--- a/include/keys/user-type.h
+++ b/include/keys/user-type.h
@@ -37,7 +37,8 @@ extern struct key_type key_type_logon;
 
 struct key_preparsed_payload;
 
-extern int user_instantiate(struct key *key, struct key_preparsed_payload *prep);
+extern int user_preparse(struct key_preparsed_payload *prep);
+extern void user_free_preparse(struct key_preparsed_payload *prep);
 extern int user_update(struct key *key, struct key_preparsed_payload *prep);
 extern int user_match(const struct key *key, const void *criterion);
 extern void user_revoke(struct key *key);
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 358c01b971db..5320153c311b 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -29,17 +29,17 @@
 #include <linux/ioport.h>       /* for struct resource */
 #include <linux/device.h>
 
-#ifdef  CONFIG_ACPI
-
 #ifndef _LINUX
 #define _LINUX
 #endif
+#include <acpi/acpi.h>
+
+#ifdef  CONFIG_ACPI
 
 #include <linux/list.h>
 #include <linux/mod_devicetable.h>
 #include <linux/dynamic_debug.h>
 
-#include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_numa.h>
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 4dbaa7081530..c826d1c28f9c 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -11,6 +11,8 @@
 #define AER_FATAL                       1
 #define AER_CORRECTABLE                 2
 
+struct pci_dev;
+
 struct aer_header_log_regs {
         unsigned int dw0;
         unsigned int dw1;
diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h
index 6dfd51a04d77..09a947e8bc87 100644
--- a/include/linux/ahci_platform.h
+++ b/include/linux/ahci_platform.h
@@ -43,10 +43,7 @@ struct ahci_host_priv *ahci_platform_get_resources(
         struct platform_device *pdev);
 int ahci_platform_init_host(struct platform_device *pdev,
                             struct ahci_host_priv *hpriv,
-                            const struct ata_port_info *pi_template,
-                            unsigned long host_flags,
-                            unsigned int force_port_map,
-                            unsigned int mask_port_map);
+                            const struct ata_port_info *pi_template);
 
 int ahci_platform_suspend_host(struct device *dev);
 int ahci_platform_resume_host(struct device *dev);
diff --git a/include/linux/amd-iommu.h b/include/linux/amd-iommu.h
index 15f6b9edd0b1..2b08e79f5100 100644
--- a/include/linux/amd-iommu.h
+++ b/include/linux/amd-iommu.h
@@ -119,6 +119,13 @@ typedef int (*amd_iommu_invalid_ppr_cb)(struct pci_dev *pdev,
 extern int amd_iommu_set_invalid_ppr_cb(struct pci_dev *pdev,
                                         amd_iommu_invalid_ppr_cb cb);
 
+#define PPR_FAULT_EXEC  (1 << 1)
+#define PPR_FAULT_READ  (1 << 2)
+#define PPR_FAULT_WRITE (1 << 5)
+#define PPR_FAULT_USER  (1 << 6)
+#define PPR_FAULT_RSVD  (1 << 7)
+#define PPR_FAULT_GN    (1 << 8)
+
 /**
  * amd_iommu_device_info() - Get information about IOMMUv2 support of a
  *                           PCI device
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index 7216b0daf544..df0356220730 100644
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -22,10 +22,6 @@
 #ifdef __KERNEL__
 #include  <linux/irqreturn.h>
 
-#ifndef bool
-#define bool int
-#endif
-
 /*
  * RECON_THRESHOLD is the maximum number of RECON messages to receive
  * within one minute before printing a "cabling problem" warning. The
@@ -285,9 +281,9 @@ struct arcnet_local {
         unsigned long first_recon; /* time of "first" RECON message to count */
         unsigned long last_recon;  /* time of most recent RECON */
         int num_recons;         /* number of RECONs between first and last. */
-        bool network_down;      /* do we think the network is down? */
+        int network_down;       /* do we think the network is down? */
 
-        bool excnak_pending;    /* We just got an excesive nak interrupt */
+        int excnak_pending;    /* We just got an excesive nak interrupt */
 
         struct {
                 uint16_t sequence;      /* sequence number (incs with each packet) */
@@ -305,7 +301,7 @@ struct arcnet_local {
                 void (*command) (struct net_device * dev, int cmd);
                 int (*status) (struct net_device * dev);
                 void (*intmask) (struct net_device * dev, int mask);
-                bool (*reset) (struct net_device * dev, bool really_reset);
+                int (*reset) (struct net_device * dev, int really_reset);
                 void (*open) (struct net_device * dev);
                 void (*close) (struct net_device * dev);
 
diff --git a/include/linux/atmel-ssc.h b/include/linux/atmel-ssc.h
index 571a12ebb018..7c0f6549898b 100644
--- a/include/linux/atmel-ssc.h
+++ b/include/linux/atmel-ssc.h
@@ -7,6 +7,7 @@
 
 struct atmel_ssc_platform_data {
         int                     use_dma;
+        int                     has_fslen_ext;
 };
 
 struct ssc_device {
@@ -71,6 +72,12 @@ void ssc_free(struct ssc_device *ssc);
 #define SSC_RFMR_DATNB_OFFSET                    8
 #define SSC_RFMR_FSEDGE_SIZE                     1
 #define SSC_RFMR_FSEDGE_OFFSET                  24
+/*
+ * The FSLEN_EXT exist on at91sam9rl, at91sam9g10,
+ * at91sam9g20, and at91sam9g45 and newer SoCs
+ */
+#define SSC_RFMR_FSLEN_EXT_SIZE                  4
+#define SSC_RFMR_FSLEN_EXT_OFFSET               28
 #define SSC_RFMR_FSLEN_SIZE                      4
 #define SSC_RFMR_FSLEN_OFFSET                   16
 #define SSC_RFMR_FSOS_SIZE                       4
@@ -109,6 +116,12 @@ void ssc_free(struct ssc_device *ssc);
 #define SSC_TFMR_FSDEN_OFFSET                   23
 #define SSC_TFMR_FSEDGE_SIZE                     1
 #define SSC_TFMR_FSEDGE_OFFSET                  24
+/*
+ * The FSLEN_EXT exist on at91sam9rl, at91sam9g10,
+ * at91sam9g20, and at91sam9g45 and newer SoCs
+ */
+#define SSC_TFMR_FSLEN_EXT_SIZE                  4
+#define SSC_TFMR_FSLEN_EXT_OFFSET               28
 #define SSC_TFMR_FSLEN_SIZE                      4
 #define SSC_TFMR_FSLEN_OFFSET                   16
 #define SSC_TFMR_FSOS_SIZE                       3
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 0b3bb16c705a..0272e49135d0 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -6,6 +6,7 @@
 
 #include <linux/bcma/bcma_driver_chipcommon.h>
 #include <linux/bcma/bcma_driver_pci.h>
+#include <linux/bcma/bcma_driver_pcie2.h>
 #include <linux/bcma/bcma_driver_mips.h>
 #include <linux/bcma/bcma_driver_gmac_cmn.h>
 #include <linux/ssb/ssb.h> /* SPROM sharing */
@@ -72,17 +73,17 @@ struct bcma_host_ops {
 /* Core-ID values. */
 #define BCMA_CORE_OOB_ROUTER            0x367   /* Out of band */
 #define BCMA_CORE_4706_CHIPCOMMON       0x500
-#define BCMA_CORE_PCIEG2                0x501
-#define BCMA_CORE_DMA                   0x502
-#define BCMA_CORE_SDIO3                 0x503
-#define BCMA_CORE_USB20                 0x504
-#define BCMA_CORE_USB30                 0x505
-#define BCMA_CORE_A9JTAG                0x506
-#define BCMA_CORE_DDR23                 0x507
-#define BCMA_CORE_ROM                   0x508
-#define BCMA_CORE_NAND                  0x509
-#define BCMA_CORE_QSPI                  0x50A
-#define BCMA_CORE_CHIPCOMMON_B          0x50B
+#define BCMA_CORE_NS_PCIEG2             0x501
+#define BCMA_CORE_NS_DMA                0x502
+#define BCMA_CORE_NS_SDIO3              0x503
+#define BCMA_CORE_NS_USB20              0x504
+#define BCMA_CORE_NS_USB30              0x505
+#define BCMA_CORE_NS_A9JTAG             0x506
+#define BCMA_CORE_NS_DDR23              0x507
+#define BCMA_CORE_NS_ROM                0x508
+#define BCMA_CORE_NS_NAND               0x509
+#define BCMA_CORE_NS_QSPI               0x50A
+#define BCMA_CORE_NS_CHIPCOMMON_B       0x50B
 #define BCMA_CORE_4706_SOC_RAM          0x50E
 #define BCMA_CORE_ARMCA9                0x510
 #define BCMA_CORE_4706_MAC_GBIT         0x52D
@@ -157,6 +158,9 @@ struct bcma_host_ops {
 /* Chip IDs of PCIe devices */
 #define BCMA_CHIP_ID_BCM4313    0x4313
 #define BCMA_CHIP_ID_BCM43142   43142
+#define BCMA_CHIP_ID_BCM43131   43131
+#define BCMA_CHIP_ID_BCM43217   43217
+#define BCMA_CHIP_ID_BCM43222   43222
 #define BCMA_CHIP_ID_BCM43224   43224
 #define  BCMA_PKG_ID_BCM43224_FAB_CSM   0x8
 #define  BCMA_PKG_ID_BCM43224_FAB_SMIC  0xa
@@ -333,6 +337,7 @@ struct bcma_bus {
 
         struct bcma_drv_cc drv_cc;
         struct bcma_drv_pci drv_pci[2];
+        struct bcma_drv_pcie2 drv_pcie2;
         struct bcma_drv_mips drv_mips;
         struct bcma_drv_gmac_cmn drv_gmac_cmn;
 
diff --git a/include/linux/bcma/bcma_driver_pcie2.h b/include/linux/bcma/bcma_driver_pcie2.h
new file mode 100644
index 000000000000..5988b05781c3
--- /dev/null
+++ b/include/linux/bcma/bcma_driver_pcie2.h
@@ -0,0 +1,158 @@
+#ifndef LINUX_BCMA_DRIVER_PCIE2_H_
+#define LINUX_BCMA_DRIVER_PCIE2_H_
+
+#define BCMA_CORE_PCIE2_CLK_CONTROL             0x0000
+#define  PCIE2_CLKC_RST_OE                      0x0001 /* When set, drives PCI_RESET out to pin */
+#define  PCIE2_CLKC_RST                         0x0002 /* Value driven out to pin */
+#define  PCIE2_CLKC_SPERST                      0x0004 /* SurvivePeRst */
+#define  PCIE2_CLKC_DISABLE_L1CLK_GATING        0x0010
+#define  PCIE2_CLKC_DLYPERST                    0x0100 /* Delay PeRst to CoE Core */
+#define  PCIE2_CLKC_DISSPROMLD                  0x0200 /* DisableSpromLoadOnPerst */
+#define  PCIE2_CLKC_WAKE_MODE_L2                0x1000 /* Wake on L2 */
+#define BCMA_CORE_PCIE2_RC_PM_CONTROL           0x0004
+#define BCMA_CORE_PCIE2_RC_PM_STATUS            0x0008
+#define BCMA_CORE_PCIE2_EP_PM_CONTROL           0x000C
+#define BCMA_CORE_PCIE2_EP_PM_STATUS            0x0010
+#define BCMA_CORE_PCIE2_EP_LTR_CONTROL          0x0014
+#define BCMA_CORE_PCIE2_EP_LTR_STATUS           0x0018
+#define BCMA_CORE_PCIE2_EP_OBFF_STATUS          0x001C
+#define BCMA_CORE_PCIE2_PCIE_ERR_STATUS         0x0020
+#define BCMA_CORE_PCIE2_RC_AXI_CONFIG           0x0100
+#define BCMA_CORE_PCIE2_EP_AXI_CONFIG           0x0104
+#define BCMA_CORE_PCIE2_RXDEBUG_STATUS0         0x0108
+#define BCMA_CORE_PCIE2_RXDEBUG_CONTROL0        0x010C
+#define BCMA_CORE_PCIE2_CONFIGINDADDR           0x0120
+#define BCMA_CORE_PCIE2_CONFIGINDDATA           0x0124
+#define BCMA_CORE_PCIE2_MDIOCONTROL             0x0128
+#define BCMA_CORE_PCIE2_MDIOWRDATA              0x012C
+#define BCMA_CORE_PCIE2_MDIORDDATA              0x0130
+#define BCMA_CORE_PCIE2_DATAINTF                0x0180
+#define BCMA_CORE_PCIE2_D2H_INTRLAZY_0          0x0188
+#define BCMA_CORE_PCIE2_H2D_INTRLAZY_0          0x018c
+#define BCMA_CORE_PCIE2_H2D_INTSTAT_0           0x0190
+#define BCMA_CORE_PCIE2_H2D_INTMASK_0           0x0194
+#define BCMA_CORE_PCIE2_D2H_INTSTAT_0           0x0198
+#define BCMA_CORE_PCIE2_D2H_INTMASK_0           0x019c
+#define BCMA_CORE_PCIE2_LTR_STATE               0x01A0 /* Latency Tolerance Reporting */
+#define  PCIE2_LTR_ACTIVE                       2
+#define  PCIE2_LTR_ACTIVE_IDLE                  1
+#define  PCIE2_LTR_SLEEP                        0
+#define  PCIE2_LTR_FINAL_MASK                   0x300
+#define  PCIE2_LTR_FINAL_SHIFT                  8
+#define BCMA_CORE_PCIE2_PWR_INT_STATUS          0x01A4
+#define BCMA_CORE_PCIE2_PWR_INT_MASK            0x01A8
+#define BCMA_CORE_PCIE2_CFG_ADDR                0x01F8
+#define BCMA_CORE_PCIE2_CFG_DATA                0x01FC
+#define BCMA_CORE_PCIE2_SYS_EQ_PAGE             0x0200
+#define BCMA_CORE_PCIE2_SYS_MSI_PAGE            0x0204
+#define BCMA_CORE_PCIE2_SYS_MSI_INTREN          0x0208
+#define BCMA_CORE_PCIE2_SYS_MSI_CTRL0           0x0210
+#define BCMA_CORE_PCIE2_SYS_MSI_CTRL1           0x0214
+#define BCMA_CORE_PCIE2_SYS_MSI_CTRL2           0x0218
+#define BCMA_CORE_PCIE2_SYS_MSI_CTRL3           0x021C
+#define BCMA_CORE_PCIE2_SYS_MSI_CTRL4           0x0220
+#define BCMA_CORE_PCIE2_SYS_MSI_CTRL5           0x0224
+#define BCMA_CORE_PCIE2_SYS_EQ_HEAD0            0x0250
+#define BCMA_CORE_PCIE2_SYS_EQ_TAIL0            0x0254
+#define BCMA_CORE_PCIE2_SYS_EQ_HEAD1            0x0258
+#define BCMA_CORE_PCIE2_SYS_EQ_TAIL1            0x025C
+#define BCMA_CORE_PCIE2_SYS_EQ_HEAD2            0x0260
+#define BCMA_CORE_PCIE2_SYS_EQ_TAIL2            0x0264
+#define BCMA_CORE_PCIE2_SYS_EQ_HEAD3            0x0268
+#define BCMA_CORE_PCIE2_SYS_EQ_TAIL3            0x026C
+#define BCMA_CORE_PCIE2_SYS_EQ_HEAD4            0x0270
+#define BCMA_CORE_PCIE2_SYS_EQ_TAIL4            0x0274
+#define BCMA_CORE_PCIE2_SYS_EQ_HEAD5            0x0278
+#define BCMA_CORE_PCIE2_SYS_EQ_TAIL5            0x027C
+#define BCMA_CORE_PCIE2_SYS_RC_INTX_EN          0x0330
+#define BCMA_CORE_PCIE2_SYS_RC_INTX_CSR         0x0334
+#define BCMA_CORE_PCIE2_SYS_MSI_REQ             0x0340
+#define BCMA_CORE_PCIE2_SYS_HOST_INTR_EN        0x0344
+#define BCMA_CORE_PCIE2_SYS_HOST_INTR_CSR       0x0348
+#define BCMA_CORE_PCIE2_SYS_HOST_INTR0          0x0350
+#define BCMA_CORE_PCIE2_SYS_HOST_INTR1          0x0354
+#define BCMA_CORE_PCIE2_SYS_HOST_INTR2          0x0358
+#define BCMA_CORE_PCIE2_SYS_HOST_INTR3          0x035C
+#define BCMA_CORE_PCIE2_SYS_EP_INT_EN0          0x0360
+#define BCMA_CORE_PCIE2_SYS_EP_INT_EN1          0x0364
+#define BCMA_CORE_PCIE2_SYS_EP_INT_CSR0         0x0370
+#define BCMA_CORE_PCIE2_SYS_EP_INT_CSR1         0x0374
+#define BCMA_CORE_PCIE2_SPROM(wordoffset)       (0x0800 + ((wordoffset) * 2))
+#define BCMA_CORE_PCIE2_FUNC0_IMAP0_0           0x0C00
+#define BCMA_CORE_PCIE2_FUNC0_IMAP0_1           0x0C04
+#define BCMA_CORE_PCIE2_FUNC0_IMAP0_2           0x0C08
+#define BCMA_CORE_PCIE2_FUNC0_IMAP0_3           0x0C0C
+#define BCMA_CORE_PCIE2_FUNC0_IMAP0_4           0x0C10
+#define BCMA_CORE_PCIE2_FUNC0_IMAP0_5           0x0C14
+#define BCMA_CORE_PCIE2_FUNC0_IMAP0_6           0x0C18
+#define BCMA_CORE_PCIE2_FUNC0_IMAP0_7           0x0C1C
+#define BCMA_CORE_PCIE2_FUNC1_IMAP0_0           0x0C20
+#define BCMA_CORE_PCIE2_FUNC1_IMAP0_1           0x0C24
+#define BCMA_CORE_PCIE2_FUNC1_IMAP0_2           0x0C28
+#define BCMA_CORE_PCIE2_FUNC1_IMAP0_3           0x0C2C
+#define BCMA_CORE_PCIE2_FUNC1_IMAP0_4           0x0C30
+#define BCMA_CORE_PCIE2_FUNC1_IMAP0_5           0x0C34
+#define BCMA_CORE_PCIE2_FUNC1_IMAP0_6           0x0C38
+#define BCMA_CORE_PCIE2_FUNC1_IMAP0_7           0x0C3C
+#define BCMA_CORE_PCIE2_FUNC0_IMAP1             0x0C80
+#define BCMA_CORE_PCIE2_FUNC1_IMAP1             0x0C88
+#define BCMA_CORE_PCIE2_FUNC0_IMAP2             0x0CC0
+#define BCMA_CORE_PCIE2_FUNC1_IMAP2             0x0CC8
+#define BCMA_CORE_PCIE2_IARR0_LOWER             0x0D00
+#define BCMA_CORE_PCIE2_IARR0_UPPER             0x0D04
+#define BCMA_CORE_PCIE2_IARR1_LOWER             0x0D08
+#define BCMA_CORE_PCIE2_IARR1_UPPER             0x0D0C
+#define BCMA_CORE_PCIE2_IARR2_LOWER             0x0D10
+#define BCMA_CORE_PCIE2_IARR2_UPPER             0x0D14
+#define BCMA_CORE_PCIE2_OARR0                   0x0D20
+#define BCMA_CORE_PCIE2_OARR1                   0x0D28
+#define BCMA_CORE_PCIE2_OARR2                   0x0D30
+#define BCMA_CORE_PCIE2_OMAP0_LOWER             0x0D40
+#define BCMA_CORE_PCIE2_OMAP0_UPPER             0x0D44
+#define BCMA_CORE_PCIE2_OMAP1_LOWER             0x0D48
+#define BCMA_CORE_PCIE2_OMAP1_UPPER             0x0D4C
+#define BCMA_CORE_PCIE2_OMAP2_LOWER             0x0D50
+#define BCMA_CORE_PCIE2_OMAP2_UPPER             0x0D54
+#define BCMA_CORE_PCIE2_FUNC1_IARR1_SIZE        0x0D58
+#define BCMA_CORE_PCIE2_FUNC1_IARR2_SIZE        0x0D5C
+#define BCMA_CORE_PCIE2_MEM_CONTROL             0x0F00
+#define BCMA_CORE_PCIE2_MEM_ECC_ERRLOG0         0x0F04
+#define BCMA_CORE_PCIE2_MEM_ECC_ERRLOG1         0x0F08
+#define BCMA_CORE_PCIE2_LINK_STATUS             0x0F0C
+#define BCMA_CORE_PCIE2_STRAP_STATUS            0x0F10
+#define BCMA_CORE_PCIE2_RESET_STATUS            0x0F14
+#define BCMA_CORE_PCIE2_RESETEN_IN_LINKDOWN     0x0F18
+#define BCMA_CORE_PCIE2_MISC_INTR_EN            0x0F1C
+#define BCMA_CORE_PCIE2_TX_DEBUG_CFG            0x0F20
+#define BCMA_CORE_PCIE2_MISC_CONFIG             0x0F24
+#define BCMA_CORE_PCIE2_MISC_STATUS             0x0F28
+#define BCMA_CORE_PCIE2_INTR_EN                 0x0F30
+#define BCMA_CORE_PCIE2_INTR_CLEAR              0x0F34
+#define BCMA_CORE_PCIE2_INTR_STATUS             0x0F38
+
+/* PCIE gen2 config regs */
+#define PCIE2_INTSTATUS                         0x090
+#define PCIE2_INTMASK                           0x094
+#define PCIE2_SBMBX                             0x098
+
+#define PCIE2_PMCR_REFUP                        0x1814 /* Trefup time */
+
+#define PCIE2_CAP_DEVSTSCTRL2_OFFSET            0xD4
+#define PCIE2_CAP_DEVSTSCTRL2_LTRENAB           0x400
+#define PCIE2_PVT_REG_PM_CLK_PERIOD             0x184c
+
+struct bcma_drv_pcie2 {
+        struct bcma_device *core;
+};
+
+#define pcie2_read16(pcie2, offset)             bcma_read16((pcie2)->core, offset)
+#define pcie2_read32(pcie2, offset)             bcma_read32((pcie2)->core, offset)
+#define pcie2_write16(pcie2, offset, val)       bcma_write16((pcie2)->core, offset, val)
+#define pcie2_write32(pcie2, offset, val)       bcma_write32((pcie2)->core, offset, val)
+
+#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/capability.h b/include/linux/capability.h
index 84b13ad67c1c..aa93e5ef594c 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -78,8 +78,11 @@ extern const kernel_cap_t __cap_init_eff_set;
 # error Fix up hand-coded capability macro initializers
 #else /* HAND-CODED capability initializers */
 
+#define CAP_LAST_U32                    ((_KERNEL_CAPABILITY_U32S) - 1)
+#define CAP_LAST_U32_VALID_MASK         (CAP_TO_MASK(CAP_LAST_CAP + 1) -1)
+
 # define CAP_EMPTY_SET    ((kernel_cap_t){{ 0, 0 }})
-# define CAP_FULL_SET     ((kernel_cap_t){{ ~0, ~0 }})
+# define CAP_FULL_SET     ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }})
 # define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0 \
                                     | CAP_TO_MASK(CAP_LINUX_IMMUTABLE), \
                                     CAP_FS_MASK_B1 } })
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 8a111dd42d7a..b5223c570eba 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -203,7 +203,15 @@ struct cgroup {
         struct kernfs_node *kn;         /* cgroup kernfs entry */
         struct kernfs_node *populated_kn; /* kn for "cgroup.subtree_populated" */
 
-        /* the bitmask of subsystems enabled on the child cgroups */
+        /*
+         * The bitmask of subsystems enabled on the child cgroups.
+         * ->subtree_control is the one configured through
+         * "cgroup.subtree_control" while ->child_subsys_mask is the
+         * effective one which may have more subsystems enabled.
+         * Controller knobs are made available iff it's enabled in
+         * ->subtree_control.
+         */
+        unsigned int subtree_control;
         unsigned int child_subsys_mask;
 
         /* Private pointers for each registered subsystem */
@@ -248,73 +256,9 @@ struct cgroup {
 
 /* cgroup_root->flags */
 enum {
-        /*
-         * Unfortunately, cgroup core and various controllers are riddled
-         * with idiosyncrasies and pointless options.  The following flag,
-         * when set, will force sane behavior - some options are forced on,
-         * others are disallowed, and some controllers will change their
-         * hierarchical or other behaviors.
-         *
-         * The set of behaviors affected by this flag are still being
-         * determined and developed and the mount option for this flag is
-         * prefixed with __DEVEL__.  The prefix will be dropped once we
-         * reach the point where all behaviors are compatible with the
-         * planned unified hierarchy, which will automatically turn on this
-         * flag.
-         *
-         * The followings are the behaviors currently affected this flag.
-         *
-         * - Mount options "noprefix", "xattr", "clone_children",
-         *   "release_agent" and "name" are disallowed.
-         *
-         * - When mounting an existing superblock, mount options should
-         *   match.
-         *
-         * - Remount is disallowed.
-         *
-         * - rename(2) is disallowed.
-         *
-         * - "tasks" is removed.  Everything should be at process
-         *   granularity.  Use "cgroup.procs" instead.
-         *
-         * - "cgroup.procs" is not sorted.  pids will be unique unless they
-         *   got recycled inbetween reads.
-         *
-         * - "release_agent" and "notify_on_release" are removed.
-         *   Replacement notification mechanism will be implemented.
-         *
-         * - "cgroup.clone_children" is removed.
-         *
-         * - "cgroup.subtree_populated" is available.  Its value is 0 if
-         *   the cgroup and its descendants contain no task; otherwise, 1.
-         *   The file also generates kernfs notification which can be
-         *   monitored through poll and [di]notify when the value of the
-         *   file changes.
-         *
-         * - If mount is requested with sane_behavior but without any
-         *   subsystem, the default unified hierarchy is mounted.
-         *
-         * - cpuset: tasks will be kept in empty cpusets when hotplug happens
-         *   and take masks of ancestors with non-empty cpus/mems, instead of
-         *   being moved to an ancestor.
-         *
-         * - cpuset: a task can be moved into an empty cpuset, and again it
-         *   takes masks of ancestors.
-         *
-         * - memcg: use_hierarchy is on by default and the cgroup file for
-         *   the flag is not created.
-         *
-         * - blkcg: blk-throttle becomes properly hierarchical.
-         *
-         * - debug: disallowed on the default hierarchy.
-         */
-        CGRP_ROOT_SANE_BEHAVIOR = (1 << 0),
-
+        CGRP_ROOT_SANE_BEHAVIOR = (1 << 0), /* __DEVEL__sane_behavior specified */
         CGRP_ROOT_NOPREFIX      = (1 << 1), /* mounted subsystems have no named prefix */
         CGRP_ROOT_XATTR         = (1 << 2), /* supports extended attributes */
-
-        /* mount options live below bit 16 */
-        CGRP_ROOT_OPTION_MASK   = (1 << 16) - 1,
 };
 
 /*
@@ -440,9 +384,11 @@ struct css_set {
 enum {
         CFTYPE_ONLY_ON_ROOT     = (1 << 0),     /* only create on root cgrp */
         CFTYPE_NOT_ON_ROOT      = (1 << 1),     /* don't create on root cgrp */
-        CFTYPE_INSANE           = (1 << 2),     /* don't create if sane_behavior */
         CFTYPE_NO_PREFIX        = (1 << 3),     /* (DON'T USE FOR NEW FILES) no subsys prefix */
-        CFTYPE_ONLY_ON_DFL      = (1 << 4),     /* only on default hierarchy */
+
+        /* internal flags, do not use outside cgroup core proper */
+        __CFTYPE_ONLY_ON_DFL    = (1 << 16),    /* only on default hierarchy */
+        __CFTYPE_NOT_ON_DFL     = (1 << 17),    /* not on default hierarchy */
 };
 
 #define MAX_CFTYPE_NAME         64
@@ -526,20 +472,64 @@ struct cftype {
 extern struct cgroup_root cgrp_dfl_root;
 extern struct css_set init_css_set;
 
+/**
+ * cgroup_on_dfl - test whether a cgroup is on the default hierarchy
+ * @cgrp: the cgroup of interest
+ *
+ * The default hierarchy is the v2 interface of cgroup and this function
+ * can be used to test whether a cgroup is on the default hierarchy for
+ * cases where a subsystem should behave differnetly depending on the
+ * interface version.
+ *
+ * The set of behaviors which change on the default hierarchy are still
+ * being determined and the mount option is prefixed with __DEVEL__.
+ *
+ * List of changed behaviors:
+ *
+ * - Mount options "noprefix", "xattr", "clone_children", "release_agent"
+ *   and "name" are disallowed.
+ *
+ * - When mounting an existing superblock, mount options should match.
+ *
+ * - Remount is disallowed.
+ *
+ * - rename(2) is disallowed.
+ *
+ * - "tasks" is removed.  Everything should be at process granularity.  Use
+ *   "cgroup.procs" instead.
+ *
+ * - "cgroup.procs" is not sorted.  pids will be unique unless they got
+ *   recycled inbetween reads.
+ *
+ * - "release_agent" and "notify_on_release" are removed.  Replacement
+ *   notification mechanism will be implemented.
+ *
+ * - "cgroup.clone_children" is removed.
+ *
+ * - "cgroup.subtree_populated" is available.  Its value is 0 if the cgroup
+ *   and its descendants contain no task; otherwise, 1.  The file also
+ *   generates kernfs notification which can be monitored through poll and
+ *   [di]notify when the value of the file changes.
+ *
+ * - cpuset: tasks will be kept in empty cpusets when hotplug happens and
+ *   take masks of ancestors with non-empty cpus/mems, instead of being
+ *   moved to an ancestor.
+ *
+ * - cpuset: a task can be moved into an empty cpuset, and again it takes
+ *   masks of ancestors.
+ *
+ * - memcg: use_hierarchy is on by default and the cgroup file for the flag
+ *   is not created.
+ *
+ * - blkcg: blk-throttle becomes properly hierarchical.
+ *
+ * - debug: disallowed on the default hierarchy.
+ */
 static inline bool cgroup_on_dfl(const struct cgroup *cgrp)
 {
         return cgrp->root == &cgrp_dfl_root;
 }
 
-/*
- * See the comment above CGRP_ROOT_SANE_BEHAVIOR for details.  This
- * function can be called as long as @cgrp is accessible.
- */
-static inline bool cgroup_sane_behavior(const struct cgroup *cgrp)
-{
-        return cgrp->root->flags & CGRP_ROOT_SANE_BEHAVIOR;
-}
-
 /* no synchronization, the result can only be used as a hint */
 static inline bool cgroup_has_tasks(struct cgroup *cgrp)
 {
@@ -602,7 +592,8 @@ static inline void pr_cont_cgroup_path(struct cgroup *cgrp)
 
 char *task_cgroup_path(struct task_struct *task, char *buf, size_t buflen);
 
-int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
+int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
+int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
 int cgroup_rm_cftypes(struct cftype *cfts);
 
 bool cgroup_is_descendant(struct cgroup *cgrp, struct cgroup *ancestor);
@@ -634,6 +625,7 @@ struct cgroup_subsys {
         int (*css_online)(struct cgroup_subsys_state *css);
         void (*css_offline)(struct cgroup_subsys_state *css);
         void (*css_free)(struct cgroup_subsys_state *css);
+        void (*css_reset)(struct cgroup_subsys_state *css);
 
         int (*can_attach)(struct cgroup_subsys_state *css,
                           struct cgroup_taskset *tset);
@@ -682,8 +674,21 @@ struct cgroup_subsys {
          */
         struct list_head cfts;
 
-        /* base cftypes, automatically registered with subsys itself */
-        struct cftype *base_cftypes;
+        /*
+         * Base cftypes which are automatically registered.  The two can
+         * point to the same array.
+         */
+        struct cftype *dfl_cftypes;     /* for the default hierarchy */
+        struct cftype *legacy_cftypes;  /* for the legacy hierarchies */
+
+        /*
+         * A subsystem may depend on other subsystems.  When such subsystem
+         * is enabled on a cgroup, the depended-upon subsystems are enabled
+         * together if available.  Subsystems enabled due to dependency are
+         * not visible to userland until explicitly enabled.  The following
+         * specifies the mask of subsystems that this one depends on.
+         */
+        unsigned int depends_on;
 };
 
 #define SUBSYS(_x) extern struct cgroup_subsys _x ## _cgrp_subsys;
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 0c287dbbb144..411dd7eb2653 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -619,5 +619,10 @@ static inline void clk_writel(u32 val, u32 __iomem *reg)
 
 #endif  /* platform dependent I/O accessors */
 
+#ifdef CONFIG_DEBUG_FS
+struct dentry *clk_debugfs_add_file(struct clk *clk, char *name, umode_t mode,
+                                void *data, const struct file_operations *fops);
+#endif
+
 #endif /* CONFIG_COMMON_CLK */
 #endif /* CLK_PROVIDER_H */
diff --git a/include/linux/clk/clk-conf.h b/include/linux/clk/clk-conf.h
new file mode 100644
index 000000000000..f3050e15f833
--- /dev/null
+++ b/include/linux/clk/clk-conf.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2014 Samsung Electronics Co., Ltd.
+ * Sylwester Nawrocki <s.nawrocki@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.
+ */
+
+struct device_node;
+
+#if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK)
+int of_clk_set_defaults(struct device_node *node, bool clk_supplier);
+#else
+static inline int of_clk_set_defaults(struct device_node *node,
+                                      bool clk_supplier)
+{
+        return 0;
+}
+#endif
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index a16b497d5159..653f0e2b6ca9 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -162,7 +162,6 @@ extern u64 timecounter_cyc2time(struct timecounter *tc,
  * @archdata:           arch-specific data
  * @suspend:            suspend function for the clocksource, if necessary
  * @resume:             resume function for the clocksource, if necessary
- * @cycle_last:         most recent cycle counter value seen by ::read()
  * @owner:              module reference, must be set by clocksource in modules
  */
 struct clocksource {
@@ -171,7 +170,6 @@ struct clocksource {
          * clocksource itself is cacheline aligned.
          */
         cycle_t (*read)(struct clocksource *cs);
-        cycle_t cycle_last;
         cycle_t mask;
         u32 mult;
         u32 shift;
diff --git a/include/linux/component.h b/include/linux/component.h
index 68870182ca1e..c00dcc302611 100644
--- a/include/linux/component.h
+++ b/include/linux/component.h
@@ -29,4 +29,11 @@ void component_master_del(struct device *,
 int component_master_add_child(struct master *master,
         int (*compare)(struct device *, void *), void *compare_data);
 
+struct component_match;
+
+int component_master_add_with_match(struct device *,
+        const struct component_master_ops *, struct component_match *);
+void component_match_add(struct device *, struct component_match **,
+        int (*compare)(struct device *, void *), void *compare_data);
+
 #endif
diff --git a/include/linux/cper.h b/include/linux/cper.h
index 2fc0ec3d89cc..76abba4b238e 100644
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
@@ -22,6 +22,7 @@
 #define LINUX_CPER_H
 
 #include <linux/uuid.h>
+#include <linux/trace_seq.h>
 
 /* CPER record signature and the size */
 #define CPER_SIG_RECORD                         "CPER"
@@ -36,6 +37,13 @@
 #define CPER_RECORD_REV                         0x0100
 
 /*
+ * CPER record length contains the CPER fields which are relevant for further
+ * handling of a memory error in userspace (we don't carry all the fields
+ * defined in the UEFI spec because some of them don't make any sense.)
+ * Currently, a length of 256 should be more than enough.
+ */
+#define CPER_REC_LEN                                    256
+/*
  * Severity difinition for error_severity in struct cper_record_header
  * and section_severity in struct cper_section_descriptor
  */
@@ -356,6 +364,24 @@ struct cper_sec_mem_err {
         __u16   mem_dev_handle;         /* module handle in UEFI 2.4 */
 };
 
+struct cper_mem_err_compact {
+        __u64   validation_bits;
+        __u16   node;
+        __u16   card;
+        __u16   module;
+        __u16   bank;
+        __u16   device;
+        __u16   row;
+        __u16   column;
+        __u16   bit_pos;
+        __u64   requestor_id;
+        __u64   responder_id;
+        __u64   target_id;
+        __u16   rank;
+        __u16   mem_array_handle;
+        __u16   mem_dev_handle;
+};
+
 struct cper_sec_pcie {
         __u64           validation_bits;
         __u32           port_type;
@@ -395,7 +421,13 @@ struct cper_sec_pcie {
 #pragma pack()
 
 u64 cper_next_record_id(void);
+const char *cper_severity_str(unsigned int);
+const char *cper_mem_err_type_str(unsigned int);
 void cper_print_bits(const char *prefix, unsigned int bits,
                      const char * const strs[], unsigned int strs_size);
+void cper_mem_err_pack(const struct cper_sec_mem_err *,
+                       struct cper_mem_err_compact *);
+const char *cper_mem_err_unpack(struct trace_seq *,
+                                struct cper_mem_err_compact *);
 
 #endif
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 8f8ae95c6e27..7d1955afa62c 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -176,6 +176,7 @@ static inline void disable_cpufreq(void) { }
 
 #define CPUFREQ_RELATION_L 0  /* lowest frequency at or above target */
 #define CPUFREQ_RELATION_H 1  /* highest frequency below or at target */
+#define CPUFREQ_RELATION_C 2  /* closest frequency to target */
 
 struct freq_attr {
         struct attribute attr;
diff --git a/include/linux/crc32.h b/include/linux/crc32.h
index 7d275c4fc011..9e8a032c1788 100644
--- a/include/linux/crc32.h
+++ b/include/linux/crc32.h
@@ -8,8 +8,8 @@
 #include <linux/types.h>
 #include <linux/bitrev.h>
 
-extern u32  crc32_le(u32 crc, unsigned char const *p, size_t len);
-extern u32  crc32_be(u32 crc, unsigned char const *p, size_t len);
+u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len);
+u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len);
 
 /**
  * crc32_le_combine - Combine two crc32 check values into one. For two
@@ -29,9 +29,14 @@ extern u32  crc32_be(u32 crc, unsigned char const *p, size_t len);
  *         with the same initializer as crc1, and crc2 seed was 0. See
  *         also crc32_combine_test().
  */
-extern u32  crc32_le_combine(u32 crc1, u32 crc2, size_t len2);
+u32 __attribute_const__ crc32_le_shift(u32 crc, size_t len);
 
-extern u32  __crc32c_le(u32 crc, unsigned char const *p, size_t len);
+static inline u32 crc32_le_combine(u32 crc1, u32 crc2, size_t len2)
+{
+        return crc32_le_shift(crc1, len2) ^ crc2;
+}
+
+u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len);
 
 /**
  * __crc32c_le_combine - Combine two crc32c check values into one. For two
@@ -51,7 +56,12 @@ extern u32  __crc32c_le(u32 crc, unsigned char const *p, size_t len);
  *         seeded with the same initializer as crc1, and crc2 seed
  *         was 0. See also crc32c_combine_test().
  */
-extern u32  __crc32c_le_combine(u32 crc1, u32 crc2, size_t len2);
+u32 __attribute_const__ __crc32c_le_shift(u32 crc, size_t len);
+
+static inline u32 __crc32c_le_combine(u32 crc1, u32 crc2, size_t len2)
+{
+        return __crc32c_le_shift(crc1, len2) ^ crc2;
+}
 
 #define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)(data), length)
 
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index b92eadf92d72..d45e949699ea 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -710,9 +710,9 @@ static inline void ablkcipher_request_free(struct ablkcipher_request *req)
 
 static inline void ablkcipher_request_set_callback(
         struct ablkcipher_request *req,
-        u32 flags, crypto_completion_t complete, void *data)
+        u32 flags, crypto_completion_t compl, void *data)
 {
-        req->base.complete = complete;
+        req->base.complete = compl;
         req->base.data = data;
         req->base.flags = flags;
 }
@@ -841,10 +841,10 @@ static inline void aead_request_free(struct aead_request *req)
 
 static inline void aead_request_set_callback(struct aead_request *req,
                                              u32 flags,
-                                             crypto_completion_t complete,
+                                             crypto_completion_t compl,
                                              void *data)
 {
-        req->base.complete = complete;
+        req->base.complete = compl;
         req->base.data = data;
         req->base.flags = flags;
 }
diff --git a/include/linux/device.h b/include/linux/device.h
index af424acd393d..43d183aeb25b 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -124,7 +124,7 @@ struct bus_type {
 
         const struct dev_pm_ops *pm;
 
-        struct iommu_ops *iommu_ops;
+        const struct iommu_ops *iommu_ops;
 
         struct subsys_private *p;
         struct lock_class_key lock_key;
@@ -605,6 +605,10 @@ extern int devres_release_group(struct device *dev, void *id);
 
 /* managed devm_k.alloc/kfree for device drivers */
 extern void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);
+extern char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
+                             va_list ap);
+extern char *devm_kasprintf(struct device *dev, gfp_t gfp,
+                            const char *fmt, ...);
 static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
 {
         return devm_kmalloc(dev, size, gfp | __GFP_ZERO);
@@ -631,8 +635,6 @@ extern unsigned long devm_get_free_pages(struct device *dev,
 extern void devm_free_pages(struct device *dev, unsigned long addr);
 
 void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
-void __iomem *devm_request_and_ioremap(struct device *dev,
-                        struct resource *res);
 
 /* allows to add/remove a custom action to devres stack */
 int devm_add_action(struct device *dev, void (*action)(void *), void *data);
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index f886985a28b2..694e1fe1c4b4 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -30,6 +30,8 @@
 #include <linux/list.h>
 #include <linux/dma-mapping.h>
 #include <linux/fs.h>
+#include <linux/fence.h>
+#include <linux/wait.h>
 
 struct device;
 struct dma_buf;
@@ -115,6 +117,7 @@ struct dma_buf_ops {
  * @exp_name: name of the exporter; useful for debugging.
  * @list_node: node for dma_buf accounting and debugging.
  * @priv: exporter specific private data for this buffer object.
+ * @resv: reservation object linked to this dma-buf
  */
 struct dma_buf {
         size_t size;
@@ -128,6 +131,17 @@ struct dma_buf {
         const char *exp_name;
         struct list_head list_node;
         void *priv;
+        struct reservation_object *resv;
+
+        /* poll support */
+        wait_queue_head_t poll;
+
+        struct dma_buf_poll_cb_t {
+                struct fence_cb cb;
+                wait_queue_head_t *poll;
+
+                unsigned long active;
+        } cb_excl, cb_shared;
 };
 
 /**
@@ -168,10 +182,11 @@ 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 *);
+                               size_t size, int flags, const char *,
+                               struct reservation_object *);
 
-#define dma_buf_export(priv, ops, size, flags)  \
-        dma_buf_export_named(priv, ops, size, flags, KBUILD_MODNAME)
+#define dma_buf_export(priv, ops, size, flags, resv)    \
+        dma_buf_export_named(priv, ops, size, flags, KBUILD_MODNAME, resv)
 
 int dma_buf_fd(struct dma_buf *dmabuf, int flags);
 struct dma_buf *dma_buf_get(int fd);
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index d2c5cc7c583c..3d1c2aa51530 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -299,6 +299,7 @@ enum dma_slave_buswidth {
         DMA_SLAVE_BUSWIDTH_UNDEFINED = 0,
         DMA_SLAVE_BUSWIDTH_1_BYTE = 1,
         DMA_SLAVE_BUSWIDTH_2_BYTES = 2,
+        DMA_SLAVE_BUSWIDTH_3_BYTES = 3,
         DMA_SLAVE_BUSWIDTH_4_BYTES = 4,
         DMA_SLAVE_BUSWIDTH_8_BYTES = 8,
 };
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index 23c8db129560..1deece46a0ca 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -114,22 +114,30 @@ extern int dmar_remove_dev_scope(struct dmar_pci_notify_info *info,
 /* Intel IOMMU detection */
 extern int detect_intel_iommu(void);
 extern int enable_drhd_fault_handling(void);
-#else
-struct dmar_pci_notify_info;
-static inline int detect_intel_iommu(void)
+
+#ifdef CONFIG_INTEL_IOMMU
+extern int iommu_detected, no_iommu;
+extern int intel_iommu_init(void);
+extern int dmar_parse_one_rmrr(struct acpi_dmar_header *header);
+extern int dmar_parse_one_atsr(struct acpi_dmar_header *header);
+extern int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info);
+#else /* !CONFIG_INTEL_IOMMU: */
+static inline int intel_iommu_init(void) { return -ENODEV; }
+static inline int dmar_parse_one_rmrr(struct acpi_dmar_header *header)
 {
-        return -ENODEV;
+        return 0;
 }
-
-static inline int dmar_table_init(void)
+static inline int dmar_parse_one_atsr(struct acpi_dmar_header *header)
 {
-        return -ENODEV;
+        return 0;
 }
-static inline int enable_drhd_fault_handling(void)
+static inline int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info)
 {
-        return -1;
+        return 0;
 }
-#endif /* !CONFIG_DMAR_TABLE */
+#endif /* CONFIG_INTEL_IOMMU */
+
+#endif /* CONFIG_DMAR_TABLE */
 
 struct irte {
         union {
@@ -177,26 +185,4 @@ extern int dmar_set_interrupt(struct intel_iommu *iommu);
 extern irqreturn_t dmar_fault(int irq, void *dev_id);
 extern int arch_setup_dmar_msi(unsigned int irq);
 
-#ifdef CONFIG_INTEL_IOMMU
-extern int iommu_detected, no_iommu;
-extern int dmar_parse_one_rmrr(struct acpi_dmar_header *header);
-extern int dmar_parse_one_atsr(struct acpi_dmar_header *header);
-extern int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info);
-extern int intel_iommu_init(void);
-#else /* !CONFIG_INTEL_IOMMU: */
-static inline int intel_iommu_init(void) { return -ENODEV; }
-static inline int dmar_parse_one_rmrr(struct acpi_dmar_header *header)
-{
-        return 0;
-}
-static inline int dmar_parse_one_atsr(struct acpi_dmar_header *header)
-{
-        return 0;
-}
-static inline int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info)
-{
-        return 0;
-}
-#endif /* CONFIG_INTEL_IOMMU */
-
 #endif /* __DMAR_H__ */
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 41bbf8ba4ba8..efc681fd5895 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -20,6 +20,7 @@
 #include <linux/ioport.h>
 #include <linux/pfn.h>
 #include <linux/pstore.h>
+#include <linux/reboot.h>
 
 #include <asm/page.h>
 
@@ -521,6 +522,8 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules,
                                               int *reset_type);
 typedef efi_status_t efi_query_variable_store_t(u32 attributes, unsigned long size);
 
+void efi_native_runtime_setup(void);
+
 /*
  *  EFI Configuration Table and GUID definitions
  */
@@ -870,11 +873,13 @@ extern int __init efi_uart_console_only (void);
 extern void efi_initialize_iomem_resources(struct resource *code_resource,
                 struct resource *data_resource, struct resource *bss_resource);
 extern void efi_get_time(struct timespec *now);
-extern int efi_set_rtc_mmss(const struct timespec *now);
 extern void efi_reserve_boot_services(void);
 extern int efi_get_fdt_params(struct efi_fdt_params *params, int verbose);
 extern struct efi_memory_map memmap;
 
+extern int efi_reboot_quirk_mode;
+extern bool efi_poweroff_required(void);
+
 /* Iterate through an efi_memory_map */
 #define for_each_efi_memory_desc(m, md)                                    \
         for ((md) = (m)->map;                                              \
@@ -916,7 +921,8 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_RUNTIME_SERVICES    3       /* Can we use runtime services? */
 #define EFI_MEMMAP              4       /* Can we use EFI memory map? */
 #define EFI_64BIT               5       /* Is the firmware 64-bit? */
-#define EFI_ARCH_1              6       /* First arch-specific bit */
+#define EFI_PARAVIRT            6       /* Access is via a paravirt interface */
+#define EFI_ARCH_1              7       /* First arch-specific bit */
 
 #ifdef CONFIG_EFI
 /*
@@ -926,11 +932,14 @@ static inline bool efi_enabled(int feature)
 {
         return test_bit(feature, &efi.flags) != 0;
 }
+extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
 #else
 static inline bool efi_enabled(int feature)
 {
         return false;
 }
+static inline void
+efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
 #endif
 
 /*
@@ -1031,12 +1040,8 @@ struct efivar_operations {
 struct efivars {
         /*
          * ->lock protects two things:
-         * 1) ->list - adds, removals, reads, writes
-         * 2) ops.[gs]et_variable() calls.
-         * It must not be held when creating sysfs entries or calling kmalloc.
-         * ops.get_next_variable() is only called from register_efivars()
-         * or efivar_update_sysfs_entries(),
-         * which is protected by the BKL, so that path is safe.
+         * 1) efivarfs_list and efivars_sysfs_list
+         * 2) ->ops calls
          */
         spinlock_t lock;
         struct kset *kset;
@@ -1161,4 +1166,46 @@ static inline void
 efi_runtime_map_setup(void *map, int nr_entries, u32 desc_size) {}
 #endif
 
+/* prototypes shared between arch specific and generic stub code */
+
+#define pr_efi(sys_table, msg)     efi_printk(sys_table, "EFI stub: "msg)
+#define pr_efi_err(sys_table, msg) efi_printk(sys_table, "EFI stub: ERROR: "msg)
+
+void efi_printk(efi_system_table_t *sys_table_arg, char *str);
+
+void efi_free(efi_system_table_t *sys_table_arg, unsigned long size,
+              unsigned long addr);
+
+char *efi_convert_cmdline(efi_system_table_t *sys_table_arg,
+                          efi_loaded_image_t *image, int *cmd_line_len);
+
+efi_status_t efi_get_memory_map(efi_system_table_t *sys_table_arg,
+                                efi_memory_desc_t **map,
+                                unsigned long *map_size,
+                                unsigned long *desc_size,
+                                u32 *desc_ver,
+                                unsigned long *key_ptr);
+
+efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
+                           unsigned long size, unsigned long align,
+                           unsigned long *addr);
+
+efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg,
+                            unsigned long size, unsigned long align,
+                            unsigned long *addr, unsigned long max);
+
+efi_status_t efi_relocate_kernel(efi_system_table_t *sys_table_arg,
+                                 unsigned long *image_addr,
+                                 unsigned long image_size,
+                                 unsigned long alloc_size,
+                                 unsigned long preferred_addr,
+                                 unsigned long alignment);
+
+efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
+                                  efi_loaded_image_t *image,
+                                  char *cmd_line, char *option_string,
+                                  unsigned long max_addr,
+                                  unsigned long *load_addr,
+                                  unsigned long *load_size);
+
 #endif /* _LINUX_EFI_H */
diff --git a/include/linux/extcon/sm5502.h b/include/linux/extcon/sm5502.h
new file mode 100644
index 000000000000..030526bf8d79
--- /dev/null
+++ b/include/linux/extcon/sm5502.h
@@ -0,0 +1,287 @@
+/*
+ * sm5502.h
+ *
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd
+ *
+ * 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.
+ *
+ * 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 __LINUX_EXTCON_SM5502_H
+#define __LINUX_EXTCON_SM5502_H
+
+enum sm5502_types {
+        TYPE_SM5502,
+};
+
+/* SM5502 registers */
+enum sm5502_reg {
+        SM5502_REG_DEVICE_ID = 0x01,
+        SM5502_REG_CONTROL,
+        SM5502_REG_INT1,
+        SM5502_REG_INT2,
+        SM5502_REG_INTMASK1,
+        SM5502_REG_INTMASK2,
+        SM5502_REG_ADC,
+        SM5502_REG_TIMING_SET1,
+        SM5502_REG_TIMING_SET2,
+        SM5502_REG_DEV_TYPE1,
+        SM5502_REG_DEV_TYPE2,
+        SM5502_REG_BUTTON1,
+        SM5502_REG_BUTTON2,
+        SM5502_REG_CAR_KIT_STATUS,
+        SM5502_REG_RSVD1,
+        SM5502_REG_RSVD2,
+        SM5502_REG_RSVD3,
+        SM5502_REG_RSVD4,
+        SM5502_REG_MANUAL_SW1,
+        SM5502_REG_MANUAL_SW2,
+        SM5502_REG_DEV_TYPE3,
+        SM5502_REG_RSVD5,
+        SM5502_REG_RSVD6,
+        SM5502_REG_RSVD7,
+        SM5502_REG_RSVD8,
+        SM5502_REG_RSVD9,
+        SM5502_REG_RESET,
+        SM5502_REG_RSVD10,
+        SM5502_REG_RESERVED_ID1,
+        SM5502_REG_RSVD11,
+        SM5502_REG_RSVD12,
+        SM5502_REG_RESERVED_ID2,
+        SM5502_REG_RSVD13,
+        SM5502_REG_OCP,
+        SM5502_REG_RSVD14,
+        SM5502_REG_RSVD15,
+        SM5502_REG_RSVD16,
+        SM5502_REG_RSVD17,
+        SM5502_REG_RSVD18,
+        SM5502_REG_RSVD19,
+        SM5502_REG_RSVD20,
+        SM5502_REG_RSVD21,
+        SM5502_REG_RSVD22,
+        SM5502_REG_RSVD23,
+        SM5502_REG_RSVD24,
+        SM5502_REG_RSVD25,
+        SM5502_REG_RSVD26,
+        SM5502_REG_RSVD27,
+        SM5502_REG_RSVD28,
+        SM5502_REG_RSVD29,
+        SM5502_REG_RSVD30,
+        SM5502_REG_RSVD31,
+        SM5502_REG_RSVD32,
+        SM5502_REG_RSVD33,
+        SM5502_REG_RSVD34,
+        SM5502_REG_RSVD35,
+        SM5502_REG_RSVD36,
+        SM5502_REG_RESERVED_ID3,
+
+        SM5502_REG_END,
+};
+
+/* Define SM5502 MASK/SHIFT constant */
+#define SM5502_REG_DEVICE_ID_VENDOR_SHIFT       0
+#define SM5502_REG_DEVICE_ID_VERSION_SHIFT      3
+#define SM5502_REG_DEVICE_ID_VENDOR_MASK        (0x3 << SM5502_REG_DEVICE_ID_VENDOR_SHIFT)
+#define SM5502_REG_DEVICE_ID_VERSION_MASK       (0x1f << SM5502_REG_DEVICE_ID_VERSION_SHIFT)
+
+#define SM5502_REG_CONTROL_MASK_INT_SHIFT       0
+#define SM5502_REG_CONTROL_WAIT_SHIFT           1
+#define SM5502_REG_CONTROL_MANUAL_SW_SHIFT      2
+#define SM5502_REG_CONTROL_RAW_DATA_SHIFT       3
+#define SM5502_REG_CONTROL_SW_OPEN_SHIFT        4
+#define SM5502_REG_CONTROL_MASK_INT_MASK        (0x1 << SM5502_REG_CONTROL_MASK_INT_SHIFT)
+#define SM5502_REG_CONTROL_WAIT_MASK            (0x1 << SM5502_REG_CONTROL_WAIT_SHIFT)
+#define SM5502_REG_CONTROL_MANUAL_SW_MASK       (0x1 << SM5502_REG_CONTROL_MANUAL_SW_SHIFT)
+#define SM5502_REG_CONTROL_RAW_DATA_MASK        (0x1 << SM5502_REG_CONTROL_RAW_DATA_SHIFT)
+#define SM5502_REG_CONTROL_SW_OPEN_MASK         (0x1 << SM5502_REG_CONTROL_SW_OPEN_SHIFT)
+
+#define SM5502_REG_INTM1_ATTACH_SHIFT           0
+#define SM5502_REG_INTM1_DETACH_SHIFT           1
+#define SM5502_REG_INTM1_KP_SHIFT               2
+#define SM5502_REG_INTM1_LKP_SHIFT              3
+#define SM5502_REG_INTM1_LKR_SHIFT              4
+#define SM5502_REG_INTM1_OVP_EVENT_SHIFT        5
+#define SM5502_REG_INTM1_OCP_EVENT_SHIFT        6
+#define SM5502_REG_INTM1_OVP_OCP_DIS_SHIFT      7
+#define SM5502_REG_INTM1_ATTACH_MASK            (0x1 << SM5502_REG_INTM1_ATTACH_SHIFT)
+#define SM5502_REG_INTM1_DETACH_MASK            (0x1 << SM5502_REG_INTM1_DETACH_SHIFT)
+#define SM5502_REG_INTM1_KP_MASK                (0x1 << SM5502_REG_INTM1_KP_SHIFT)
+#define SM5502_REG_INTM1_LKP_MASK               (0x1 << SM5502_REG_INTM1_LKP_SHIFT)
+#define SM5502_REG_INTM1_LKR_MASK               (0x1 << SM5502_REG_INTM1_LKR_SHIFT)
+#define SM5502_REG_INTM1_OVP_EVENT_MASK         (0x1 << SM5502_REG_INTM1_OVP_EVENT_SHIFT)
+#define SM5502_REG_INTM1_OCP_EVENT_MASK         (0x1 << SM5502_REG_INTM1_OCP_EVENT_SHIFT)
+#define SM5502_REG_INTM1_OVP_OCP_DIS_MASK       (0x1 << SM5502_REG_INTM1_OVP_OCP_DIS_SHIFT)
+
+#define SM5502_REG_INTM2_VBUS_DET_SHIFT         0
+#define SM5502_REG_INTM2_REV_ACCE_SHIFT         1
+#define SM5502_REG_INTM2_ADC_CHG_SHIFT          2
+#define SM5502_REG_INTM2_STUCK_KEY_SHIFT        3
+#define SM5502_REG_INTM2_STUCK_KEY_RCV_SHIFT    4
+#define SM5502_REG_INTM2_MHL_SHIFT              5
+#define SM5502_REG_INTM2_VBUS_DET_MASK          (0x1 << SM5502_REG_INTM2_VBUS_DET_SHIFT)
+#define SM5502_REG_INTM2_REV_ACCE_MASK          (0x1 << SM5502_REG_INTM2_REV_ACCE_SHIFT)
+#define SM5502_REG_INTM2_ADC_CHG_MASK           (0x1 << SM5502_REG_INTM2_ADC_CHG_SHIFT)
+#define SM5502_REG_INTM2_STUCK_KEY_MASK         (0x1 << SM5502_REG_INTM2_STUCK_KEY_SHIFT)
+#define SM5502_REG_INTM2_STUCK_KEY_RCV_MASK     (0x1 << SM5502_REG_INTM2_STUCK_KEY_RCV_SHIFT)
+#define SM5502_REG_INTM2_MHL_MASK               (0x1 << SM5502_REG_INTM2_MHL_SHIFT)
+
+#define SM5502_REG_ADC_SHIFT                    0
+#define SM5502_REG_ADC_MASK                     (0x1f << SM5502_REG_ADC_SHIFT)
+
+#define SM5502_REG_TIMING_SET1_KEY_PRESS_SHIFT  4
+#define SM5502_REG_TIMING_SET1_KEY_PRESS_MASK   (0xf << SM5502_REG_TIMING_SET1_KEY_PRESS_SHIFT)
+#define TIMING_KEY_PRESS_100MS                  0x0
+#define TIMING_KEY_PRESS_200MS                  0x1
+#define TIMING_KEY_PRESS_300MS                  0x2
+#define TIMING_KEY_PRESS_400MS                  0x3
+#define TIMING_KEY_PRESS_500MS                  0x4
+#define TIMING_KEY_PRESS_600MS                  0x5
+#define TIMING_KEY_PRESS_700MS                  0x6
+#define TIMING_KEY_PRESS_800MS                  0x7
+#define TIMING_KEY_PRESS_900MS                  0x8
+#define TIMING_KEY_PRESS_1000MS                 0x9
+#define SM5502_REG_TIMING_SET1_ADC_DET_SHIFT    0
+#define SM5502_REG_TIMING_SET1_ADC_DET_MASK     (0xf << SM5502_REG_TIMING_SET1_ADC_DET_SHIFT)
+#define TIMING_ADC_DET_50MS                     0x0
+#define TIMING_ADC_DET_100MS                    0x1
+#define TIMING_ADC_DET_150MS                    0x2
+#define TIMING_ADC_DET_200MS                    0x3
+#define TIMING_ADC_DET_300MS                    0x4
+#define TIMING_ADC_DET_400MS                    0x5
+#define TIMING_ADC_DET_500MS                    0x6
+#define TIMING_ADC_DET_600MS                    0x7
+#define TIMING_ADC_DET_700MS                    0x8
+#define TIMING_ADC_DET_800MS                    0x9
+#define TIMING_ADC_DET_900MS                    0xA
+#define TIMING_ADC_DET_1000MS                   0xB
+
+#define SM5502_REG_TIMING_SET2_SW_WAIT_SHIFT    4
+#define SM5502_REG_TIMING_SET2_SW_WAIT_MASK     (0xf << SM5502_REG_TIMING_SET2_SW_WAIT_SHIFT)
+#define TIMING_SW_WAIT_10MS                     0x0
+#define TIMING_SW_WAIT_30MS                     0x1
+#define TIMING_SW_WAIT_50MS                     0x2
+#define TIMING_SW_WAIT_70MS                     0x3
+#define TIMING_SW_WAIT_90MS                     0x4
+#define TIMING_SW_WAIT_110MS                    0x5
+#define TIMING_SW_WAIT_130MS                    0x6
+#define TIMING_SW_WAIT_150MS                    0x7
+#define TIMING_SW_WAIT_170MS                    0x8
+#define TIMING_SW_WAIT_190MS                    0x9
+#define TIMING_SW_WAIT_210MS                    0xA
+#define SM5502_REG_TIMING_SET2_LONG_KEY_SHIFT   0
+#define SM5502_REG_TIMING_SET2_LONG_KEY_MASK    (0xf << SM5502_REG_TIMING_SET2_LONG_KEY_SHIFT)
+#define TIMING_LONG_KEY_300MS                   0x0
+#define TIMING_LONG_KEY_400MS                   0x1
+#define TIMING_LONG_KEY_500MS                   0x2
+#define TIMING_LONG_KEY_600MS                   0x3
+#define TIMING_LONG_KEY_700MS                   0x4
+#define TIMING_LONG_KEY_800MS                   0x5
+#define TIMING_LONG_KEY_900MS                   0x6
+#define TIMING_LONG_KEY_1000MS                  0x7
+#define TIMING_LONG_KEY_1100MS                  0x8
+#define TIMING_LONG_KEY_1200MS                  0x9
+#define TIMING_LONG_KEY_1300MS                  0xA
+#define TIMING_LONG_KEY_1400MS                  0xB
+#define TIMING_LONG_KEY_1500MS                  0xC
+
+#define SM5502_REG_DEV_TYPE1_AUDIO_TYPE1_SHIFT          0
+#define SM5502_REG_DEV_TYPE1_AUDIO_TYPE2_SHIFT          1
+#define SM5502_REG_DEV_TYPE1_USB_SDP_SHIFT              2
+#define SM5502_REG_DEV_TYPE1_UART_SHIFT                 3
+#define SM5502_REG_DEV_TYPE1_CAR_KIT_CHARGER_SHIFT      4
+#define SM5502_REG_DEV_TYPE1_USB_CHG_SHIFT              5
+#define SM5502_REG_DEV_TYPE1_DEDICATED_CHG_SHIFT        6
+#define SM5502_REG_DEV_TYPE1_USB_OTG_SHIFT              7
+#define SM5502_REG_DEV_TYPE1_AUDIO_TYPE1_MASK           (0x1 << SM5502_REG_DEV_TYPE1_AUDIO_TYPE1_SHIFT)
+#define SM5502_REG_DEV_TYPE1_AUDIO_TYPE1__MASK          (0x1 << SM5502_REG_DEV_TYPE1_AUDIO_TYPE2_SHIFT)
+#define SM5502_REG_DEV_TYPE1_USB_SDP_MASK               (0x1 << SM5502_REG_DEV_TYPE1_USB_SDP_SHIFT)
+#define SM5502_REG_DEV_TYPE1_UART_MASK                  (0x1 << SM5502_REG_DEV_TYPE1_UART_SHIFT)
+#define SM5502_REG_DEV_TYPE1_CAR_KIT_CHARGER_MASK       (0x1 << SM5502_REG_DEV_TYPE1_CAR_KIT_CHARGER_SHIFT)
+#define SM5502_REG_DEV_TYPE1_USB_CHG_MASK               (0x1 << SM5502_REG_DEV_TYPE1_USB_CHG_SHIFT)
+#define SM5502_REG_DEV_TYPE1_DEDICATED_CHG_MASK         (0x1 << SM5502_REG_DEV_TYPE1_DEDICATED_CHG_SHIFT)
+#define SM5502_REG_DEV_TYPE1_USB_OTG_MASK               (0x1 << SM5502_REG_DEV_TYPE1_USB_OTG_SHIFT)
+
+#define SM5502_REG_DEV_TYPE2_JIG_USB_ON_SHIFT           0
+#define SM5502_REG_DEV_TYPE2_JIG_USB_OFF_SHIFT          1
+#define SM5502_REG_DEV_TYPE2_JIG_UART_ON_SHIFT          2
+#define SM5502_REG_DEV_TYPE2_JIG_UART_OFF_SHIFT         3
+#define SM5502_REG_DEV_TYPE2_PPD_SHIFT                  4
+#define SM5502_REG_DEV_TYPE2_TTY_SHIFT                  5
+#define SM5502_REG_DEV_TYPE2_AV_CABLE_SHIFT             6
+#define SM5502_REG_DEV_TYPE2_JIG_USB_ON_MASK            (0x1 << SM5502_REG_DEV_TYPE2_JIG_USB_ON_SHIFT)
+#define SM5502_REG_DEV_TYPE2_JIG_USB_OFF_MASK           (0x1 << SM5502_REG_DEV_TYPE2_JIG_USB_OFF_SHIFT)
+#define SM5502_REG_DEV_TYPE2_JIG_UART_ON_MASK           (0x1 << SM5502_REG_DEV_TYPE2_JIG_UART_ON_SHIFT)
+#define SM5502_REG_DEV_TYPE2_JIG_UART_OFF_MASK          (0x1 << SM5502_REG_DEV_TYPE2_JIG_UART_OFF_SHIFT)
+#define SM5502_REG_DEV_TYPE2_PPD_MASK                   (0x1 << SM5502_REG_DEV_TYPE2_PPD_SHIFT)
+#define SM5502_REG_DEV_TYPE2_TTY_MASK                   (0x1 << SM5502_REG_DEV_TYPE2_TTY_SHIFT)
+#define SM5502_REG_DEV_TYPE2_AV_CABLE_MASK              (0x1 << SM5502_REG_DEV_TYPE2_AV_CABLE_SHIFT)
+
+#define SM5502_REG_MANUAL_SW1_VBUSIN_SHIFT      0
+#define SM5502_REG_MANUAL_SW1_DP_SHIFT          2
+#define SM5502_REG_MANUAL_SW1_DM_SHIFT          5
+#define SM5502_REG_MANUAL_SW1_VBUSIN_MASK       (0x3 << SM5502_REG_MANUAL_SW1_VBUSIN_SHIFT)
+#define SM5502_REG_MANUAL_SW1_DP_MASK           (0x7 << SM5502_REG_MANUAL_SW1_DP_SHIFT)
+#define SM5502_REG_MANUAL_SW1_DM_MASK           (0x7 << SM5502_REG_MANUAL_SW1_DM_SHIFT)
+#define VBUSIN_SWITCH_OPEN                      0x0
+#define VBUSIN_SWITCH_VBUSOUT                   0x1
+#define VBUSIN_SWITCH_MIC                       0x2
+#define VBUSIN_SWITCH_VBUSOUT_WITH_USB          0x3
+#define DM_DP_CON_SWITCH_OPEN                   0x0
+#define DM_DP_CON_SWITCH_USB                    0x1
+#define DM_DP_CON_SWITCH_AUDIO                  0x2
+#define DM_DP_CON_SWITCH_UART                   0x3
+#define DM_DP_SWITCH_OPEN                       ((DM_DP_CON_SWITCH_OPEN <<SM5502_REG_MANUAL_SW1_DP_SHIFT) \
+                                                | (DM_DP_CON_SWITCH_OPEN <<SM5502_REG_MANUAL_SW1_DM_SHIFT))
+#define DM_DP_SWITCH_USB                        ((DM_DP_CON_SWITCH_USB <<SM5502_REG_MANUAL_SW1_DP_SHIFT) \
+                                                | (DM_DP_CON_SWITCH_USB <<SM5502_REG_MANUAL_SW1_DM_SHIFT))
+#define DM_DP_SWITCH_AUDIO                      ((DM_DP_CON_SWITCH_AUDIO <<SM5502_REG_MANUAL_SW1_DP_SHIFT) \
+                                                | (DM_DP_CON_SWITCH_AUDIO <<SM5502_REG_MANUAL_SW1_DM_SHIFT))
+#define DM_DP_SWITCH_UART                       ((DM_DP_CON_SWITCH_UART <<SM5502_REG_MANUAL_SW1_DP_SHIFT) \
+                                                | (DM_DP_CON_SWITCH_UART <<SM5502_REG_MANUAL_SW1_DM_SHIFT))
+
+/* SM5502 Interrupts */
+enum sm5502_irq {
+        /* INT1 */
+        SM5502_IRQ_INT1_ATTACH,
+        SM5502_IRQ_INT1_DETACH,
+        SM5502_IRQ_INT1_KP,
+        SM5502_IRQ_INT1_LKP,
+        SM5502_IRQ_INT1_LKR,
+        SM5502_IRQ_INT1_OVP_EVENT,
+        SM5502_IRQ_INT1_OCP_EVENT,
+        SM5502_IRQ_INT1_OVP_OCP_DIS,
+
+        /* INT2 */
+        SM5502_IRQ_INT2_VBUS_DET,
+        SM5502_IRQ_INT2_REV_ACCE,
+        SM5502_IRQ_INT2_ADC_CHG,
+        SM5502_IRQ_INT2_STUCK_KEY,
+        SM5502_IRQ_INT2_STUCK_KEY_RCV,
+        SM5502_IRQ_INT2_MHL,
+
+        SM5502_IRQ_NUM,
+};
+
+#define SM5502_IRQ_INT1_ATTACH_MASK             BIT(0)
+#define SM5502_IRQ_INT1_DETACH_MASK             BIT(1)
+#define SM5502_IRQ_INT1_KP_MASK                 BIT(2)
+#define SM5502_IRQ_INT1_LKP_MASK                BIT(3)
+#define SM5502_IRQ_INT1_LKR_MASK                BIT(4)
+#define SM5502_IRQ_INT1_OVP_EVENT_MASK          BIT(5)
+#define SM5502_IRQ_INT1_OCP_EVENT_MASK          BIT(6)
+#define SM5502_IRQ_INT1_OVP_OCP_DIS_MASK        BIT(7)
+#define SM5502_IRQ_INT2_VBUS_DET_MASK           BIT(0)
+#define SM5502_IRQ_INT2_REV_ACCE_MASK           BIT(1)
+#define SM5502_IRQ_INT2_ADC_CHG_MASK            BIT(2)
+#define SM5502_IRQ_INT2_STUCK_KEY_MASK          BIT(3)
+#define SM5502_IRQ_INT2_STUCK_KEY_RCV_MASK      BIT(4)
+#define SM5502_IRQ_INT2_MHL_MASK                BIT(5)
+
+#endif /*  __LINUX_EXTCON_SM5502_H */
diff --git a/include/linux/fence.h b/include/linux/fence.h
new file mode 100644
index 000000000000..d174585b874b
--- /dev/null
+++ b/include/linux/fence.h
@@ -0,0 +1,360 @@
+/*
+ * Fence mechanism for dma-buf to allow for asynchronous dma access
+ *
+ * Copyright (C) 2012 Canonical Ltd
+ * Copyright (C) 2012 Texas Instruments
+ *
+ * Authors:
+ * Rob Clark <robdclark@gmail.com>
+ * Maarten Lankhorst <maarten.lankhorst@canonical.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 __LINUX_FENCE_H
+#define __LINUX_FENCE_H
+
+#include <linux/err.h>
+#include <linux/wait.h>
+#include <linux/list.h>
+#include <linux/bitops.h>
+#include <linux/kref.h>
+#include <linux/sched.h>
+#include <linux/printk.h>
+#include <linux/rcupdate.h>
+
+struct fence;
+struct fence_ops;
+struct fence_cb;
+
+/**
+ * struct fence - software synchronization primitive
+ * @refcount: refcount for this fence
+ * @ops: fence_ops associated with this fence
+ * @rcu: used for releasing fence with kfree_rcu
+ * @cb_list: list of all callbacks to call
+ * @lock: spin_lock_irqsave used for locking
+ * @context: execution context this fence belongs to, returned by
+ *           fence_context_alloc()
+ * @seqno: the sequence number of this fence inside the execution context,
+ * can be compared to decide which fence would be signaled later.
+ * @flags: A mask of FENCE_FLAG_* defined below
+ * @timestamp: Timestamp when the fence was signaled.
+ * @status: Optional, only valid if < 0, must be set before calling
+ * fence_signal, indicates that the fence has completed with an error.
+ *
+ * the flags member must be manipulated and read using the appropriate
+ * atomic ops (bit_*), so taking the spinlock will not be needed most
+ * of the time.
+ *
+ * FENCE_FLAG_SIGNALED_BIT - fence is already signaled
+ * FENCE_FLAG_ENABLE_SIGNAL_BIT - enable_signaling might have been called*
+ * FENCE_FLAG_USER_BITS - start of the unused bits, can be used by the
+ * implementer of the fence for its own purposes. Can be used in different
+ * ways by different fence implementers, so do not rely on this.
+ *
+ * *) Since atomic bitops are used, this is not guaranteed to be the case.
+ * Particularly, if the bit was set, but fence_signal was called right
+ * before this bit was set, it would have been able to set the
+ * FENCE_FLAG_SIGNALED_BIT, before enable_signaling was called.
+ * Adding a check for FENCE_FLAG_SIGNALED_BIT after setting
+ * FENCE_FLAG_ENABLE_SIGNAL_BIT closes this race, and makes sure that
+ * after fence_signal was called, any enable_signaling call will have either
+ * been completed, or never called at all.
+ */
+struct fence {
+        struct kref refcount;
+        const struct fence_ops *ops;
+        struct rcu_head rcu;
+        struct list_head cb_list;
+        spinlock_t *lock;
+        unsigned context, seqno;
+        unsigned long flags;
+        ktime_t timestamp;
+        int status;
+};
+
+enum fence_flag_bits {
+        FENCE_FLAG_SIGNALED_BIT,
+        FENCE_FLAG_ENABLE_SIGNAL_BIT,
+        FENCE_FLAG_USER_BITS, /* must always be last member */
+};
+
+typedef void (*fence_func_t)(struct fence *fence, struct fence_cb *cb);
+
+/**
+ * struct fence_cb - callback for fence_add_callback
+ * @node: used by fence_add_callback to append this struct to fence::cb_list
+ * @func: fence_func_t to call
+ *
+ * This struct will be initialized by fence_add_callback, additional
+ * data can be passed along by embedding fence_cb in another struct.
+ */
+struct fence_cb {
+        struct list_head node;
+        fence_func_t func;
+};
+
+/**
+ * struct fence_ops - operations implemented for fence
+ * @get_driver_name: returns the driver name.
+ * @get_timeline_name: return the name of the context this fence belongs to.
+ * @enable_signaling: enable software signaling of fence.
+ * @signaled: [optional] peek whether the fence is signaled, can be null.
+ * @wait: custom wait implementation, or fence_default_wait.
+ * @release: [optional] called on destruction of fence, can be null
+ * @fill_driver_data: [optional] callback to fill in free-form debug info
+ * Returns amount of bytes filled, or -errno.
+ * @fence_value_str: [optional] fills in the value of the fence as a string
+ * @timeline_value_str: [optional] fills in the current value of the timeline
+ * as a string
+ *
+ * Notes on enable_signaling:
+ * For fence implementations that have the capability for hw->hw
+ * signaling, they can implement this op to enable the necessary
+ * irqs, or insert commands into cmdstream, etc.  This is called
+ * in the first wait() or add_callback() path to let the fence
+ * implementation know that there is another driver waiting on
+ * the signal (ie. hw->sw case).
+ *
+ * This function can be called called from atomic context, but not
+ * from irq context, so normal spinlocks can be used.
+ *
+ * A return value of false indicates the fence already passed,
+ * or some failure occured that made it impossible to enable
+ * signaling. True indicates succesful enabling.
+ *
+ * fence->status may be set in enable_signaling, but only when false is
+ * returned.
+ *
+ * Calling fence_signal before enable_signaling is called allows
+ * for a tiny race window in which enable_signaling is called during,
+ * before, or after fence_signal. To fight this, it is recommended
+ * that before enable_signaling returns true an extra reference is
+ * taken on the fence, to be released when the fence is signaled.
+ * This will mean fence_signal will still be called twice, but
+ * the second time will be a noop since it was already signaled.
+ *
+ * Notes on signaled:
+ * May set fence->status if returning true.
+ *
+ * Notes on wait:
+ * Must not be NULL, set to fence_default_wait for default implementation.
+ * the fence_default_wait implementation should work for any fence, as long
+ * as enable_signaling works correctly.
+ *
+ * Must return -ERESTARTSYS if the wait is intr = true and the wait was
+ * interrupted, and remaining jiffies if fence has signaled, or 0 if wait
+ * timed out. Can also return other error values on custom implementations,
+ * which should be treated as if the fence is signaled. For example a hardware
+ * lockup could be reported like that.
+ *
+ * Notes on release:
+ * Can be NULL, this function allows additional commands to run on
+ * destruction of the fence. Can be called from irq context.
+ * If pointer is set to NULL, kfree will get called instead.
+ */
+
+struct fence_ops {
+        const char * (*get_driver_name)(struct fence *fence);
+        const char * (*get_timeline_name)(struct fence *fence);
+        bool (*enable_signaling)(struct fence *fence);
+        bool (*signaled)(struct fence *fence);
+        signed long (*wait)(struct fence *fence, bool intr, signed long timeout);
+        void (*release)(struct fence *fence);
+
+        int (*fill_driver_data)(struct fence *fence, void *data, int size);
+        void (*fence_value_str)(struct fence *fence, char *str, int size);
+        void (*timeline_value_str)(struct fence *fence, char *str, int size);
+};
+
+void fence_init(struct fence *fence, const struct fence_ops *ops,
+                spinlock_t *lock, unsigned context, unsigned seqno);
+
+void fence_release(struct kref *kref);
+void fence_free(struct fence *fence);
+
+/**
+ * fence_get - increases refcount of the fence
+ * @fence:      [in]    fence to increase refcount of
+ *
+ * Returns the same fence, with refcount increased by 1.
+ */
+static inline struct fence *fence_get(struct fence *fence)
+{
+        if (fence)
+                kref_get(&fence->refcount);
+        return fence;
+}
+
+/**
+ * fence_get_rcu - get a fence from a reservation_object_list with rcu read lock
+ * @fence:      [in]    fence to increase refcount of
+ *
+ * Function returns NULL if no refcount could be obtained, or the fence.
+ */
+static inline struct fence *fence_get_rcu(struct fence *fence)
+{
+        if (kref_get_unless_zero(&fence->refcount))
+                return fence;
+        else
+                return NULL;
+}
+
+/**
+ * fence_put - decreases refcount of the fence
+ * @fence:      [in]    fence to reduce refcount of
+ */
+static inline void fence_put(struct fence *fence)
+{
+        if (fence)
+                kref_put(&fence->refcount, fence_release);
+}
+
+int fence_signal(struct fence *fence);
+int fence_signal_locked(struct fence *fence);
+signed long fence_default_wait(struct fence *fence, bool intr, signed long timeout);
+int fence_add_callback(struct fence *fence, struct fence_cb *cb,
+                       fence_func_t func);
+bool fence_remove_callback(struct fence *fence, struct fence_cb *cb);
+void fence_enable_sw_signaling(struct fence *fence);
+
+/**
+ * fence_is_signaled_locked - Return an indication if the fence is signaled yet.
+ * @fence:      [in]    the fence to check
+ *
+ * Returns true if the fence was already signaled, false if not. Since this
+ * function doesn't enable signaling, it is not guaranteed to ever return
+ * true if fence_add_callback, fence_wait or fence_enable_sw_signaling
+ * haven't been called before.
+ *
+ * This function requires fence->lock to be held.
+ */
+static inline bool
+fence_is_signaled_locked(struct fence *fence)
+{
+        if (test_bit(FENCE_FLAG_SIGNALED_BIT, &fence->flags))
+                return true;
+
+        if (fence->ops->signaled && fence->ops->signaled(fence)) {
+                fence_signal_locked(fence);
+                return true;
+        }
+
+        return false;
+}
+
+/**
+ * fence_is_signaled - Return an indication if the fence is signaled yet.
+ * @fence:      [in]    the fence to check
+ *
+ * Returns true if the fence was already signaled, false if not. Since this
+ * function doesn't enable signaling, it is not guaranteed to ever return
+ * true if fence_add_callback, fence_wait or fence_enable_sw_signaling
+ * haven't been called before.
+ *
+ * It's recommended for seqno fences to call fence_signal when the
+ * operation is complete, it makes it possible to prevent issues from
+ * wraparound between time of issue and time of use by checking the return
+ * value of this function before calling hardware-specific wait instructions.
+ */
+static inline bool
+fence_is_signaled(struct fence *fence)
+{
+        if (test_bit(FENCE_FLAG_SIGNALED_BIT, &fence->flags))
+                return true;
+
+        if (fence->ops->signaled && fence->ops->signaled(fence)) {
+                fence_signal(fence);
+                return true;
+        }
+
+        return false;
+}
+
+/**
+ * fence_later - return the chronologically later fence
+ * @f1: [in]    the first fence from the same context
+ * @f2: [in]    the second fence from the same context
+ *
+ * Returns NULL if both fences are signaled, otherwise the fence that would be
+ * signaled last. Both fences must be from the same context, since a seqno is
+ * not re-used across contexts.
+ */
+static inline struct fence *fence_later(struct fence *f1, struct fence *f2)
+{
+        if (WARN_ON(f1->context != f2->context))
+                return NULL;
+
+        /*
+         * can't check just FENCE_FLAG_SIGNALED_BIT here, it may never have been
+         * set if enable_signaling wasn't called, and enabling that here is
+         * overkill.
+         */
+        if (f2->seqno - f1->seqno <= INT_MAX)
+                return fence_is_signaled(f2) ? NULL : f2;
+        else
+                return fence_is_signaled(f1) ? NULL : f1;
+}
+
+signed long fence_wait_timeout(struct fence *, bool intr, signed long timeout);
+
+
+/**
+ * fence_wait - sleep until the fence gets signaled
+ * @fence:      [in]    the fence to wait on
+ * @intr:       [in]    if true, do an interruptible wait
+ *
+ * This function will return -ERESTARTSYS if interrupted by a signal,
+ * or 0 if the fence was signaled. Other error values may be
+ * returned on custom implementations.
+ *
+ * Performs a synchronous wait on this fence. It is assumed the caller
+ * directly or indirectly holds a reference to the fence, otherwise the
+ * fence might be freed before return, resulting in undefined behavior.
+ */
+static inline signed long fence_wait(struct fence *fence, bool intr)
+{
+        signed long ret;
+
+        /* Since fence_wait_timeout cannot timeout with
+         * MAX_SCHEDULE_TIMEOUT, only valid return values are
+         * -ERESTARTSYS and MAX_SCHEDULE_TIMEOUT.
+         */
+        ret = fence_wait_timeout(fence, intr, MAX_SCHEDULE_TIMEOUT);
+
+        return ret < 0 ? ret : 0;
+}
+
+unsigned fence_context_alloc(unsigned num);
+
+#define FENCE_TRACE(f, fmt, args...) \
+        do {                                                            \
+                struct fence *__ff = (f);                               \
+                if (config_enabled(CONFIG_FENCE_TRACE))                 \
+                        pr_info("f %u#%u: " fmt,                        \
+                                __ff->context, __ff->seqno, ##args);    \
+        } while (0)
+
+#define FENCE_WARN(f, fmt, args...) \
+        do {                                                            \
+                struct fence *__ff = (f);                               \
+                pr_warn("f %u#%u: " fmt, __ff->context, __ff->seqno,    \
+                         ##args);                                       \
+        } while (0)
+
+#define FENCE_ERR(f, fmt, args...) \
+        do {                                                            \
+                struct fence *__ff = (f);                               \
+                pr_err("f %u#%u: " fmt, __ff->context, __ff->seqno,     \
+                        ##args);                                        \
+        } while (0)
+
+#endif /* __LINUX_FENCE_H */
diff --git a/include/linux/filter.h b/include/linux/filter.h
index a7e3c48d73a7..a5227ab8ccb1 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -6,6 +6,7 @@
 
 #include <linux/atomic.h>
 #include <linux/compat.h>
+#include <linux/skbuff.h>
 #include <linux/workqueue.h>
 #include <uapi/linux/filter.h>
 
@@ -81,7 +82,7 @@ enum {
 /* ALU ops on registers, bpf_add|sub|...: dst_reg += src_reg */
 
 #define BPF_ALU64_REG(OP, DST, SRC)                             \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU64 | BPF_OP(OP) | BPF_X,        \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -89,7 +90,7 @@ enum {
                 .imm   = 0 })
 
 #define BPF_ALU32_REG(OP, DST, SRC)                             \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU | BPF_OP(OP) | BPF_X,          \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -99,7 +100,7 @@ enum {
 /* ALU ops on immediates, bpf_add|sub|...: dst_reg += imm32 */
 
 #define BPF_ALU64_IMM(OP, DST, IMM)                             \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU64 | BPF_OP(OP) | BPF_K,        \
                 .dst_reg = DST,                                 \
                 .src_reg = 0,                                   \
@@ -107,7 +108,7 @@ enum {
                 .imm   = IMM })
 
 #define BPF_ALU32_IMM(OP, DST, IMM)                             \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU | BPF_OP(OP) | BPF_K,          \
                 .dst_reg = DST,                                 \
                 .src_reg = 0,                                   \
@@ -117,7 +118,7 @@ enum {
 /* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */
 
 #define BPF_ENDIAN(TYPE, DST, LEN)                              \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU | BPF_END | BPF_SRC(TYPE),     \
                 .dst_reg = DST,                                 \
                 .src_reg = 0,                                   \
@@ -127,7 +128,7 @@ enum {
 /* Short form of mov, dst_reg = src_reg */
 
 #define BPF_MOV64_REG(DST, SRC)                                 \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU64 | BPF_MOV | BPF_X,           \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -135,7 +136,7 @@ enum {
                 .imm   = 0 })
 
 #define BPF_MOV32_REG(DST, SRC)                                 \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU | BPF_MOV | BPF_X,             \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -145,7 +146,7 @@ enum {
 /* Short form of mov, dst_reg = imm32 */
 
 #define BPF_MOV64_IMM(DST, IMM)                                 \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU64 | BPF_MOV | BPF_K,           \
                 .dst_reg = DST,                                 \
                 .src_reg = 0,                                   \
@@ -153,7 +154,7 @@ enum {
                 .imm   = IMM })
 
 #define BPF_MOV32_IMM(DST, IMM)                                 \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU | BPF_MOV | BPF_K,             \
                 .dst_reg = DST,                                 \
                 .src_reg = 0,                                   \
@@ -163,7 +164,7 @@ enum {
 /* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
 
 #define BPF_MOV64_RAW(TYPE, DST, SRC, IMM)                      \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU64 | BPF_MOV | BPF_SRC(TYPE),   \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -171,7 +172,7 @@ enum {
                 .imm   = IMM })
 
 #define BPF_MOV32_RAW(TYPE, DST, SRC, IMM)                      \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ALU | BPF_MOV | BPF_SRC(TYPE),     \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -181,7 +182,7 @@ enum {
 /* Direct packet access, R0 = *(uint *) (skb->data + imm32) */
 
 #define BPF_LD_ABS(SIZE, IMM)                                   \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_LD | BPF_SIZE(SIZE) | BPF_ABS,     \
                 .dst_reg = 0,                                   \
                 .src_reg = 0,                                   \
@@ -191,7 +192,7 @@ enum {
 /* Indirect packet access, R0 = *(uint *) (skb->data + src_reg + imm32) */
 
 #define BPF_LD_IND(SIZE, SRC, IMM)                              \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_LD | BPF_SIZE(SIZE) | BPF_IND,     \
                 .dst_reg = 0,                                   \
                 .src_reg = SRC,                                 \
@@ -201,7 +202,7 @@ enum {
 /* Memory load, dst_reg = *(uint *) (src_reg + off16) */
 
 #define BPF_LDX_MEM(SIZE, DST, SRC, OFF)                        \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_LDX | BPF_SIZE(SIZE) | BPF_MEM,    \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -211,7 +212,7 @@ enum {
 /* Memory store, *(uint *) (dst_reg + off16) = src_reg */
 
 #define BPF_STX_MEM(SIZE, DST, SRC, OFF)                        \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_STX | BPF_SIZE(SIZE) | BPF_MEM,    \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -221,7 +222,7 @@ enum {
 /* Memory store, *(uint *) (dst_reg + off16) = imm32 */
 
 #define BPF_ST_MEM(SIZE, DST, OFF, IMM)                         \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_ST | BPF_SIZE(SIZE) | BPF_MEM,     \
                 .dst_reg = DST,                                 \
                 .src_reg = 0,                                   \
@@ -231,7 +232,7 @@ enum {
 /* Conditional jumps against registers, if (dst_reg 'op' src_reg) goto pc + off16 */
 
 #define BPF_JMP_REG(OP, DST, SRC, OFF)                          \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_JMP | BPF_OP(OP) | BPF_X,          \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -241,7 +242,7 @@ enum {
 /* Conditional jumps against immediates, if (dst_reg 'op' imm32) goto pc + off16 */
 
 #define BPF_JMP_IMM(OP, DST, IMM, OFF)                          \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_JMP | BPF_OP(OP) | BPF_K,          \
                 .dst_reg = DST,                                 \
                 .src_reg = 0,                                   \
@@ -251,7 +252,7 @@ enum {
 /* Function call */
 
 #define BPF_EMIT_CALL(FUNC)                                     \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_JMP | BPF_CALL,                    \
                 .dst_reg = 0,                                   \
                 .src_reg = 0,                                   \
@@ -261,7 +262,7 @@ enum {
 /* Raw code statement block */
 
 #define BPF_RAW_INSN(CODE, DST, SRC, OFF, IMM)                  \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = CODE,                                  \
                 .dst_reg = DST,                                 \
                 .src_reg = SRC,                                 \
@@ -271,7 +272,7 @@ enum {
 /* Program exit */
 
 #define BPF_EXIT_INSN()                                         \
-        ((struct sock_filter_int) {                             \
+        ((struct bpf_insn) {                                    \
                 .code  = BPF_JMP | BPF_EXIT,                    \
                 .dst_reg = 0,                                   \
                 .src_reg = 0,                                   \
@@ -295,9 +296,10 @@ enum {
 })
 
 /* Macro to invoke filter function. */
-#define SK_RUN_FILTER(filter, ctx)  (*filter->bpf_func)(ctx, filter->insnsi)
+#define SK_RUN_FILTER(filter, ctx) \
+        (*filter->prog->bpf_func)(ctx, filter->prog->insnsi)
 
-struct sock_filter_int {
+struct bpf_insn {
         __u8    code;           /* opcode */
         __u8    dst_reg:4;      /* dest register */
         __u8    src_reg:4;      /* source register */
@@ -322,54 +324,58 @@ struct sk_buff;
 struct sock;
 struct seccomp_data;
 
-struct sk_filter {
-        atomic_t                refcnt;
+struct bpf_prog {
         u32                     jited:1,        /* Is our filter JIT'ed? */
                                 len:31;         /* Number of filter blocks */
         struct sock_fprog_kern  *orig_prog;     /* Original BPF program */
-        struct rcu_head         rcu;
         unsigned int            (*bpf_func)(const struct sk_buff *skb,
-                                            const struct sock_filter_int *filter);
+                                            const struct bpf_insn *filter);
         union {
                 struct sock_filter      insns[0];
-                struct sock_filter_int  insnsi[0];
+                struct bpf_insn         insnsi[0];
                 struct work_struct      work;
         };
 };
 
-static inline unsigned int sk_filter_size(unsigned int proglen)
+struct sk_filter {
+        atomic_t        refcnt;
+        struct rcu_head rcu;
+        struct bpf_prog *prog;
+};
+
+#define BPF_PROG_RUN(filter, ctx)  (*filter->bpf_func)(ctx, filter->insnsi)
+
+static inline unsigned int bpf_prog_size(unsigned int proglen)
 {
-        return max(sizeof(struct sk_filter),
-                   offsetof(struct sk_filter, insns[proglen]));
+        return max(sizeof(struct bpf_prog),
+                   offsetof(struct bpf_prog, insns[proglen]));
 }
 
-#define sk_filter_proglen(fprog)                        \
-                (fprog->len * sizeof(fprog->filter[0]))
+#define bpf_classic_proglen(fprog) (fprog->len * sizeof(fprog->filter[0]))
 
 int sk_filter(struct sock *sk, struct sk_buff *skb);
 
-void sk_filter_select_runtime(struct sk_filter *fp);
-void sk_filter_free(struct sk_filter *fp);
+void bpf_prog_select_runtime(struct bpf_prog *fp);
+void bpf_prog_free(struct bpf_prog *fp);
 
-int sk_convert_filter(struct sock_filter *prog, int len,
-                      struct sock_filter_int *new_prog, int *new_len);
+int bpf_convert_filter(struct sock_filter *prog, int len,
+                       struct bpf_insn *new_prog, int *new_len);
 
-int sk_unattached_filter_create(struct sk_filter **pfp,
-                                struct sock_fprog_kern *fprog);
-void sk_unattached_filter_destroy(struct sk_filter *fp);
+int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog);
+void bpf_prog_destroy(struct bpf_prog *fp);
 
 int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
 int sk_detach_filter(struct sock *sk);
 
-int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
+int bpf_check_classic(const struct sock_filter *filter, unsigned int flen);
 int sk_get_filter(struct sock *sk, struct sock_filter __user *filter,
                   unsigned int len);
 
-void sk_filter_charge(struct sock *sk, struct sk_filter *fp);
+bool sk_filter_charge(struct sock *sk, struct sk_filter *fp);
 void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp);
 
 u64 __bpf_call_base(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5);
-void bpf_int_jit_compile(struct sk_filter *fp);
+void bpf_int_jit_compile(struct bpf_prog *fp);
 
 #define BPF_ANC         BIT(15)
 
@@ -406,13 +412,25 @@ static inline u16 bpf_anc_helper(const struct sock_filter *ftest)
         }
 }
 
+void *bpf_internal_load_pointer_neg_helper(const struct sk_buff *skb,
+                                           int k, unsigned int size);
+
+static inline void *bpf_load_pointer(const struct sk_buff *skb, int k,
+                                     unsigned int size, void *buffer)
+{
+        if (k >= 0)
+                return skb_header_pointer(skb, k, size, buffer);
+
+        return bpf_internal_load_pointer_neg_helper(skb, k, size);
+}
+
 #ifdef CONFIG_BPF_JIT
 #include <stdarg.h>
 #include <linux/linkage.h>
 #include <linux/printk.h>
 
-void bpf_jit_compile(struct sk_filter *fp);
-void bpf_jit_free(struct sk_filter *fp);
+void bpf_jit_compile(struct bpf_prog *fp);
+void bpf_jit_free(struct bpf_prog *fp);
 
 static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen,
                                 u32 pass, void *image)
@@ -426,11 +444,11 @@ static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen,
 #else
 #include <linux/slab.h>
 
-static inline void bpf_jit_compile(struct sk_filter *fp)
+static inline void bpf_jit_compile(struct bpf_prog *fp)
 {
 }
 
-static inline void bpf_jit_free(struct sk_filter *fp)
+static inline void bpf_jit_free(struct bpf_prog *fp)
 {
         kfree(fp);
 }
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 59529330efd6..5c41c5e75b5c 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -45,6 +45,8 @@ int request_firmware_nowait(
         struct module *module, bool uevent,
         const char *name, struct device *device, gfp_t gfp, void *context,
         void (*cont)(const struct firmware *fw, void *context));
+int request_firmware_direct(const struct firmware **fw, const char *name,
+                            struct device *device);
 
 void release_firmware(const struct firmware *fw);
 #else
@@ -66,13 +68,12 @@ static inline void release_firmware(const struct firmware *fw)
 {
 }
 
-#endif
+static inline int request_firmware_direct(const struct firmware **fw,
+                                          const char *name,
+                                          struct device *device)
+{
+        return -EINVAL;
+}
 
-#ifdef CONFIG_FW_LOADER_USER_HELPER
-int request_firmware_direct(const struct firmware **fw, const char *name,
-                            struct device *device);
-#else
-#define request_firmware_direct request_firmware
 #endif
-
 #endif
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e11d60cc867b..2daccaf4b547 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -833,7 +833,7 @@ static inline struct file *get_file(struct file *f)
  *
  * Lockd stuffs a "host" pointer into this.
  */
-typedef struct files_struct *fl_owner_t;
+typedef void *fl_owner_t;
 
 struct file_lock_operations {
         void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 404a686a3644..6bb5e3f2a3b4 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -33,8 +33,7 @@
  * features, then it must call an indirect function that
  * does. Or at least does enough to prevent any unwelcomed side effects.
  */
-#if !defined(CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST) || \
-        !ARCH_SUPPORTS_FTRACE_OPS
+#if !ARCH_SUPPORTS_FTRACE_OPS
 # define FTRACE_FORCE_LIST_FUNC 1
 #else
 # define FTRACE_FORCE_LIST_FUNC 0
@@ -118,17 +117,18 @@ struct ftrace_ops {
         ftrace_func_t                   func;
         struct ftrace_ops               *next;
         unsigned long                   flags;
-        int __percpu                    *disabled;
         void                            *private;
+        int __percpu                    *disabled;
 #ifdef CONFIG_DYNAMIC_FTRACE
+        int                             nr_trampolines;
         struct ftrace_hash              *notrace_hash;
         struct ftrace_hash              *filter_hash;
+        struct ftrace_hash              *tramp_hash;
         struct mutex                    regex_lock;
+        unsigned long                   trampoline;
 #endif
 };
 
-extern int function_trace_stop;
-
 /*
  * Type of the current tracing.
  */
@@ -140,32 +140,6 @@ enum ftrace_tracing_type_t {
 /* Current tracing type, default is FTRACE_TYPE_ENTER */
 extern enum ftrace_tracing_type_t ftrace_tracing_type;
 
-/**
- * ftrace_stop - stop function tracer.
- *
- * A quick way to stop the function tracer. Note this an on off switch,
- * it is not something that is recursive like preempt_disable.
- * This does not disable the calling of mcount, it only stops the
- * calling of functions from mcount.
- */
-static inline void ftrace_stop(void)
-{
-        function_trace_stop = 1;
-}
-
-/**
- * ftrace_start - start the function tracer.
- *
- * This function is the inverse of ftrace_stop. This does not enable
- * the function tracing if the function tracer is disabled. This only
- * sets the function tracer flag to continue calling the functions
- * from mcount.
- */
-static inline void ftrace_start(void)
-{
-        function_trace_stop = 0;
-}
-
 /*
  * The ftrace_ops must be a static and should also
  * be read_mostly.  These functions do modify read_mostly variables
@@ -242,8 +216,6 @@ static inline int ftrace_nr_registered_ops(void)
 }
 static inline void clear_ftrace_function(void) { }
 static inline void ftrace_kill(void) { }
-static inline void ftrace_stop(void) { }
-static inline void ftrace_start(void) { }
 #endif /* CONFIG_FUNCTION_TRACER */
 
 #ifdef CONFIG_STACK_TRACER
@@ -317,13 +289,20 @@ extern int ftrace_nr_registered_ops(void);
  * from tracing that function.
  */
 enum {
-        FTRACE_FL_ENABLED       = (1UL << 29),
+        FTRACE_FL_ENABLED       = (1UL << 31),
         FTRACE_FL_REGS          = (1UL << 30),
-        FTRACE_FL_REGS_EN       = (1UL << 31)
+        FTRACE_FL_REGS_EN       = (1UL << 29),
+        FTRACE_FL_TRAMP         = (1UL << 28),
+        FTRACE_FL_TRAMP_EN      = (1UL << 27),
 };
 
-#define FTRACE_FL_MASK          (0x7UL << 29)
-#define FTRACE_REF_MAX          ((1UL << 29) - 1)
+#define FTRACE_REF_MAX_SHIFT    27
+#define FTRACE_FL_BITS          5
+#define FTRACE_FL_MASKED_BITS   ((1UL << FTRACE_FL_BITS) - 1)
+#define FTRACE_FL_MASK          (FTRACE_FL_MASKED_BITS << FTRACE_REF_MAX_SHIFT)
+#define FTRACE_REF_MAX          ((1UL << FTRACE_REF_MAX_SHIFT) - 1)
+
+#define ftrace_rec_count(rec)   ((rec)->flags & ~FTRACE_FL_MASK)
 
 struct dyn_ftrace {
         unsigned long           ip; /* address of mcount call-site */
@@ -431,6 +410,10 @@ void ftrace_modify_all_code(int command);
 #define FTRACE_ADDR ((unsigned long)ftrace_caller)
 #endif
 
+#ifndef FTRACE_GRAPH_ADDR
+#define FTRACE_GRAPH_ADDR ((unsigned long)ftrace_graph_caller)
+#endif
+
 #ifndef FTRACE_REGS_ADDR
 #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
 # define FTRACE_REGS_ADDR ((unsigned long)ftrace_regs_caller)
@@ -439,6 +422,16 @@ void ftrace_modify_all_code(int command);
 #endif
 #endif
 
+/*
+ * If an arch would like functions that are only traced
+ * by the function graph tracer to jump directly to its own
+ * trampoline, then they can define FTRACE_GRAPH_TRAMP_ADDR
+ * to be that address to jump to.
+ */
+#ifndef FTRACE_GRAPH_TRAMP_ADDR
+#define FTRACE_GRAPH_TRAMP_ADDR ((unsigned long) 0)
+#endif
+
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 extern void ftrace_graph_caller(void);
 extern int ftrace_enable_ftrace_graph_caller(void);
@@ -736,6 +729,7 @@ extern char __irqentry_text_end[];
 extern int register_ftrace_graph(trace_func_graph_ret_t retfunc,
                                 trace_func_graph_ent_t entryfunc);
 
+extern bool ftrace_graph_is_dead(void);
 extern void ftrace_graph_stop(void);
 
 /* The current handlers in use */
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index cff3106ffe2c..06c6faa9e5cc 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -272,7 +272,6 @@ struct ftrace_event_call {
         struct trace_event      event;
         const char              *print_fmt;
         struct event_filter     *filter;
-        struct list_head        *files;
         void                    *mod;
         void                    *data;
         /*
@@ -404,8 +403,6 @@ enum event_trigger_type {
         ETT_EVENT_ENABLE        = (1 << 3),
 };
 
-extern void destroy_preds(struct ftrace_event_file *file);
-extern void destroy_call_preds(struct ftrace_event_call *call);
 extern int filter_match_preds(struct event_filter *filter, void *rec);
 
 extern int filter_check_discard(struct ftrace_event_file *file, void *rec,
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index e7a8d3fa91d5..a036d058a249 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -165,6 +165,7 @@ enum  hrtimer_base_type {
  * struct hrtimer_cpu_base - the per cpu clock bases
  * @lock:               lock protecting the base and associated clock bases
  *                      and timers
+ * @cpu:                cpu number
  * @active_bases:       Bitfield to mark bases with active timers
  * @clock_was_set:      Indicates that clock was set from irq context.
  * @expires_next:       absolute time of the next event which was scheduled
@@ -179,6 +180,7 @@ enum  hrtimer_base_type {
  */
 struct hrtimer_cpu_base {
         raw_spinlock_t                  lock;
+        unsigned int                    cpu;
         unsigned int                    active_bases;
         unsigned int                    clock_was_set;
 #ifdef CONFIG_HIGH_RES_TIMERS
@@ -324,14 +326,6 @@ static inline void timerfd_clock_was_set(void) { }
 #endif
 extern void hrtimers_resume(void);
 
-extern ktime_t ktime_get(void);
-extern ktime_t ktime_get_real(void);
-extern ktime_t ktime_get_boottime(void);
-extern ktime_t ktime_get_monotonic_offset(void);
-extern ktime_t ktime_get_clocktai(void);
-extern ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot,
-                                         ktime_t *offs_tai);
-
 DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
 
 
@@ -452,12 +446,6 @@ extern void hrtimer_run_pending(void);
 /* Bootup initialization: */
 extern void __init hrtimers_init(void);
 
-#if BITS_PER_LONG < 64
-extern u64 ktime_divns(const ktime_t kt, s64 div);
-#else /* BITS_PER_LONG < 64 */
-# define ktime_divns(kt, div)           (u64)((kt).tv64 / (div))
-#endif
-
 /* Show pending timers: */
 extern void sysrq_timer_list_show(void);
 
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 255cd5cc0754..a23c096b3080 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -80,6 +80,7 @@ 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
 pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud);
diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h
index b4b0eef5fddf..914bb08cd738 100644
--- a/include/linux/hw_random.h
+++ b/include/linux/hw_random.h
@@ -29,6 +29,8 @@
  * @read:               New API. drivers can fill up to max bytes of data
  *                      into the buffer. The buffer is aligned for any type.
  * @priv:               Private data, for use by the RNG driver.
+ * @quality:            Estimation of true entropy in RNG's bitstream
+ *                      (per mill).
  */
 struct hwrng {
         const char *name;
@@ -38,6 +40,7 @@ struct hwrng {
         int (*data_read)(struct hwrng *rng, u32 *data);
         int (*read)(struct hwrng *rng, void *data, size_t max, bool wait);
         unsigned long priv;
+        unsigned short quality;
 
         /* internal. */
         struct list_head list;
@@ -47,5 +50,7 @@ struct hwrng {
 extern int hwrng_register(struct hwrng *rng);
 /** Unregister a Hardware Random Number Generator driver. */
 extern void hwrng_unregister(struct hwrng *rng);
+/** Feed random bits into the pool. */
+extern void add_hwgenerator_randomness(const char *buffer, size_t count, size_t entropy);
 
 #endif /* LINUX_HWRANDOM_H_ */
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 6bff13f74050..63ab3873c5ed 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1001,6 +1001,26 @@ struct ieee80211_vendor_ie {
         u8 oui_type;
 } __packed;
 
+struct ieee80211_wmm_ac_param {
+        u8 aci_aifsn; /* AIFSN, ACM, ACI */
+        u8 cw; /* ECWmin, ECWmax (CW = 2^ECW - 1) */
+        __le16 txop_limit;
+} __packed;
+
+struct ieee80211_wmm_param_ie {
+        u8 element_id; /* Element ID: 221 (0xdd); */
+        u8 len; /* Length: 24 */
+        /* required fields for WMM version 1 */
+        u8 oui[3]; /* 00:50:f2 */
+        u8 oui_type; /* 2 */
+        u8 oui_subtype; /* 1 */
+        u8 version; /* 1 for WMM version 1.0 */
+        u8 qos_info; /* AP/STA specific QoS info */
+        u8 reserved; /* 0 */
+        /* AC_BE, AC_BK, AC_VI, AC_VO */
+        struct ieee80211_wmm_ac_param ac[4];
+} __packed;
+
 /* Control frames */
 struct ieee80211_rts {
         __le16 frame_control;
@@ -1621,6 +1641,9 @@ enum ieee80211_reasoncode {
         WLAN_REASON_INVALID_RSN_IE_CAP = 22,
         WLAN_REASON_IEEE8021X_FAILED = 23,
         WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
+        /* TDLS (802.11z) */
+        WLAN_REASON_TDLS_TEARDOWN_UNREACHABLE = 25,
+        WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED = 26,
         /* 802.11e */
         WLAN_REASON_DISASSOC_UNSPECIFIED_QOS = 32,
         WLAN_REASON_DISASSOC_QAP_NO_BANDWIDTH = 33,
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index fd22789d7b2e..808dcb8cc04f 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -36,8 +36,28 @@ extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __use
 
 typedef int br_should_route_hook_t(struct sk_buff *skb);
 extern br_should_route_hook_t __rcu *br_should_route_hook;
+
+#if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)
 int br_multicast_list_adjacent(struct net_device *dev,
                                struct list_head *br_ip_list);
+bool br_multicast_has_querier_anywhere(struct net_device *dev, int proto);
 bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto);
+#else
+static inline int br_multicast_list_adjacent(struct net_device *dev,
+                                             struct list_head *br_ip_list)
+{
+        return 0;
+}
+static inline bool br_multicast_has_querier_anywhere(struct net_device *dev,
+                                                     int proto)
+{
+        return false;
+}
+static inline bool br_multicast_has_querier_adjacent(struct net_device *dev,
+                                                     int proto)
+{
+        return false;
+}
+#endif
 
 #endif
diff --git a/include/linux/iio/accel/kxcjk_1013.h b/include/linux/iio/accel/kxcjk_1013.h
new file mode 100644
index 000000000000..fd1d540ea62d
--- /dev/null
+++ b/include/linux/iio/accel/kxcjk_1013.h
@@ -0,0 +1,22 @@
+/*
+ * KXCJK-1013 3-axis accelerometer Interface
+ * Copyright (c) 2014, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#ifndef __IIO_KXCJK_1013_H__
+#define __IIO_KXCJK_1013_H__
+
+struct kxcjk_1013_platform_data {
+        bool active_high_intr;
+};
+
+#endif
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 96f51f0e0096..d8257ab60bac 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -47,6 +47,7 @@
         .type = device_type, \
         .modified = mod, \
         .info_mask_separate = mask, \
+        .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
         .scan_index = index, \
         .channel2 = ch2, \
         .address = addr, \
@@ -59,11 +60,6 @@
         }, \
 }
 
-#define ST_SENSOR_DEV_ATTR_SAMP_FREQ() \
-                IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO, \
-                        st_sensors_sysfs_get_sampling_frequency, \
-                        st_sensors_sysfs_set_sampling_frequency)
-
 #define ST_SENSORS_DEV_ATTR_SAMP_FREQ_AVAIL() \
                 IIO_DEV_ATTR_SAMP_FREQ_AVAIL( \
                         st_sensors_sysfs_sampling_frequency_avail)
@@ -285,12 +281,6 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev,
 int st_sensors_check_device_support(struct iio_dev *indio_dev,
                         int num_sensors_list, const struct st_sensors *sensors);
 
-ssize_t st_sensors_sysfs_get_sampling_frequency(struct device *dev,
-                                struct device_attribute *attr, char *buf);
-
-ssize_t st_sensors_sysfs_set_sampling_frequency(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t size);
-
 ssize_t st_sensors_sysfs_sampling_frequency_avail(struct device *dev,
                                 struct device_attribute *attr, char *buf);
 
diff --git a/include/linux/iio/common/st_sensors_i2c.h b/include/linux/iio/common/st_sensors_i2c.h
index 67d845385ae2..1796af093368 100644
--- a/include/linux/iio/common/st_sensors_i2c.h
+++ b/include/linux/iio/common/st_sensors_i2c.h
@@ -13,8 +13,19 @@
 
 #include <linux/i2c.h>
 #include <linux/iio/common/st_sensors.h>
+#include <linux/of.h>
 
 void st_sensors_i2c_configure(struct iio_dev *indio_dev,
                 struct i2c_client *client, struct st_sensor_data *sdata);
 
+#ifdef CONFIG_OF
+void st_sensors_of_i2c_probe(struct i2c_client *client,
+                             const struct of_device_id *match);
+#else
+static inline void st_sensors_of_i2c_probe(struct i2c_client *client,
+                                           const struct of_device_id *match)
+{
+}
+#endif
+
 #endif /* ST_SENSORS_I2C_H */
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index ccde91725f98..15dc6bc2bdd2 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -277,14 +277,7 @@ static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
  **/
 static inline s64 iio_get_time_ns(void)
 {
-        struct timespec ts;
-        /*
-         * calls getnstimeofday.
-         * If hrtimers then up to ns accurate, if not microsecond.
-         */
-        ktime_get_real_ts(&ts);
-
-        return timespec_to_ns(&ts);
+        return ktime_get_real_ns();
 }
 
 /* Device operating modes */
diff --git a/include/linux/iio/imu/adis.h b/include/linux/iio/imu/adis.h
index b665dc7f017b..fa2d01ef8f55 100644
--- a/include/linux/iio/imu/adis.h
+++ b/include/linux/iio/imu/adis.h
@@ -157,13 +157,14 @@ int adis_single_conversion(struct iio_dev *indio_dev,
         const struct iio_chan_spec *chan, unsigned int error_mask,
         int *val);
 
-#define ADIS_VOLTAGE_CHAN(addr, si, chan, name, bits) { \
+#define ADIS_VOLTAGE_CHAN(addr, si, chan, name, info_all, bits) { \
         .type = IIO_VOLTAGE, \
         .indexed = 1, \
         .channel = (chan), \
         .extend_name = name, \
         .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
                 BIT(IIO_CHAN_INFO_SCALE), \
+        .info_mask_shared_by_all = info_all, \
         .address = (addr), \
         .scan_index = (si), \
         .scan_type = { \
@@ -174,19 +175,20 @@ int adis_single_conversion(struct iio_dev *indio_dev,
         }, \
 }
 
-#define ADIS_SUPPLY_CHAN(addr, si, bits) \
-        ADIS_VOLTAGE_CHAN(addr, si, 0, "supply", bits)
+#define ADIS_SUPPLY_CHAN(addr, si, info_all, bits) \
+        ADIS_VOLTAGE_CHAN(addr, si, 0, "supply", info_all, bits)
 
-#define ADIS_AUX_ADC_CHAN(addr, si, bits) \
-        ADIS_VOLTAGE_CHAN(addr, si, 1, NULL, bits)
+#define ADIS_AUX_ADC_CHAN(addr, si, info_all, bits) \
+        ADIS_VOLTAGE_CHAN(addr, si, 1, NULL, info_all, bits)
 
-#define ADIS_TEMP_CHAN(addr, si, bits) { \
+#define ADIS_TEMP_CHAN(addr, si, info_all, bits) { \
         .type = IIO_TEMP, \
         .indexed = 1, \
         .channel = 0, \
         .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
                 BIT(IIO_CHAN_INFO_SCALE) | \
                 BIT(IIO_CHAN_INFO_OFFSET), \
+        .info_mask_shared_by_all = info_all, \
         .address = (addr), \
         .scan_index = (si), \
         .scan_type = { \
@@ -197,13 +199,14 @@ int adis_single_conversion(struct iio_dev *indio_dev,
         }, \
 }
 
-#define ADIS_MOD_CHAN(_type, mod, addr, si, info_sep, bits) { \
+#define ADIS_MOD_CHAN(_type, mod, addr, si, info_sep, info_all, bits) { \
         .type = (_type), \
         .modified = 1, \
         .channel2 = IIO_MOD_ ## mod, \
         .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
                  info_sep, \
         .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
+        .info_mask_shared_by_all = info_all, \
         .address = (addr), \
         .scan_index = (si), \
         .scan_type = { \
@@ -214,17 +217,17 @@ int adis_single_conversion(struct iio_dev *indio_dev,
         }, \
 }
 
-#define ADIS_ACCEL_CHAN(mod, addr, si, info_sep, bits) \
-        ADIS_MOD_CHAN(IIO_ACCEL, mod, addr, si, info_sep, bits)
+#define ADIS_ACCEL_CHAN(mod, addr, si, info_sep, info_all, bits) \
+        ADIS_MOD_CHAN(IIO_ACCEL, mod, addr, si, info_sep, info_all, bits)
 
-#define ADIS_GYRO_CHAN(mod, addr, si, info_sep, bits) \
-        ADIS_MOD_CHAN(IIO_ANGL_VEL, mod, addr, si, info_sep, bits)
+#define ADIS_GYRO_CHAN(mod, addr, si, info_sep, info_all, bits)         \
+        ADIS_MOD_CHAN(IIO_ANGL_VEL, mod, addr, si, info_sep, info_all, bits)
 
-#define ADIS_INCLI_CHAN(mod, addr, si, info_sep, bits) \
-        ADIS_MOD_CHAN(IIO_INCLI, mod, addr, si, info_sep, bits)
+#define ADIS_INCLI_CHAN(mod, addr, si, info_sep, info_all, bits) \
+        ADIS_MOD_CHAN(IIO_INCLI, mod, addr, si, info_sep, info_all, bits)
 
-#define ADIS_ROT_CHAN(mod, addr, si, info_sep, bits) \
-        ADIS_MOD_CHAN(IIO_ROT, mod, addr, si, info_sep, bits)
+#define ADIS_ROT_CHAN(mod, addr, si, info_sep, info_all, bits) \
+        ADIS_MOD_CHAN(IIO_ROT, mod, addr, si, info_sep, info_all, bits)
 
 #ifdef CONFIG_IIO_ADIS_LIB_BUFFER
 
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index 369cf2cd5144..4b79ffe7b188 100644
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -129,12 +129,11 @@ void iio_trigger_unregister(struct iio_trigger *trig_info);
 /**
  * iio_trigger_poll() - called on a trigger occurring
  * @trig:       trigger which occurred
- * @time:       timestamp when trigger occurred
  *
  * Typically called in relevant hardware interrupt handler.
  **/
-void iio_trigger_poll(struct iio_trigger *trig, s64 time);
-void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time);
+void iio_trigger_poll(struct iio_trigger *trig);
+void iio_trigger_poll_chained(struct iio_trigger *trig);
 
 irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private);
 
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index d480631eabc2..4a2af8adf874 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -56,6 +56,10 @@ enum iio_modifier {
         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
 };
 
 enum iio_event_type {
@@ -70,6 +74,7 @@ enum iio_event_info {
         IIO_EV_INFO_ENABLE,
         IIO_EV_INFO_VALUE,
         IIO_EV_INFO_HYSTERESIS,
+        IIO_EV_INFO_PERIOD,
 };
 
 enum iio_event_direction {
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 1b7f268cddce..7cf5e9b32550 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -19,6 +19,7 @@ extern int ima_file_check(struct file *file, int mask);
 extern void ima_file_free(struct file *file);
 extern int ima_file_mmap(struct file *file, unsigned long prot);
 extern int ima_module_check(struct file *file);
+extern int ima_fw_from_file(struct file *file, char *buf, size_t size);
 
 #else
 static inline int ima_bprm_check(struct linux_binprm *bprm)
@@ -46,6 +47,11 @@ static inline int ima_module_check(struct file *file)
         return 0;
 }
 
+static inline int ima_fw_from_file(struct file *file, char *buf, size_t size)
+{
+        return 0;
+}
+
 #endif /* CONFIG_IMA */
 
 #ifdef CONFIG_IMA_APPRAISE
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 6df7f9fe0d01..2bb4c4f3531a 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -102,12 +102,6 @@ extern struct group_info init_groups;
 #define INIT_IDS
 #endif
 
-#ifdef CONFIG_RCU_BOOST
-#define INIT_TASK_RCU_BOOST()                                           \
-        .rcu_boost_mutex = NULL,
-#else
-#define INIT_TASK_RCU_BOOST()
-#endif
 #ifdef CONFIG_TREE_PREEMPT_RCU
 #define INIT_TASK_RCU_TREE_PREEMPT()                                    \
         .rcu_blocked_node = NULL,
@@ -119,8 +113,7 @@ extern struct group_info init_groups;
         .rcu_read_lock_nesting = 0,                                     \
         .rcu_read_unlock_special = 0,                                   \
         .rcu_node_entry = LIST_HEAD_INIT(tsk.rcu_node_entry),           \
-        INIT_TASK_RCU_TREE_PREEMPT()                                    \
-        INIT_TASK_RCU_BOOST()
+        INIT_TASK_RCU_TREE_PREEMPT()
 #else
 #define INIT_TASK_RCU_PREEMPT(tsk)
 #endif
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 0a2da5188217..a65208a8fe18 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -336,6 +336,7 @@ struct intel_iommu {
 #ifdef CONFIG_IRQ_REMAP
         struct ir_table *ir_table;      /* Interrupt remapping info */
 #endif
+        struct device   *iommu_dev; /* IOMMU-sysfs device */
         int             node;
 };
 
@@ -365,4 +366,6 @@ extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
 extern int dmar_ir_support(void);
 
+extern const struct attribute_group *intel_iommu_groups[];
+
 #endif
diff --git a/include/linux/io.h b/include/linux/io.h
index b76e6e545806..d5fc9b8d8b03 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -58,6 +58,8 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
 }
 #endif
 
+#define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err)
+
 void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
                             unsigned long size);
 void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index b96a5b2136e4..20f9a527922a 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -50,7 +50,7 @@ struct iommu_domain_geometry {
 };
 
 struct iommu_domain {
-        struct iommu_ops *ops;
+        const struct iommu_ops *ops;
         void *priv;
         iommu_fault_handler_t handler;
         void *handler_token;
@@ -140,7 +140,7 @@ struct iommu_ops {
 #define IOMMU_GROUP_NOTIFY_UNBIND_DRIVER        5 /* Pre Driver unbind */
 #define IOMMU_GROUP_NOTIFY_UNBOUND_DRIVER       6 /* Post Driver unbind */
 
-extern int bus_set_iommu(struct bus_type *bus, struct iommu_ops *ops);
+extern int bus_set_iommu(struct bus_type *bus, const struct iommu_ops *ops);
 extern bool iommu_present(struct bus_type *bus);
 extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus);
 extern struct iommu_group *iommu_group_get_by_id(int id);
@@ -181,11 +181,18 @@ extern int iommu_group_register_notifier(struct iommu_group *group,
 extern int iommu_group_unregister_notifier(struct iommu_group *group,
                                            struct notifier_block *nb);
 extern int iommu_group_id(struct iommu_group *group);
+extern struct iommu_group *iommu_group_get_for_dev(struct device *dev);
 
 extern int iommu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr,
                                  void *data);
 extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr,
                                  void *data);
+struct device *iommu_device_create(struct device *parent, void *drvdata,
+                                   const struct attribute_group **groups,
+                                   const char *fmt, ...);
+void iommu_device_destroy(struct device *dev);
+int iommu_device_link(struct device *dev, struct device *link);
+void iommu_device_unlink(struct device *dev, struct device *link);
 
 /* Window handling function prototypes */
 extern int iommu_domain_window_enable(struct iommu_domain *domain, u32 wnd_nr,
@@ -396,6 +403,27 @@ static inline int iommu_domain_set_attr(struct iommu_domain *domain,
         return -EINVAL;
 }
 
+static inline struct device *iommu_device_create(struct device *parent,
+                                        void *drvdata,
+                                        const struct attribute_group **groups,
+                                        const char *fmt, ...)
+{
+        return ERR_PTR(-ENODEV);
+}
+
+static inline void iommu_device_destroy(struct device *dev)
+{
+}
+
+static inline int iommu_device_link(struct device *dev, struct device *link)
+{
+        return -EINVAL;
+}
+
+static inline void iommu_device_unlink(struct device *dev, struct device *link)
+{
+}
+
 #endif /* CONFIG_IOMMU_API */
 
 #endif /* __LINUX_IOMMU_H */
diff --git a/include/linux/iova.h b/include/linux/iova.h
index 3277f4711349..19e81d5ccb6d 100644
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
@@ -34,6 +34,11 @@ struct iova_domain {
         unsigned long   dma_32bit_pfn;
 };
 
+static inline unsigned long iova_size(struct iova *iova)
+{
+        return iova->pfn_hi - iova->pfn_lo + 1;
+}
+
 struct iova *alloc_iova_mem(void);
 void free_iova_mem(struct iova *iova);
 void free_iova(struct iova_domain *iovad, unsigned long pfn);
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 2faef339d8f2..ff560537dd61 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -39,6 +39,7 @@ struct ipv6_devconf {
 #endif
         __s32           proxy_ndp;
         __s32           accept_source_route;
+        __s32           accept_ra_from_local;
 #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
         __s32           optimistic_dad;
 #endif
@@ -193,12 +194,13 @@ struct ipv6_pinfo {
                                 sndflow:1,
                                 repflow:1,
                                 pmtudisc:3,
-                                ipv6only:1,
+                                padding:1,      /* 1 bit hole */
                                 srcprefs:3,     /* 001: prefer temporary address
                                                  * 010: prefer public address
                                                  * 100: prefer care-of address
                                                  */
-                                dontfrag:1;
+                                dontfrag:1,
+                                autoflowlabel:1;
         __u8                    min_hopcount;
         __u8                    tclass;
         __be32                  rcv_flowinfo;
@@ -256,16 +258,6 @@ static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)
         return inet_sk(__sk)->pinet6;
 }
 
-static inline struct request_sock *inet6_reqsk_alloc(struct request_sock_ops *ops)
-{
-        struct request_sock *req = reqsk_alloc(ops);
-
-        if (req)
-                inet_rsk(req)->pktopts = NULL;
-
-        return req;
-}
-
 static inline struct raw6_sock *raw6_sk(const struct sock *sk)
 {
         return (struct raw6_sock *)sk;
@@ -282,8 +274,8 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,
         __inet_sk_copy_descendant(sk_to, sk_from, ancestor_size);
 }
 
-#define __ipv6_only_sock(sk)    (inet6_sk(sk)->ipv6only)
-#define ipv6_only_sock(sk)      ((sk)->sk_family == PF_INET6 && __ipv6_only_sock(sk))
+#define __ipv6_only_sock(sk)    (sk->sk_ipv6only)
+#define ipv6_only_sock(sk)      (__ipv6_only_sock(sk))
 #define ipv6_sk_rxinfo(sk)      ((sk)->sk_family == PF_INET6 && \
                                  inet6_sk(sk)->rxopt.bits.rxinfo)
 
@@ -296,8 +288,8 @@ static inline const struct in6_addr *inet6_rcv_saddr(const struct sock *sk)
 
 static inline int inet_v6_ipv6only(const struct sock *sk)
 {
-        return likely(sk->sk_state != TCP_TIME_WAIT) ?
-                ipv6_only_sock(sk) : inet_twsk(sk)->tw_ipv6only;
+        /* ipv6only field is at same position for timewait and other sockets */
+        return ipv6_only_sock(sk);
 }
 #else
 #define __ipv6_only_sock(sk)    0
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 0d998d8b01d8..62af59242ddc 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -771,6 +771,8 @@ void irq_gc_eoi(struct irq_data *d);
 int irq_gc_set_wake(struct irq_data *d, unsigned int on);
 
 /* Setup functions for irq_chip_generic */
+int irq_map_generic_chip(struct irq_domain *d, unsigned int virq,
+                         irq_hw_number_t hw_irq);
 struct irq_chip_generic *
 irq_alloc_generic_chip(const char *name, int nr_ct, unsigned int irq_base,
                        void __iomem *reg_base, irq_flow_handler_t handler);
diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
index 19ae05d4b8ec..bf9422c3aefe 100644
--- a/include/linux/irq_work.h
+++ b/include/linux/irq_work.h
@@ -33,6 +33,11 @@ void init_irq_work(struct irq_work *work, void (*func)(struct irq_work *))
 #define DEFINE_IRQ_WORK(name, _f) struct irq_work name = { .func = (_f), }
 
 bool irq_work_queue(struct irq_work *work);
+
+#ifdef CONFIG_SMP
+bool irq_work_queue_on(struct irq_work *work, int cpu);
+#endif
+
 void irq_work_run(void);
 void irq_work_sync(struct irq_work *work);
 
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
new file mode 100644
index 000000000000..03a4ea37ba86
--- /dev/null
+++ b/include/linux/irqchip/arm-gic-v3.h
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2013, 2014 ARM Limited, All Rights Reserved.
+ * Author: Marc Zyngier <marc.zyngier@arm.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 __LINUX_IRQCHIP_ARM_GIC_V3_H
+#define __LINUX_IRQCHIP_ARM_GIC_V3_H
+
+#include <asm/sysreg.h>
+
+/*
+ * Distributor registers. We assume we're running non-secure, with ARE
+ * being set. Secure-only and non-ARE registers are not described.
+ */
+#define GICD_CTLR                       0x0000
+#define GICD_TYPER                      0x0004
+#define GICD_IIDR                       0x0008
+#define GICD_STATUSR                    0x0010
+#define GICD_SETSPI_NSR                 0x0040
+#define GICD_CLRSPI_NSR                 0x0048
+#define GICD_SETSPI_SR                  0x0050
+#define GICD_CLRSPI_SR                  0x0058
+#define GICD_SEIR                       0x0068
+#define GICD_ISENABLER                  0x0100
+#define GICD_ICENABLER                  0x0180
+#define GICD_ISPENDR                    0x0200
+#define GICD_ICPENDR                    0x0280
+#define GICD_ISACTIVER                  0x0300
+#define GICD_ICACTIVER                  0x0380
+#define GICD_IPRIORITYR                 0x0400
+#define GICD_ICFGR                      0x0C00
+#define GICD_IROUTER                    0x6000
+#define GICD_PIDR2                      0xFFE8
+
+#define GICD_CTLR_RWP                   (1U << 31)
+#define GICD_CTLR_ARE_NS                (1U << 4)
+#define GICD_CTLR_ENABLE_G1A            (1U << 1)
+#define GICD_CTLR_ENABLE_G1             (1U << 0)
+
+#define GICD_IROUTER_SPI_MODE_ONE       (0U << 31)
+#define GICD_IROUTER_SPI_MODE_ANY       (1U << 31)
+
+#define GIC_PIDR2_ARCH_MASK             0xf0
+#define GIC_PIDR2_ARCH_GICv3            0x30
+#define GIC_PIDR2_ARCH_GICv4            0x40
+
+/*
+ * Re-Distributor registers, offsets from RD_base
+ */
+#define GICR_CTLR                       GICD_CTLR
+#define GICR_IIDR                       0x0004
+#define GICR_TYPER                      0x0008
+#define GICR_STATUSR                    GICD_STATUSR
+#define GICR_WAKER                      0x0014
+#define GICR_SETLPIR                    0x0040
+#define GICR_CLRLPIR                    0x0048
+#define GICR_SEIR                       GICD_SEIR
+#define GICR_PROPBASER                  0x0070
+#define GICR_PENDBASER                  0x0078
+#define GICR_INVLPIR                    0x00A0
+#define GICR_INVALLR                    0x00B0
+#define GICR_SYNCR                      0x00C0
+#define GICR_MOVLPIR                    0x0100
+#define GICR_MOVALLR                    0x0110
+#define GICR_PIDR2                      GICD_PIDR2
+
+#define GICR_WAKER_ProcessorSleep       (1U << 1)
+#define GICR_WAKER_ChildrenAsleep       (1U << 2)
+
+/*
+ * Re-Distributor registers, offsets from SGI_base
+ */
+#define GICR_ISENABLER0                 GICD_ISENABLER
+#define GICR_ICENABLER0                 GICD_ICENABLER
+#define GICR_ISPENDR0                   GICD_ISPENDR
+#define GICR_ICPENDR0                   GICD_ICPENDR
+#define GICR_ISACTIVER0                 GICD_ISACTIVER
+#define GICR_ICACTIVER0                 GICD_ICACTIVER
+#define GICR_IPRIORITYR0                GICD_IPRIORITYR
+#define GICR_ICFGR0                     GICD_ICFGR
+
+#define GICR_TYPER_VLPIS                (1U << 1)
+#define GICR_TYPER_LAST                 (1U << 4)
+
+/*
+ * CPU interface registers
+ */
+#define ICC_CTLR_EL1_EOImode_drop_dir   (0U << 1)
+#define ICC_CTLR_EL1_EOImode_drop       (1U << 1)
+#define ICC_SRE_EL1_SRE                 (1U << 0)
+
+/*
+ * Hypervisor interface registers (SRE only)
+ */
+#define ICH_LR_VIRTUAL_ID_MASK          ((1UL << 32) - 1)
+
+#define ICH_LR_EOI                      (1UL << 41)
+#define ICH_LR_GROUP                    (1UL << 60)
+#define ICH_LR_STATE                    (3UL << 62)
+#define ICH_LR_PENDING_BIT              (1UL << 62)
+#define ICH_LR_ACTIVE_BIT               (1UL << 63)
+
+#define ICH_MISR_EOI                    (1 << 0)
+#define ICH_MISR_U                      (1 << 1)
+
+#define ICH_HCR_EN                      (1 << 0)
+#define ICH_HCR_UIE                     (1 << 1)
+
+#define ICH_VMCR_CTLR_SHIFT             0
+#define ICH_VMCR_CTLR_MASK              (0x21f << ICH_VMCR_CTLR_SHIFT)
+#define ICH_VMCR_BPR1_SHIFT             18
+#define ICH_VMCR_BPR1_MASK              (7 << ICH_VMCR_BPR1_SHIFT)
+#define ICH_VMCR_BPR0_SHIFT             21
+#define ICH_VMCR_BPR0_MASK              (7 << ICH_VMCR_BPR0_SHIFT)
+#define ICH_VMCR_PMR_SHIFT              24
+#define ICH_VMCR_PMR_MASK               (0xffUL << ICH_VMCR_PMR_SHIFT)
+
+#define ICC_EOIR1_EL1                   sys_reg(3, 0, 12, 12, 1)
+#define ICC_IAR1_EL1                    sys_reg(3, 0, 12, 12, 0)
+#define ICC_SGI1R_EL1                   sys_reg(3, 0, 12, 11, 5)
+#define ICC_PMR_EL1                     sys_reg(3, 0, 4, 6, 0)
+#define ICC_CTLR_EL1                    sys_reg(3, 0, 12, 12, 4)
+#define ICC_SRE_EL1                     sys_reg(3, 0, 12, 12, 5)
+#define ICC_GRPEN1_EL1                  sys_reg(3, 0, 12, 12, 7)
+
+#define ICC_IAR1_EL1_SPURIOUS           0x3ff
+
+#define ICC_SRE_EL2                     sys_reg(3, 4, 12, 9, 5)
+
+#define ICC_SRE_EL2_SRE                 (1 << 0)
+#define ICC_SRE_EL2_ENABLE              (1 << 3)
+
+/*
+ * System register definitions
+ */
+#define ICH_VSEIR_EL2                   sys_reg(3, 4, 12, 9, 4)
+#define ICH_HCR_EL2                     sys_reg(3, 4, 12, 11, 0)
+#define ICH_VTR_EL2                     sys_reg(3, 4, 12, 11, 1)
+#define ICH_MISR_EL2                    sys_reg(3, 4, 12, 11, 2)
+#define ICH_EISR_EL2                    sys_reg(3, 4, 12, 11, 3)
+#define ICH_ELSR_EL2                    sys_reg(3, 4, 12, 11, 5)
+#define ICH_VMCR_EL2                    sys_reg(3, 4, 12, 11, 7)
+
+#define __LR0_EL2(x)                    sys_reg(3, 4, 12, 12, x)
+#define __LR8_EL2(x)                    sys_reg(3, 4, 12, 13, x)
+
+#define ICH_LR0_EL2                     __LR0_EL2(0)
+#define ICH_LR1_EL2                     __LR0_EL2(1)
+#define ICH_LR2_EL2                     __LR0_EL2(2)
+#define ICH_LR3_EL2                     __LR0_EL2(3)
+#define ICH_LR4_EL2                     __LR0_EL2(4)
+#define ICH_LR5_EL2                     __LR0_EL2(5)
+#define ICH_LR6_EL2                     __LR0_EL2(6)
+#define ICH_LR7_EL2                     __LR0_EL2(7)
+#define ICH_LR8_EL2                     __LR8_EL2(0)
+#define ICH_LR9_EL2                     __LR8_EL2(1)
+#define ICH_LR10_EL2                    __LR8_EL2(2)
+#define ICH_LR11_EL2                    __LR8_EL2(3)
+#define ICH_LR12_EL2                    __LR8_EL2(4)
+#define ICH_LR13_EL2                    __LR8_EL2(5)
+#define ICH_LR14_EL2                    __LR8_EL2(6)
+#define ICH_LR15_EL2                    __LR8_EL2(7)
+
+#define __AP0Rx_EL2(x)                  sys_reg(3, 4, 12, 8, x)
+#define ICH_AP0R0_EL2                   __AP0Rx_EL2(0)
+#define ICH_AP0R1_EL2                   __AP0Rx_EL2(1)
+#define ICH_AP0R2_EL2                   __AP0Rx_EL2(2)
+#define ICH_AP0R3_EL2                   __AP0Rx_EL2(3)
+
+#define __AP1Rx_EL2(x)                  sys_reg(3, 4, 12, 9, x)
+#define ICH_AP1R0_EL2                   __AP1Rx_EL2(0)
+#define ICH_AP1R1_EL2                   __AP1Rx_EL2(1)
+#define ICH_AP1R2_EL2                   __AP1Rx_EL2(2)
+#define ICH_AP1R3_EL2                   __AP1Rx_EL2(3)
+
+#ifndef __ASSEMBLY__
+
+#include <linux/stringify.h>
+
+static inline void gic_write_eoir(u64 irq)
+{
+        asm volatile("msr_s " __stringify(ICC_EOIR1_EL1) ", %0" : : "r" (irq));
+        isb();
+}
+
+#endif
+
+#endif
diff --git a/include/linux/irqchip/spear-shirq.h b/include/linux/irqchip/spear-shirq.h
deleted file mode 100644
index c8be16d213a3..000000000000
--- a/include/linux/irqchip/spear-shirq.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * SPEAr platform shared irq layer header file
- *
- * Copyright (C) 2009-2012 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 __SPEAR_SHIRQ_H
-#define __SPEAR_SHIRQ_H
-
-#include <linux/irq.h>
-#include <linux/types.h>
-
-/*
- * struct shirq_regs: shared irq register configuration
- *
- * enb_reg: enable register offset
- * reset_to_enb: val 1 indicates, we need to clear bit for enabling interrupt
- * status_reg: status register offset
- * status_reg_mask: status register valid mask
- * clear_reg: clear register offset
- * reset_to_clear: val 1 indicates, we need to clear bit for clearing interrupt
- */
-struct shirq_regs {
-        u32 enb_reg;
-        u32 reset_to_enb;
-        u32 status_reg;
-        u32 clear_reg;
-        u32 reset_to_clear;
-};
-
-/*
- * struct spear_shirq: shared irq structure
- *
- * irq: hardware irq number
- * irq_base: base irq in linux domain
- * irq_nr: no. of shared interrupts in a particular block
- * irq_bit_off: starting bit offset in the status register
- * invalid_irq: irq group is currently disabled
- * base: base address of shared irq register
- * regs: register configuration for shared irq block
- */
-struct spear_shirq {
-        u32 irq;
-        u32 irq_base;
-        u32 irq_nr;
-        u32 irq_bit_off;
-        int invalid_irq;
-        void __iomem *base;
-        struct shirq_regs regs;
-};
-
-int __init spear300_shirq_of_init(struct device_node *np,
-                struct device_node *parent);
-int __init spear310_shirq_of_init(struct device_node *np,
-                struct device_node *parent);
-int __init spear320_shirq_of_init(struct device_node *np,
-                struct device_node *parent);
-
-#endif /* __SPEAR_SHIRQ_H */
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index c983ed18c332..b0f9d16e48f6 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -172,6 +172,8 @@ extern int irq_domain_associate(struct irq_domain *domain, unsigned int irq,
 extern void irq_domain_associate_many(struct irq_domain *domain,
                                       unsigned int irq_base,
                                       irq_hw_number_t hwirq_base, int count);
+extern void irq_domain_disassociate(struct irq_domain *domain,
+                                    unsigned int irq);
 
 extern unsigned int irq_create_mapping(struct irq_domain *host,
                                        irq_hw_number_t hwirq);
diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h
index 8e10f57f109f..a0070c6dfaf8 100644
--- a/include/linux/isdn_ppp.h
+++ b/include/linux/isdn_ppp.h
@@ -180,8 +180,8 @@ struct ippp_struct {
   struct slcompress *slcomp;
 #endif
 #ifdef CONFIG_IPPP_FILTER
-  struct sk_filter *pass_filter;   /* filter for packets to pass */
-  struct sk_filter *active_filter; /* filter for pkts to reset idle */
+  struct bpf_prog *pass_filter;   /* filter for packets to pass */
+  struct bpf_prog *active_filter; /* filter for pkts to reset idle */
 #endif
   unsigned long debug;
   struct isdn_ppp_compressor *compressor,*decompressor;
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 4c52907a6d8b..a9e2268ecccb 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -501,7 +501,7 @@ static inline char * __deprecated pack_hex_byte(char *buf, u8 byte)
 extern int hex_to_bin(char ch);
 extern int __must_check hex2bin(u8 *dst, const char *src, size_t count);
 
-int mac_pton(const char *s, u8 *mac);
+bool mac_pton(const char *s, u8 *mac);
 
 /*
  * General tracing related utility functions - trace_printk(),
diff --git a/include/linux/key-type.h b/include/linux/key-type.h
index a74c3a84dfdd..44792ee649de 100644
--- a/include/linux/key-type.h
+++ b/include/linux/key-type.h
@@ -41,10 +41,11 @@ struct key_construction {
 struct key_preparsed_payload {
         char            *description;   /* Proposed key description (or NULL) */
         void            *type_data[2];  /* Private key-type data */
-        void            *payload;       /* Proposed payload */
+        void            *payload[2];    /* Proposed payload */
         const void      *data;          /* Raw data */
         size_t          datalen;        /* Raw datalen */
         size_t          quotalen;       /* Quota length for proposed payload */
+        time_t          expiry;         /* Expiry time of key */
         bool            trusted;        /* True if key is trusted */
 };
 
@@ -159,5 +160,7 @@ static inline int key_negate_and_link(struct key *key,
         return key_reject_and_link(key, timeout, ENOKEY, keyring, instkey);
 }
 
+extern int generic_key_instantiate(struct key *key, struct key_preparsed_payload *prep);
+
 #endif /* CONFIG_KEYS */
 #endif /* _LINUX_KEY_TYPE_H */
diff --git a/include/linux/key.h b/include/linux/key.h
index 017b0826642f..e1d4715f3222 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -170,6 +170,8 @@ struct key {
 #define KEY_FLAG_INVALIDATED    7       /* set if key has been invalidated */
 #define KEY_FLAG_TRUSTED        8       /* set if key is trusted */
 #define KEY_FLAG_TRUSTED_ONLY   9       /* set if keyring only accepts links to trusted keys */
+#define KEY_FLAG_BUILTIN        10      /* set if key is builtin */
+#define KEY_FLAG_ROOT_CAN_INVAL 11      /* set if key can be invalidated by root without permission */
 
         /* the key type and key description string
          * - the desc is used to match a key against search criteria
diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index 7dcef3317689..13d55206ccf6 100644
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -73,7 +73,6 @@ struct kthread_worker {
 struct kthread_work {
         struct list_head        node;
         kthread_work_func_t     func;
-        wait_queue_head_t       done;
         struct kthread_worker   *worker;
 };
 
@@ -85,7 +84,6 @@ struct kthread_work {
 #define KTHREAD_WORK_INIT(work, fn)     {                               \
         .node = LIST_HEAD_INIT((work).node),                            \
         .func = (fn),                                                   \
-        .done = __WAIT_QUEUE_HEAD_INITIALIZER((work).done),             \
         }
 
 #define DEFINE_KTHREAD_WORKER(worker)                                   \
@@ -95,22 +93,16 @@ struct kthread_work {
         struct kthread_work work = KTHREAD_WORK_INIT(work, fn)
 
 /*
- * kthread_worker.lock and kthread_work.done need their own lockdep class
- * keys if they are defined on stack with lockdep enabled.  Use the
- * following macros when defining them on stack.
+ * kthread_worker.lock needs its own lockdep class key when defined on
+ * stack with lockdep enabled.  Use the following macros in such cases.
  */
 #ifdef CONFIG_LOCKDEP
 # define KTHREAD_WORKER_INIT_ONSTACK(worker)                            \
         ({ init_kthread_worker(&worker); worker; })
 # define DEFINE_KTHREAD_WORKER_ONSTACK(worker)                          \
         struct kthread_worker worker = KTHREAD_WORKER_INIT_ONSTACK(worker)
-# define KTHREAD_WORK_INIT_ONSTACK(work, fn)                            \
-        ({ init_kthread_work((&work), fn); work; })
-# define DEFINE_KTHREAD_WORK_ONSTACK(work, fn)                          \
-        struct kthread_work work = KTHREAD_WORK_INIT_ONSTACK(work, fn)
 #else
 # define DEFINE_KTHREAD_WORKER_ONSTACK(worker) DEFINE_KTHREAD_WORKER(worker)
-# define DEFINE_KTHREAD_WORK_ONSTACK(work, fn) DEFINE_KTHREAD_WORK(work, fn)
 #endif
 
 extern void __init_kthread_worker(struct kthread_worker *worker,
@@ -127,7 +119,6 @@ extern void __init_kthread_worker(struct kthread_worker *worker,
                 memset((work), 0, sizeof(struct kthread_work));         \
                 INIT_LIST_HEAD(&(work)->node);                          \
                 (work)->func = (fn);                                    \
-                init_waitqueue_head(&(work)->done);                     \
         } while (0)
 
 int kthread_worker_fn(void *worker_ptr);
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index de9e46e6bcc9..c9d645ad98ff 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -27,43 +27,19 @@
 /*
  * ktime_t:
  *
- * On 64-bit CPUs a single 64-bit variable is used to store the hrtimers
+ * A single 64-bit variable is used to store the hrtimers
  * internal representation of time values in scalar nanoseconds. The
  * design plays out best on 64-bit CPUs, where most conversions are
  * NOPs and most arithmetic ktime_t operations are plain arithmetic
  * operations.
  *
- * On 32-bit CPUs an optimized representation of the timespec structure
- * is used to avoid expensive conversions from and to timespecs. The
- * endian-aware order of the tv struct members is chosen to allow
- * mathematical operations on the tv64 member of the union too, which
- * for certain operations produces better code.
- *
- * For architectures with efficient support for 64/32-bit conversions the
- * plain scalar nanosecond based representation can be selected by the
- * config switch CONFIG_KTIME_SCALAR.
  */
 union ktime {
         s64     tv64;
-#if BITS_PER_LONG != 64 && !defined(CONFIG_KTIME_SCALAR)
-        struct {
-# ifdef __BIG_ENDIAN
-        s32     sec, nsec;
-# else
-        s32     nsec, sec;
-# endif
-        } tv;
-#endif
 };
 
 typedef union ktime ktime_t;            /* Kill this */
 
-/*
- * ktime_t definitions when using the 64-bit scalar representation:
- */
-
-#if (BITS_PER_LONG == 64) || defined(CONFIG_KTIME_SCALAR)
-
 /**
  * ktime_set - Set a ktime_t variable from a seconds/nanoseconds value
  * @secs:       seconds to set
@@ -71,13 +47,12 @@ typedef union ktime ktime_t;		/* Kill this */
  *
  * Return: The ktime_t representation of the value.
  */
-static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
+static inline ktime_t ktime_set(const s64 secs, const unsigned long nsecs)
 {
-#if (BITS_PER_LONG == 64)
         if (unlikely(secs >= KTIME_SEC_MAX))
                 return (ktime_t){ .tv64 = KTIME_MAX };
-#endif
-        return (ktime_t) { .tv64 = (s64)secs * NSEC_PER_SEC + (s64)nsecs };
+
+        return (ktime_t) { .tv64 = secs * NSEC_PER_SEC + (s64)nsecs };
 }
 
 /* Subtract two ktime_t variables. rem = lhs -rhs: */
@@ -108,6 +83,12 @@ static inline ktime_t timespec_to_ktime(struct timespec ts)
         return ktime_set(ts.tv_sec, ts.tv_nsec);
 }
 
+/* convert a timespec64 to ktime_t format: */
+static inline ktime_t timespec64_to_ktime(struct timespec64 ts)
+{
+        return ktime_set(ts.tv_sec, ts.tv_nsec);
+}
+
 /* convert a timeval to ktime_t format: */
 static inline ktime_t timeval_to_ktime(struct timeval tv)
 {
@@ -117,159 +98,15 @@ static inline ktime_t timeval_to_ktime(struct timeval tv)
 /* Map the ktime_t to timespec conversion to ns_to_timespec function */
 #define ktime_to_timespec(kt)           ns_to_timespec((kt).tv64)
 
+/* Map the ktime_t to timespec conversion to ns_to_timespec function */
+#define ktime_to_timespec64(kt)         ns_to_timespec64((kt).tv64)
+
 /* Map the ktime_t to timeval conversion to ns_to_timeval function */
 #define ktime_to_timeval(kt)            ns_to_timeval((kt).tv64)
 
 /* Convert ktime_t to nanoseconds - NOP in the scalar storage format: */
 #define ktime_to_ns(kt)                 ((kt).tv64)
 
-#else   /* !((BITS_PER_LONG == 64) || defined(CONFIG_KTIME_SCALAR)) */
-
-/*
- * Helper macros/inlines to get the ktime_t math right in the timespec
- * representation. The macros are sometimes ugly - their actual use is
- * pretty okay-ish, given the circumstances. We do all this for
- * performance reasons. The pure scalar nsec_t based code was nice and
- * simple, but created too many 64-bit / 32-bit conversions and divisions.
- *
- * Be especially aware that negative values are represented in a way
- * that the tv.sec field is negative and the tv.nsec field is greater
- * or equal to zero but less than nanoseconds per second. This is the
- * same representation which is used by timespecs.
- *
- *   tv.sec < 0 and 0 >= tv.nsec < NSEC_PER_SEC
- */
-
-/* Set a ktime_t variable to a value in sec/nsec representation: */
-static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
-{
-        return (ktime_t) { .tv = { .sec = secs, .nsec = nsecs } };
-}
-
-/**
- * ktime_sub - subtract two ktime_t variables
- * @lhs:        minuend
- * @rhs:        subtrahend
- *
- * Return: The remainder of the subtraction.
- */
-static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs)
-{
-        ktime_t res;
-
-        res.tv64 = lhs.tv64 - rhs.tv64;
-        if (res.tv.nsec < 0)
-                res.tv.nsec += NSEC_PER_SEC;
-
-        return res;
-}
-
-/**
- * ktime_add - add two ktime_t variables
- * @add1:       addend1
- * @add2:       addend2
- *
- * Return: The sum of @add1 and @add2.
- */
-static inline ktime_t ktime_add(const ktime_t add1, const ktime_t add2)
-{
-        ktime_t res;
-
-        res.tv64 = add1.tv64 + add2.tv64;
-        /*
-         * performance trick: the (u32) -NSEC gives 0x00000000Fxxxxxxx
-         * so we subtract NSEC_PER_SEC and add 1 to the upper 32 bit.
-         *
-         * it's equivalent to:
-         *   tv.nsec -= NSEC_PER_SEC
-         *   tv.sec ++;
-         */
-        if (res.tv.nsec >= NSEC_PER_SEC)
-                res.tv64 += (u32)-NSEC_PER_SEC;
-
-        return res;
-}
-
-/**
- * ktime_add_ns - Add a scalar nanoseconds value to a ktime_t variable
- * @kt:         addend
- * @nsec:       the scalar nsec value to add
- *
- * Return: The sum of @kt and @nsec in ktime_t format.
- */
-extern ktime_t ktime_add_ns(const ktime_t kt, u64 nsec);
-
-/**
- * ktime_sub_ns - Subtract a scalar nanoseconds value from a ktime_t variable
- * @kt:         minuend
- * @nsec:       the scalar nsec value to subtract
- *
- * Return: The subtraction of @nsec from @kt in ktime_t format.
- */
-extern ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec);
-
-/**
- * timespec_to_ktime - convert a timespec to ktime_t format
- * @ts:         the timespec variable to convert
- *
- * Return: A ktime_t variable with the converted timespec value.
- */
-static inline ktime_t timespec_to_ktime(const struct timespec ts)
-{
-        return (ktime_t) { .tv = { .sec = (s32)ts.tv_sec,
-                                   .nsec = (s32)ts.tv_nsec } };
-}
-
-/**
- * timeval_to_ktime - convert a timeval to ktime_t format
- * @tv:         the timeval variable to convert
- *
- * Return: A ktime_t variable with the converted timeval value.
- */
-static inline ktime_t timeval_to_ktime(const struct timeval tv)
-{
-        return (ktime_t) { .tv = { .sec = (s32)tv.tv_sec,
-                                   .nsec = (s32)(tv.tv_usec *
-                                                 NSEC_PER_USEC) } };
-}
-
-/**
- * ktime_to_timespec - convert a ktime_t variable to timespec format
- * @kt:         the ktime_t variable to convert
- *
- * Return: The timespec representation of the ktime value.
- */
-static inline struct timespec ktime_to_timespec(const ktime_t kt)
-{
-        return (struct timespec) { .tv_sec = (time_t) kt.tv.sec,
-                                   .tv_nsec = (long) kt.tv.nsec };
-}
-
-/**
- * ktime_to_timeval - convert a ktime_t variable to timeval format
- * @kt:         the ktime_t variable to convert
- *
- * Return: The timeval representation of the ktime value.
- */
-static inline struct timeval ktime_to_timeval(const ktime_t kt)
-{
-        return (struct timeval) {
-                .tv_sec = (time_t) kt.tv.sec,
-                .tv_usec = (suseconds_t) (kt.tv.nsec / NSEC_PER_USEC) };
-}
-
-/**
- * ktime_to_ns - convert a ktime_t variable to scalar nanoseconds
- * @kt:         the ktime_t variable to convert
- *
- * Return: The scalar nanoseconds representation of @kt.
- */
-static inline s64 ktime_to_ns(const ktime_t kt)
-{
-        return (s64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec;
-}
-
-#endif  /* !((BITS_PER_LONG == 64) || defined(CONFIG_KTIME_SCALAR)) */
 
 /**
  * ktime_equal - Compares two ktime_t variables to see if they are equal
@@ -328,16 +165,20 @@ static inline bool ktime_before(const ktime_t cmp1, const ktime_t cmp2)
         return ktime_compare(cmp1, cmp2) < 0;
 }
 
+#if BITS_PER_LONG < 64
+extern u64 ktime_divns(const ktime_t kt, s64 div);
+#else /* BITS_PER_LONG < 64 */
+# define ktime_divns(kt, div)           (u64)((kt).tv64 / (div))
+#endif
+
 static inline s64 ktime_to_us(const ktime_t kt)
 {
-        struct timeval tv = ktime_to_timeval(kt);
-        return (s64) tv.tv_sec * USEC_PER_SEC + tv.tv_usec;
+        return ktime_divns(kt, NSEC_PER_USEC);
 }
 
 static inline s64 ktime_to_ms(const ktime_t kt)
 {
-        struct timeval tv = ktime_to_timeval(kt);
-        return (s64) tv.tv_sec * MSEC_PER_SEC + tv.tv_usec / USEC_PER_MSEC;
+        return ktime_divns(kt, NSEC_PER_MSEC);
 }
 
 static inline s64 ktime_us_delta(const ktime_t later, const ktime_t earlier)
@@ -381,6 +222,25 @@ static inline __must_check bool ktime_to_timespec_cond(const ktime_t kt,
         }
 }
 
+/**
+ * ktime_to_timespec64_cond - convert a ktime_t variable to timespec64
+ *                          format only if the variable contains data
+ * @kt:         the ktime_t variable to convert
+ * @ts:         the timespec variable to store the result in
+ *
+ * Return: %true if there was a successful conversion, %false if kt was 0.
+ */
+static inline __must_check bool ktime_to_timespec64_cond(const ktime_t kt,
+                                                       struct timespec64 *ts)
+{
+        if (kt.tv64) {
+                *ts = ktime_to_timespec64(kt);
+                return true;
+        } else {
+                return false;
+        }
+}
+
 /*
  * The resolution of the clocks. The resolution value is returned in
  * the clock_getres() system call to give application programmers an
@@ -390,12 +250,6 @@ static inline __must_check bool ktime_to_timespec_cond(const ktime_t kt,
 #define LOW_RES_NSEC            TICK_NSEC
 #define KTIME_LOW_RES           (ktime_t){ .tv64 = LOW_RES_NSEC }
 
-/* Get the monotonic time in timespec format: */
-extern void ktime_get_ts(struct timespec *ts);
-
-/* Get the real (wall-) time in timespec format: */
-#define ktime_get_real_ts(ts)   getnstimeofday(ts)
-
 static inline ktime_t ns_to_ktime(u64 ns)
 {
         static const ktime_t ktime_zero = { .tv64 = 0 };
@@ -410,4 +264,6 @@ static inline ktime_t ms_to_ktime(u64 ms)
         return ktime_add_ms(ktime_zero, ms);
 }
 
+# include <linux/timekeeping.h>
+
 #endif
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 5ab4e3a76721..92abb497ab14 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -593,6 +593,7 @@ struct ata_host {
         struct device           *dev;
         void __iomem * const    *iomap;
         unsigned int            n_ports;
+        unsigned int            n_tags;                 /* nr of NCQ tags */
         void                    *private_data;
         struct ata_port_operations *ops;
         unsigned long           flags;
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h
index 6d9371f88875..a614b33d0a39 100644
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -110,6 +110,12 @@ struct arizona {
         int clk32k_ref;
 
         struct snd_soc_dapm_context *dapm;
+
+        int tdm_width[ARIZONA_MAX_AIF];
+        int tdm_slots[ARIZONA_MAX_AIF];
+
+        uint16_t dac_comp_coeff;
+        uint8_t dac_comp_enabled;
 };
 
 int arizona_clk32k_enable(struct arizona *arizona);
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 12a5c135c746..4578c72c9b86 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -127,6 +127,9 @@ struct arizona_pdata {
         /** Internal pull on GPIO5 is disabled when used for jack detection */
         bool jd_gpio5_nopull;
 
+        /** set to true if jackdet contact opens on insert */
+        bool jd_invert;
+
         /** Use the headphone detect circuit to identify the accessory */
         bool hpdet_acc_id;
 
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 3e050b933dd0..c466ff3e16b8 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -262,6 +262,41 @@ enum max77693_irq_source {
         MAX77693_IRQ_GROUP_NR,
 };
 
+#define LED_IRQ_FLED2_OPEN              BIT(0)
+#define LED_IRQ_FLED2_SHORT             BIT(1)
+#define LED_IRQ_FLED1_OPEN              BIT(2)
+#define LED_IRQ_FLED1_SHORT             BIT(3)
+#define LED_IRQ_MAX_FLASH               BIT(4)
+
+#define TOPSYS_IRQ_T120C_INT            BIT(0)
+#define TOPSYS_IRQ_T140C_INT            BIT(1)
+#define TOPSYS_IRQ_LOWSYS_INT           BIT(3)
+
+#define CHG_IRQ_BYP_I                   BIT(0)
+#define CHG_IRQ_THM_I                   BIT(2)
+#define CHG_IRQ_BAT_I                   BIT(3)
+#define CHG_IRQ_CHG_I                   BIT(4)
+#define CHG_IRQ_CHGIN_I                 BIT(6)
+
+#define MUIC_IRQ_INT1_ADC               BIT(0)
+#define MUIC_IRQ_INT1_ADC_LOW           BIT(1)
+#define MUIC_IRQ_INT1_ADC_ERR           BIT(2)
+#define MUIC_IRQ_INT1_ADC1K             BIT(3)
+
+#define MUIC_IRQ_INT2_CHGTYP            BIT(0)
+#define MUIC_IRQ_INT2_CHGDETREUN        BIT(1)
+#define MUIC_IRQ_INT2_DCDTMR            BIT(2)
+#define MUIC_IRQ_INT2_DXOVP             BIT(3)
+#define MUIC_IRQ_INT2_VBVOLT            BIT(4)
+#define MUIC_IRQ_INT2_VIDRM             BIT(5)
+
+#define MUIC_IRQ_INT3_EOC               BIT(0)
+#define MUIC_IRQ_INT3_CGMBC             BIT(1)
+#define MUIC_IRQ_INT3_OVP               BIT(2)
+#define MUIC_IRQ_INT3_MBCCHG_ERR        BIT(3)
+#define MUIC_IRQ_INT3_CHG_ENABLED       BIT(4)
+#define MUIC_IRQ_INT3_BAT_DET           BIT(5)
+
 enum max77693_irq {
         /* PMIC - FLASH */
         MAX77693_LED_IRQ_FLED2_OPEN,
@@ -282,6 +317,10 @@ enum max77693_irq {
         MAX77693_CHG_IRQ_CHG_I,
         MAX77693_CHG_IRQ_CHGIN_I,
 
+        MAX77693_IRQ_NR,
+};
+
+enum max77693_irq_muic {
         /* MUIC INT1 */
         MAX77693_MUIC_IRQ_INT1_ADC,
         MAX77693_MUIC_IRQ_INT1_ADC_LOW,
@@ -304,7 +343,7 @@ enum max77693_irq {
         MAX77693_MUIC_IRQ_INT3_CHG_ENABLED,
         MAX77693_MUIC_IRQ_INT3_BAT_DET,
 
-        MAX77693_IRQ_NR,
+        MAX77693_MUIC_IRQ_NR,
 };
 
 struct max77693_dev {
@@ -319,7 +358,10 @@ struct max77693_dev {
         struct regmap *regmap_muic;
         struct regmap *regmap_haptic;
 
-        struct irq_domain *irq_domain;
+        struct regmap_irq_chip_data *irq_data_led;
+        struct regmap_irq_chip_data *irq_data_topsys;
+        struct regmap_irq_chip_data *irq_data_charger;
+        struct regmap_irq_chip_data *irq_data_muic;
 
         int irq;
         int irq_gpio;
@@ -332,14 +374,6 @@ enum max77693_types {
         TYPE_MAX77693,
 };
 
-extern int max77693_read_reg(struct regmap *map, u8 reg, u8 *dest);
-extern int max77693_bulk_read(struct regmap *map, u8 reg, int count,
-                                u8 *buf);
-extern int max77693_write_reg(struct regmap *map, u8 reg, u8 value);
-extern int max77693_bulk_write(struct regmap *map, u8 reg, int count,
-                                u8 *buf);
-extern int max77693_update_reg(struct regmap *map, u8 reg, u8 val, u8 mask);
-
 extern int max77693_irq_init(struct max77693_dev *max77686);
 extern void max77693_irq_exit(struct max77693_dev *max77686);
 extern int max77693_irq_resume(struct max77693_dev *max77686);
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 3420e09e2e20..fb0390a1a498 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -30,6 +30,8 @@
 #define PALMAS_CHIP_ID                  0xC035
 #define PALMAS_CHIP_CHARGER_ID          0xC036
 
+#define TPS65917_RESERVED               -1
+
 #define is_palmas(a)    (((a) == PALMAS_CHIP_OLD_ID) || \
                         ((a) == PALMAS_CHIP_ID))
 #define is_palmas_charger(a) ((a) == PALMAS_CHIP_CHARGER_ID)
@@ -51,6 +53,8 @@ struct palmas_pmic;
 struct palmas_gpadc;
 struct palmas_resource;
 struct palmas_usb;
+struct palmas_pmic_driver_data;
+struct palmas_pmic_platform_data;
 
 enum palmas_usb_state {
         PALMAS_USB_STATE_DISCONNECT,
@@ -74,6 +78,8 @@ struct palmas {
         struct mutex irq_lock;
         struct regmap_irq_chip_data *irq_data;
 
+        struct palmas_pmic_driver_data *pmic_ddata;
+
         /* Child Devices */
         struct palmas_pmic *pmic;
         struct palmas_gpadc *gpadc;
@@ -86,6 +92,46 @@ struct palmas {
         u8 pwm_muxed;
 };
 
+#define PALMAS_EXT_REQ (PALMAS_EXT_CONTROL_ENABLE1 |    \
+                        PALMAS_EXT_CONTROL_ENABLE2 |    \
+                        PALMAS_EXT_CONTROL_NSLEEP)
+
+struct palmas_sleep_requestor_info {
+        int id;
+        int reg_offset;
+        int bit_pos;
+};
+
+struct palmas_regs_info {
+        char    *name;
+        char    *sname;
+        u8      vsel_addr;
+        u8      ctrl_addr;
+        u8      tstep_addr;
+        int     sleep_id;
+};
+
+struct palmas_pmic_driver_data {
+        int smps_start;
+        int smps_end;
+        int ldo_begin;
+        int ldo_end;
+        int max_reg;
+        struct palmas_regs_info *palmas_regs_info;
+        struct of_regulator_match *palmas_matches;
+        struct palmas_sleep_requestor_info *sleep_req_info;
+        int (*smps_register)(struct palmas_pmic *pmic,
+                             struct palmas_pmic_driver_data *ddata,
+                             struct palmas_pmic_platform_data *pdata,
+                             const char *pdev_name,
+                             struct regulator_config config);
+        int (*ldo_register)(struct palmas_pmic *pmic,
+                            struct palmas_pmic_driver_data *ddata,
+                            struct palmas_pmic_platform_data *pdata,
+                            const char *pdev_name,
+                            struct regulator_config config);
+};
+
 struct palmas_gpadc_platform_data {
         /* Channel 3 current source is only enabled during conversion */
         int ch3_current;
@@ -184,6 +230,27 @@ enum palmas_regulators {
         PALMAS_NUM_REGS,
 };
 
+enum tps65917_regulators {
+        /* SMPS regulators */
+        TPS65917_REG_SMPS1,
+        TPS65917_REG_SMPS2,
+        TPS65917_REG_SMPS3,
+        TPS65917_REG_SMPS4,
+        TPS65917_REG_SMPS5,
+        /* LDO regulators */
+        TPS65917_REG_LDO1,
+        TPS65917_REG_LDO2,
+        TPS65917_REG_LDO3,
+        TPS65917_REG_LDO4,
+        TPS65917_REG_LDO5,
+        TPS65917_REG_REGEN1,
+        TPS65917_REG_REGEN2,
+        TPS65917_REG_REGEN3,
+
+        /* Total number of regulators */
+        TPS65917_NUM_REGS,
+};
+
 /* External controll signal name */
 enum {
         PALMAS_EXT_CONTROL_ENABLE1      = 0x1,
@@ -228,6 +295,24 @@ enum palmas_external_requestor_id {
         PALMAS_EXTERNAL_REQSTR_ID_MAX,
 };
 
+enum tps65917_external_requestor_id {
+        TPS65917_EXTERNAL_REQSTR_ID_REGEN1,
+        TPS65917_EXTERNAL_REQSTR_ID_REGEN2,
+        TPS65917_EXTERNAL_REQSTR_ID_REGEN3,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS1,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS2,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS3,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS4,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS5,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO1,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO2,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO3,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO4,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO5,
+        /* Last entry */
+        TPS65917_EXTERNAL_REQSTR_ID_MAX,
+};
+
 struct palmas_pmic_platform_data {
         /* An array of pointers to regulator init data indexed by regulator
          * ID
@@ -349,6 +434,48 @@ struct palmas_gpadc_result {
 
 #define PALMAS_MAX_CHANNELS 16
 
+/* Define the tps65917 IRQ numbers */
+enum tps65917_irqs {
+        /* INT1 registers */
+        TPS65917_RESERVED1,
+        TPS65917_PWRON_IRQ,
+        TPS65917_LONG_PRESS_KEY_IRQ,
+        TPS65917_RESERVED2,
+        TPS65917_PWRDOWN_IRQ,
+        TPS65917_HOTDIE_IRQ,
+        TPS65917_VSYS_MON_IRQ,
+        TPS65917_RESERVED3,
+        /* INT2 registers */
+        TPS65917_RESERVED4,
+        TPS65917_OTP_ERROR_IRQ,
+        TPS65917_WDT_IRQ,
+        TPS65917_RESERVED5,
+        TPS65917_RESET_IN_IRQ,
+        TPS65917_FSD_IRQ,
+        TPS65917_SHORT_IRQ,
+        TPS65917_RESERVED6,
+        /* INT3 registers */
+        TPS65917_GPADC_AUTO_0_IRQ,
+        TPS65917_GPADC_AUTO_1_IRQ,
+        TPS65917_GPADC_EOC_SW_IRQ,
+        TPS65917_RESREVED6,
+        TPS65917_RESERVED7,
+        TPS65917_RESERVED8,
+        TPS65917_RESERVED9,
+        TPS65917_VBUS_IRQ,
+        /* INT4 registers */
+        TPS65917_GPIO_0_IRQ,
+        TPS65917_GPIO_1_IRQ,
+        TPS65917_GPIO_2_IRQ,
+        TPS65917_GPIO_3_IRQ,
+        TPS65917_GPIO_4_IRQ,
+        TPS65917_GPIO_5_IRQ,
+        TPS65917_GPIO_6_IRQ,
+        TPS65917_RESERVED10,
+        /* Total Number IRQs */
+        TPS65917_NUM_IRQ,
+};
+
 /* Define the palmas IRQ numbers */
 enum palmas_irqs {
         /* INT1 registers */
@@ -400,6 +527,7 @@ struct palmas_pmic {
 
         int smps123;
         int smps457;
+        int smps12;
 
         int range[PALMAS_REG_SMPS10_OUT1];
         unsigned int ramp_delay[PALMAS_REG_SMPS10_OUT1];
@@ -2871,6 +2999,715 @@ enum usb_irq_events {
 #define PALMAS_GPADC_TRIM15                                     0x0E
 #define PALMAS_GPADC_TRIM16                                     0x0F
 
+/* TPS65917 Interrupt registers */
+
+/* Registers for function INTERRUPT */
+#define TPS65917_INT1_STATUS                                    0x00
+#define TPS65917_INT1_MASK                                      0x01
+#define TPS65917_INT1_LINE_STATE                                0x02
+#define TPS65917_INT2_STATUS                                    0x05
+#define TPS65917_INT2_MASK                                      0x06
+#define TPS65917_INT2_LINE_STATE                                0x07
+#define TPS65917_INT3_STATUS                                    0x0A
+#define TPS65917_INT3_MASK                                      0x0B
+#define TPS65917_INT3_LINE_STATE                                0x0C
+#define TPS65917_INT4_STATUS                                    0x0F
+#define TPS65917_INT4_MASK                                      0x10
+#define TPS65917_INT4_LINE_STATE                                0x11
+#define TPS65917_INT4_EDGE_DETECT1                              0x12
+#define TPS65917_INT4_EDGE_DETECT2                              0x13
+#define TPS65917_INT_CTRL                                       0x14
+
+/* Bit definitions for INT1_STATUS */
+#define TPS65917_INT1_STATUS_VSYS_MON                           0x40
+#define TPS65917_INT1_STATUS_VSYS_MON_SHIFT                     0x06
+#define TPS65917_INT1_STATUS_HOTDIE                             0x20
+#define TPS65917_INT1_STATUS_HOTDIE_SHIFT                       0x05
+#define TPS65917_INT1_STATUS_PWRDOWN                            0x10
+#define TPS65917_INT1_STATUS_PWRDOWN_SHIFT                      0x04
+#define TPS65917_INT1_STATUS_LONG_PRESS_KEY                     0x04
+#define TPS65917_INT1_STATUS_LONG_PRESS_KEY_SHIFT               0x02
+#define TPS65917_INT1_STATUS_PWRON                              0x02
+#define TPS65917_INT1_STATUS_PWRON_SHIFT                        0x01
+
+/* Bit definitions for INT1_MASK */
+#define TPS65917_INT1_MASK_VSYS_MON                             0x40
+#define TPS65917_INT1_MASK_VSYS_MON_SHIFT                       0x06
+#define TPS65917_INT1_MASK_HOTDIE                               0x20
+#define TPS65917_INT1_MASK_HOTDIE_SHIFT                 0x05
+#define TPS65917_INT1_MASK_PWRDOWN                              0x10
+#define TPS65917_INT1_MASK_PWRDOWN_SHIFT                        0x04
+#define TPS65917_INT1_MASK_LONG_PRESS_KEY                       0x04
+#define TPS65917_INT1_MASK_LONG_PRESS_KEY_SHIFT         0x02
+#define TPS65917_INT1_MASK_PWRON                                0x02
+#define TPS65917_INT1_MASK_PWRON_SHIFT                          0x01
+
+/* Bit definitions for INT1_LINE_STATE */
+#define TPS65917_INT1_LINE_STATE_VSYS_MON                       0x40
+#define TPS65917_INT1_LINE_STATE_VSYS_MON_SHIFT         0x06
+#define TPS65917_INT1_LINE_STATE_HOTDIE                 0x20
+#define TPS65917_INT1_LINE_STATE_HOTDIE_SHIFT                   0x05
+#define TPS65917_INT1_LINE_STATE_PWRDOWN                        0x10
+#define TPS65917_INT1_LINE_STATE_PWRDOWN_SHIFT                  0x04
+#define TPS65917_INT1_LINE_STATE_LONG_PRESS_KEY         0x04
+#define TPS65917_INT1_LINE_STATE_LONG_PRESS_KEY_SHIFT           0x02
+#define TPS65917_INT1_LINE_STATE_PWRON                          0x02
+#define TPS65917_INT1_LINE_STATE_PWRON_SHIFT                    0x01
+
+/* Bit definitions for INT2_STATUS */
+#define TPS65917_INT2_STATUS_SHORT                              0x40
+#define TPS65917_INT2_STATUS_SHORT_SHIFT                        0x06
+#define TPS65917_INT2_STATUS_FSD                                0x20
+#define TPS65917_INT2_STATUS_FSD_SHIFT                          0x05
+#define TPS65917_INT2_STATUS_RESET_IN                           0x10
+#define TPS65917_INT2_STATUS_RESET_IN_SHIFT                     0x04
+#define TPS65917_INT2_STATUS_WDT                                0x04
+#define TPS65917_INT2_STATUS_WDT_SHIFT                          0x02
+#define TPS65917_INT2_STATUS_OTP_ERROR                          0x02
+#define TPS65917_INT2_STATUS_OTP_ERROR_SHIFT                    0x01
+
+/* Bit definitions for INT2_MASK */
+#define TPS65917_INT2_MASK_SHORT                                0x40
+#define TPS65917_INT2_MASK_SHORT_SHIFT                          0x06
+#define TPS65917_INT2_MASK_FSD                                  0x20
+#define TPS65917_INT2_MASK_FSD_SHIFT                            0x05
+#define TPS65917_INT2_MASK_RESET_IN                             0x10
+#define TPS65917_INT2_MASK_RESET_IN_SHIFT                       0x04
+#define TPS65917_INT2_MASK_WDT                                  0x04
+#define TPS65917_INT2_MASK_WDT_SHIFT                            0x02
+#define TPS65917_INT2_MASK_OTP_ERROR_TIMER                      0x02
+#define TPS65917_INT2_MASK_OTP_ERROR_SHIFT                      0x01
+
+/* Bit definitions for INT2_LINE_STATE */
+#define TPS65917_INT2_LINE_STATE_SHORT                          0x40
+#define TPS65917_INT2_LINE_STATE_SHORT_SHIFT                    0x06
+#define TPS65917_INT2_LINE_STATE_FSD                            0x20
+#define TPS65917_INT2_LINE_STATE_FSD_SHIFT                      0x05
+#define TPS65917_INT2_LINE_STATE_RESET_IN                       0x10
+#define TPS65917_INT2_LINE_STATE_RESET_IN_SHIFT         0x04
+#define TPS65917_INT2_LINE_STATE_WDT                            0x04
+#define TPS65917_INT2_LINE_STATE_WDT_SHIFT                      0x02
+#define TPS65917_INT2_LINE_STATE_OTP_ERROR                      0x02
+#define TPS65917_INT2_LINE_STATE_OTP_ERROR_SHIFT                0x01
+
+/* Bit definitions for INT3_STATUS */
+#define TPS65917_INT3_STATUS_VBUS                               0x80
+#define TPS65917_INT3_STATUS_VBUS_SHIFT                 0x07
+#define TPS65917_INT3_STATUS_GPADC_EOC_SW                       0x04
+#define TPS65917_INT3_STATUS_GPADC_EOC_SW_SHIFT         0x02
+#define TPS65917_INT3_STATUS_GPADC_AUTO_1                       0x02
+#define TPS65917_INT3_STATUS_GPADC_AUTO_1_SHIFT         0x01
+#define TPS65917_INT3_STATUS_GPADC_AUTO_0                       0x01
+#define TPS65917_INT3_STATUS_GPADC_AUTO_0_SHIFT         0x00
+
+/* Bit definitions for INT3_MASK */
+#define TPS65917_INT3_MASK_VBUS                         0x80
+#define TPS65917_INT3_MASK_VBUS_SHIFT                           0x07
+#define TPS65917_INT3_MASK_GPADC_EOC_SW                 0x04
+#define TPS65917_INT3_MASK_GPADC_EOC_SW_SHIFT                   0x02
+#define TPS65917_INT3_MASK_GPADC_AUTO_1                 0x02
+#define TPS65917_INT3_MASK_GPADC_AUTO_1_SHIFT                   0x01
+#define TPS65917_INT3_MASK_GPADC_AUTO_0                 0x01
+#define TPS65917_INT3_MASK_GPADC_AUTO_0_SHIFT                   0x00
+
+/* Bit definitions for INT3_LINE_STATE */
+#define TPS65917_INT3_LINE_STATE_VBUS                           0x80
+#define TPS65917_INT3_LINE_STATE_VBUS_SHIFT                     0x07
+#define TPS65917_INT3_LINE_STATE_GPADC_EOC_SW                   0x04
+#define TPS65917_INT3_LINE_STATE_GPADC_EOC_SW_SHIFT             0x02
+#define TPS65917_INT3_LINE_STATE_GPADC_AUTO_1                   0x02
+#define TPS65917_INT3_LINE_STATE_GPADC_AUTO_1_SHIFT             0x01
+#define TPS65917_INT3_LINE_STATE_GPADC_AUTO_0                   0x01
+#define TPS65917_INT3_LINE_STATE_GPADC_AUTO_0_SHIFT             0x00
+
+/* Bit definitions for INT4_STATUS */
+#define TPS65917_INT4_STATUS_GPIO_6                             0x40
+#define TPS65917_INT4_STATUS_GPIO_6_SHIFT                       0x06
+#define TPS65917_INT4_STATUS_GPIO_5                             0x20
+#define TPS65917_INT4_STATUS_GPIO_5_SHIFT                       0x05
+#define TPS65917_INT4_STATUS_GPIO_4                             0x10
+#define TPS65917_INT4_STATUS_GPIO_4_SHIFT                       0x04
+#define TPS65917_INT4_STATUS_GPIO_3                             0x08
+#define TPS65917_INT4_STATUS_GPIO_3_SHIFT                       0x03
+#define TPS65917_INT4_STATUS_GPIO_2                             0x04
+#define TPS65917_INT4_STATUS_GPIO_2_SHIFT                       0x02
+#define TPS65917_INT4_STATUS_GPIO_1                             0x02
+#define TPS65917_INT4_STATUS_GPIO_1_SHIFT                       0x01
+#define TPS65917_INT4_STATUS_GPIO_0                             0x01
+#define TPS65917_INT4_STATUS_GPIO_0_SHIFT                       0x00
+
+/* Bit definitions for INT4_MASK */
+#define TPS65917_INT4_MASK_GPIO_6                               0x40
+#define TPS65917_INT4_MASK_GPIO_6_SHIFT                 0x06
+#define TPS65917_INT4_MASK_GPIO_5                               0x20
+#define TPS65917_INT4_MASK_GPIO_5_SHIFT                 0x05
+#define TPS65917_INT4_MASK_GPIO_4                               0x10
+#define TPS65917_INT4_MASK_GPIO_4_SHIFT                 0x04
+#define TPS65917_INT4_MASK_GPIO_3                               0x08
+#define TPS65917_INT4_MASK_GPIO_3_SHIFT                 0x03
+#define TPS65917_INT4_MASK_GPIO_2                               0x04
+#define TPS65917_INT4_MASK_GPIO_2_SHIFT                 0x02
+#define TPS65917_INT4_MASK_GPIO_1                               0x02
+#define TPS65917_INT4_MASK_GPIO_1_SHIFT                 0x01
+#define TPS65917_INT4_MASK_GPIO_0                               0x01
+#define TPS65917_INT4_MASK_GPIO_0_SHIFT                 0x00
+
+/* Bit definitions for INT4_LINE_STATE */
+#define TPS65917_INT4_LINE_STATE_GPIO_6                 0x40
+#define TPS65917_INT4_LINE_STATE_GPIO_6_SHIFT                   0x06
+#define TPS65917_INT4_LINE_STATE_GPIO_5                 0x20
+#define TPS65917_INT4_LINE_STATE_GPIO_5_SHIFT                   0x05
+#define TPS65917_INT4_LINE_STATE_GPIO_4                 0x10
+#define TPS65917_INT4_LINE_STATE_GPIO_4_SHIFT                   0x04
+#define TPS65917_INT4_LINE_STATE_GPIO_3                 0x08
+#define TPS65917_INT4_LINE_STATE_GPIO_3_SHIFT                   0x03
+#define TPS65917_INT4_LINE_STATE_GPIO_2                 0x04
+#define TPS65917_INT4_LINE_STATE_GPIO_2_SHIFT                   0x02
+#define TPS65917_INT4_LINE_STATE_GPIO_1                 0x02
+#define TPS65917_INT4_LINE_STATE_GPIO_1_SHIFT                   0x01
+#define TPS65917_INT4_LINE_STATE_GPIO_0                 0x01
+#define TPS65917_INT4_LINE_STATE_GPIO_0_SHIFT                   0x00
+
+/* Bit definitions for INT4_EDGE_DETECT1 */
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_3_RISING                0x80
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_3_RISING_SHIFT          0x07
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_3_FALLING               0x40
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_3_FALLING_SHIFT 0x06
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_2_RISING                0x20
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_2_RISING_SHIFT          0x05
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_2_FALLING               0x10
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_2_FALLING_SHIFT 0x04
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_1_RISING                0x08
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_1_RISING_SHIFT          0x03
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_1_FALLING               0x04
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_1_FALLING_SHIFT 0x02
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_0_RISING                0x02
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_0_RISING_SHIFT          0x01
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_0_FALLING               0x01
+#define TPS65917_INT4_EDGE_DETECT1_GPIO_0_FALLING_SHIFT 0x00
+
+/* Bit definitions for INT4_EDGE_DETECT2 */
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_6_RISING                0x20
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_6_RISING_SHIFT          0x05
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_6_FALLING               0x10
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_6_FALLING_SHIFT 0x04
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_5_RISING                0x08
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_5_RISING_SHIFT          0x03
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_5_FALLING               0x04
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_5_FALLING_SHIFT 0x02
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_4_RISING                0x02
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_4_RISING_SHIFT          0x01
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_4_FALLING               0x01
+#define TPS65917_INT4_EDGE_DETECT2_GPIO_4_FALLING_SHIFT 0x00
+
+/* Bit definitions for INT_CTRL */
+#define TPS65917_INT_CTRL_INT_PENDING                           0x04
+#define TPS65917_INT_CTRL_INT_PENDING_SHIFT                     0x02
+#define TPS65917_INT_CTRL_INT_CLEAR                             0x01
+#define TPS65917_INT_CTRL_INT_CLEAR_SHIFT                       0x00
+
+/* TPS65917 SMPS Registers */
+
+/* Registers for function SMPS */
+#define TPS65917_SMPS1_CTRL                                     0x00
+#define TPS65917_SMPS1_FORCE                                    0x02
+#define TPS65917_SMPS1_VOLTAGE                                  0x03
+#define TPS65917_SMPS2_CTRL                                     0x04
+#define TPS65917_SMPS2_FORCE                                    0x06
+#define TPS65917_SMPS2_VOLTAGE                                  0x07
+#define TPS65917_SMPS3_CTRL                                     0x0C
+#define TPS65917_SMPS3_FORCE                                    0x0E
+#define TPS65917_SMPS3_VOLTAGE                                  0x0F
+#define TPS65917_SMPS4_CTRL                                     0x10
+#define TPS65917_SMPS4_VOLTAGE                                  0x13
+#define TPS65917_SMPS5_CTRL                                     0x18
+#define TPS65917_SMPS5_VOLTAGE                                  0x1B
+#define TPS65917_SMPS_CTRL                                      0x24
+#define TPS65917_SMPS_PD_CTRL                                   0x25
+#define TPS65917_SMPS_THERMAL_EN                                0x27
+#define TPS65917_SMPS_THERMAL_STATUS                            0x28
+#define TPS65917_SMPS_SHORT_STATUS                              0x29
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN         0x2A
+#define TPS65917_SMPS_POWERGOOD_MASK1                           0x2B
+#define TPS65917_SMPS_POWERGOOD_MASK2                           0x2C
+
+/* Bit definitions for SMPS1_CTRL */
+#define TPS65917_SMPS1_CTRL_WR_S                                0x80
+#define TPS65917_SMPS1_CTRL_WR_S_SHIFT                          0x07
+#define TPS65917_SMPS1_CTRL_ROOF_FLOOR_EN                       0x40
+#define TPS65917_SMPS1_CTRL_ROOF_FLOOR_EN_SHIFT         0x06
+#define TPS65917_SMPS1_CTRL_STATUS_MASK                 0x30
+#define TPS65917_SMPS1_CTRL_STATUS_SHIFT                        0x04
+#define TPS65917_SMPS1_CTRL_MODE_SLEEP_MASK                     0x0C
+#define TPS65917_SMPS1_CTRL_MODE_SLEEP_SHIFT                    0x02
+#define TPS65917_SMPS1_CTRL_MODE_ACTIVE_MASK                    0x03
+#define TPS65917_SMPS1_CTRL_MODE_ACTIVE_SHIFT                   0x00
+
+/* Bit definitions for SMPS1_FORCE */
+#define TPS65917_SMPS1_FORCE_CMD                                0x80
+#define TPS65917_SMPS1_FORCE_CMD_SHIFT                          0x07
+#define TPS65917_SMPS1_FORCE_VSEL_MASK                          0x7F
+#define TPS65917_SMPS1_FORCE_VSEL_SHIFT                 0x00
+
+/* Bit definitions for SMPS1_VOLTAGE */
+#define TPS65917_SMPS1_VOLTAGE_RANGE                            0x80
+#define TPS65917_SMPS1_VOLTAGE_RANGE_SHIFT                      0x07
+#define TPS65917_SMPS1_VOLTAGE_VSEL_MASK                        0x7F
+#define TPS65917_SMPS1_VOLTAGE_VSEL_SHIFT                       0x00
+
+/* Bit definitions for SMPS2_CTRL */
+#define TPS65917_SMPS2_CTRL_WR_S                                0x80
+#define TPS65917_SMPS2_CTRL_WR_S_SHIFT                          0x07
+#define TPS65917_SMPS2_CTRL_ROOF_FLOOR_EN                       0x40
+#define TPS65917_SMPS2_CTRL_ROOF_FLOOR_EN_SHIFT         0x06
+#define TPS65917_SMPS2_CTRL_STATUS_MASK                 0x30
+#define TPS65917_SMPS2_CTRL_STATUS_SHIFT                        0x04
+#define TPS65917_SMPS2_CTRL_MODE_SLEEP_MASK                     0x0C
+#define TPS65917_SMPS2_CTRL_MODE_SLEEP_SHIFT                    0x02
+#define TPS65917_SMPS2_CTRL_MODE_ACTIVE_MASK                    0x03
+#define TPS65917_SMPS2_CTRL_MODE_ACTIVE_SHIFT                   0x00
+
+/* Bit definitions for SMPS2_FORCE */
+#define TPS65917_SMPS2_FORCE_CMD                                0x80
+#define TPS65917_SMPS2_FORCE_CMD_SHIFT                          0x07
+#define TPS65917_SMPS2_FORCE_VSEL_MASK                          0x7F
+#define TPS65917_SMPS2_FORCE_VSEL_SHIFT                 0x00
+
+/* Bit definitions for SMPS2_VOLTAGE */
+#define TPS65917_SMPS2_VOLTAGE_RANGE                            0x80
+#define TPS65917_SMPS2_VOLTAGE_RANGE_SHIFT                      0x07
+#define TPS65917_SMPS2_VOLTAGE_VSEL_MASK                        0x7F
+#define TPS65917_SMPS2_VOLTAGE_VSEL_SHIFT                       0x00
+
+/* Bit definitions for SMPS3_CTRL */
+#define TPS65917_SMPS3_CTRL_WR_S                                0x80
+#define TPS65917_SMPS3_CTRL_WR_S_SHIFT                          0x07
+#define TPS65917_SMPS3_CTRL_ROOF_FLOOR_EN                       0x40
+#define TPS65917_SMPS3_CTRL_ROOF_FLOOR_EN_SHIFT         0x06
+#define TPS65917_SMPS3_CTRL_STATUS_MASK                 0x30
+#define TPS65917_SMPS3_CTRL_STATUS_SHIFT                        0x04
+#define TPS65917_SMPS3_CTRL_MODE_SLEEP_MASK                     0x0C
+#define TPS65917_SMPS3_CTRL_MODE_SLEEP_SHIFT                    0x02
+#define TPS65917_SMPS3_CTRL_MODE_ACTIVE_MASK                    0x03
+#define TPS65917_SMPS3_CTRL_MODE_ACTIVE_SHIFT                   0x00
+
+/* Bit definitions for SMPS3_FORCE */
+#define TPS65917_SMPS3_FORCE_CMD                                0x80
+#define TPS65917_SMPS3_FORCE_CMD_SHIFT                          0x07
+#define TPS65917_SMPS3_FORCE_VSEL_MASK                          0x7F
+#define TPS65917_SMPS3_FORCE_VSEL_SHIFT                 0x00
+
+/* Bit definitions for SMPS3_VOLTAGE */
+#define TPS65917_SMPS3_VOLTAGE_RANGE                            0x80
+#define TPS65917_SMPS3_VOLTAGE_RANGE_SHIFT                      0x07
+#define TPS65917_SMPS3_VOLTAGE_VSEL_MASK                        0x7F
+#define TPS65917_SMPS3_VOLTAGE_VSEL_SHIFT                       0x00
+
+/* Bit definitions for SMPS4_CTRL */
+#define TPS65917_SMPS4_CTRL_WR_S                                0x80
+#define TPS65917_SMPS4_CTRL_WR_S_SHIFT                          0x07
+#define TPS65917_SMPS4_CTRL_ROOF_FLOOR_EN                       0x40
+#define TPS65917_SMPS4_CTRL_ROOF_FLOOR_EN_SHIFT         0x06
+#define TPS65917_SMPS4_CTRL_STATUS_MASK                 0x30
+#define TPS65917_SMPS4_CTRL_STATUS_SHIFT                        0x04
+#define TPS65917_SMPS4_CTRL_MODE_SLEEP_MASK                     0x0C
+#define TPS65917_SMPS4_CTRL_MODE_SLEEP_SHIFT                    0x02
+#define TPS65917_SMPS4_CTRL_MODE_ACTIVE_MASK                    0x03
+#define TPS65917_SMPS4_CTRL_MODE_ACTIVE_SHIFT                   0x00
+
+/* Bit definitions for SMPS4_VOLTAGE */
+#define TPS65917_SMPS4_VOLTAGE_RANGE                            0x80
+#define TPS65917_SMPS4_VOLTAGE_RANGE_SHIFT                      0x07
+#define TPS65917_SMPS4_VOLTAGE_VSEL_MASK                        0x7F
+#define TPS65917_SMPS4_VOLTAGE_VSEL_SHIFT                       0x00
+
+/* Bit definitions for SMPS5_CTRL */
+#define TPS65917_SMPS5_CTRL_WR_S                                0x80
+#define TPS65917_SMPS5_CTRL_WR_S_SHIFT                          0x07
+#define TPS65917_SMPS5_CTRL_ROOF_FLOOR_EN                       0x40
+#define TPS65917_SMPS5_CTRL_ROOF_FLOOR_EN_SHIFT         0x06
+#define TPS65917_SMPS5_CTRL_STATUS_MASK                 0x30
+#define TPS65917_SMPS5_CTRL_STATUS_SHIFT                        0x04
+#define TPS65917_SMPS5_CTRL_MODE_SLEEP_MASK                     0x0C
+#define TPS65917_SMPS5_CTRL_MODE_SLEEP_SHIFT                    0x02
+#define TPS65917_SMPS5_CTRL_MODE_ACTIVE_MASK                    0x03
+#define TPS65917_SMPS5_CTRL_MODE_ACTIVE_SHIFT                   0x00
+
+/* Bit definitions for SMPS5_VOLTAGE */
+#define TPS65917_SMPS5_VOLTAGE_RANGE                            0x80
+#define TPS65917_SMPS5_VOLTAGE_RANGE_SHIFT                      0x07
+#define TPS65917_SMPS5_VOLTAGE_VSEL_MASK                        0x7F
+#define TPS65917_SMPS5_VOLTAGE_VSEL_SHIFT                       0x00
+
+/* Bit definitions for SMPS_CTRL */
+#define TPS65917_SMPS_CTRL_SMPS1_SMPS12_EN                      0x10
+#define TPS65917_SMPS_CTRL_SMPS1_SMPS12_EN_SHIFT                0x04
+#define TPS65917_SMPS_CTRL_SMPS12_PHASE_CTRL                    0x03
+#define TPS65917_SMPS_CTRL_SMPS12_PHASE_CTRL_SHIFT              0x00
+
+/* Bit definitions for SMPS_PD_CTRL */
+#define TPS65917_SMPS_PD_CTRL_SMPS5                             0x40
+#define TPS65917_SMPS_PD_CTRL_SMPS5_SHIFT                       0x06
+#define TPS65917_SMPS_PD_CTRL_SMPS4                             0x10
+#define TPS65917_SMPS_PD_CTRL_SMPS4_SHIFT                       0x04
+#define TPS65917_SMPS_PD_CTRL_SMPS3                             0x08
+#define TPS65917_SMPS_PD_CTRL_SMPS3_SHIFT                       0x03
+#define TPS65917_SMPS_PD_CTRL_SMPS2                             0x02
+#define TPS65917_SMPS_PD_CTRL_SMPS2_SHIFT                       0x01
+#define TPS65917_SMPS_PD_CTRL_SMPS1                             0x01
+#define TPS65917_SMPS_PD_CTRL_SMPS1_SHIFT                       0x00
+
+/* Bit definitions for SMPS_THERMAL_EN */
+#define TPS65917_SMPS_THERMAL_EN_SMPS5                          0x40
+#define TPS65917_SMPS_THERMAL_EN_SMPS5_SHIFT                    0x06
+#define TPS65917_SMPS_THERMAL_EN_SMPS3                          0x08
+#define TPS65917_SMPS_THERMAL_EN_SMPS3_SHIFT                    0x03
+#define TPS65917_SMPS_THERMAL_EN_SMPS12                 0x01
+#define TPS65917_SMPS_THERMAL_EN_SMPS12_SHIFT                   0x00
+
+/* Bit definitions for SMPS_THERMAL_STATUS */
+#define TPS65917_SMPS_THERMAL_STATUS_SMPS5                      0x40
+#define TPS65917_SMPS_THERMAL_STATUS_SMPS5_SHIFT                0x06
+#define TPS65917_SMPS_THERMAL_STATUS_SMPS3                      0x08
+#define TPS65917_SMPS_THERMAL_STATUS_SMPS3_SHIFT                0x03
+#define TPS65917_SMPS_THERMAL_STATUS_SMPS12                     0x01
+#define TPS65917_SMPS_THERMAL_STATUS_SMPS12_SHIFT               0x00
+
+/* Bit definitions for SMPS_SHORT_STATUS */
+#define TPS65917_SMPS_SHORT_STATUS_SMPS5                        0x40
+#define TPS65917_SMPS_SHORT_STATUS_SMPS5_SHIFT                  0x06
+#define TPS65917_SMPS_SHORT_STATUS_SMPS4                        0x10
+#define TPS65917_SMPS_SHORT_STATUS_SMPS4_SHIFT                  0x04
+#define TPS65917_SMPS_SHORT_STATUS_SMPS3                        0x08
+#define TPS65917_SMPS_SHORT_STATUS_SMPS3_SHIFT                  0x03
+#define TPS65917_SMPS_SHORT_STATUS_SMPS2                        0x02
+#define TPS65917_SMPS_SHORT_STATUS_SMPS2_SHIFT                  0x01
+#define TPS65917_SMPS_SHORT_STATUS_SMPS1                        0x01
+#define TPS65917_SMPS_SHORT_STATUS_SMPS1_SHIFT                  0x00
+
+/* Bit definitions for SMPS_NEGATIVE_CURRENT_LIMIT_EN */
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS5           0x40
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS5_SHIFT     0x06
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS4           0x10
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS4_SHIFT     0x04
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS3           0x08
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS3_SHIFT     0x03
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS2           0x02
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS2_SHIFT     0x01
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS1           0x01
+#define TPS65917_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS1_SHIFT     0x00
+
+/* Bit definitions for SMPS_POWERGOOD_MASK1 */
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS5                     0x40
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS5_SHIFT               0x06
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS4                     0x10
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS4_SHIFT               0x04
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS3                     0x08
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS3_SHIFT               0x03
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS2                     0x02
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS2_SHIFT               0x01
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS1                     0x01
+#define TPS65917_SMPS_POWERGOOD_MASK1_SMPS1_SHIFT               0x00
+
+/* Bit definitions for SMPS_POWERGOOD_MASK2 */
+#define TPS65917_SMPS_POWERGOOD_MASK2_POWERGOOD_TYPE_SELECT             0x80
+#define TPS65917_SMPS_POWERGOOD_MASK2_POWERGOOD_TYPE_SELECT_SHIFT       0x07
+#define TPS65917_SMPS_POWERGOOD_MASK2_OVC_ALARM_SHIFT                   0x10
+#define TPS65917_SMPS_POWERGOOD_MASK2_OVC_ALARM                 0x04
+
+/* Bit definitions for SMPS_PLL_CTRL */
+
+#define TPS65917_SMPS_PLL_CTRL_PLL_EN_PLL_BYPASS_SHIFT          0x08
+#define TPS65917_SMPS_PLL_CTRL_PLL_PLL_EN_BYPASS                0x03
+#define TPS65917_SMPS_PLL_CTRL_PLL_PLL_BYPASS_CLK_SHIFT 0x04
+#define TPS65917_SMPS_PLL_CTRL_PLL_PLL_BYPASS_CLK               0x02
+
+/* Registers for function LDO */
+#define TPS65917_LDO1_CTRL                                      0x00
+#define TPS65917_LDO1_VOLTAGE                                   0x01
+#define TPS65917_LDO2_CTRL                                      0x02
+#define TPS65917_LDO2_VOLTAGE                                   0x03
+#define TPS65917_LDO3_CTRL                                      0x04
+#define TPS65917_LDO3_VOLTAGE                                   0x05
+#define TPS65917_LDO4_CTRL                                      0x0E
+#define TPS65917_LDO4_VOLTAGE                                   0x0F
+#define TPS65917_LDO5_CTRL                                      0x12
+#define TPS65917_LDO5_VOLTAGE                                   0x13
+#define TPS65917_LDO_PD_CTRL1                                   0x1B
+#define TPS65917_LDO_PD_CTRL2                                   0x1C
+#define TPS65917_LDO_SHORT_STATUS1                              0x1D
+#define TPS65917_LDO_SHORT_STATUS2                              0x1E
+#define TPS65917_LDO_PD_CTRL3                                   0x2D
+#define TPS65917_LDO_SHORT_STATUS3                              0x2E
+
+/* Bit definitions for LDO1_CTRL */
+#define TPS65917_LDO1_CTRL_WR_S                         0x80
+#define TPS65917_LDO1_CTRL_WR_S_SHIFT                           0x07
+#define TPS65917_LDO1_CTRL_BYPASS_EN                            0x40
+#define TPS65917_LDO1_CTRL_BYPASS_EN_SHIFT                      0x06
+#define TPS65917_LDO1_CTRL_STATUS                               0x10
+#define TPS65917_LDO1_CTRL_STATUS_SHIFT                 0x04
+#define TPS65917_LDO1_CTRL_MODE_SLEEP                           0x04
+#define TPS65917_LDO1_CTRL_MODE_SLEEP_SHIFT                     0x02
+#define TPS65917_LDO1_CTRL_MODE_ACTIVE                          0x01
+#define TPS65917_LDO1_CTRL_MODE_ACTIVE_SHIFT                    0x00
+
+/* Bit definitions for LDO1_VOLTAGE */
+#define TPS65917_LDO1_VOLTAGE_VSEL_MASK                 0x2F
+#define TPS65917_LDO1_VOLTAGE_VSEL_SHIFT                        0x00
+
+/* Bit definitions for LDO2_CTRL */
+#define TPS65917_LDO2_CTRL_WR_S                         0x80
+#define TPS65917_LDO2_CTRL_WR_S_SHIFT                           0x07
+#define TPS65917_LDO2_CTRL_BYPASS_EN                            0x40
+#define TPS65917_LDO2_CTRL_BYPASS_EN_SHIFT                      0x06
+#define TPS65917_LDO2_CTRL_STATUS                               0x10
+#define TPS65917_LDO2_CTRL_STATUS_SHIFT                 0x04
+#define TPS65917_LDO2_CTRL_MODE_SLEEP                           0x04
+#define TPS65917_LDO2_CTRL_MODE_SLEEP_SHIFT                     0x02
+#define TPS65917_LDO2_CTRL_MODE_ACTIVE                          0x01
+#define TPS65917_LDO2_CTRL_MODE_ACTIVE_SHIFT                    0x00
+
+/* Bit definitions for LDO2_VOLTAGE */
+#define TPS65917_LDO2_VOLTAGE_VSEL_MASK                 0x2F
+#define TPS65917_LDO2_VOLTAGE_VSEL_SHIFT                        0x00
+
+/* Bit definitions for LDO3_CTRL */
+#define TPS65917_LDO3_CTRL_WR_S                         0x80
+#define TPS65917_LDO3_CTRL_WR_S_SHIFT                           0x07
+#define TPS65917_LDO3_CTRL_STATUS                               0x10
+#define TPS65917_LDO3_CTRL_STATUS_SHIFT                 0x04
+#define TPS65917_LDO3_CTRL_MODE_SLEEP                           0x04
+#define TPS65917_LDO3_CTRL_MODE_SLEEP_SHIFT                     0x02
+#define TPS65917_LDO3_CTRL_MODE_ACTIVE                          0x01
+#define TPS65917_LDO3_CTRL_MODE_ACTIVE_SHIFT                    0x00
+
+/* Bit definitions for LDO3_VOLTAGE */
+#define TPS65917_LDO3_VOLTAGE_VSEL_MASK                 0x2F
+#define TPS65917_LDO3_VOLTAGE_VSEL_SHIFT                        0x00
+
+/* Bit definitions for LDO4_CTRL */
+#define TPS65917_LDO4_CTRL_WR_S                         0x80
+#define TPS65917_LDO4_CTRL_WR_S_SHIFT                           0x07
+#define TPS65917_LDO4_CTRL_STATUS                               0x10
+#define TPS65917_LDO4_CTRL_STATUS_SHIFT                 0x04
+#define TPS65917_LDO4_CTRL_MODE_SLEEP                           0x04
+#define TPS65917_LDO4_CTRL_MODE_SLEEP_SHIFT                     0x02
+#define TPS65917_LDO4_CTRL_MODE_ACTIVE                          0x01
+#define TPS65917_LDO4_CTRL_MODE_ACTIVE_SHIFT                    0x00
+
+/* Bit definitions for LDO4_VOLTAGE */
+#define TPS65917_LDO4_VOLTAGE_VSEL_MASK                 0x2F
+#define TPS65917_LDO4_VOLTAGE_VSEL_SHIFT                        0x00
+
+/* Bit definitions for LDO5_CTRL */
+#define TPS65917_LDO5_CTRL_WR_S                         0x80
+#define TPS65917_LDO5_CTRL_WR_S_SHIFT                           0x07
+#define TPS65917_LDO5_CTRL_STATUS                               0x10
+#define TPS65917_LDO5_CTRL_STATUS_SHIFT                 0x04
+#define TPS65917_LDO5_CTRL_MODE_SLEEP                           0x04
+#define TPS65917_LDO5_CTRL_MODE_SLEEP_SHIFT                     0x02
+#define TPS65917_LDO5_CTRL_MODE_ACTIVE                          0x01
+#define TPS65917_LDO5_CTRL_MODE_ACTIVE_SHIFT                    0x00
+
+/* Bit definitions for LDO5_VOLTAGE */
+#define TPS65917_LDO5_VOLTAGE_VSEL_MASK                 0x2F
+#define TPS65917_LDO5_VOLTAGE_VSEL_SHIFT                        0x00
+
+/* Bit definitions for LDO_PD_CTRL1 */
+#define TPS65917_LDO_PD_CTRL1_LDO4                              0x80
+#define TPS65917_LDO_PD_CTRL1_LDO4_SHIFT                        0x07
+#define TPS65917_LDO_PD_CTRL1_LDO2                              0x02
+#define TPS65917_LDO_PD_CTRL1_LDO2_SHIFT                        0x01
+#define TPS65917_LDO_PD_CTRL1_LDO1                              0x01
+#define TPS65917_LDO_PD_CTRL1_LDO1_SHIFT                        0x00
+
+/* Bit definitions for LDO_PD_CTRL2 */
+#define TPS65917_LDO_PD_CTRL2_LDO3                              0x04
+#define TPS65917_LDO_PD_CTRL2_LDO3_SHIFT                        0x02
+#define TPS65917_LDO_PD_CTRL2_LDO5                              0x02
+#define TPS65917_LDO_PD_CTRL2_LDO5_SHIFT                        0x01
+
+/* Bit definitions for LDO_PD_CTRL3 */
+#define TPS65917_LDO_PD_CTRL2_LDOVANA                           0x80
+#define TPS65917_LDO_PD_CTRL2_LDOVANA_SHIFT                     0x07
+
+/* Bit definitions for LDO_SHORT_STATUS1 */
+#define TPS65917_LDO_SHORT_STATUS1_LDO4                 0x80
+#define TPS65917_LDO_SHORT_STATUS1_LDO4_SHIFT                   0x07
+#define TPS65917_LDO_SHORT_STATUS1_LDO2                 0x02
+#define TPS65917_LDO_SHORT_STATUS1_LDO2_SHIFT                   0x01
+#define TPS65917_LDO_SHORT_STATUS1_LDO1                 0x01
+#define TPS65917_LDO_SHORT_STATUS1_LDO1_SHIFT                   0x00
+
+/* Bit definitions for LDO_SHORT_STATUS2 */
+#define TPS65917_LDO_SHORT_STATUS2_LDO3                 0x04
+#define TPS65917_LDO_SHORT_STATUS2_LDO3_SHIFT                   0x02
+#define TPS65917_LDO_SHORT_STATUS2_LDO5                 0x02
+#define TPS65917_LDO_SHORT_STATUS2_LDO5_SHIFT                   0x01
+
+/* Bit definitions for LDO_SHORT_STATUS2 */
+#define TPS65917_LDO_SHORT_STATUS2_LDOVANA                      0x80
+#define TPS65917_LDO_SHORT_STATUS2_LDOVANA_SHIFT                0x07
+
+/* Bit definitions for REGEN1_CTRL */
+#define TPS65917_REGEN1_CTRL_STATUS                             0x10
+#define TPS65917_REGEN1_CTRL_STATUS_SHIFT                       0x04
+#define TPS65917_REGEN1_CTRL_MODE_SLEEP                 0x04
+#define TPS65917_REGEN1_CTRL_MODE_SLEEP_SHIFT                   0x02
+#define TPS65917_REGEN1_CTRL_MODE_ACTIVE                        0x01
+#define TPS65917_REGEN1_CTRL_MODE_ACTIVE_SHIFT                  0x00
+
+/* Bit definitions for PLLEN_CTRL */
+#define TPS65917_PLLEN_CTRL_STATUS                              0x10
+#define TPS65917_PLLEN_CTRL_STATUS_SHIFT                        0x04
+#define TPS65917_PLLEN_CTRL_MODE_SLEEP                          0x04
+#define TPS65917_PLLEN_CTRL_MODE_SLEEP_SHIFT                    0x02
+#define TPS65917_PLLEN_CTRL_MODE_ACTIVE                 0x01
+#define TPS65917_PLLEN_CTRL_MODE_ACTIVE_SHIFT                   0x00
+
+/* Bit definitions for REGEN2_CTRL */
+#define TPS65917_REGEN2_CTRL_STATUS                             0x10
+#define TPS65917_REGEN2_CTRL_STATUS_SHIFT                       0x04
+#define TPS65917_REGEN2_CTRL_MODE_SLEEP                 0x04
+#define TPS65917_REGEN2_CTRL_MODE_SLEEP_SHIFT                   0x02
+#define TPS65917_REGEN2_CTRL_MODE_ACTIVE                        0x01
+#define TPS65917_REGEN2_CTRL_MODE_ACTIVE_SHIFT                  0x00
+
+/* Bit definitions for NSLEEP_RES_ASSIGN */
+#define TPS65917_NSLEEP_RES_ASSIGN_PLL_EN                       0x08
+#define TPS65917_NSLEEP_RES_ASSIGN_PLL_EN_SHIFT         0x03
+#define TPS65917_NSLEEP_RES_ASSIGN_REGEN3                       0x04
+#define TPS65917_NSLEEP_RES_ASSIGN_REGEN3_SHIFT         0x02
+#define TPS65917_NSLEEP_RES_ASSIGN_REGEN2                       0x02
+#define TPS65917_NSLEEP_RES_ASSIGN_REGEN2_SHIFT         0x01
+#define TPS65917_NSLEEP_RES_ASSIGN_REGEN1                       0x01
+#define TPS65917_NSLEEP_RES_ASSIGN_REGEN1_SHIFT         0x00
+
+/* Bit definitions for NSLEEP_SMPS_ASSIGN */
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS5                       0x40
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS5_SHIFT         0x06
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS4                       0x10
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS4_SHIFT         0x04
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS3                       0x08
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS3_SHIFT         0x03
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS2                       0x02
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS2_SHIFT         0x01
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS1                       0x01
+#define TPS65917_NSLEEP_SMPS_ASSIGN_SMPS1_SHIFT         0x00
+
+/* Bit definitions for NSLEEP_LDO_ASSIGN1 */
+#define TPS65917_NSLEEP_LDO_ASSIGN1_LDO4                        0x80
+#define TPS65917_NSLEEP_LDO_ASSIGN1_LDO4_SHIFT                  0x07
+#define TPS65917_NSLEEP_LDO_ASSIGN1_LDO2                        0x02
+#define TPS65917_NSLEEP_LDO_ASSIGN1_LDO2_SHIFT                  0x01
+#define TPS65917_NSLEEP_LDO_ASSIGN1_LDO1                        0x01
+#define TPS65917_NSLEEP_LDO_ASSIGN1_LDO1_SHIFT                  0x00
+
+/* Bit definitions for NSLEEP_LDO_ASSIGN2 */
+#define TPS65917_NSLEEP_LDO_ASSIGN2_LDO3                        0x04
+#define TPS65917_NSLEEP_LDO_ASSIGN2_LDO3_SHIFT                  0x02
+#define TPS65917_NSLEEP_LDO_ASSIGN2_LDO5                        0x02
+#define TPS65917_NSLEEP_LDO_ASSIGN2_LDO5_SHIFT                  0x01
+
+/* Bit definitions for ENABLE1_RES_ASSIGN */
+#define TPS65917_ENABLE1_RES_ASSIGN_PLLEN                       0x08
+#define TPS65917_ENABLE1_RES_ASSIGN_PLLEN_SHIFT         0x03
+#define TPS65917_ENABLE1_RES_ASSIGN_REGEN3                      0x04
+#define TPS65917_ENABLE1_RES_ASSIGN_REGEN3_SHIFT                0x02
+#define TPS65917_ENABLE1_RES_ASSIGN_REGEN2                      0x02
+#define TPS65917_ENABLE1_RES_ASSIGN_REGEN2_SHIFT                0x01
+#define TPS65917_ENABLE1_RES_ASSIGN_REGEN1                      0x01
+#define TPS65917_ENABLE1_RES_ASSIGN_REGEN1_SHIFT                0x00
+
+/* Bit definitions for ENABLE1_SMPS_ASSIGN */
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS5                      0x40
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS5_SHIFT                0x06
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS4                      0x10
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS4_SHIFT                0x04
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS3                      0x08
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS3_SHIFT                0x03
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS2                      0x02
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS2_SHIFT                0x01
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS1                      0x01
+#define TPS65917_ENABLE1_SMPS_ASSIGN_SMPS1_SHIFT                0x00
+
+/* Bit definitions for ENABLE1_LDO_ASSIGN1 */
+#define TPS65917_ENABLE1_LDO_ASSIGN1_LDO4                       0x80
+#define TPS65917_ENABLE1_LDO_ASSIGN1_LDO4_SHIFT         0x07
+#define TPS65917_ENABLE1_LDO_ASSIGN1_LDO2                       0x02
+#define TPS65917_ENABLE1_LDO_ASSIGN1_LDO2_SHIFT         0x01
+#define TPS65917_ENABLE1_LDO_ASSIGN1_LDO1                       0x01
+#define TPS65917_ENABLE1_LDO_ASSIGN1_LDO1_SHIFT         0x00
+
+/* Bit definitions for ENABLE1_LDO_ASSIGN2 */
+#define TPS65917_ENABLE1_LDO_ASSIGN2_LDO3                       0x04
+#define TPS65917_ENABLE1_LDO_ASSIGN2_LDO3_SHIFT         0x02
+#define TPS65917_ENABLE1_LDO_ASSIGN2_LDO5                       0x02
+#define TPS65917_ENABLE1_LDO_ASSIGN2_LDO5_SHIFT         0x01
+
+/* Bit definitions for ENABLE2_RES_ASSIGN */
+#define TPS65917_ENABLE2_RES_ASSIGN_PLLEN                       0x08
+#define TPS65917_ENABLE2_RES_ASSIGN_PLLEN_SHIFT         0x03
+#define TPS65917_ENABLE2_RES_ASSIGN_REGEN3                      0x04
+#define TPS65917_ENABLE2_RES_ASSIGN_REGEN3_SHIFT                0x02
+#define TPS65917_ENABLE2_RES_ASSIGN_REGEN2                      0x02
+#define TPS65917_ENABLE2_RES_ASSIGN_REGEN2_SHIFT                0x01
+#define TPS65917_ENABLE2_RES_ASSIGN_REGEN1                      0x01
+#define TPS65917_ENABLE2_RES_ASSIGN_REGEN1_SHIFT                0x00
+
+/* Bit definitions for ENABLE2_SMPS_ASSIGN */
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS5                      0x40
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS5_SHIFT                0x06
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS4                      0x10
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS4_SHIFT                0x04
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS3                      0x08
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS3_SHIFT                0x03
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS2                      0x02
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS2_SHIFT                0x01
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS1                      0x01
+#define TPS65917_ENABLE2_SMPS_ASSIGN_SMPS1_SHIFT                0x00
+
+/* Bit definitions for ENABLE2_LDO_ASSIGN1 */
+#define TPS65917_ENABLE2_LDO_ASSIGN1_LDO4                       0x80
+#define TPS65917_ENABLE2_LDO_ASSIGN1_LDO4_SHIFT         0x07
+#define TPS65917_ENABLE2_LDO_ASSIGN1_LDO2                       0x02
+#define TPS65917_ENABLE2_LDO_ASSIGN1_LDO2_SHIFT         0x01
+#define TPS65917_ENABLE2_LDO_ASSIGN1_LDO1                       0x01
+#define TPS65917_ENABLE2_LDO_ASSIGN1_LDO1_SHIFT         0x00
+
+/* Bit definitions for ENABLE2_LDO_ASSIGN2 */
+#define TPS65917_ENABLE2_LDO_ASSIGN2_LDO3                       0x04
+#define TPS65917_ENABLE2_LDO_ASSIGN2_LDO3_SHIFT         0x02
+#define TPS65917_ENABLE2_LDO_ASSIGN2_LDO5                       0x02
+#define TPS65917_ENABLE2_LDO_ASSIGN2_LDO5_SHIFT         0x01
+
+/* Bit definitions for REGEN3_CTRL */
+#define TPS65917_REGEN3_CTRL_STATUS                             0x10
+#define TPS65917_REGEN3_CTRL_STATUS_SHIFT                       0x04
+#define TPS65917_REGEN3_CTRL_MODE_SLEEP                 0x04
+#define TPS65917_REGEN3_CTRL_MODE_SLEEP_SHIFT                   0x02
+#define TPS65917_REGEN3_CTRL_MODE_ACTIVE                        0x01
+#define TPS65917_REGEN3_CTRL_MODE_ACTIVE_SHIFT                  0x00
+
+/* Registers for function RESOURCE */
+#define TPS65917_REGEN1_CTRL                                    0x2
+#define TPS65917_PLLEN_CTRL                                     0x3
+#define TPS65917_NSLEEP_RES_ASSIGN                              0x6
+#define TPS65917_NSLEEP_SMPS_ASSIGN                             0x7
+#define TPS65917_NSLEEP_LDO_ASSIGN1                             0x8
+#define TPS65917_NSLEEP_LDO_ASSIGN2                             0x9
+#define TPS65917_ENABLE1_RES_ASSIGN                             0xA
+#define TPS65917_ENABLE1_SMPS_ASSIGN                            0xB
+#define TPS65917_ENABLE1_LDO_ASSIGN1                            0xC
+#define TPS65917_ENABLE1_LDO_ASSIGN2                            0xD
+#define TPS65917_ENABLE2_RES_ASSIGN                             0xE
+#define TPS65917_ENABLE2_SMPS_ASSIGN                            0xF
+#define TPS65917_ENABLE2_LDO_ASSIGN1                            0x10
+#define TPS65917_ENABLE2_LDO_ASSIGN2                            0x11
+#define TPS65917_REGEN2_CTRL                                    0x12
+#define TPS65917_REGEN3_CTRL                                    0x13
+
 static inline int palmas_read(struct palmas *palmas, unsigned int base,
                 unsigned int reg, unsigned int *val)
 {
diff --git a/include/linux/mic_bus.h b/include/linux/mic_bus.h
new file mode 100644
index 000000000000..d5b5f76d57ef
--- /dev/null
+++ b/include/linux/mic_bus.h
@@ -0,0 +1,110 @@
+/*
+ * Intel MIC Platform Software Stack (MPSS)
+ *
+ * Copyright(c) 2014 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.
+ *
+ * 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.
+ *
+ * The full GNU General Public License is included in this distribution in
+ * the file called "COPYING".
+ *
+ * Intel MIC Bus driver.
+ *
+ * This implementation is very similar to the the virtio bus driver
+ * implementation @ include/linux/virtio.h.
+ */
+#ifndef _MIC_BUS_H_
+#define _MIC_BUS_H_
+/*
+ * Everything a mbus driver needs to work with any particular mbus
+ * implementation.
+ */
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+
+struct mbus_device_id {
+        __u32 device;
+        __u32 vendor;
+};
+
+#define MBUS_DEV_DMA_HOST 2
+#define MBUS_DEV_DMA_MIC 3
+#define MBUS_DEV_ANY_ID 0xffffffff
+
+/**
+ * mbus_device - representation of a device using mbus
+ * @mmio_va: virtual address of mmio space
+ * @hw_ops: the hardware ops supported by this device.
+ * @id: the device type identification (used to match it with a driver).
+ * @dev: underlying device.
+ * be used to communicate with.
+ * @index: unique position on the mbus bus
+ */
+struct mbus_device {
+        void __iomem *mmio_va;
+        struct mbus_hw_ops *hw_ops;
+        struct mbus_device_id id;
+        struct device dev;
+        int index;
+};
+
+/**
+ * mbus_driver - operations for a mbus I/O driver
+ * @driver: underlying device driver (populate name and owner).
+ * @id_table: the ids serviced by this driver.
+ * @probe: the function to call when a device is found.  Returns 0 or -errno.
+ * @remove: the function to call when a device is removed.
+ */
+struct mbus_driver {
+        struct device_driver driver;
+        const struct mbus_device_id *id_table;
+        int (*probe)(struct mbus_device *dev);
+        void (*scan)(struct mbus_device *dev);
+        void (*remove)(struct mbus_device *dev);
+};
+
+/**
+ * struct mic_irq - opaque pointer used as cookie
+ */
+struct mic_irq;
+
+/**
+ * mbus_hw_ops - Hardware operations for accessing a MIC device on the MIC bus.
+ */
+struct mbus_hw_ops {
+        struct mic_irq* (*request_threaded_irq)(struct mbus_device *mbdev,
+                                                irq_handler_t handler,
+                                                irq_handler_t thread_fn,
+                                                const char *name, void *data,
+                                                int intr_src);
+        void (*free_irq)(struct mbus_device *mbdev,
+                         struct mic_irq *cookie, void *data);
+        void (*ack_interrupt)(struct mbus_device *mbdev, int num);
+};
+
+struct mbus_device *
+mbus_register_device(struct device *pdev, int id, struct dma_map_ops *dma_ops,
+                     struct mbus_hw_ops *hw_ops, void __iomem *mmio_va);
+void mbus_unregister_device(struct mbus_device *mbdev);
+
+int mbus_register_driver(struct mbus_driver *drv);
+void mbus_unregister_driver(struct mbus_driver *drv);
+
+static inline struct mbus_device *dev_to_mbus(struct device *_dev)
+{
+        return container_of(_dev, struct mbus_device, dev);
+}
+
+static inline struct mbus_driver *drv_to_mbus(struct device_driver *drv)
+{
+        return container_of(drv, struct mbus_driver, driver);
+}
+
+#endif /* _MIC_BUS_H */
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 35b51e7af886..e15b1544ea83 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -48,6 +48,17 @@
 #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
+                                                 * using 100 Mbps units.
+                                                 */
+#define MLX4_RATELIMIT_100M_UNITS       3       /* 100 Mbps */
+#define MLX4_RATELIMIT_1G_UNITS         4       /* 1 Gbps */
+#define MLX4_RATELIMIT_DEFAULT          0x00ff
+
 #define MLX4_ROCE_MAX_GIDS      128
 #define MLX4_ROCE_PF_GIDS       16
 
@@ -1243,4 +1254,11 @@ int mlx4_vf_smi_enabled(struct mlx4_dev *dev, int slave, int port);
 int mlx4_vf_get_enable_smi_admin(struct mlx4_dev *dev, int slave, int port);
 int mlx4_vf_set_enable_smi_admin(struct mlx4_dev *dev, int slave, int port,
                                  int enable);
+
+/* Returns true if running in low memory profile (kdump kernel) */
+static inline bool mlx4_low_memory_profile(void)
+{
+        return reset_devices;
+}
+
 #endif /* MLX4_DEVICE_H */
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 3406cfb1267a..334947151dfc 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -456,9 +456,6 @@ struct mlx5_eqe_cq_err {
         u8      syndrome;
 };
 
-struct mlx5_eqe_dropped_packet {
-};
-
 struct mlx5_eqe_port_state {
         u8      reserved0[8];
         u8      port;
@@ -498,7 +495,6 @@ union ev_data {
         struct mlx5_eqe_comp            comp;
         struct mlx5_eqe_qp_srq          qp_srq;
         struct mlx5_eqe_cq_err          cq_err;
-        struct mlx5_eqe_dropped_packet  dp;
         struct mlx5_eqe_port_state      port;
         struct mlx5_eqe_gpio            gpio;
         struct mlx5_eqe_congestion      cong;
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 2bce4aad2570..b88e9b46d957 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -381,8 +381,8 @@ struct mlx5_buf {
         struct mlx5_buf_list   *page_list;
         int                     nbufs;
         int                     npages;
-        int                     page_shift;
         int                     size;
+        u8                      page_shift;
 };
 
 struct mlx5_eq {
@@ -543,6 +543,10 @@ struct mlx5_priv {
         /* protect mkey key part */
         spinlock_t              mkey_lock;
         u8                      mkey_key;
+
+        struct list_head        dev_list;
+        struct list_head        ctx_list;
+        spinlock_t              ctx_lock;
 };
 
 struct mlx5_core_dev {
@@ -555,7 +559,7 @@ struct mlx5_core_dev {
         struct mlx5_init_seg __iomem *iseg;
         void                    (*event) (struct mlx5_core_dev *dev,
                                           enum mlx5_dev_event event,
-                                          void *data);
+                                          unsigned long param);
         struct mlx5_priv        priv;
         struct mlx5_profile     *profile;
         atomic_t                num_qps;
@@ -604,8 +608,8 @@ struct mlx5_cmd_work_ent {
         int                     page_queue;
         u8                      status;
         u8                      token;
-        struct timespec         ts1;
-        struct timespec         ts2;
+        u64                     ts1;
+        u64                     ts2;
         u16                     op;
 };
 
@@ -686,8 +690,6 @@ static inline u32 mlx5_base_mkey(const u32 key)
         return key & 0xffffff00u;
 }
 
-int mlx5_dev_init(struct mlx5_core_dev *dev, struct pci_dev *pdev);
-void mlx5_dev_cleanup(struct mlx5_core_dev *dev);
 int mlx5_cmd_init(struct mlx5_core_dev *dev);
 void mlx5_cmd_cleanup(struct mlx5_core_dev *dev);
 void mlx5_cmd_use_events(struct mlx5_core_dev *dev);
@@ -734,7 +736,7 @@ int mlx5_core_dump_fill_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
 int mlx5_core_alloc_pd(struct mlx5_core_dev *dev, u32 *pdn);
 int mlx5_core_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn);
 int mlx5_core_mad_ifc(struct mlx5_core_dev *dev, void *inb, void *outb,
-                      u16 opmod, int port);
+                      u16 opmod, u8 port);
 void mlx5_pagealloc_init(struct mlx5_core_dev *dev);
 void mlx5_pagealloc_cleanup(struct mlx5_core_dev *dev);
 int mlx5_pagealloc_start(struct mlx5_core_dev *dev);
@@ -767,7 +769,7 @@ void mlx5_qp_debugfs_cleanup(struct mlx5_core_dev *dev);
 int mlx5_core_access_reg(struct mlx5_core_dev *dev, void *data_in,
                          int size_in, void *data_out, int size_out,
                          u16 reg_num, int arg, int write);
-int mlx5_set_port_caps(struct mlx5_core_dev *dev, int port_num, u32 caps);
+int mlx5_set_port_caps(struct mlx5_core_dev *dev, u8 port_num, u32 caps);
 
 int mlx5_debug_eq_add(struct mlx5_core_dev *dev, struct mlx5_eq *eq);
 void mlx5_debug_eq_remove(struct mlx5_core_dev *dev, struct mlx5_eq *eq);
@@ -811,9 +813,20 @@ enum {
         MAX_MR_CACHE_ENTRIES    = 16,
 };
 
+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);
+        struct list_head        list;
+};
+
+int mlx5_register_interface(struct mlx5_interface *intf);
+void mlx5_unregister_interface(struct mlx5_interface *intf);
+
 struct mlx5_profile {
         u64     mask;
-        u32     log_max_qp;
+        u8      log_max_qp;
         struct {
                 int     size;
                 int     limit;
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 96c5750e3110..796deac19fcf 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -516,4 +516,12 @@ struct vm_special_mapping
         struct page **pages;
 };
 
+enum tlb_flush_reason {
+        TLB_FLUSH_ON_TASK_SWITCH,
+        TLB_REMOTE_SHOOTDOWN,
+        TLB_LOCAL_SHOOTDOWN,
+        TLB_LOCAL_MM_SHOOTDOWN,
+        NR_TLB_FLUSH_REASONS,
+};
+
 #endif /* _LINUX_MM_TYPES_H */
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index b1990c5524e1..494f99e852da 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -381,6 +381,11 @@ extern int param_set_ulong(const char *val, const struct kernel_param *kp);
 extern int param_get_ulong(char *buffer, const struct kernel_param *kp);
 #define param_check_ulong(name, p) __param_check(name, p, unsigned long)
 
+extern struct kernel_param_ops param_ops_ullong;
+extern int param_set_ullong(const char *val, const struct kernel_param *kp);
+extern int param_get_ullong(char *buffer, const struct kernel_param *kp);
+#define param_check_ullong(name, p) __param_check(name, p, unsigned long long)
+
 extern struct kernel_param_ops param_ops_charp;
 extern int param_set_charp(const char *val, const struct kernel_param *kp);
 extern int param_get_charp(char *buffer, const struct kernel_param *kp);
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 92a2f991262a..8103f32f6d87 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -25,7 +25,8 @@ void write_msi_msg(unsigned int irq, struct msi_msg *msg);
 struct msi_desc {
         struct {
                 __u8    is_msix : 1;
-                __u8    multiple: 3;    /* log2 number of messages */
+                __u8    multiple: 3;    /* log2 num of messages allocated */
+                __u8    multi_cap : 3;  /* log2 num of messages supported */
                 __u8    maskbit : 1;    /* mask-pending bit supported ? */
                 __u8    is_64   : 1;    /* Address size: 0=32bit 1=64bit */
                 __u8    pos;            /* Location of the msi capability */
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 42aa9b9ecd5f..8d5535c58cc2 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -176,8 +176,4 @@ extern void mutex_unlock(struct mutex *lock);
 
 extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
 
-#ifndef arch_mutex_cpu_relax
-# define arch_mutex_cpu_relax() cpu_relax()
-#endif
-
 #endif /* __LINUX_MUTEX_H */
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index d99800cbdcf3..dcfdecbfa0b7 100644
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -176,4 +176,12 @@ enum {
                                  NETIF_F_HW_VLAN_STAG_RX | \
                                  NETIF_F_HW_VLAN_STAG_TX)
 
+#define NETIF_F_GSO_ENCAP_ALL   (NETIF_F_GSO_GRE |                      \
+                                 NETIF_F_GSO_GRE_CSUM |                 \
+                                 NETIF_F_GSO_IPIP |                     \
+                                 NETIF_F_GSO_SIT |                      \
+                                 NETIF_F_GSO_UDP_TUNNEL |               \
+                                 NETIF_F_GSO_UDP_TUNNEL_CSUM |          \
+                                 NETIF_F_GSO_MPLS)
+
 #endif  /* _LINUX_NETDEV_FEATURES_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 66f9a04ec270..38377392d082 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -943,7 +943,8 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
  *                    const unsigned char *addr)
  *      Deletes the FDB entry from dev coresponding to addr.
  * int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb,
- *                     struct net_device *dev, int idx)
+ *                     struct net_device *dev, struct net_device *filter_dev,
+ *                     int idx)
  *      Used to add FDB entries to dump requests. Implementers should add
  *      entries to skb and update idx with the number of entries.
  *
@@ -1114,6 +1115,7 @@ struct net_device_ops {
         int                     (*ndo_fdb_dump)(struct sk_buff *skb,
                                                 struct netlink_callback *cb,
                                                 struct net_device *dev,
+                                                struct net_device *filter_dev,
                                                 int idx);
 
         int                     (*ndo_bridge_setlink)(struct net_device *dev,
@@ -1229,42 +1231,228 @@ enum netdev_priv_flags {
 #define IFF_LIVE_ADDR_CHANGE            IFF_LIVE_ADDR_CHANGE
 #define IFF_MACVLAN                     IFF_MACVLAN
 
-/*
- *      The DEVICE structure.
- *      Actually, this whole structure is a big mistake.  It mixes I/O
- *      data with strictly "high-level" data, and it has to know about
- *      almost every data structure used in the INET module.
+/**
+ *      struct net_device - The DEVICE structure.
+ *              Actually, this whole structure is a big mistake.  It mixes I/O
+ *              data with strictly "high-level" data, and it has to know about
+ *              almost every data structure used in the INET module.
+ *
+ *      @name:  This is the first field of the "visible" part of this structure
+ *              (i.e. as seen by users in the "Space.c" file).  It is the name
+ *              of the interface.
+ *
+ *      @name_hlist:    Device name hash chain, please keep it close to name[]
+ *      @ifalias:       SNMP alias
+ *      @mem_end:       Shared memory end
+ *      @mem_start:     Shared memory start
+ *      @base_addr:     Device I/O address
+ *      @irq:           Device IRQ number
+ *
+ *      @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
+ *      @unreg_list:    List entry, that is used, when we are unregistering the
+ *                      device, see the function unregister_netdev
+ *      @close_list:    List entry, that is used, when we are closing the device
+ *
+ *      @adj_list:      Directly linked devices, like slaves for bonding
+ *      @all_adj_list:  All linked devices, *including* neighbours
+ *      @features:      Currently active device features
+ *      @hw_features:   User-changeable features
+ *
+ *      @wanted_features:       User-requested features
+ *      @vlan_features:         Mask of features inheritable by VLAN devices
+ *
+ *      @hw_enc_features:       Mask of features inherited by encapsulating devices
+ *                              This field indicates what encapsulation
+ *                              offloads the hardware is capable of doing,
+ *                              and drivers will need to set them appropriately.
+ *
+ *      @mpls_features: Mask of features inheritable by MPLS
+ *
+ *      @ifindex:       interface index
+ *      @iflink:        unique device identifier
+ *
+ *      @stats:         Statistics struct, which was left as a legacy, use
+ *                      rtnl_link_stats64 instead
+ *
+ *      @rx_dropped:    Dropped packets by core network,
+ *                      do not use this in drivers
+ *      @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.
+ *      @wireless_data: Instance data managed by the core of wireless extensions
+ *
+ *      @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
+ *                      of Layer 2 headers.
+ *
+ *      @flags:         Interface flags (a la BSD)
+ *      @priv_flags:    Like 'flags' but invisible to userspace,
+ *                      see if.h for the definitions
+ *      @gflags:        Global flags ( kept as legacy )
+ *      @padded:        How much padding added by alloc_netdev()
+ *      @operstate:     RFC2863 operstate
+ *      @link_mode:     Mapping policy to operstate
+ *      @if_port:       Selectable AUI, TP, ...
+ *      @dma:           DMA channel
+ *      @mtu:           Interface MTU value
+ *      @type:          Interface hardware type
+ *      @hard_header_len: Hardware header length
+ *
+ *      @needed_headroom: Extra headroom the hardware may need, but not in all
+ *                        cases can this be guaranteed
+ *      @needed_tailroom: Extra tailroom the hardware may need, but not in all
+ *                        cases can this be guaranteed. Some cases also use
+ *                        LL_MAX_HEADER instead to allocate the skb
+ *
+ *      interface address info:
+ *
+ *      @perm_addr:             Permanent hw address
+ *      @addr_assign_type:      Hw address assignment type
+ *      @addr_len:              Hardware address length
+ *      @neigh_priv_len;        Used in neigh_alloc(),
+ *                              initialized only in atm/clip.c
+ *      @dev_id:                Used to differentiate devices that share
+ *                              the same link layer address
+ *      @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()
+ *      @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
+ *      @allmulti:              Counter, enables or disables allmulticast mode
+ *
+ *      @vlan_info:     VLAN info
+ *      @dsa_ptr:       dsa specific data
+ *      @tipc_ptr:      TIPC specific data
+ *      @atalk_ptr:     AppleTalk link
+ *      @ip_ptr:        IPv4 specific data
+ *      @dn_ptr:        DECnet specific data
+ *      @ip6_ptr:       IPv6 specific data
+ *      @ax25_ptr:      AX.25 specific data
+ *      @ieee80211_ptr: IEEE 802.11 specific data, assign before registering
+ *
+ *      @last_rx:       Time of last Rx
+ *      @dev_addr:      Hw address (before bcast,
+ *                      because most packets are unicast)
+ *
+ *      @_rx:                   Array of RX queues
+ *      @num_rx_queues:         Number of RX queues
+ *                              allocated at register_netdev() time
+ *      @real_num_rx_queues:    Number of RX queues currently active in device
+ *
+ *      @rx_handler:            handler for received packets
+ *      @rx_handler_data:       XXX: need comments on this one
+ *      @ingress_queue:         XXX: need comments on this one
+ *      @broadcast:             hw bcast address
+ *
+ *      @_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
+ *      @qdisc:                 Root qdisc from userspace point of view
+ *      @tx_queue_len:          Max frames per queue allowed
+ *      @tx_global_lock:        XXX: need comments on this one
+ *
+ *      @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() )
+ *      @watchdog_timer:        List of timers
+ *
+ *      @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
+ *      @dismantle:             Device is going to be freed
+ *      @rtnl_link_state:       This enum represents the phases of creating
+ *                              a new link
+ *
+ *      @destructor:            Called from unregister,
+ *                              can be used to call free_netdev
+ *      @npinfo:                XXX: need comments on this one
+ *      @nd_net:                Network namespace this network device is inside
+ *
+ *      @ml_priv:       Mid-layer private
+ *      @lstats:        Loopback statistics
+ *      @tstats:        Tunnel statistics
+ *      @dstats:        Dummy statistics
+ *      @vstats:        Virtual ethernet statistics
+ *
+ *      @garp_port:     GARP
+ *      @mrp_port:      MRP
+ *
+ *      @dev:           Class/net/name entry
+ *      @sysfs_groups:  Space for optional device, statistics and wireless
+ *                      sysfs groups
+ *
+ *      @sysfs_rx_queue_group:  Space for optional per-rx queue attributes
+ *      @rtnl_link_ops: Rtnl_link_ops
+ *
+ *      @gso_max_size:  Maximum size of generic segmentation offload
+ *      @gso_max_segs:  Maximum number of segments that can be passed to the
+ *                      NIC for GSO
+ *
+ *      @dcbnl_ops:     Data Center Bridging netlink ops
+ *      @num_tc:        Number of traffic classes in the net device
+ *      @tc_to_txq:     XXX: need comments on this one
+ *      @prio_tc_map    XXX: need comments on this one
+ *
+ *      @fcoe_ddp_xid:  Max exchange id for FCoE LRO by ddp
+ *
+ *      @priomap:       XXX: need comments on this one
+ *      @phydev:        Physical device may attach itself
+ *                      for hardware timestamping
+ *
+ *      @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
  *      moves out.
  */
 
 struct net_device {
-
-        /*
-         * This is the first field of the "visible" part of this structure
-         * (i.e. as seen by users in the "Space.c" file).  It is the name
-         * of the interface.
-         */
         char                    name[IFNAMSIZ];
-
-        /* device name hash chain, please keep it close to name[] */
         struct hlist_node       name_hlist;
-
-        /* snmp alias */
         char                    *ifalias;
-
         /*
          *      I/O specific fields
          *      FIXME: Merge these and struct ifmap into one
          */
-        unsigned long           mem_end;        /* shared mem end       */
-        unsigned long           mem_start;      /* shared mem start     */
-        unsigned long           base_addr;      /* device I/O address   */
-        int                     irq;            /* device IRQ number    */
+        unsigned long           mem_end;
+        unsigned long           mem_start;
+        unsigned long           base_addr;
+        int                     irq;
 
         /*
-         *      Some hardware also needs these fields, but they are not
+         *      Some hardware also needs these fields (state,dev_list,
+         *      napi_list,unreg_list,close_list) but they are not
          *      part of the usual set specified in Space.c.
          */
 
@@ -1275,110 +1463,80 @@ struct net_device {
         struct list_head        unreg_list;
         struct list_head        close_list;
 
-        /* directly linked devices, like slaves for bonding */
         struct {
                 struct list_head upper;
                 struct list_head lower;
         } adj_list;
 
-        /* all linked devices, *including* neighbours */
         struct {
                 struct list_head upper;
                 struct list_head lower;
         } all_adj_list;
 
-
-        /* currently active device features */
         netdev_features_t       features;
-        /* user-changeable features */
         netdev_features_t       hw_features;
-        /* user-requested features */
         netdev_features_t       wanted_features;
-        /* mask of features inheritable by VLAN devices */
         netdev_features_t       vlan_features;
-        /* mask of features inherited by encapsulating devices
-         * This field indicates what encapsulation offloads
-         * the hardware is capable of doing, and drivers will
-         * need to set them appropriately.
-         */
         netdev_features_t       hw_enc_features;
-        /* mask of fetures inheritable by MPLS */
         netdev_features_t       mpls_features;
 
-        /* Interface index. Unique device identifier    */
         int                     ifindex;
         int                     iflink;
 
         struct net_device_stats stats;
 
-        /* dropped packets by core network, Do not use this in drivers */
         atomic_long_t           rx_dropped;
         atomic_long_t           tx_dropped;
 
-        /* Stats to monitor carrier on<->off transitions */
         atomic_t                carrier_changes;
 
 #ifdef CONFIG_WIRELESS_EXT
-        /* List of functions to handle Wireless Extensions (instead of ioctl).
-         * See <net/iw_handler.h> for details. Jean II */
         const struct iw_handler_def *   wireless_handlers;
-        /* Instance data managed by the core of Wireless Extensions. */
         struct iw_public_data * wireless_data;
 #endif
-        /* Management operations */
         const struct net_device_ops *netdev_ops;
         const struct ethtool_ops *ethtool_ops;
         const struct forwarding_accel_ops *fwd_ops;
 
-        /* Hardware header description */
         const struct header_ops *header_ops;
 
-        unsigned int            flags;  /* interface flags (a la BSD)   */
-        unsigned int            priv_flags; /* Like 'flags' but invisible to userspace.
-                                             * See if.h for definitions. */
+        unsigned int            flags;
+        unsigned int            priv_flags;
+
         unsigned short          gflags;
-        unsigned short          padded; /* How much padding added by alloc_netdev() */
+        unsigned short          padded;
 
-        unsigned char           operstate; /* RFC2863 operstate */
-        unsigned char           link_mode; /* mapping policy to operstate */
+        unsigned char           operstate;
+        unsigned char           link_mode;
 
-        unsigned char           if_port;        /* Selectable AUI, TP,..*/
-        unsigned char           dma;            /* DMA channel          */
+        unsigned char           if_port;
+        unsigned char           dma;
 
-        unsigned int            mtu;    /* interface MTU value          */
-        unsigned short          type;   /* interface hardware type      */
-        unsigned short          hard_header_len;        /* hardware hdr length  */
+        unsigned int            mtu;
+        unsigned short          type;
+        unsigned short          hard_header_len;
 
-        /* extra head- and tailroom the hardware may need, but not in all cases
-         * can this be guaranteed, especially tailroom. Some cases also use
-         * LL_MAX_HEADER instead to allocate the skb.
-         */
         unsigned short          needed_headroom;
         unsigned short          needed_tailroom;
 
         /* Interface address info. */
-        unsigned char           perm_addr[MAX_ADDR_LEN]; /* permanent hw address */
-        unsigned char           addr_assign_type; /* hw address assignment type */
-        unsigned char           addr_len;       /* hardware address length      */
+        unsigned char           perm_addr[MAX_ADDR_LEN];
+        unsigned char           addr_assign_type;
+        unsigned char           addr_len;
         unsigned short          neigh_priv_len;
-        unsigned short          dev_id;         /* Used to differentiate devices
-                                                 * that share the same link
-                                                 * layer address
-                                                 */
-        unsigned short          dev_port;       /* Used to differentiate
-                                                 * devices that share the same
-                                                 * function
-                                                 */
+        unsigned short          dev_id;
+        unsigned short          dev_port;
         spinlock_t              addr_list_lock;
-        struct netdev_hw_addr_list      uc;     /* Unicast mac addresses */
-        struct netdev_hw_addr_list      mc;     /* Multicast mac addresses */
-        struct netdev_hw_addr_list      dev_addrs; /* list of device
-                                                    * hw addresses
-                                                    */
+        struct netdev_hw_addr_list      uc;
+        struct netdev_hw_addr_list      mc;
+        struct netdev_hw_addr_list      dev_addrs;
+
 #ifdef CONFIG_SYSFS
         struct kset             *queues_kset;
 #endif
 
+        unsigned char           name_assign_type;
+
         bool                    uc_promisc;
         unsigned int            promiscuity;
         unsigned int            allmulti;
@@ -1387,40 +1545,34 @@ struct net_device {
         /* Protocol specific pointers */
 
 #if IS_ENABLED(CONFIG_VLAN_8021Q)
-        struct vlan_info __rcu  *vlan_info;     /* VLAN info */
+        struct vlan_info __rcu  *vlan_info;
 #endif
 #if IS_ENABLED(CONFIG_NET_DSA)
-        struct dsa_switch_tree  *dsa_ptr;       /* dsa specific data */
+        struct dsa_switch_tree  *dsa_ptr;
 #endif
 #if IS_ENABLED(CONFIG_TIPC)
-        struct tipc_bearer __rcu *tipc_ptr;     /* TIPC specific data */
+        struct tipc_bearer __rcu *tipc_ptr;
 #endif
-        void                    *atalk_ptr;     /* AppleTalk link       */
-        struct in_device __rcu  *ip_ptr;        /* IPv4 specific data   */
-        struct dn_dev __rcu     *dn_ptr;        /* DECnet specific data */
-        struct inet6_dev __rcu  *ip6_ptr;       /* IPv6 specific data */
-        void                    *ax25_ptr;      /* AX.25 specific data */
-        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
-                                                   assign before registering */
+        void                    *atalk_ptr;
+        struct in_device __rcu  *ip_ptr;
+        struct dn_dev __rcu     *dn_ptr;
+        struct inet6_dev __rcu  *ip6_ptr;
+        void                    *ax25_ptr;
+        struct wireless_dev     *ieee80211_ptr;
 
 /*
  * Cache lines mostly used on receive path (including eth_type_trans())
  */
-        unsigned long           last_rx;        /* Time of last Rx */
+        unsigned long           last_rx;
 
         /* Interface address info used in eth_type_trans() */
-        unsigned char           *dev_addr;      /* hw address, (before bcast
-                                                   because most packets are
-                                                   unicast) */
+        unsigned char           *dev_addr;
 
 
 #ifdef CONFIG_SYSFS
         struct netdev_rx_queue  *_rx;
 
-        /* Number of RX queues allocated at register_netdev() time */
         unsigned int            num_rx_queues;
-
-        /* Number of RX queues currently active in device */
         unsigned int            real_num_rx_queues;
 
 #endif
@@ -1429,33 +1581,23 @@ struct net_device {
         void __rcu              *rx_handler_data;
 
         struct netdev_queue __rcu *ingress_queue;
-        unsigned char           broadcast[MAX_ADDR_LEN];        /* hw bcast add */
+        unsigned char           broadcast[MAX_ADDR_LEN];
 
 
 /*
  * Cache lines mostly used on transmit path
  */
         struct netdev_queue     *_tx ____cacheline_aligned_in_smp;
-
-        /* Number of TX queues allocated at alloc_netdev_mq() time  */
         unsigned int            num_tx_queues;
-
-        /* Number of TX queues currently active in device  */
         unsigned int            real_num_tx_queues;
-
-        /* root qdisc from userspace point of view */
         struct Qdisc            *qdisc;
-
-        unsigned long           tx_queue_len;   /* Max frames per queue allowed */
+        unsigned long           tx_queue_len;
         spinlock_t              tx_global_lock;
 
 #ifdef CONFIG_XPS
         struct xps_dev_maps __rcu *xps_maps;
 #endif
 #ifdef CONFIG_RFS_ACCEL
-        /* 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. */
         struct cpu_rmap         *rx_cpu_rmap;
 #endif
 
@@ -1465,22 +1607,17 @@ struct net_device {
          * trans_start here is expensive for high speed devices on SMP,
          * please use netdev_queue->trans_start instead.
          */
-        unsigned long           trans_start;    /* Time (in jiffies) of last Tx */
+        unsigned long           trans_start;
 
-        int                     watchdog_timeo; /* used by dev_watchdog() */
+        int                     watchdog_timeo;
         struct timer_list       watchdog_timer;
 
-        /* Number of references to this device */
         int __percpu            *pcpu_refcnt;
-
-        /* delayed register/unregister */
         struct list_head        todo_list;
-        /* device index hash chain */
-        struct hlist_node       index_hlist;
 
+        struct hlist_node       index_hlist;
         struct list_head        link_watch_list;
 
-        /* register/unregister state machine */
         enum { NETREG_UNINITIALIZED=0,
                NETREG_REGISTERED,       /* completed register_netdevice */
                NETREG_UNREGISTERING,    /* called unregister_netdevice */
@@ -1489,14 +1626,13 @@ struct net_device {
                NETREG_DUMMY,            /* dummy device for NAPI poll */
         } reg_state:8;
 
-        bool dismantle; /* device is going do be freed */
+        bool dismantle;
 
         enum {
                 RTNL_LINK_INITIALIZED,
                 RTNL_LINK_INITIALIZING,
         } rtnl_link_state:16;
 
-        /* Called from unregister, can be used to call free_netdev */
         void (*destructor)(struct net_device *dev);
 
 #ifdef CONFIG_NETPOLL
@@ -1504,31 +1640,25 @@ struct net_device {
 #endif
 
 #ifdef CONFIG_NET_NS
-        /* Network namespace this network device is inside */
         struct net              *nd_net;
 #endif
 
         /* mid-layer private */
         union {
-                void                            *ml_priv;
-                struct pcpu_lstats __percpu     *lstats; /* loopback stats */
+                void                                    *ml_priv;
+                struct pcpu_lstats __percpu             *lstats;
                 struct pcpu_sw_netstats __percpu        *tstats;
-                struct pcpu_dstats __percpu     *dstats; /* dummy stats */
-                struct pcpu_vstats __percpu     *vstats; /* veth stats */
+                struct pcpu_dstats __percpu             *dstats;
+                struct pcpu_vstats __percpu             *vstats;
         };
-        /* GARP */
+
         struct garp_port __rcu  *garp_port;
-        /* MRP */
         struct mrp_port __rcu   *mrp_port;
 
-        /* class/net/name entry */
-        struct device           dev;
-        /* space for optional device, statistics, and wireless sysfs groups */
+        struct device   dev;
         const struct attribute_group *sysfs_groups[4];
-        /* space for optional per-rx queue attributes */
         const struct attribute_group *sysfs_rx_queue_group;
 
-        /* rtnetlink link ops */
         const struct rtnl_link_ops *rtnl_link_ops;
 
         /* for setting kernel sock attribute on TCP connection setup */
@@ -1538,7 +1668,6 @@ struct net_device {
         u16                     gso_max_segs;
 
 #ifdef CONFIG_DCB
-        /* Data Center Bridging netlink ops */
         const struct dcbnl_rtnl_ops *dcbnl_ops;
 #endif
         u8 num_tc;
@@ -1546,20 +1675,14 @@ struct net_device {
         u8 prio_tc_map[TC_BITMASK + 1];
 
 #if IS_ENABLED(CONFIG_FCOE)
-        /* max exchange id for FCoE LRO by ddp */
         unsigned int            fcoe_ddp_xid;
 #endif
 #if IS_ENABLED(CONFIG_CGROUP_NET_PRIO)
         struct netprio_map __rcu *priomap;
 #endif
-        /* phy device may attach itself for hardware timestamping */
         struct phy_device *phydev;
-
         struct lock_class_key *qdisc_tx_busylock;
-
-        /* group the device belongs to */
         int group;
-
         struct pm_qos_request   pm_qos_req;
 };
 #define to_net_dev(d) container_of(d, struct net_device, dev)
@@ -2486,7 +2609,7 @@ static inline int netif_set_xps_queue(struct net_device *dev,
  * as a distribution range limit for the returned value.
  */
 static inline u16 skb_tx_hash(const struct net_device *dev,
-                              const struct sk_buff *skb)
+                              struct sk_buff *skb)
 {
         return __skb_tx_hash(dev, skb, dev->real_num_tx_queues);
 }
@@ -2987,13 +3110,15 @@ void ether_setup(struct net_device *dev);
 
 /* Support for loadable net-drivers */
 struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
+                                    unsigned char name_assign_type,
                                     void (*setup)(struct net_device *),
                                     unsigned int txqs, unsigned int rxqs);
-#define alloc_netdev(sizeof_priv, name, setup) \
-        alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1)
+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
+        alloc_netdev_mqs(sizeof_priv, name, name_assign_type, setup, 1, 1)
 
-#define alloc_netdev_mq(sizeof_priv, name, setup, count) \
-        alloc_netdev_mqs(sizeof_priv, name, setup, count, count)
+#define alloc_netdev_mq(sizeof_priv, name, name_assign_type, setup, count) \
+        alloc_netdev_mqs(sizeof_priv, name, name_assign_type, setup, count, \
+                         count)
 
 int register_netdev(struct net_device *dev);
 void unregister_netdev(struct net_device *dev);
@@ -3377,11 +3502,26 @@ extern struct pernet_operations __net_initdata loopback_net_ops;
 
 static inline const char *netdev_name(const struct net_device *dev)
 {
-        if (dev->reg_state != NETREG_REGISTERED)
-                return "(unregistered net_device)";
+        if (!dev->name[0] || strchr(dev->name, '%'))
+                return "(unnamed net_device)";
         return dev->name;
 }
 
+static inline const char *netdev_reg_state(const struct net_device *dev)
+{
+        switch (dev->reg_state) {
+        case NETREG_UNINITIALIZED: return " (uninitialized)";
+        case NETREG_REGISTERED: return "";
+        case NETREG_UNREGISTERING: return " (unregistering)";
+        case NETREG_UNREGISTERED: return " (unregistered)";
+        case NETREG_RELEASED: return " (released)";
+        case NETREG_DUMMY: return " (dummy)";
+        }
+
+        WARN_ONCE(1, "%s: unknown reg_state %d\n", dev->name, dev->reg_state);
+        return " (unknown)";
+}
+
 __printf(3, 4)
 int netdev_printk(const char *level, const struct net_device *dev,
                   const char *format, ...);
@@ -3438,7 +3578,8 @@ do {								\
  * file/line information and a backtrace.
  */
 #define netdev_WARN(dev, format, args...)                       \
-        WARN(1, "netdevice: %s\n" format, netdev_name(dev), ##args)
+        WARN(1, "netdevice: %s%s\n" format, netdev_name(dev),   \
+             netdev_reg_state(dev), ##args)
 
 /* netif printk helpers, similar to netdev_printk */
 
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 447775ee2c4b..1d2a6ab6b8bb 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -63,4 +63,8 @@ extern int proc_dowatchdog(struct ctl_table *, int ,
                            void __user *, size_t *, loff_t *);
 #endif
 
+#ifdef CONFIG_HAVE_ACPI_APEI_NMI
+#include <asm/nmi.h>
+#endif
+
 #endif
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index c13b8782a4eb..fb7b7221e063 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -109,7 +109,12 @@ static inline bool of_dma_is_coherent(struct device_node *np)
 extern int of_address_to_resource(struct device_node *dev, int index,
                                   struct resource *r);
 void __iomem *of_iomap(struct device_node *node, int index);
+void __iomem *of_io_request_and_map(struct device_node *device,
+                                        int index, char *name);
 #else
+
+#include <linux/io.h>
+
 static inline int of_address_to_resource(struct device_node *dev, int index,
                                          struct resource *r)
 {
@@ -120,6 +125,12 @@ static inline void __iomem *of_iomap(struct device_node *device, int index)
 {
         return NULL;
 }
+
+static inline void __iomem *of_io_request_and_map(struct device_node *device,
+                                        int index, char *name)
+{
+        return IOMEM_ERR_PTR(-EINVAL);
+}
 #endif
 
 #if defined(CONFIG_OF_ADDRESS) && defined(CONFIG_PCI)
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index 05117899fcb4..0ff360d5b3b3 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -73,6 +73,8 @@ extern int early_init_dt_scan_root(unsigned long node, const char *uname,
                                    int depth, void *data);
 
 extern bool early_init_dt_scan(void *params);
+extern bool early_init_dt_verify(void *params);
+extern void early_init_dt_scan_nodes(void);
 
 extern const char *of_flat_dt_get_machine_name(void);
 extern const void *of_flat_dt_match_machine(const void *default_match,
@@ -84,6 +86,7 @@ extern void unflatten_and_copy_device_tree(void);
 extern void early_init_devtree(void *);
 extern void early_get_first_memblock_info(void *, phys_addr_t *);
 extern u64 fdt_translate_address(const void *blob, int node_offset);
+extern void of_fdt_limit_memory(int limit);
 #else /* CONFIG_OF_FLATTREE */
 static inline void early_init_fdt_scan_reserved_mem(void) {}
 static inline const char *of_flat_dt_get_machine_name(void) { return NULL; }
diff --git a/include/linux/oid_registry.h b/include/linux/oid_registry.h
index 6926db724258..c2bbf672b84e 100644
--- a/include/linux/oid_registry.h
+++ b/include/linux/oid_registry.h
@@ -52,9 +52,15 @@ enum OID {
         OID_md4,                        /* 1.2.840.113549.2.4 */
         OID_md5,                        /* 1.2.840.113549.2.5 */
 
-        OID_certAuthInfoAccess,         /* 1.3.6.1.5.5.7.1.1 */
+        /* Microsoft Authenticode & Software Publishing */
+        OID_msIndirectData,             /* 1.3.6.1.4.1.311.2.1.4 */
+        OID_msPeImageDataObjId,         /* 1.3.6.1.4.1.311.2.1.15 */
+        OID_msIndividualSPKeyPurpose,   /* 1.3.6.1.4.1.311.2.1.21 */
         OID_msOutlookExpress,           /* 1.3.6.1.4.1.311.16.4 */
+
+        OID_certAuthInfoAccess,         /* 1.3.6.1.5.5.7.1.1 */
         OID_sha1,                       /* 1.3.14.3.2.26 */
+        OID_sha256,                     /* 2.16.840.1.101.3.4.2.1 */
 
         /* Distinguished Name attribute IDs [RFC 2256] */
         OID_commonName,                 /* 2.5.4.3 */
diff --git a/include/linux/omap-iommu.h b/include/linux/omap-iommu.h
index cac78de09c07..c1aede46718b 100644
--- a/include/linux/omap-iommu.h
+++ b/include/linux/omap-iommu.h
@@ -10,41 +10,8 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef _INTEL_IOMMU_H_
-#define _INTEL_IOMMU_H_
-
-struct iovm_struct {
-        struct omap_iommu       *iommu; /* iommu object which this belongs to */
-        u32                     da_start; /* area definition */
-        u32                     da_end;
-        u32                     flags; /* IOVMF_: see below */
-        struct list_head        list; /* linked in ascending order */
-        const struct sg_table   *sgt; /* keep 'page' <-> 'da' mapping */
-        void                    *va; /* mpu side mapped address */
-};
-
-#define MMU_RAM_ENDIAN_SHIFT    9
-#define MMU_RAM_ENDIAN_LITTLE   (0 << MMU_RAM_ENDIAN_SHIFT)
-#define MMU_RAM_ELSZ_8          (0 << MMU_RAM_ELSZ_SHIFT)
-#define IOVMF_ENDIAN_LITTLE     MMU_RAM_ENDIAN_LITTLE
-#define MMU_RAM_ELSZ_SHIFT      7
-#define IOVMF_ELSZ_8            MMU_RAM_ELSZ_8
-
-struct iommu_domain;
-
-extern struct iovm_struct *omap_find_iovm_area(struct device *dev, u32 da);
-extern u32
-omap_iommu_vmap(struct iommu_domain *domain, struct device *dev, u32 da,
-                        const struct sg_table *sgt, u32 flags);
-extern struct sg_table *omap_iommu_vunmap(struct iommu_domain *domain,
-                                struct device *dev, u32 da);
-extern u32
-omap_iommu_vmalloc(struct iommu_domain *domain, struct device *dev,
-                                u32 da, size_t bytes, u32 flags);
-extern void
-omap_iommu_vfree(struct iommu_domain *domain, struct device *dev,
-                                const u32 da);
-extern void *omap_da_to_va(struct device *dev, u32 da);
+#ifndef _OMAP_IOMMU_H_
+#define _OMAP_IOMMU_H_
 
 extern void omap_iommu_save_ctx(struct device *dev);
 extern void omap_iommu_restore_ctx(struct device *dev);
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 0a97b583ee8d..e1474ae18c88 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -399,6 +399,18 @@ static inline struct page *read_mapping_page(struct address_space *mapping,
 }
 
 /*
+ * Get the offset in PAGE_SIZE.
+ * (TODO: hugepage should have ->index in PAGE_SIZE)
+ */
+static inline pgoff_t page_to_pgoff(struct page *page)
+{
+        if (unlikely(PageHeadHuge(page)))
+                return page->index << compound_order(page);
+        else
+                return page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+}
+
+/*
  * Return byte-offset into filesystem object for page.
  */
 static inline loff_t page_offset(struct page *page)
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 637a608ded0b..64dacb7288a6 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -11,12 +11,17 @@
 #include <linux/acpi.h>
 
 #ifdef CONFIG_ACPI
-extern acpi_status pci_acpi_add_bus_pm_notifier(struct acpi_device *dev,
-                                                 struct pci_bus *pci_bus);
-extern acpi_status pci_acpi_remove_bus_pm_notifier(struct acpi_device *dev);
+extern acpi_status pci_acpi_add_bus_pm_notifier(struct acpi_device *dev);
+static inline acpi_status pci_acpi_remove_bus_pm_notifier(struct acpi_device *dev)
+{
+        return acpi_remove_pm_notifier(dev);
+}
 extern acpi_status pci_acpi_add_pm_notifier(struct acpi_device *dev,
                                              struct pci_dev *pci_dev);
-extern acpi_status pci_acpi_remove_pm_notifier(struct acpi_device *dev);
+static inline acpi_status pci_acpi_remove_pm_notifier(struct acpi_device *dev)
+{
+        return acpi_remove_pm_notifier(dev);
+}
 extern phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle);
 
 static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 466bcd111d85..61978a460841 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -978,6 +978,8 @@ int pci_try_reset_slot(struct pci_slot *slot);
 int pci_probe_reset_bus(struct pci_bus *bus);
 int pci_reset_bus(struct pci_bus *bus);
 int pci_try_reset_bus(struct pci_bus *bus);
+void pci_reset_secondary_bus(struct pci_dev *dev);
+void pcibios_reset_secondary_bus(struct pci_dev *dev);
 void pci_reset_bridge_secondary_bus(struct pci_dev *dev);
 void pci_update_resource(struct pci_dev *dev, int resno);
 int __must_check pci_assign_resource(struct pci_dev *dev, int i);
@@ -1186,7 +1188,6 @@ int pci_msix_vec_count(struct pci_dev *dev);
 int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec);
 void pci_msix_shutdown(struct pci_dev *dev);
 void pci_disable_msix(struct pci_dev *dev);
-void msi_remove_pci_irq_vectors(struct pci_dev *dev);
 void pci_restore_msi_state(struct pci_dev *dev);
 int pci_msi_enabled(void);
 int pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec);
@@ -1217,7 +1218,6 @@ static inline int pci_enable_msix(struct pci_dev *dev,
 { return -ENOSYS; }
 static inline void pci_msix_shutdown(struct pci_dev *dev) { }
 static inline void pci_disable_msix(struct pci_dev *dev) { }
-static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) { }
 static inline void pci_restore_msi_state(struct pci_dev *dev) { }
 static inline int pci_msi_enabled(void) { return 0; }
 static inline int pci_enable_msi_range(struct pci_dev *dev, int minvec,
@@ -1477,8 +1477,9 @@ enum pci_fixup_pass {
         pci_fixup_final,        /* Final phase of device fixups */
         pci_fixup_enable,       /* pci_enable_device() time */
         pci_fixup_resume,       /* pci_device_resume() */
-        pci_fixup_suspend,      /* pci_device_suspend */
+        pci_fixup_suspend,      /* pci_device_suspend() */
         pci_fixup_resume_early, /* pci_device_resume_early() */
+        pci_fixup_suspend_late, /* pci_device_suspend_late() */
 };
 
 /* Anonymous variables would be nice... */
@@ -1519,6 +1520,11 @@ enum pci_fixup_pass {
         DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend,                   \
                 suspend##hook, vendor, device, class,   \
                 class_shift, hook)
+#define DECLARE_PCI_FIXUP_CLASS_SUSPEND_LATE(vendor, device, class,     \
+                                         class_shift, hook)             \
+        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend_late,              \
+                suspend_late##hook, vendor, device,     \
+                class, class_shift, hook)
 
 #define DECLARE_PCI_FIXUP_EARLY(vendor, device, hook)                   \
         DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early,                     \
@@ -1544,6 +1550,10 @@ enum pci_fixup_pass {
         DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend,                   \
                 suspend##hook, vendor, device,          \
                 PCI_ANY_ID, 0, hook)
+#define DECLARE_PCI_FIXUP_SUSPEND_LATE(vendor, device, hook)            \
+        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend_late,              \
+                suspend_late##hook, vendor, device,     \
+                PCI_ANY_ID, 0, hook)
 
 #ifdef CONFIG_PCI_QUIRKS
 void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 7fa31731c854..6ed0bb73a864 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -6,6 +6,8 @@
  *      Do not add new entries to this file unless the definitions
  *      are shared between multiple drivers.
  */
+#ifndef _LINUX_PCI_IDS_H
+#define _LINUX_PCI_IDS_H
 
 /* Device classes and subclasses */
 
@@ -2968,3 +2970,5 @@
 #define PCI_DEVICE_ID_XEN_PLATFORM      0x0001
 
 #define PCI_VENDOR_ID_OCZ               0x1b85
+
+#endif /* _LINUX_PCI_IDS_H */
diff --git a/include/linux/pe.h b/include/linux/pe.h
new file mode 100644
index 000000000000..e170b95e763b
--- /dev/null
+++ b/include/linux/pe.h
@@ -0,0 +1,448 @@
+/*
+ * Copyright 2011 Red Hat, Inc.
+ * 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; 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/>.
+ *
+ * Author(s): Peter Jones <pjones@redhat.com>
+ */
+#ifndef __LINUX_PE_H
+#define __LINUX_PE_H
+
+#include <linux/types.h>
+
+#define MZ_MAGIC        0x5a4d  /* "MZ" */
+
+struct mz_hdr {
+        uint16_t magic;         /* MZ_MAGIC */
+        uint16_t lbsize;        /* size of last used block */
+        uint16_t blocks;        /* pages in file, 0x3 */
+        uint16_t relocs;        /* relocations */
+        uint16_t hdrsize;       /* header size in "paragraphs" */
+        uint16_t min_extra_pps; /* .bss */
+        uint16_t max_extra_pps; /* runtime limit for the arena size */
+        uint16_t ss;            /* relative stack segment */
+        uint16_t sp;            /* initial %sp register */
+        uint16_t checksum;      /* word checksum */
+        uint16_t ip;            /* initial %ip register */
+        uint16_t cs;            /* initial %cs relative to load segment */
+        uint16_t reloc_table_offset;    /* offset of the first relocation */
+        uint16_t overlay_num;   /* overlay number.  set to 0. */
+        uint16_t reserved0[4];  /* reserved */
+        uint16_t oem_id;        /* oem identifier */
+        uint16_t oem_info;      /* oem specific */
+        uint16_t reserved1[10]; /* reserved */
+        uint32_t peaddr;        /* address of pe header */
+        char     message[64];   /* message to print */
+};
+
+struct mz_reloc {
+        uint16_t offset;
+        uint16_t segment;
+};
+
+#define PE_MAGIC                0x00004550      /* "PE\0\0" */
+#define PE_OPT_MAGIC_PE32       0x010b
+#define PE_OPT_MAGIC_PE32_ROM   0x0107
+#define PE_OPT_MAGIC_PE32PLUS   0x020b
+
+/* machine type */
+#define IMAGE_FILE_MACHINE_UNKNOWN      0x0000
+#define IMAGE_FILE_MACHINE_AM33         0x01d3
+#define IMAGE_FILE_MACHINE_AMD64        0x8664
+#define IMAGE_FILE_MACHINE_ARM          0x01c0
+#define IMAGE_FILE_MACHINE_ARMV7        0x01c4
+#define IMAGE_FILE_MACHINE_EBC          0x0ebc
+#define IMAGE_FILE_MACHINE_I386         0x014c
+#define IMAGE_FILE_MACHINE_IA64         0x0200
+#define IMAGE_FILE_MACHINE_M32R         0x9041
+#define IMAGE_FILE_MACHINE_MIPS16       0x0266
+#define IMAGE_FILE_MACHINE_MIPSFPU      0x0366
+#define IMAGE_FILE_MACHINE_MIPSFPU16    0x0466
+#define IMAGE_FILE_MACHINE_POWERPC      0x01f0
+#define IMAGE_FILE_MACHINE_POWERPCFP    0x01f1
+#define IMAGE_FILE_MACHINE_R4000        0x0166
+#define IMAGE_FILE_MACHINE_SH3          0x01a2
+#define IMAGE_FILE_MACHINE_SH3DSP       0x01a3
+#define IMAGE_FILE_MACHINE_SH3E         0x01a4
+#define IMAGE_FILE_MACHINE_SH4          0x01a6
+#define IMAGE_FILE_MACHINE_SH5          0x01a8
+#define IMAGE_FILE_MACHINE_THUMB        0x01c2
+#define IMAGE_FILE_MACHINE_WCEMIPSV2    0x0169
+
+/* flags */
+#define IMAGE_FILE_RELOCS_STRIPPED           0x0001
+#define IMAGE_FILE_EXECUTABLE_IMAGE          0x0002
+#define IMAGE_FILE_LINE_NUMS_STRIPPED        0x0004
+#define IMAGE_FILE_LOCAL_SYMS_STRIPPED       0x0008
+#define IMAGE_FILE_AGGRESSIVE_WS_TRIM        0x0010
+#define IMAGE_FILE_LARGE_ADDRESS_AWARE       0x0020
+#define IMAGE_FILE_16BIT_MACHINE             0x0040
+#define IMAGE_FILE_BYTES_REVERSED_LO         0x0080
+#define IMAGE_FILE_32BIT_MACHINE             0x0100
+#define IMAGE_FILE_DEBUG_STRIPPED            0x0200
+#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP   0x0400
+#define IMAGE_FILE_NET_RUN_FROM_SWAP         0x0800
+#define IMAGE_FILE_SYSTEM                    0x1000
+#define IMAGE_FILE_DLL                       0x2000
+#define IMAGE_FILE_UP_SYSTEM_ONLY            0x4000
+#define IMAGE_FILE_BYTES_REVERSED_HI         0x8000
+
+struct pe_hdr {
+        uint32_t magic;         /* PE magic */
+        uint16_t machine;       /* machine type */
+        uint16_t sections;      /* number of sections */
+        uint32_t timestamp;     /* time_t */
+        uint32_t symbol_table;  /* symbol table offset */
+        uint32_t symbols;       /* number of symbols */
+        uint16_t opt_hdr_size;  /* size of optional header */
+        uint16_t flags;         /* flags */
+};
+
+#define IMAGE_FILE_OPT_ROM_MAGIC        0x107
+#define IMAGE_FILE_OPT_PE32_MAGIC       0x10b
+#define IMAGE_FILE_OPT_PE32_PLUS_MAGIC  0x20b
+
+#define IMAGE_SUBSYSTEM_UNKNOWN                  0
+#define IMAGE_SUBSYSTEM_NATIVE                   1
+#define IMAGE_SUBSYSTEM_WINDOWS_GUI              2
+#define IMAGE_SUBSYSTEM_WINDOWS_CUI              3
+#define IMAGE_SUBSYSTEM_POSIX_CUI                7
+#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI           9
+#define IMAGE_SUBSYSTEM_EFI_APPLICATION         10
+#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11
+#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER      12
+#define IMAGE_SUBSYSTEM_EFI_ROM_IMAGE           13
+#define IMAGE_SUBSYSTEM_XBOX                    14
+
+#define IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE          0x0040
+#define IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY       0x0080
+#define IMAGE_DLL_CHARACTERISTICS_NX_COMPAT             0x0100
+#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION           0x0200
+#define IMAGE_DLLCHARACTERISTICS_NO_SEH                 0x0400
+#define IMAGE_DLLCHARACTERISTICS_NO_BIND                0x0800
+#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER             0x2000
+#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE  0x8000
+
+/* the fact that pe32 isn't padded where pe32+ is 64-bit means union won't
+ * work right.  vomit. */
+struct pe32_opt_hdr {
+        /* "standard" header */
+        uint16_t magic;         /* file type */
+        uint8_t  ld_major;      /* linker major version */
+        uint8_t  ld_minor;      /* linker minor version */
+        uint32_t text_size;     /* size of text section(s) */
+        uint32_t data_size;     /* size of data section(s) */
+        uint32_t bss_size;      /* size of bss section(s) */
+        uint32_t entry_point;   /* file offset of entry point */
+        uint32_t code_base;     /* relative code addr in ram */
+        uint32_t data_base;     /* relative data addr in ram */
+        /* "windows" header */
+        uint32_t image_base;    /* preferred load address */
+        uint32_t section_align; /* alignment in bytes */
+        uint32_t file_align;    /* file alignment in bytes */
+        uint16_t os_major;      /* major OS version */
+        uint16_t os_minor;      /* minor OS version */
+        uint16_t image_major;   /* major image version */
+        uint16_t image_minor;   /* minor image version */
+        uint16_t subsys_major;  /* major subsystem version */
+        uint16_t subsys_minor;  /* minor subsystem version */
+        uint32_t win32_version; /* reserved, must be 0 */
+        uint32_t image_size;    /* image size */
+        uint32_t header_size;   /* header size rounded up to
+                                   file_align */
+        uint32_t csum;          /* checksum */
+        uint16_t subsys;        /* subsystem */
+        uint16_t dll_flags;     /* more flags! */
+        uint32_t stack_size_req;/* amt of stack requested */
+        uint32_t stack_size;    /* amt of stack required */
+        uint32_t heap_size_req; /* amt of heap requested */
+        uint32_t heap_size;     /* amt of heap required */
+        uint32_t loader_flags;  /* reserved, must be 0 */
+        uint32_t data_dirs;     /* number of data dir entries */
+};
+
+struct pe32plus_opt_hdr {
+        uint16_t magic;         /* file type */
+        uint8_t  ld_major;      /* linker major version */
+        uint8_t  ld_minor;      /* linker minor version */
+        uint32_t text_size;     /* size of text section(s) */
+        uint32_t data_size;     /* size of data section(s) */
+        uint32_t bss_size;      /* size of bss section(s) */
+        uint32_t entry_point;   /* file offset of entry point */
+        uint32_t code_base;     /* relative code addr in ram */
+        /* "windows" header */
+        uint64_t image_base;    /* preferred load address */
+        uint32_t section_align; /* alignment in bytes */
+        uint32_t file_align;    /* file alignment in bytes */
+        uint16_t os_major;      /* major OS version */
+        uint16_t os_minor;      /* minor OS version */
+        uint16_t image_major;   /* major image version */
+        uint16_t image_minor;   /* minor image version */
+        uint16_t subsys_major;  /* major subsystem version */
+        uint16_t subsys_minor;  /* minor subsystem version */
+        uint32_t win32_version; /* reserved, must be 0 */
+        uint32_t image_size;    /* image size */
+        uint32_t header_size;   /* header size rounded up to
+                                   file_align */
+        uint32_t csum;          /* checksum */
+        uint16_t subsys;        /* subsystem */
+        uint16_t dll_flags;     /* more flags! */
+        uint64_t stack_size_req;/* amt of stack requested */
+        uint64_t stack_size;    /* amt of stack required */
+        uint64_t heap_size_req; /* amt of heap requested */
+        uint64_t heap_size;     /* amt of heap required */
+        uint32_t loader_flags;  /* reserved, must be 0 */
+        uint32_t data_dirs;     /* number of data dir entries */
+};
+
+struct data_dirent {
+        uint32_t virtual_address;       /* relative to load address */
+        uint32_t size;
+};
+
+struct data_directory {
+        struct data_dirent exports;             /* .edata */
+        struct data_dirent imports;             /* .idata */
+        struct data_dirent resources;           /* .rsrc */
+        struct data_dirent exceptions;          /* .pdata */
+        struct data_dirent certs;               /* certs */
+        struct data_dirent base_relocations;    /* .reloc */
+        struct data_dirent debug;               /* .debug */
+        struct data_dirent arch;                /* reservered */
+        struct data_dirent global_ptr;          /* global pointer reg. Size=0 */
+        struct data_dirent tls;                 /* .tls */
+        struct data_dirent load_config;         /* load configuration structure */
+        struct data_dirent bound_imports;       /* no idea */
+        struct data_dirent import_addrs;        /* import address table */
+        struct data_dirent delay_imports;       /* delay-load import table */
+        struct data_dirent clr_runtime_hdr;     /* .cor (object only) */
+        struct data_dirent reserved;
+};
+
+struct section_header {
+        char name[8];                   /* name or "/12\0" string tbl offset */
+        uint32_t virtual_size;          /* size of loaded section in ram */
+        uint32_t virtual_address;       /* relative virtual address */
+        uint32_t raw_data_size;         /* size of the section */
+        uint32_t data_addr;             /* file pointer to first page of sec */
+        uint32_t relocs;                /* file pointer to relocation entries */
+        uint32_t line_numbers;          /* line numbers! */
+        uint16_t num_relocs;            /* number of relocations */
+        uint16_t num_lin_numbers;       /* srsly. */
+        uint32_t flags;
+};
+
+/* they actually defined 0x00000000 as well, but I think we'll skip that one. */
+#define IMAGE_SCN_RESERVED_0    0x00000001
+#define IMAGE_SCN_RESERVED_1    0x00000002
+#define IMAGE_SCN_RESERVED_2    0x00000004
+#define IMAGE_SCN_TYPE_NO_PAD   0x00000008 /* don't pad - obsolete */
+#define IMAGE_SCN_RESERVED_3    0x00000010
+#define IMAGE_SCN_CNT_CODE      0x00000020 /* .text */
+#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 /* .data */
+#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 /* .bss */
+#define IMAGE_SCN_LNK_OTHER     0x00000100 /* reserved */
+#define IMAGE_SCN_LNK_INFO      0x00000200 /* .drectve comments */
+#define IMAGE_SCN_RESERVED_4    0x00000400
+#define IMAGE_SCN_LNK_REMOVE    0x00000800 /* .o only - scn to be rm'd*/
+#define IMAGE_SCN_LNK_COMDAT    0x00001000 /* .o only - COMDAT data */
+#define IMAGE_SCN_RESERVED_5    0x00002000 /* spec omits this */
+#define IMAGE_SCN_RESERVED_6    0x00004000 /* spec omits this */
+#define IMAGE_SCN_GPREL         0x00008000 /* global pointer referenced data */
+/* spec lists 0x20000 twice, I suspect they meant 0x10000 for one of them */
+#define IMAGE_SCN_MEM_PURGEABLE 0x00010000 /* reserved for "future" use */
+#define IMAGE_SCN_16BIT         0x00020000 /* reserved for "future" use */
+#define IMAGE_SCN_LOCKED        0x00040000 /* reserved for "future" use */
+#define IMAGE_SCN_PRELOAD       0x00080000 /* reserved for "future" use */
+/* and here they just stuck a 1-byte integer in the middle of a bitfield */
+#define IMAGE_SCN_ALIGN_1BYTES  0x00100000 /* it does what it says on the box */
+#define IMAGE_SCN_ALIGN_2BYTES  0x00200000
+#define IMAGE_SCN_ALIGN_4BYTES  0x00300000
+#define IMAGE_SCN_ALIGN_8BYTES  0x00400000
+#define IMAGE_SCN_ALIGN_16BYTES 0x00500000
+#define IMAGE_SCN_ALIGN_32BYTES 0x00600000
+#define IMAGE_SCN_ALIGN_64BYTES 0x00700000
+#define IMAGE_SCN_ALIGN_128BYTES 0x00800000
+#define IMAGE_SCN_ALIGN_256BYTES 0x00900000
+#define IMAGE_SCN_ALIGN_512BYTES 0x00a00000
+#define IMAGE_SCN_ALIGN_1024BYTES 0x00b00000
+#define IMAGE_SCN_ALIGN_2048BYTES 0x00c00000
+#define IMAGE_SCN_ALIGN_4096BYTES 0x00d00000
+#define IMAGE_SCN_ALIGN_8192BYTES 0x00e00000
+#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 /* extended relocations */
+#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 /* scn can be discarded */
+#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 /* cannot be cached */
+#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 /* not pageable */
+#define IMAGE_SCN_MEM_SHARED    0x10000000 /* can be shared */
+#define IMAGE_SCN_MEM_EXECUTE   0x20000000 /* can be executed as code */
+#define IMAGE_SCN_MEM_READ      0x40000000 /* readable */
+#define IMAGE_SCN_MEM_WRITE     0x80000000 /* writeable */
+
+enum x64_coff_reloc_type {
+        IMAGE_REL_AMD64_ABSOLUTE = 0,
+        IMAGE_REL_AMD64_ADDR64,
+        IMAGE_REL_AMD64_ADDR32,
+        IMAGE_REL_AMD64_ADDR32N,
+        IMAGE_REL_AMD64_REL32,
+        IMAGE_REL_AMD64_REL32_1,
+        IMAGE_REL_AMD64_REL32_2,
+        IMAGE_REL_AMD64_REL32_3,
+        IMAGE_REL_AMD64_REL32_4,
+        IMAGE_REL_AMD64_REL32_5,
+        IMAGE_REL_AMD64_SECTION,
+        IMAGE_REL_AMD64_SECREL,
+        IMAGE_REL_AMD64_SECREL7,
+        IMAGE_REL_AMD64_TOKEN,
+        IMAGE_REL_AMD64_SREL32,
+        IMAGE_REL_AMD64_PAIR,
+        IMAGE_REL_AMD64_SSPAN32,
+};
+
+enum arm_coff_reloc_type {
+        IMAGE_REL_ARM_ABSOLUTE,
+        IMAGE_REL_ARM_ADDR32,
+        IMAGE_REL_ARM_ADDR32N,
+        IMAGE_REL_ARM_BRANCH2,
+        IMAGE_REL_ARM_BRANCH1,
+        IMAGE_REL_ARM_SECTION,
+        IMAGE_REL_ARM_SECREL,
+};
+
+enum sh_coff_reloc_type {
+        IMAGE_REL_SH3_ABSOLUTE,
+        IMAGE_REL_SH3_DIRECT16,
+        IMAGE_REL_SH3_DIRECT32,
+        IMAGE_REL_SH3_DIRECT8,
+        IMAGE_REL_SH3_DIRECT8_WORD,
+        IMAGE_REL_SH3_DIRECT8_LONG,
+        IMAGE_REL_SH3_DIRECT4,
+        IMAGE_REL_SH3_DIRECT4_WORD,
+        IMAGE_REL_SH3_DIRECT4_LONG,
+        IMAGE_REL_SH3_PCREL8_WORD,
+        IMAGE_REL_SH3_PCREL8_LONG,
+        IMAGE_REL_SH3_PCREL12_WORD,
+        IMAGE_REL_SH3_STARTOF_SECTION,
+        IMAGE_REL_SH3_SIZEOF_SECTION,
+        IMAGE_REL_SH3_SECTION,
+        IMAGE_REL_SH3_SECREL,
+        IMAGE_REL_SH3_DIRECT32_NB,
+        IMAGE_REL_SH3_GPREL4_LONG,
+        IMAGE_REL_SH3_TOKEN,
+        IMAGE_REL_SHM_PCRELPT,
+        IMAGE_REL_SHM_REFLO,
+        IMAGE_REL_SHM_REFHALF,
+        IMAGE_REL_SHM_RELLO,
+        IMAGE_REL_SHM_RELHALF,
+        IMAGE_REL_SHM_PAIR,
+        IMAGE_REL_SHM_NOMODE,
+};
+
+enum ppc_coff_reloc_type {
+        IMAGE_REL_PPC_ABSOLUTE,
+        IMAGE_REL_PPC_ADDR64,
+        IMAGE_REL_PPC_ADDR32,
+        IMAGE_REL_PPC_ADDR24,
+        IMAGE_REL_PPC_ADDR16,
+        IMAGE_REL_PPC_ADDR14,
+        IMAGE_REL_PPC_REL24,
+        IMAGE_REL_PPC_REL14,
+        IMAGE_REL_PPC_ADDR32N,
+        IMAGE_REL_PPC_SECREL,
+        IMAGE_REL_PPC_SECTION,
+        IMAGE_REL_PPC_SECREL16,
+        IMAGE_REL_PPC_REFHI,
+        IMAGE_REL_PPC_REFLO,
+        IMAGE_REL_PPC_PAIR,
+        IMAGE_REL_PPC_SECRELLO,
+        IMAGE_REL_PPC_GPREL,
+        IMAGE_REL_PPC_TOKEN,
+};
+
+enum x86_coff_reloc_type {
+        IMAGE_REL_I386_ABSOLUTE,
+        IMAGE_REL_I386_DIR16,
+        IMAGE_REL_I386_REL16,
+        IMAGE_REL_I386_DIR32,
+        IMAGE_REL_I386_DIR32NB,
+        IMAGE_REL_I386_SEG12,
+        IMAGE_REL_I386_SECTION,
+        IMAGE_REL_I386_SECREL,
+        IMAGE_REL_I386_TOKEN,
+        IMAGE_REL_I386_SECREL7,
+        IMAGE_REL_I386_REL32,
+};
+
+enum ia64_coff_reloc_type {
+        IMAGE_REL_IA64_ABSOLUTE,
+        IMAGE_REL_IA64_IMM14,
+        IMAGE_REL_IA64_IMM22,
+        IMAGE_REL_IA64_IMM64,
+        IMAGE_REL_IA64_DIR32,
+        IMAGE_REL_IA64_DIR64,
+        IMAGE_REL_IA64_PCREL21B,
+        IMAGE_REL_IA64_PCREL21M,
+        IMAGE_REL_IA64_PCREL21F,
+        IMAGE_REL_IA64_GPREL22,
+        IMAGE_REL_IA64_LTOFF22,
+        IMAGE_REL_IA64_SECTION,
+        IMAGE_REL_IA64_SECREL22,
+        IMAGE_REL_IA64_SECREL64I,
+        IMAGE_REL_IA64_SECREL32,
+        IMAGE_REL_IA64_DIR32NB,
+        IMAGE_REL_IA64_SREL14,
+        IMAGE_REL_IA64_SREL22,
+        IMAGE_REL_IA64_SREL32,
+        IMAGE_REL_IA64_UREL32,
+        IMAGE_REL_IA64_PCREL60X,
+        IMAGE_REL_IA64_PCREL60B,
+        IMAGE_REL_IA64_PCREL60F,
+        IMAGE_REL_IA64_PCREL60I,
+        IMAGE_REL_IA64_PCREL60M,
+        IMAGE_REL_IA64_IMMGPREL6,
+        IMAGE_REL_IA64_TOKEN,
+        IMAGE_REL_IA64_GPREL32,
+        IMAGE_REL_IA64_ADDEND,
+};
+
+struct coff_reloc {
+        uint32_t virtual_address;
+        uint32_t symbol_table_index;
+        union {
+                enum x64_coff_reloc_type  x64_type;
+                enum arm_coff_reloc_type  arm_type;
+                enum sh_coff_reloc_type   sh_type;
+                enum ppc_coff_reloc_type  ppc_type;
+                enum x86_coff_reloc_type  x86_type;
+                enum ia64_coff_reloc_type ia64_type;
+                uint16_t data;
+        };
+};
+
+/*
+ * Definitions for the contents of the certs data block
+ */
+#define WIN_CERT_TYPE_PKCS_SIGNED_DATA  0x0002
+#define WIN_CERT_TYPE_EFI_OKCS115       0x0EF0
+#define WIN_CERT_TYPE_EFI_GUID          0x0EF1
+
+#define WIN_CERT_REVISION_1_0   0x0100
+#define WIN_CERT_REVISION_2_0   0x0200
+
+struct win_certificate {
+        uint32_t length;
+        uint16_t revision;
+        uint16_t cert_type;
+};
+
+#endif /* __LINUX_PE_H */
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
index dec01d6c3f80..cfd56046ecec 100644
--- a/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@ -1,6 +1,40 @@
+/*
+ * linux/percpu-defs.h - basic definitions for percpu areas
+ *
+ * DO NOT INCLUDE DIRECTLY OUTSIDE PERCPU IMPLEMENTATION PROPER.
+ *
+ * This file is separate from linux/percpu.h to avoid cyclic inclusion
+ * dependency from arch header files.  Only to be included from
+ * asm/percpu.h.
+ *
+ * This file includes macros necessary to declare percpu sections and
+ * variables, and definitions of percpu accessors and operations.  It
+ * should provide enough percpu features to arch header files even when
+ * they can only include asm/percpu.h to avoid cyclic inclusion dependency.
+ */
+
 #ifndef _LINUX_PERCPU_DEFS_H
 #define _LINUX_PERCPU_DEFS_H
 
+#ifdef CONFIG_SMP
+
+#ifdef MODULE
+#define PER_CPU_SHARED_ALIGNED_SECTION ""
+#define PER_CPU_ALIGNED_SECTION ""
+#else
+#define PER_CPU_SHARED_ALIGNED_SECTION "..shared_aligned"
+#define PER_CPU_ALIGNED_SECTION "..shared_aligned"
+#endif
+#define PER_CPU_FIRST_SECTION "..first"
+
+#else
+
+#define PER_CPU_SHARED_ALIGNED_SECTION ""
+#define PER_CPU_ALIGNED_SECTION "..shared_aligned"
+#define PER_CPU_FIRST_SECTION ""
+
+#endif
+
 /*
  * Base implementations of per-CPU variable declarations and definitions, where
  * the section in which the variable is to be placed is provided by the
@@ -19,19 +53,6 @@
         __attribute__((section(".discard"), unused))
 
 /*
- * Macro which verifies @ptr is a percpu pointer without evaluating
- * @ptr.  This is to be used in percpu accessors to verify that the
- * input parameter is a percpu pointer.
- *
- * + 0 is required in order to convert the pointer type from a
- * potential array type to a pointer to a single item of the array.
- */
-#define __verify_pcpu_ptr(ptr)  do {                                    \
-        const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL;    \
-        (void)__vpp_verify;                                             \
-} while (0)
-
-/*
  * s390 and alpha modules require percpu variables to be defined as
  * weak to force the compiler to generate GOT based external
  * references for them.  This is necessary because percpu sections
@@ -164,4 +185,337 @@
 #define EXPORT_PER_CPU_SYMBOL_GPL(var)
 #endif
 
+/*
+ * Accessors and operations.
+ */
+#ifndef __ASSEMBLY__
+
+/*
+ * __verify_pcpu_ptr() verifies @ptr is a percpu pointer without evaluating
+ * @ptr and is invoked once before a percpu area is accessed by all
+ * accessors and operations.  This is performed in the generic part of
+ * percpu and arch overrides don't need to worry about it; however, if an
+ * arch wants to implement an arch-specific percpu accessor or operation,
+ * it may use __verify_pcpu_ptr() to verify the parameters.
+ *
+ * + 0 is required in order to convert the pointer type from a
+ * potential array type to a pointer to a single item of the array.
+ */
+#define __verify_pcpu_ptr(ptr)                                          \
+do {                                                                    \
+        const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL;    \
+        (void)__vpp_verify;                                             \
+} while (0)
+
+#ifdef CONFIG_SMP
+
+/*
+ * Add an offset to a pointer but keep the pointer as-is.  Use RELOC_HIDE()
+ * to prevent the compiler from making incorrect assumptions about the
+ * pointer value.  The weird cast keeps both GCC and sparse happy.
+ */
+#define SHIFT_PERCPU_PTR(__p, __offset)                                 \
+        RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset))
+
+#define per_cpu_ptr(ptr, cpu)                                           \
+({                                                                      \
+        __verify_pcpu_ptr(ptr);                                         \
+        SHIFT_PERCPU_PTR((ptr), per_cpu_offset((cpu)));                 \
+})
+
+#define raw_cpu_ptr(ptr)                                                \
+({                                                                      \
+        __verify_pcpu_ptr(ptr);                                         \
+        arch_raw_cpu_ptr(ptr);                                          \
+})
+
+#ifdef CONFIG_DEBUG_PREEMPT
+#define this_cpu_ptr(ptr)                                               \
+({                                                                      \
+        __verify_pcpu_ptr(ptr);                                         \
+        SHIFT_PERCPU_PTR(ptr, my_cpu_offset);                           \
+})
+#else
+#define this_cpu_ptr(ptr) raw_cpu_ptr(ptr)
+#endif
+
+#else   /* CONFIG_SMP */
+
+#define VERIFY_PERCPU_PTR(__p)                                          \
+({                                                                      \
+        __verify_pcpu_ptr(__p);                                         \
+        (typeof(*(__p)) __kernel __force *)(__p);                       \
+})
+
+#define per_cpu_ptr(ptr, cpu)   ({ (void)(cpu); VERIFY_PERCPU_PTR(ptr); })
+#define raw_cpu_ptr(ptr)        per_cpu_ptr(ptr, 0)
+#define this_cpu_ptr(ptr)       raw_cpu_ptr(ptr)
+
+#endif  /* CONFIG_SMP */
+
+#define per_cpu(var, cpu)       (*per_cpu_ptr(&(var), cpu))
+#define __raw_get_cpu_var(var)  (*raw_cpu_ptr(&(var)))
+#define __get_cpu_var(var)      (*this_cpu_ptr(&(var)))
+
+/* keep until we have removed all uses of __this_cpu_ptr */
+#define __this_cpu_ptr(ptr)     raw_cpu_ptr(ptr)
+
+/*
+ * Must be an lvalue. Since @var must be a simple identifier,
+ * we force a syntax error here if it isn't.
+ */
+#define get_cpu_var(var)                                                \
+(*({                                                                    \
+        preempt_disable();                                              \
+        this_cpu_ptr(&var);                                             \
+}))
+
+/*
+ * The weird & is necessary because sparse considers (void)(var) to be
+ * a direct dereference of percpu variable (var).
+ */
+#define put_cpu_var(var)                                                \
+do {                                                                    \
+        (void)&(var);                                                   \
+        preempt_enable();                                               \
+} while (0)
+
+#define get_cpu_ptr(var)                                                \
+({                                                                      \
+        preempt_disable();                                              \
+        this_cpu_ptr(var);                                              \
+})
+
+#define put_cpu_ptr(var)                                                \
+do {                                                                    \
+        (void)(var);                                                    \
+        preempt_enable();                                               \
+} while (0)
+
+/*
+ * Branching function to split up a function into a set of functions that
+ * are called for different scalar sizes of the objects handled.
+ */
+
+extern void __bad_size_call_parameter(void);
+
+#ifdef CONFIG_DEBUG_PREEMPT
+extern void __this_cpu_preempt_check(const char *op);
+#else
+static inline void __this_cpu_preempt_check(const char *op) { }
+#endif
+
+#define __pcpu_size_call_return(stem, variable)                         \
+({                                                                      \
+        typeof(variable) pscr_ret__;                                    \
+        __verify_pcpu_ptr(&(variable));                                 \
+        switch(sizeof(variable)) {                                      \
+        case 1: pscr_ret__ = stem##1(variable); break;                  \
+        case 2: pscr_ret__ = stem##2(variable); break;                  \
+        case 4: pscr_ret__ = stem##4(variable); break;                  \
+        case 8: pscr_ret__ = stem##8(variable); break;                  \
+        default:                                                        \
+                __bad_size_call_parameter(); break;                     \
+        }                                                               \
+        pscr_ret__;                                                     \
+})
+
+#define __pcpu_size_call_return2(stem, variable, ...)                   \
+({                                                                      \
+        typeof(variable) pscr2_ret__;                                   \
+        __verify_pcpu_ptr(&(variable));                                 \
+        switch(sizeof(variable)) {                                      \
+        case 1: pscr2_ret__ = stem##1(variable, __VA_ARGS__); break;    \
+        case 2: pscr2_ret__ = stem##2(variable, __VA_ARGS__); break;    \
+        case 4: pscr2_ret__ = stem##4(variable, __VA_ARGS__); break;    \
+        case 8: pscr2_ret__ = stem##8(variable, __VA_ARGS__); break;    \
+        default:                                                        \
+                __bad_size_call_parameter(); break;                     \
+        }                                                               \
+        pscr2_ret__;                                                    \
+})
+
+/*
+ * Special handling for cmpxchg_double.  cmpxchg_double is passed two
+ * percpu variables.  The first has to be aligned to a double word
+ * boundary and the second has to follow directly thereafter.
+ * We enforce this on all architectures even if they don't support
+ * a double cmpxchg instruction, since it's a cheap requirement, and it
+ * avoids breaking the requirement for architectures with the instruction.
+ */
+#define __pcpu_double_call_return_bool(stem, pcp1, pcp2, ...)           \
+({                                                                      \
+        bool pdcrb_ret__;                                               \
+        __verify_pcpu_ptr(&(pcp1));                                     \
+        BUILD_BUG_ON(sizeof(pcp1) != sizeof(pcp2));                     \
+        VM_BUG_ON((unsigned long)(&(pcp1)) % (2 * sizeof(pcp1)));       \
+        VM_BUG_ON((unsigned long)(&(pcp2)) !=                           \
+                  (unsigned long)(&(pcp1)) + sizeof(pcp1));             \
+        switch(sizeof(pcp1)) {                                          \
+        case 1: pdcrb_ret__ = stem##1(pcp1, pcp2, __VA_ARGS__); break;  \
+        case 2: pdcrb_ret__ = stem##2(pcp1, pcp2, __VA_ARGS__); break;  \
+        case 4: pdcrb_ret__ = stem##4(pcp1, pcp2, __VA_ARGS__); break;  \
+        case 8: pdcrb_ret__ = stem##8(pcp1, pcp2, __VA_ARGS__); break;  \
+        default:                                                        \
+                __bad_size_call_parameter(); break;                     \
+        }                                                               \
+        pdcrb_ret__;                                                    \
+})
+
+#define __pcpu_size_call(stem, variable, ...)                           \
+do {                                                                    \
+        __verify_pcpu_ptr(&(variable));                                 \
+        switch(sizeof(variable)) {                                      \
+                case 1: stem##1(variable, __VA_ARGS__);break;           \
+                case 2: stem##2(variable, __VA_ARGS__);break;           \
+                case 4: stem##4(variable, __VA_ARGS__);break;           \
+                case 8: stem##8(variable, __VA_ARGS__);break;           \
+                default:                                                \
+                        __bad_size_call_parameter();break;              \
+        }                                                               \
+} while (0)
+
+/*
+ * this_cpu operations (C) 2008-2013 Christoph Lameter <cl@linux.com>
+ *
+ * Optimized manipulation for memory allocated through the per cpu
+ * allocator or for addresses of per cpu variables.
+ *
+ * These operation guarantee exclusivity of access for other operations
+ * on the *same* processor. The assumption is that per cpu data is only
+ * accessed by a single processor instance (the current one).
+ *
+ * The arch code can provide optimized implementation by defining macros
+ * for certain scalar sizes. F.e. provide this_cpu_add_2() to provide per
+ * cpu atomic operations for 2 byte sized RMW actions. If arch code does
+ * not provide operations for a scalar size then the fallback in the
+ * generic code will be used.
+ *
+ * cmpxchg_double replaces two adjacent scalars at once.  The first two
+ * parameters are per cpu variables which have to be of the same size.  A
+ * truth value is returned to indicate success or failure (since a double
+ * register result is difficult to handle).  There is very limited hardware
+ * support for these operations, so only certain sizes may work.
+ */
+
+/*
+ * Operations for contexts where we do not want to do any checks for
+ * preemptions.  Unless strictly necessary, always use [__]this_cpu_*()
+ * instead.
+ *
+ * If there is no other protection through preempt disable and/or disabling
+ * interupts then one of these RMW operations can show unexpected behavior
+ * because the execution thread was rescheduled on another processor or an
+ * interrupt occurred and the same percpu variable was modified from the
+ * interrupt context.
+ */
+#define raw_cpu_read(pcp)               __pcpu_size_call_return(raw_cpu_read_, pcp)
+#define raw_cpu_write(pcp, val)         __pcpu_size_call(raw_cpu_write_, pcp, val)
+#define raw_cpu_add(pcp, val)           __pcpu_size_call(raw_cpu_add_, pcp, val)
+#define raw_cpu_and(pcp, val)           __pcpu_size_call(raw_cpu_and_, pcp, val)
+#define raw_cpu_or(pcp, val)            __pcpu_size_call(raw_cpu_or_, pcp, val)
+#define raw_cpu_add_return(pcp, val)    __pcpu_size_call_return2(raw_cpu_add_return_, pcp, val)
+#define raw_cpu_xchg(pcp, nval)         __pcpu_size_call_return2(raw_cpu_xchg_, pcp, nval)
+#define raw_cpu_cmpxchg(pcp, oval, nval) \
+        __pcpu_size_call_return2(raw_cpu_cmpxchg_, pcp, oval, nval)
+#define raw_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        __pcpu_double_call_return_bool(raw_cpu_cmpxchg_double_, pcp1, pcp2, oval1, oval2, nval1, nval2)
+
+#define raw_cpu_sub(pcp, val)           raw_cpu_add(pcp, -(val))
+#define raw_cpu_inc(pcp)                raw_cpu_add(pcp, 1)
+#define raw_cpu_dec(pcp)                raw_cpu_sub(pcp, 1)
+#define raw_cpu_sub_return(pcp, val)    raw_cpu_add_return(pcp, -(typeof(pcp))(val))
+#define raw_cpu_inc_return(pcp)         raw_cpu_add_return(pcp, 1)
+#define raw_cpu_dec_return(pcp)         raw_cpu_add_return(pcp, -1)
+
+/*
+ * Operations for contexts that are safe from preemption/interrupts.  These
+ * operations verify that preemption is disabled.
+ */
+#define __this_cpu_read(pcp)                                            \
+({                                                                      \
+        __this_cpu_preempt_check("read");                               \
+        raw_cpu_read(pcp);                                              \
+})
+
+#define __this_cpu_write(pcp, val)                                      \
+({                                                                      \
+        __this_cpu_preempt_check("write");                              \
+        raw_cpu_write(pcp, val);                                        \
+})
+
+#define __this_cpu_add(pcp, val)                                        \
+({                                                                      \
+        __this_cpu_preempt_check("add");                                \
+        raw_cpu_add(pcp, val);                                          \
+})
+
+#define __this_cpu_and(pcp, val)                                        \
+({                                                                      \
+        __this_cpu_preempt_check("and");                                \
+        raw_cpu_and(pcp, val);                                          \
+})
+
+#define __this_cpu_or(pcp, val)                                         \
+({                                                                      \
+        __this_cpu_preempt_check("or");                                 \
+        raw_cpu_or(pcp, val);                                           \
+})
+
+#define __this_cpu_add_return(pcp, val)                                 \
+({                                                                      \
+        __this_cpu_preempt_check("add_return");                         \
+        raw_cpu_add_return(pcp, val);                                   \
+})
+
+#define __this_cpu_xchg(pcp, nval)                                      \
+({                                                                      \
+        __this_cpu_preempt_check("xchg");                               \
+        raw_cpu_xchg(pcp, nval);                                        \
+})
+
+#define __this_cpu_cmpxchg(pcp, oval, nval)                             \
+({                                                                      \
+        __this_cpu_preempt_check("cmpxchg");                            \
+        raw_cpu_cmpxchg(pcp, oval, nval);                               \
+})
+
+#define __this_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+({      __this_cpu_preempt_check("cmpxchg_double");                     \
+        raw_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2); \
+})
+
+#define __this_cpu_sub(pcp, val)        __this_cpu_add(pcp, -(typeof(pcp))(val))
+#define __this_cpu_inc(pcp)             __this_cpu_add(pcp, 1)
+#define __this_cpu_dec(pcp)             __this_cpu_sub(pcp, 1)
+#define __this_cpu_sub_return(pcp, val) __this_cpu_add_return(pcp, -(typeof(pcp))(val))
+#define __this_cpu_inc_return(pcp)      __this_cpu_add_return(pcp, 1)
+#define __this_cpu_dec_return(pcp)      __this_cpu_add_return(pcp, -1)
+
+/*
+ * Operations with implied preemption protection.  These operations can be
+ * used without worrying about preemption.  Note that interrupts may still
+ * occur while an operation is in progress and if the interrupt modifies
+ * the variable too then RMW actions may not be reliable.
+ */
+#define this_cpu_read(pcp)              __pcpu_size_call_return(this_cpu_read_, pcp)
+#define this_cpu_write(pcp, val)        __pcpu_size_call(this_cpu_write_, pcp, val)
+#define this_cpu_add(pcp, val)          __pcpu_size_call(this_cpu_add_, pcp, val)
+#define this_cpu_and(pcp, val)          __pcpu_size_call(this_cpu_and_, pcp, val)
+#define this_cpu_or(pcp, val)           __pcpu_size_call(this_cpu_or_, pcp, val)
+#define this_cpu_add_return(pcp, val)   __pcpu_size_call_return2(this_cpu_add_return_, pcp, val)
+#define this_cpu_xchg(pcp, nval)        __pcpu_size_call_return2(this_cpu_xchg_, pcp, nval)
+#define this_cpu_cmpxchg(pcp, oval, nval) \
+        __pcpu_size_call_return2(this_cpu_cmpxchg_, pcp, oval, nval)
+#define this_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \
+        __pcpu_double_call_return_bool(this_cpu_cmpxchg_double_, pcp1, pcp2, oval1, oval2, nval1, nval2)
+
+#define this_cpu_sub(pcp, val)          this_cpu_add(pcp, -(typeof(pcp))(val))
+#define this_cpu_inc(pcp)               this_cpu_add(pcp, 1)
+#define this_cpu_dec(pcp)               this_cpu_sub(pcp, 1)
+#define this_cpu_sub_return(pcp, val)   this_cpu_add_return(pcp, -(typeof(pcp))(val))
+#define this_cpu_inc_return(pcp)        this_cpu_add_return(pcp, 1)
+#define this_cpu_dec_return(pcp)        this_cpu_add_return(pcp, -1)
+
+#endif /* __ASSEMBLY__ */
 #endif /* _LINUX_PERCPU_DEFS_H */
diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h
index 5d8920e23073..3dfbf237cd8f 100644
--- a/include/linux/percpu-refcount.h
+++ b/include/linux/percpu-refcount.h
@@ -57,11 +57,9 @@ struct percpu_ref {
         atomic_t                count;
         /*
          * The low bit of the pointer indicates whether the ref is in percpu
-         * mode; if set, then get/put will manipulate the atomic_t (this is a
-         * hack because we need to keep the pointer around for
-         * percpu_ref_kill_rcu())
+         * mode; if set, then get/put will manipulate the atomic_t.
          */
-        unsigned __percpu       *pcpu_count;
+        unsigned long           pcpu_count_ptr;
         percpu_ref_func_t       *release;
         percpu_ref_func_t       *confirm_kill;
         struct rcu_head         rcu;
@@ -69,7 +67,8 @@ struct percpu_ref {
 
 int __must_check percpu_ref_init(struct percpu_ref *ref,
                                  percpu_ref_func_t *release);
-void percpu_ref_cancel_init(struct percpu_ref *ref);
+void percpu_ref_reinit(struct percpu_ref *ref);
+void percpu_ref_exit(struct percpu_ref *ref);
 void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
                                  percpu_ref_func_t *confirm_kill);
 
@@ -88,12 +87,28 @@ static inline void percpu_ref_kill(struct percpu_ref *ref)
         return percpu_ref_kill_and_confirm(ref, NULL);
 }
 
-#define PCPU_STATUS_BITS        2
-#define PCPU_STATUS_MASK        ((1 << PCPU_STATUS_BITS) - 1)
-#define PCPU_REF_PTR            0
 #define PCPU_REF_DEAD           1
 
-#define REF_STATUS(count)       (((unsigned long) count) & PCPU_STATUS_MASK)
+/*
+ * Internal helper.  Don't use outside percpu-refcount proper.  The
+ * function doesn't return the pointer and let the caller test it for NULL
+ * because doing so forces the compiler to generate two conditional
+ * branches as it can't assume that @ref->pcpu_count is not NULL.
+ */
+static inline bool __pcpu_ref_alive(struct percpu_ref *ref,
+                                    unsigned __percpu **pcpu_countp)
+{
+        unsigned long pcpu_ptr = ACCESS_ONCE(ref->pcpu_count_ptr);
+
+        /* paired with smp_store_release() in percpu_ref_reinit() */
+        smp_read_barrier_depends();
+
+        if (unlikely(pcpu_ptr & PCPU_REF_DEAD))
+                return false;
+
+        *pcpu_countp = (unsigned __percpu *)pcpu_ptr;
+        return true;
+}
 
 /**
  * percpu_ref_get - increment a percpu refcount
@@ -107,9 +122,7 @@ static inline void percpu_ref_get(struct percpu_ref *ref)
 
         rcu_read_lock_sched();
 
-        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
-
-        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
+        if (__pcpu_ref_alive(ref, &pcpu_count))
                 this_cpu_inc(*pcpu_count);
         else
                 atomic_inc(&ref->count);
@@ -133,9 +146,7 @@ static inline bool percpu_ref_tryget(struct percpu_ref *ref)
 
         rcu_read_lock_sched();
 
-        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
-
-        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR)) {
+        if (__pcpu_ref_alive(ref, &pcpu_count)) {
                 this_cpu_inc(*pcpu_count);
                 ret = true;
         } else {
@@ -168,9 +179,7 @@ static inline bool percpu_ref_tryget_live(struct percpu_ref *ref)
 
         rcu_read_lock_sched();
 
-        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
-
-        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR)) {
+        if (__pcpu_ref_alive(ref, &pcpu_count)) {
                 this_cpu_inc(*pcpu_count);
                 ret = true;
         }
@@ -193,9 +202,7 @@ static inline void percpu_ref_put(struct percpu_ref *ref)
 
         rcu_read_lock_sched();
 
-        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
-
-        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
+        if (__pcpu_ref_alive(ref, &pcpu_count))
                 this_cpu_dec(*pcpu_count);
         else if (unlikely(atomic_dec_and_test(&ref->count)))
                 ref->release(ref);
@@ -203,4 +210,19 @@ static inline void percpu_ref_put(struct percpu_ref *ref)
         rcu_read_unlock_sched();
 }
 
+/**
+ * percpu_ref_is_zero - test whether a percpu refcount reached zero
+ * @ref: percpu_ref to test
+ *
+ * Returns %true if @ref reached zero.
+ */
+static inline bool percpu_ref_is_zero(struct percpu_ref *ref)
+{
+        unsigned __percpu *pcpu_count;
+
+        if (__pcpu_ref_alive(ref, &pcpu_count))
+                return false;
+        return !atomic_read(&ref->count);
+}
+
 #endif
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 8419053d0f2e..6f61b61b7996 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -23,32 +23,6 @@
          PERCPU_MODULE_RESERVE)
 #endif
 
-/*
- * Must be an lvalue. Since @var must be a simple identifier,
- * we force a syntax error here if it isn't.
- */
-#define get_cpu_var(var) (*({                           \
-        preempt_disable();                              \
-        this_cpu_ptr(&var); }))
-
-/*
- * The weird & is necessary because sparse considers (void)(var) to be
- * a direct dereference of percpu variable (var).
- */
-#define put_cpu_var(var) do {                           \
-        (void)&(var);                                   \
-        preempt_enable();                               \
-} while (0)
-
-#define get_cpu_ptr(var) ({                             \
-        preempt_disable();                              \
-        this_cpu_ptr(var); })
-
-#define put_cpu_ptr(var) do {                           \
-        (void)(var);                                    \
-        preempt_enable();                               \
-} while (0)
-
 /* minimum unit size, also is the maximum supported allocation size */
 #define PCPU_MIN_UNIT_SIZE              PFN_ALIGN(32 << 10)
 
@@ -140,17 +114,6 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size,
                                 pcpu_fc_populate_pte_fn_t populate_pte_fn);
 #endif
 
-/*
- * Use this to get to a cpu's version of the per-cpu object
- * dynamically allocated. Non-atomic access to the current CPU's
- * version should probably be combined with get_cpu()/put_cpu().
- */
-#ifdef CONFIG_SMP
-#define per_cpu_ptr(ptr, cpu)   SHIFT_PERCPU_PTR((ptr), per_cpu_offset((cpu)))
-#else
-#define per_cpu_ptr(ptr, cpu)   ({ (void)(cpu); VERIFY_PERCPU_PTR((ptr)); })
-#endif
-
 extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
 extern bool is_kernel_percpu_address(unsigned long addr);
 
@@ -166,640 +129,4 @@ extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
 #define alloc_percpu(type)      \
         (typeof(type) __percpu *)__alloc_percpu(sizeof(type), __alignof__(type))
 
-/*
- * Branching function to split up a function into a set of functions that
- * are called for different scalar sizes of the objects handled.
- */
-
-extern void __bad_size_call_parameter(void);
-
-#ifdef CONFIG_DEBUG_PREEMPT
-extern void __this_cpu_preempt_check(const char *op);
-#else
-static inline void __this_cpu_preempt_check(const char *op) { }
-#endif
-
-#define __pcpu_size_call_return(stem, variable)                         \
-({      typeof(variable) pscr_ret__;                                    \
-        __verify_pcpu_ptr(&(variable));                                 \
-        switch(sizeof(variable)) {                                      \
-        case 1: pscr_ret__ = stem##1(variable);break;                   \
-        case 2: pscr_ret__ = stem##2(variable);break;                   \
-        case 4: pscr_ret__ = stem##4(variable);break;                   \
-        case 8: pscr_ret__ = stem##8(variable);break;                   \
-        default:                                                        \
-                __bad_size_call_parameter();break;                      \
-        }                                                               \
-        pscr_ret__;                                                     \
-})
-
-#define __pcpu_size_call_return2(stem, variable, ...)                   \
-({                                                                      \
-        typeof(variable) pscr2_ret__;                                   \
-        __verify_pcpu_ptr(&(variable));                                 \
-        switch(sizeof(variable)) {                                      \
-        case 1: pscr2_ret__ = stem##1(variable, __VA_ARGS__); break;    \
-        case 2: pscr2_ret__ = stem##2(variable, __VA_ARGS__); break;    \
-        case 4: pscr2_ret__ = stem##4(variable, __VA_ARGS__); break;    \
-        case 8: pscr2_ret__ = stem##8(variable, __VA_ARGS__); break;    \
-        default:                                                        \
-                __bad_size_call_parameter(); break;                     \
-        }                                                               \
-        pscr2_ret__;                                                    \
-})
-
-/*
- * Special handling for cmpxchg_double.  cmpxchg_double is passed two
- * percpu variables.  The first has to be aligned to a double word
- * boundary and the second has to follow directly thereafter.
- * We enforce this on all architectures even if they don't support
- * a double cmpxchg instruction, since it's a cheap requirement, and it
- * avoids breaking the requirement for architectures with the instruction.
- */
-#define __pcpu_double_call_return_bool(stem, pcp1, pcp2, ...)           \
-({                                                                      \
-        bool pdcrb_ret__;                                               \
-        __verify_pcpu_ptr(&pcp1);                                       \
-        BUILD_BUG_ON(sizeof(pcp1) != sizeof(pcp2));                     \
-        VM_BUG_ON((unsigned long)(&pcp1) % (2 * sizeof(pcp1)));         \
-        VM_BUG_ON((unsigned long)(&pcp2) !=                             \
-                  (unsigned long)(&pcp1) + sizeof(pcp1));               \
-        switch(sizeof(pcp1)) {                                          \
-        case 1: pdcrb_ret__ = stem##1(pcp1, pcp2, __VA_ARGS__); break;  \
-        case 2: pdcrb_ret__ = stem##2(pcp1, pcp2, __VA_ARGS__); break;  \
-        case 4: pdcrb_ret__ = stem##4(pcp1, pcp2, __VA_ARGS__); break;  \
-        case 8: pdcrb_ret__ = stem##8(pcp1, pcp2, __VA_ARGS__); break;  \
-        default:                                                        \
-                __bad_size_call_parameter(); break;                     \
-        }                                                               \
-        pdcrb_ret__;                                                    \
-})
-
-#define __pcpu_size_call(stem, variable, ...)                           \
-do {                                                                    \
-        __verify_pcpu_ptr(&(variable));                                 \
-        switch(sizeof(variable)) {                                      \
-                case 1: stem##1(variable, __VA_ARGS__);break;           \
-                case 2: stem##2(variable, __VA_ARGS__);break;           \
-                case 4: stem##4(variable, __VA_ARGS__);break;           \
-                case 8: stem##8(variable, __VA_ARGS__);break;           \
-                default:                                                \
-                        __bad_size_call_parameter();break;              \
-        }                                                               \
-} while (0)
-
-/*
- * this_cpu operations (C) 2008-2013 Christoph Lameter <cl@linux.com>
- *
- * Optimized manipulation for memory allocated through the per cpu
- * allocator or for addresses of per cpu variables.
- *
- * These operation guarantee exclusivity of access for other operations
- * on the *same* processor. The assumption is that per cpu data is only
- * accessed by a single processor instance (the current one).
- *
- * The first group is used for accesses that must be done in a
- * preemption safe way since we know that the context is not preempt
- * safe. Interrupts may occur. If the interrupt modifies the variable
- * too then RMW actions will not be reliable.
- *
- * The arch code can provide optimized functions in two ways:
- *
- * 1. Override the function completely. F.e. define this_cpu_add().
- *    The arch must then ensure that the various scalar format passed
- *    are handled correctly.
- *
- * 2. Provide functions for certain scalar sizes. F.e. provide
- *    this_cpu_add_2() to provide per cpu atomic operations for 2 byte
- *    sized RMW actions. If arch code does not provide operations for
- *    a scalar size then the fallback in the generic code will be
- *    used.
- */
-
-#define _this_cpu_generic_read(pcp)                                     \
-({      typeof(pcp) ret__;                                              \
-        preempt_disable();                                              \
-        ret__ = *this_cpu_ptr(&(pcp));                                  \
-        preempt_enable();                                               \
-        ret__;                                                          \
-})
-
-#ifndef this_cpu_read
-# ifndef this_cpu_read_1
-#  define this_cpu_read_1(pcp)  _this_cpu_generic_read(pcp)
-# endif
-# ifndef this_cpu_read_2
-#  define this_cpu_read_2(pcp)  _this_cpu_generic_read(pcp)
-# endif
-# ifndef this_cpu_read_4
-#  define this_cpu_read_4(pcp)  _this_cpu_generic_read(pcp)
-# endif
-# ifndef this_cpu_read_8
-#  define this_cpu_read_8(pcp)  _this_cpu_generic_read(pcp)
-# endif
-# define this_cpu_read(pcp)     __pcpu_size_call_return(this_cpu_read_, (pcp))
-#endif
-
-#define _this_cpu_generic_to_op(pcp, val, op)                           \
-do {                                                                    \
-        unsigned long flags;                                            \
-        raw_local_irq_save(flags);                                      \
-        *raw_cpu_ptr(&(pcp)) op val;                                    \
-        raw_local_irq_restore(flags);                                   \
-} while (0)
-
-#ifndef this_cpu_write
-# ifndef this_cpu_write_1
-#  define this_cpu_write_1(pcp, val)    _this_cpu_generic_to_op((pcp), (val), =)
-# endif
-# ifndef this_cpu_write_2
-#  define this_cpu_write_2(pcp, val)    _this_cpu_generic_to_op((pcp), (val), =)
-# endif
-# ifndef this_cpu_write_4
-#  define this_cpu_write_4(pcp, val)    _this_cpu_generic_to_op((pcp), (val), =)
-# endif
-# ifndef this_cpu_write_8
-#  define this_cpu_write_8(pcp, val)    _this_cpu_generic_to_op((pcp), (val), =)
-# endif
-# define this_cpu_write(pcp, val)       __pcpu_size_call(this_cpu_write_, (pcp), (val))
-#endif
-
-#ifndef this_cpu_add
-# ifndef this_cpu_add_1
-#  define this_cpu_add_1(pcp, val)      _this_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# ifndef this_cpu_add_2
-#  define this_cpu_add_2(pcp, val)      _this_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# ifndef this_cpu_add_4
-#  define this_cpu_add_4(pcp, val)      _this_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# ifndef this_cpu_add_8
-#  define this_cpu_add_8(pcp, val)      _this_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# define this_cpu_add(pcp, val)         __pcpu_size_call(this_cpu_add_, (pcp), (val))
-#endif
-
-#ifndef this_cpu_sub
-# define this_cpu_sub(pcp, val)         this_cpu_add((pcp), -(typeof(pcp))(val))
-#endif
-
-#ifndef this_cpu_inc
-# define this_cpu_inc(pcp)              this_cpu_add((pcp), 1)
-#endif
-
-#ifndef this_cpu_dec
-# define this_cpu_dec(pcp)              this_cpu_sub((pcp), 1)
-#endif
-
-#ifndef this_cpu_and
-# ifndef this_cpu_and_1
-#  define this_cpu_and_1(pcp, val)      _this_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# ifndef this_cpu_and_2
-#  define this_cpu_and_2(pcp, val)      _this_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# ifndef this_cpu_and_4
-#  define this_cpu_and_4(pcp, val)      _this_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# ifndef this_cpu_and_8
-#  define this_cpu_and_8(pcp, val)      _this_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# define this_cpu_and(pcp, val)         __pcpu_size_call(this_cpu_and_, (pcp), (val))
-#endif
-
-#ifndef this_cpu_or
-# ifndef this_cpu_or_1
-#  define this_cpu_or_1(pcp, val)       _this_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# ifndef this_cpu_or_2
-#  define this_cpu_or_2(pcp, val)       _this_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# ifndef this_cpu_or_4
-#  define this_cpu_or_4(pcp, val)       _this_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# ifndef this_cpu_or_8
-#  define this_cpu_or_8(pcp, val)       _this_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# define this_cpu_or(pcp, val)          __pcpu_size_call(this_cpu_or_, (pcp), (val))
-#endif
-
-#define _this_cpu_generic_add_return(pcp, val)                          \
-({                                                                      \
-        typeof(pcp) ret__;                                              \
-        unsigned long flags;                                            \
-        raw_local_irq_save(flags);                                      \
-        raw_cpu_add(pcp, val);                                  \
-        ret__ = raw_cpu_read(pcp);                                      \
-        raw_local_irq_restore(flags);                                   \
-        ret__;                                                          \
-})
-
-#ifndef this_cpu_add_return
-# ifndef this_cpu_add_return_1
-#  define this_cpu_add_return_1(pcp, val)       _this_cpu_generic_add_return(pcp, val)
-# endif
-# ifndef this_cpu_add_return_2
-#  define this_cpu_add_return_2(pcp, val)       _this_cpu_generic_add_return(pcp, val)
-# endif
-# ifndef this_cpu_add_return_4
-#  define this_cpu_add_return_4(pcp, val)       _this_cpu_generic_add_return(pcp, val)
-# endif
-# ifndef this_cpu_add_return_8
-#  define this_cpu_add_return_8(pcp, val)       _this_cpu_generic_add_return(pcp, val)
-# endif
-# define this_cpu_add_return(pcp, val)  __pcpu_size_call_return2(this_cpu_add_return_, pcp, val)
-#endif
-
-#define this_cpu_sub_return(pcp, val)   this_cpu_add_return(pcp, -(typeof(pcp))(val))
-#define this_cpu_inc_return(pcp)        this_cpu_add_return(pcp, 1)
-#define this_cpu_dec_return(pcp)        this_cpu_add_return(pcp, -1)
-
-#define _this_cpu_generic_xchg(pcp, nval)                               \
-({      typeof(pcp) ret__;                                              \
-        unsigned long flags;                                            \
-        raw_local_irq_save(flags);                                      \
-        ret__ = raw_cpu_read(pcp);                                      \
-        raw_cpu_write(pcp, nval);                                       \
-        raw_local_irq_restore(flags);                                   \
-        ret__;                                                          \
-})
-
-#ifndef this_cpu_xchg
-# ifndef this_cpu_xchg_1
-#  define this_cpu_xchg_1(pcp, nval)    _this_cpu_generic_xchg(pcp, nval)
-# endif
-# ifndef this_cpu_xchg_2
-#  define this_cpu_xchg_2(pcp, nval)    _this_cpu_generic_xchg(pcp, nval)
-# endif
-# ifndef this_cpu_xchg_4
-#  define this_cpu_xchg_4(pcp, nval)    _this_cpu_generic_xchg(pcp, nval)
-# endif
-# ifndef this_cpu_xchg_8
-#  define this_cpu_xchg_8(pcp, nval)    _this_cpu_generic_xchg(pcp, nval)
-# endif
-# define this_cpu_xchg(pcp, nval)       \
-        __pcpu_size_call_return2(this_cpu_xchg_, (pcp), nval)
-#endif
-
-#define _this_cpu_generic_cmpxchg(pcp, oval, nval)                      \
-({                                                                      \
-        typeof(pcp) ret__;                                              \
-        unsigned long flags;                                            \
-        raw_local_irq_save(flags);                                      \
-        ret__ = raw_cpu_read(pcp);                                      \
-        if (ret__ == (oval))                                            \
-                raw_cpu_write(pcp, nval);                               \
-        raw_local_irq_restore(flags);                                   \
-        ret__;                                                          \
-})
-
-#ifndef this_cpu_cmpxchg
-# ifndef this_cpu_cmpxchg_1
-#  define this_cpu_cmpxchg_1(pcp, oval, nval)   _this_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# ifndef this_cpu_cmpxchg_2
-#  define this_cpu_cmpxchg_2(pcp, oval, nval)   _this_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# ifndef this_cpu_cmpxchg_4
-#  define this_cpu_cmpxchg_4(pcp, oval, nval)   _this_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# ifndef this_cpu_cmpxchg_8
-#  define this_cpu_cmpxchg_8(pcp, oval, nval)   _this_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# define this_cpu_cmpxchg(pcp, oval, nval)      \
-        __pcpu_size_call_return2(this_cpu_cmpxchg_, pcp, oval, nval)
-#endif
-
-/*
- * cmpxchg_double replaces two adjacent scalars at once.  The first
- * two parameters are per cpu variables which have to be of the same
- * size.  A truth value is returned to indicate success or failure
- * (since a double register result is difficult to handle).  There is
- * very limited hardware support for these operations, so only certain
- * sizes may work.
- */
-#define _this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)        \
-({                                                                      \
-        int ret__;                                                      \
-        unsigned long flags;                                            \
-        raw_local_irq_save(flags);                                      \
-        ret__ = raw_cpu_generic_cmpxchg_double(pcp1, pcp2,              \
-                        oval1, oval2, nval1, nval2);                    \
-        raw_local_irq_restore(flags);                                   \
-        ret__;                                                          \
-})
-
-#ifndef this_cpu_cmpxchg_double
-# ifndef this_cpu_cmpxchg_double_1
-#  define this_cpu_cmpxchg_double_1(pcp1, pcp2, oval1, oval2, nval1, nval2)     \
-        _this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# ifndef this_cpu_cmpxchg_double_2
-#  define this_cpu_cmpxchg_double_2(pcp1, pcp2, oval1, oval2, nval1, nval2)     \
-        _this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# ifndef this_cpu_cmpxchg_double_4
-#  define this_cpu_cmpxchg_double_4(pcp1, pcp2, oval1, oval2, nval1, nval2)     \
-        _this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# ifndef this_cpu_cmpxchg_double_8
-#  define this_cpu_cmpxchg_double_8(pcp1, pcp2, oval1, oval2, nval1, nval2)     \
-        _this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# define this_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)        \
-        __pcpu_double_call_return_bool(this_cpu_cmpxchg_double_, (pcp1), (pcp2), (oval1), (oval2), (nval1), (nval2))
-#endif
-
-/*
- * Generic percpu operations for contexts where we do not want to do
- * any checks for preemptiosn.
- *
- * If there is no other protection through preempt disable and/or
- * disabling interupts then one of these RMW operations can show unexpected
- * behavior because the execution thread was rescheduled on another processor
- * or an interrupt occurred and the same percpu variable was modified from
- * the interrupt context.
- */
-#ifndef raw_cpu_read
-# ifndef raw_cpu_read_1
-#  define raw_cpu_read_1(pcp)   (*raw_cpu_ptr(&(pcp)))
-# endif
-# ifndef raw_cpu_read_2
-#  define raw_cpu_read_2(pcp)   (*raw_cpu_ptr(&(pcp)))
-# endif
-# ifndef raw_cpu_read_4
-#  define raw_cpu_read_4(pcp)   (*raw_cpu_ptr(&(pcp)))
-# endif
-# ifndef raw_cpu_read_8
-#  define raw_cpu_read_8(pcp)   (*raw_cpu_ptr(&(pcp)))
-# endif
-# define raw_cpu_read(pcp)      __pcpu_size_call_return(raw_cpu_read_, (pcp))
-#endif
-
-#define raw_cpu_generic_to_op(pcp, val, op)                             \
-do {                                                                    \
-        *raw_cpu_ptr(&(pcp)) op val;                                    \
-} while (0)
-
-
-#ifndef raw_cpu_write
-# ifndef raw_cpu_write_1
-#  define raw_cpu_write_1(pcp, val)     raw_cpu_generic_to_op((pcp), (val), =)
-# endif
-# ifndef raw_cpu_write_2
-#  define raw_cpu_write_2(pcp, val)     raw_cpu_generic_to_op((pcp), (val), =)
-# endif
-# ifndef raw_cpu_write_4
-#  define raw_cpu_write_4(pcp, val)     raw_cpu_generic_to_op((pcp), (val), =)
-# endif
-# ifndef raw_cpu_write_8
-#  define raw_cpu_write_8(pcp, val)     raw_cpu_generic_to_op((pcp), (val), =)
-# endif
-# define raw_cpu_write(pcp, val)        __pcpu_size_call(raw_cpu_write_, (pcp), (val))
-#endif
-
-#ifndef raw_cpu_add
-# ifndef raw_cpu_add_1
-#  define raw_cpu_add_1(pcp, val)       raw_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# ifndef raw_cpu_add_2
-#  define raw_cpu_add_2(pcp, val)       raw_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# ifndef raw_cpu_add_4
-#  define raw_cpu_add_4(pcp, val)       raw_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# ifndef raw_cpu_add_8
-#  define raw_cpu_add_8(pcp, val)       raw_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# define raw_cpu_add(pcp, val)  __pcpu_size_call(raw_cpu_add_, (pcp), (val))
-#endif
-
-#ifndef raw_cpu_sub
-# define raw_cpu_sub(pcp, val)  raw_cpu_add((pcp), -(val))
-#endif
-
-#ifndef raw_cpu_inc
-# define raw_cpu_inc(pcp)               raw_cpu_add((pcp), 1)
-#endif
-
-#ifndef raw_cpu_dec
-# define raw_cpu_dec(pcp)               raw_cpu_sub((pcp), 1)
-#endif
-
-#ifndef raw_cpu_and
-# ifndef raw_cpu_and_1
-#  define raw_cpu_and_1(pcp, val)       raw_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# ifndef raw_cpu_and_2
-#  define raw_cpu_and_2(pcp, val)       raw_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# ifndef raw_cpu_and_4
-#  define raw_cpu_and_4(pcp, val)       raw_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# ifndef raw_cpu_and_8
-#  define raw_cpu_and_8(pcp, val)       raw_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# define raw_cpu_and(pcp, val)  __pcpu_size_call(raw_cpu_and_, (pcp), (val))
-#endif
-
-#ifndef raw_cpu_or
-# ifndef raw_cpu_or_1
-#  define raw_cpu_or_1(pcp, val)        raw_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# ifndef raw_cpu_or_2
-#  define raw_cpu_or_2(pcp, val)        raw_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# ifndef raw_cpu_or_4
-#  define raw_cpu_or_4(pcp, val)        raw_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# ifndef raw_cpu_or_8
-#  define raw_cpu_or_8(pcp, val)        raw_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# define raw_cpu_or(pcp, val)   __pcpu_size_call(raw_cpu_or_, (pcp), (val))
-#endif
-
-#define raw_cpu_generic_add_return(pcp, val)                            \
-({                                                                      \
-        raw_cpu_add(pcp, val);                                          \
-        raw_cpu_read(pcp);                                              \
-})
-
-#ifndef raw_cpu_add_return
-# ifndef raw_cpu_add_return_1
-#  define raw_cpu_add_return_1(pcp, val)        raw_cpu_generic_add_return(pcp, val)
-# endif
-# ifndef raw_cpu_add_return_2
-#  define raw_cpu_add_return_2(pcp, val)        raw_cpu_generic_add_return(pcp, val)
-# endif
-# ifndef raw_cpu_add_return_4
-#  define raw_cpu_add_return_4(pcp, val)        raw_cpu_generic_add_return(pcp, val)
-# endif
-# ifndef raw_cpu_add_return_8
-#  define raw_cpu_add_return_8(pcp, val)        raw_cpu_generic_add_return(pcp, val)
-# endif
-# define raw_cpu_add_return(pcp, val)   \
-        __pcpu_size_call_return2(raw_cpu_add_return_, pcp, val)
-#endif
-
-#define raw_cpu_sub_return(pcp, val)    raw_cpu_add_return(pcp, -(typeof(pcp))(val))
-#define raw_cpu_inc_return(pcp) raw_cpu_add_return(pcp, 1)
-#define raw_cpu_dec_return(pcp) raw_cpu_add_return(pcp, -1)
-
-#define raw_cpu_generic_xchg(pcp, nval)                                 \
-({      typeof(pcp) ret__;                                              \
-        ret__ = raw_cpu_read(pcp);                                      \
-        raw_cpu_write(pcp, nval);                                       \
-        ret__;                                                          \
-})
-
-#ifndef raw_cpu_xchg
-# ifndef raw_cpu_xchg_1
-#  define raw_cpu_xchg_1(pcp, nval)     raw_cpu_generic_xchg(pcp, nval)
-# endif
-# ifndef raw_cpu_xchg_2
-#  define raw_cpu_xchg_2(pcp, nval)     raw_cpu_generic_xchg(pcp, nval)
-# endif
-# ifndef raw_cpu_xchg_4
-#  define raw_cpu_xchg_4(pcp, nval)     raw_cpu_generic_xchg(pcp, nval)
-# endif
-# ifndef raw_cpu_xchg_8
-#  define raw_cpu_xchg_8(pcp, nval)     raw_cpu_generic_xchg(pcp, nval)
-# endif
-# define raw_cpu_xchg(pcp, nval)        \
-        __pcpu_size_call_return2(raw_cpu_xchg_, (pcp), nval)
-#endif
-
-#define raw_cpu_generic_cmpxchg(pcp, oval, nval)                        \
-({                                                                      \
-        typeof(pcp) ret__;                                              \
-        ret__ = raw_cpu_read(pcp);                                      \
-        if (ret__ == (oval))                                            \
-                raw_cpu_write(pcp, nval);                               \
-        ret__;                                                          \
-})
-
-#ifndef raw_cpu_cmpxchg
-# ifndef raw_cpu_cmpxchg_1
-#  define raw_cpu_cmpxchg_1(pcp, oval, nval)    raw_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# ifndef raw_cpu_cmpxchg_2
-#  define raw_cpu_cmpxchg_2(pcp, oval, nval)    raw_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# ifndef raw_cpu_cmpxchg_4
-#  define raw_cpu_cmpxchg_4(pcp, oval, nval)    raw_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# ifndef raw_cpu_cmpxchg_8
-#  define raw_cpu_cmpxchg_8(pcp, oval, nval)    raw_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# define raw_cpu_cmpxchg(pcp, oval, nval)       \
-        __pcpu_size_call_return2(raw_cpu_cmpxchg_, pcp, oval, nval)
-#endif
-
-#define raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)  \
-({                                                                      \
-        int __ret = 0;                                                  \
-        if (raw_cpu_read(pcp1) == (oval1) &&                            \
-                         raw_cpu_read(pcp2)  == (oval2)) {              \
-                raw_cpu_write(pcp1, (nval1));                           \
-                raw_cpu_write(pcp2, (nval2));                           \
-                __ret = 1;                                              \
-        }                                                               \
-        (__ret);                                                        \
-})
-
-#ifndef raw_cpu_cmpxchg_double
-# ifndef raw_cpu_cmpxchg_double_1
-#  define raw_cpu_cmpxchg_double_1(pcp1, pcp2, oval1, oval2, nval1, nval2)      \
-        raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# ifndef raw_cpu_cmpxchg_double_2
-#  define raw_cpu_cmpxchg_double_2(pcp1, pcp2, oval1, oval2, nval1, nval2)      \
-        raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# ifndef raw_cpu_cmpxchg_double_4
-#  define raw_cpu_cmpxchg_double_4(pcp1, pcp2, oval1, oval2, nval1, nval2)      \
-        raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# ifndef raw_cpu_cmpxchg_double_8
-#  define raw_cpu_cmpxchg_double_8(pcp1, pcp2, oval1, oval2, nval1, nval2)      \
-        raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# define raw_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \
-        __pcpu_double_call_return_bool(raw_cpu_cmpxchg_double_, (pcp1), (pcp2), (oval1), (oval2), (nval1), (nval2))
-#endif
-
-/*
- * Generic percpu operations for context that are safe from preemption/interrupts.
- */
-#ifndef __this_cpu_read
-# define __this_cpu_read(pcp) \
-        (__this_cpu_preempt_check("read"),__pcpu_size_call_return(raw_cpu_read_, (pcp)))
-#endif
-
-#ifndef __this_cpu_write
-# define __this_cpu_write(pcp, val)                                     \
-do { __this_cpu_preempt_check("write");                                 \
-     __pcpu_size_call(raw_cpu_write_, (pcp), (val));                    \
-} while (0)
-#endif
-
-#ifndef __this_cpu_add
-# define __this_cpu_add(pcp, val)                                        \
-do { __this_cpu_preempt_check("add");                                   \
-        __pcpu_size_call(raw_cpu_add_, (pcp), (val));                   \
-} while (0)
-#endif
-
-#ifndef __this_cpu_sub
-# define __this_cpu_sub(pcp, val)       __this_cpu_add((pcp), -(typeof(pcp))(val))
-#endif
-
-#ifndef __this_cpu_inc
-# define __this_cpu_inc(pcp)            __this_cpu_add((pcp), 1)
-#endif
-
-#ifndef __this_cpu_dec
-# define __this_cpu_dec(pcp)            __this_cpu_sub((pcp), 1)
-#endif
-
-#ifndef __this_cpu_and
-# define __this_cpu_and(pcp, val)                                       \
-do { __this_cpu_preempt_check("and");                                   \
-        __pcpu_size_call(raw_cpu_and_, (pcp), (val));                   \
-} while (0)
-
-#endif
-
-#ifndef __this_cpu_or
-# define __this_cpu_or(pcp, val)                                        \
-do { __this_cpu_preempt_check("or");                                    \
-        __pcpu_size_call(raw_cpu_or_, (pcp), (val));                    \
-} while (0)
-#endif
-
-#ifndef __this_cpu_add_return
-# define __this_cpu_add_return(pcp, val)        \
-        (__this_cpu_preempt_check("add_return"),__pcpu_size_call_return2(raw_cpu_add_return_, pcp, val))
-#endif
-
-#define __this_cpu_sub_return(pcp, val) __this_cpu_add_return(pcp, -(typeof(pcp))(val))
-#define __this_cpu_inc_return(pcp)      __this_cpu_add_return(pcp, 1)
-#define __this_cpu_dec_return(pcp)      __this_cpu_add_return(pcp, -1)
-
-#ifndef __this_cpu_xchg
-# define __this_cpu_xchg(pcp, nval)     \
-        (__this_cpu_preempt_check("xchg"),__pcpu_size_call_return2(raw_cpu_xchg_, (pcp), nval))
-#endif
-
-#ifndef __this_cpu_cmpxchg
-# define __this_cpu_cmpxchg(pcp, oval, nval)    \
-        (__this_cpu_preempt_check("cmpxchg"),__pcpu_size_call_return2(raw_cpu_cmpxchg_, pcp, oval, nval))
-#endif
-
-#ifndef __this_cpu_cmpxchg_double
-# define __this_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)      \
-        (__this_cpu_preempt_check("cmpxchg_double"),__pcpu_double_call_return_bool(raw_cpu_cmpxchg_double_, (pcp1), (pcp2), (oval1), (oval2), (nval1), (nval2)))
-#endif
-
 #endif /* __LINUX_PERCPU_H */
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 68041446c450..ed39956b5613 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -545,6 +545,24 @@ struct phy_driver {
          */
         void (*link_change_notify)(struct phy_device *dev);
 
+        /* A function provided by a phy specific driver to override the
+         * the PHY driver framework support for reading a MMD register
+         * from the PHY. If not supported, return -1. This function is
+         * optional for PHY specific drivers, if not provided then the
+         * default MMD read function is used by the PHY framework.
+         */
+        int (*read_mmd_indirect)(struct phy_device *dev, int ptrad,
+                                 int devnum, int regnum);
+
+        /* A function provided by a phy specific driver to override the
+         * the PHY driver framework support for writing a MMD register
+         * from the PHY. This function is optional for PHY specific drivers,
+         * if not provided then the default MMD read function is used by
+         * the PHY framework.
+         */
+        void (*write_mmd_indirect)(struct phy_device *dev, int ptrad,
+                                   int devnum, int regnum, u32 val);
+
         struct device_driver driver;
 };
 #define to_phy_driver(d) container_of(d, struct phy_driver, driver)
diff --git a/include/linux/phy/omap_control_phy.h b/include/linux/phy/omap_control_phy.h
index 5450403c7546..e9e6cfbfbb58 100644
--- a/include/linux/phy/omap_control_phy.h
+++ b/include/linux/phy/omap_control_phy.h
@@ -23,6 +23,7 @@ enum omap_control_phy_type {
         OMAP_CTRL_TYPE_OTGHS = 1,       /* Mailbox OTGHS_CONTROL */
         OMAP_CTRL_TYPE_USB2,    /* USB2_PHY, power down in CONTROL_DEV_CONF */
         OMAP_CTRL_TYPE_PIPE3,   /* PIPE3 PHY, DPLL & seperate Rx/Tx power */
+        OMAP_CTRL_TYPE_PCIE,    /* RX TX control of ACSPCIE */
         OMAP_CTRL_TYPE_DRA7USB2, /* USB2 PHY, power and power_aux e.g. DRA7 */
         OMAP_CTRL_TYPE_AM437USB2, /* USB2 PHY, power e.g. AM437x */
 };
@@ -33,6 +34,7 @@ struct omap_control_phy {
         u32 __iomem *otghs_control;
         u32 __iomem *power;
         u32 __iomem *power_aux;
+        u32 __iomem *pcie_pcs;
 
         struct clk *sys_clk;
 
@@ -63,6 +65,9 @@ enum omap_control_usb_mode {
 #define OMAP_CTRL_PIPE3_PHY_TX_RX_POWERON       0x3
 #define OMAP_CTRL_PIPE3_PHY_TX_RX_POWEROFF      0x0
 
+#define OMAP_CTRL_PCIE_PCS_MASK                 0xff
+#define OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT    0x8
+
 #define OMAP_CTRL_USB2_PHY_PD           BIT(28)
 
 #define AM437X_CTRL_USB2_PHY_PD         BIT(0)
@@ -74,6 +79,7 @@ enum omap_control_usb_mode {
 void omap_control_phy_power(struct device *dev, int on);
 void omap_control_usb_set_mode(struct device *dev,
                                enum omap_control_usb_mode mode);
+void omap_control_pcie_pcs(struct device *dev, u8 id, u8 delay);
 #else
 
 static inline void omap_control_phy_power(struct device *dev, int on)
@@ -84,6 +90,10 @@ static inline void omap_control_usb_set_mode(struct device *dev,
         enum omap_control_usb_mode mode)
 {
 }
+
+static inline void omap_control_pcie_pcs(struct device *dev, u8 id, u8 delay)
+{
+}
 #endif
 
 #endif  /* __OMAP_CONTROL_PHY_H__ */
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index 2760744cb2a7..8cb6f815475b 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -18,6 +18,7 @@
 #include <linux/of.h>
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
+#include <linux/regulator/consumer.h>
 
 struct phy;
 
@@ -65,6 +66,7 @@ struct phy {
         int                     init_count;
         int                     power_count;
         struct phy_attrs        attrs;
+        struct regulator        *pwr;
 };
 
 /**
@@ -156,9 +158,10 @@ void devm_phy_put(struct device *dev, struct phy *phy);
 struct phy *of_phy_get(struct device_node *np, const char *con_id);
 struct phy *of_phy_simple_xlate(struct device *dev,
         struct of_phandle_args *args);
-struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
-        struct phy_init_data *init_data);
-struct phy *devm_phy_create(struct device *dev,
+struct phy *phy_create(struct device *dev, struct device_node *node,
+                       const struct phy_ops *ops,
+                       struct phy_init_data *init_data);
+struct phy *devm_phy_create(struct device *dev, struct device_node *node,
         const struct phy_ops *ops, struct phy_init_data *init_data);
 void phy_destroy(struct phy *phy);
 void devm_phy_destroy(struct device *dev, struct phy *phy);
@@ -297,13 +300,17 @@ static inline struct phy *of_phy_simple_xlate(struct device *dev,
 }
 
 static inline struct phy *phy_create(struct device *dev,
-        const struct phy_ops *ops, struct phy_init_data *init_data)
+                                     struct device_node *node,
+                                     const struct phy_ops *ops,
+                                     struct phy_init_data *init_data)
 {
         return ERR_PTR(-ENOSYS);
 }
 
 static inline struct phy *devm_phy_create(struct device *dev,
-        const struct phy_ops *ops, struct phy_init_data *init_data)
+                                          struct device_node *node,
+                                          const struct phy_ops *ops,
+                                          struct phy_init_data *init_data)
 {
         return ERR_PTR(-ENOSYS);
 }
diff --git a/include/linux/platform_data/ad7291.h b/include/linux/platform_data/ad7291.h
new file mode 100644
index 000000000000..bbd89fa51188
--- /dev/null
+++ b/include/linux/platform_data/ad7291.h
@@ -0,0 +1,12 @@
+#ifndef __IIO_AD7291_H__
+#define __IIO_AD7291_H__
+
+/**
+ * struct ad7291_platform_data - AD7291 platform data
+ * @use_external_ref: Whether to use an external or internal reference voltage
+ */
+struct ad7291_platform_data {
+        bool use_external_ref;
+};
+
+#endif
diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h
index 709c6f7e2f8c..a6591c693ebb 100644
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
@@ -15,15 +15,6 @@
 #define S3C64XX_AC97_GPE  1
 extern void s3c64xx_ac97_setup_gpio(int);
 
-/*
- * The machine init code calls s5p*_spdif_setup_gpio with
- * one of these defines in order to select appropriate bank
- * of GPIO for S/PDIF pins
- */
-#define S5PC100_SPDIF_GPD  0
-#define S5PC100_SPDIF_GPG3 1
-extern void s5pc100_spdif_setup_gpio(int);
-
 struct samsung_i2s {
 /* If the Primary DAI has 5.1 Channels */
 #define QUIRK_PRI_6CHAN         (1 << 0)
diff --git a/include/linux/platform_data/ata-samsung_cf.h b/include/linux/platform_data/ata-samsung_cf.h
index c2049e3d7444..748e71642c4a 100644
--- a/include/linux/platform_data/ata-samsung_cf.h
+++ b/include/linux/platform_data/ata-samsung_cf.h
@@ -29,7 +29,6 @@ extern void s3c_ide_set_platdata(struct s3c_ide_platdata *pdata);
 
 /* architecture-specific IDE configuration */
 extern void s3c64xx_ide_setup_gpio(void);
-extern void s5pc100_ide_setup_gpio(void);
 extern void s5pv210_ide_setup_gpio(void);
 
 #endif /*__ATA_SAMSUNG_CF_H */
diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h
index bcbc6c3c14c0..d05542aafa3e 100644
--- a/include/linux/platform_data/dma-imx.h
+++ b/include/linux/platform_data/dma-imx.h
@@ -50,6 +50,7 @@ enum imx_dma_prio {
 
 struct imx_dma_data {
         int dma_request; /* DMA request line */
+        int dma_request2; /* secondary DMA request line */
         enum sdma_peripheral_type peripheral_type;
         int priority;
 };
diff --git a/include/linux/platform_data/dsp-omap.h b/include/linux/platform_data/dsp-omap.h
deleted file mode 100644
index 5927709b1908..000000000000
--- a/include/linux/platform_data/dsp-omap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __OMAP_DSP_H__
-#define __OMAP_DSP_H__
-
-#include <linux/types.h>
-
-struct omap_dsp_platform_data {
-        void (*dsp_set_min_opp) (u8 opp_id);
-        u8 (*dsp_get_opp) (void);
-        void (*cpu_set_freq) (unsigned long f);
-        unsigned long (*cpu_get_freq) (void);
-        unsigned long mpu_speed[6];
-
-        /* functions to write and read PRCM registers */
-        void (*dsp_prm_write)(u32, s16 , u16);
-        u32 (*dsp_prm_read)(s16 , u16);
-        u32 (*dsp_prm_rmw_bits)(u32, u32, s16, s16);
-        void (*dsp_cm_write)(u32, s16 , u16);
-        u32 (*dsp_cm_read)(s16 , u16);
-        u32 (*dsp_cm_rmw_bits)(u32, u32, s16, s16);
-
-        void (*set_bootaddr)(u32);
-        void (*set_bootmode)(u8);
-
-        phys_addr_t phys_mempool_base;
-        phys_addr_t phys_mempool_size;
-};
-
-#if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE)
-extern void omap_dsp_reserve_sdram_memblock(void);
-#else
-static inline void omap_dsp_reserve_sdram_memblock(void) { }
-#endif
-
-#endif
diff --git a/include/linux/platform_data/iommu-omap.h b/include/linux/platform_data/iommu-omap.h
index 5b429c43a297..54a0a9582fad 100644
--- a/include/linux/platform_data/iommu-omap.h
+++ b/include/linux/platform_data/iommu-omap.h
@@ -31,14 +31,10 @@ struct omap_iommu_arch_data {
 
 /**
  * struct omap_mmu_dev_attr - OMAP mmu device attributes for omap_hwmod
- * @da_start:           device address where the va space starts.
- * @da_end:             device address where the va space ends.
  * @nr_tlb_entries:     number of entries supported by the translation
  *                      look-aside buffer (TLB).
  */
 struct omap_mmu_dev_attr {
-        u32 da_start;
-        u32 da_end;
         int nr_tlb_entries;
 };
 
@@ -46,8 +42,6 @@ struct iommu_platform_data {
         const char *name;
         const char *reset_name;
         int nr_tlb_entries;
-        u32 da_start;
-        u32 da_end;
 
         int (*assert_reset)(struct platform_device *pdev, const char *name);
         int (*deassert_reset)(struct platform_device *pdev, const char *name);
diff --git a/include/linux/platform_data/ntc_thermistor.h b/include/linux/platform_data/ntc_thermistor.h
index c7285b575462..0a6de4ca4930 100644
--- a/include/linux/platform_data/ntc_thermistor.h
+++ b/include/linux/platform_data/ntc_thermistor.h
@@ -26,6 +26,7 @@ struct iio_channel;
 enum ntc_thermistor_type {
         TYPE_NCPXXWB473,
         TYPE_NCPXXWL333,
+        TYPE_B57330V2103,
 };
 
 struct ntc_thermistor_platform_data {
diff --git a/include/linux/platform_data/st21nfcb.h b/include/linux/platform_data/st21nfcb.h
new file mode 100644
index 000000000000..2d11f1f5efab
--- /dev/null
+++ b/include/linux/platform_data/st21nfcb.h
@@ -0,0 +1,32 @@
+/*
+ * Driver include for the ST21NFCB NFC chip.
+ *
+ * Copyright (C) 2014  STMicroelectronics SAS. All rights reserved.
+ *
+ * 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.
+ *
+ * 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 _ST21NFCB_NCI_H_
+#define _ST21NFCB_NCI_H_
+
+#include <linux/i2c.h>
+
+#define ST21NFCB_NCI_DRIVER_NAME "st21nfcb_nci"
+
+struct st21nfcb_nfc_platform_data {
+        unsigned int gpio_irq;
+        unsigned int gpio_reset;
+        unsigned int irq_polarity;
+};
+
+#endif /* _ST21NFCA_HCI_H_ */
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 16f6654082dd..153d303af7eb 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -28,6 +28,7 @@ struct platform_device {
         struct resource *resource;
 
         const struct platform_device_id *id_entry;
+        char *driver_override; /* Driver name to force a match */
 
         /* MFD cell pointer */
         struct mfd_cell *mfd_cell;
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index 43fd6716f662..367f49b9a1c9 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -24,11 +24,20 @@
 #define RPM_AUTO                0x08    /* Use autosuspend_delay */
 
 #ifdef CONFIG_PM
+extern struct workqueue_struct *pm_wq;
+
+static inline bool queue_pm_work(struct work_struct *work)
+{
+        return queue_work(pm_wq, work);
+}
+
 extern int pm_generic_runtime_suspend(struct device *dev);
 extern int pm_generic_runtime_resume(struct device *dev);
 extern int pm_runtime_force_suspend(struct device *dev);
 extern int pm_runtime_force_resume(struct device *dev);
 #else
+static inline bool queue_pm_work(struct work_struct *work) { return false; }
+
 static inline int pm_generic_runtime_suspend(struct device *dev) { return 0; }
 static inline int pm_generic_runtime_resume(struct device *dev) { return 0; }
 static inline int pm_runtime_force_suspend(struct device *dev) { return 0; }
@@ -37,8 +46,6 @@ static inline int pm_runtime_force_resume(struct device *dev) { return 0; }
 
 #ifdef CONFIG_PM_RUNTIME
 
-extern struct workqueue_struct *pm_wq;
-
 extern int __pm_runtime_idle(struct device *dev, int rpmflags);
 extern int __pm_runtime_suspend(struct device *dev, int rpmflags);
 extern int __pm_runtime_resume(struct device *dev, int rpmflags);
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index f2b76aeaf4e4..f3dea41dbcd2 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -120,6 +120,7 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
         POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,
         POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
+        POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,
         POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_FULL,
@@ -131,6 +132,8 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_CAPACITY_ALERT_MAX, /* in percents! */
         POWER_SUPPLY_PROP_CAPACITY_LEVEL,
         POWER_SUPPLY_PROP_TEMP,
+        POWER_SUPPLY_PROP_TEMP_MAX,
+        POWER_SUPPLY_PROP_TEMP_MIN,
         POWER_SUPPLY_PROP_TEMP_ALERT_MIN,
         POWER_SUPPLY_PROP_TEMP_ALERT_MAX,
         POWER_SUPPLY_PROP_TEMP_AMBIENT,
@@ -142,6 +145,7 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,
         POWER_SUPPLY_PROP_TYPE, /* use power_supply.type instead */
         POWER_SUPPLY_PROP_SCOPE,
+        POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
         /* Properties of type `const char *' */
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h
index 7dfed71d76a6..159c987b1853 100644
--- a/include/linux/ptp_classify.h
+++ b/include/linux/ptp_classify.h
@@ -33,8 +33,8 @@
 #define PTP_CLASS_IPV4  0x10 /* event in an IPV4 UDP packet */
 #define PTP_CLASS_IPV6  0x20 /* event in an IPV6 UDP packet */
 #define PTP_CLASS_L2    0x30 /* event in a L2 packet */
-#define PTP_CLASS_VLAN  0x40 /* event in a VLAN tagged L2 packet */
-#define PTP_CLASS_PMASK 0xf0 /* mask for the packet type field */
+#define PTP_CLASS_PMASK 0x30 /* mask for the packet type field */
+#define PTP_CLASS_VLAN  0x40 /* event in a VLAN tagged packet */
 
 #define PTP_CLASS_V1_IPV4 (PTP_CLASS_V1 | PTP_CLASS_IPV4)
 #define PTP_CLASS_V1_IPV6 (PTP_CLASS_V1 | PTP_CLASS_IPV6) /* probably DNE */
@@ -54,7 +54,6 @@
 #define IP6_HLEN        40
 #define UDP_HLEN        8
 #define OFF_IHL         14
-#define OFF_PTP6        (ETH_HLEN + IP6_HLEN + UDP_HLEN)
 #define IPV4_HLEN(data) (((struct iphdr *)(data + OFF_IHL))->ihl << 2)
 
 #if defined(CONFIG_NET_PTP_CLASSIFY)
diff --git a/include/linux/ras.h b/include/linux/ras.h
new file mode 100644
index 000000000000..2aceeafd6fe5
--- /dev/null
+++ b/include/linux/ras.h
@@ -0,0 +1,14 @@
+#ifndef __RAS_H__
+#define __RAS_H__
+
+#ifdef CONFIG_DEBUG_FS
+int ras_userspace_consumers(void);
+void ras_debugfs_init(void);
+int ras_add_daemon_trace(void);
+#else
+static inline int ras_userspace_consumers(void) { return 0; }
+static inline void ras_debugfs_init(void) { return; }
+static inline int ras_add_daemon_trace(void) { return 0; }
+#endif
+
+#endif
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 6a94cc8b1ca0..d231aa17b1d7 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -826,15 +826,14 @@ static inline void rcu_preempt_sleep_check(void)
  * read-side critical section that would block in a !PREEMPT kernel.
  * But if you want the full story, read on!
  *
- * In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), it
- * is illegal to block while in an RCU read-side critical section.  In
- * preemptible RCU implementations (TREE_PREEMPT_RCU and TINY_PREEMPT_RCU)
- * in CONFIG_PREEMPT kernel builds, RCU read-side critical sections may
- * be preempted, but explicit blocking is illegal.  Finally, in preemptible
- * RCU implementations in real-time (with -rt patchset) kernel builds,
- * RCU read-side critical sections may be preempted and they may also
- * block, but only when acquiring spinlocks that are subject to priority
- * inheritance.
+ * In non-preemptible RCU implementations (TREE_RCU and TINY_RCU),
+ * it is illegal to block while in an RCU read-side critical section.
+ * In preemptible RCU implementations (TREE_PREEMPT_RCU) in CONFIG_PREEMPT
+ * kernel builds, RCU read-side critical sections may be preempted,
+ * but explicit blocking is illegal.  Finally, in preemptible RCU
+ * implementations in real-time (with -rt patchset) kernel builds, RCU
+ * read-side critical sections may be preempted and they may also block, but
+ * only when acquiring spinlocks that are subject to priority inheritance.
  */
 static inline void rcu_read_lock(void)
 {
@@ -858,6 +857,34 @@ static inline void rcu_read_lock(void)
 /**
  * rcu_read_unlock() - marks the end of an RCU read-side critical section.
  *
+ * In most situations, rcu_read_unlock() is immune from deadlock.
+ * However, in kernels built with CONFIG_RCU_BOOST, rcu_read_unlock()
+ * is responsible for deboosting, which it does via rt_mutex_unlock().
+ * Unfortunately, this function acquires the scheduler's runqueue and
+ * priority-inheritance spinlocks.  This means that deadlock could result
+ * if the caller of rcu_read_unlock() already holds one of these locks or
+ * any lock that is ever acquired while holding them.
+ *
+ * That said, RCU readers are never priority boosted unless they were
+ * preempted.  Therefore, one way to avoid deadlock is to make sure
+ * that preemption never happens within any RCU read-side critical
+ * section whose outermost rcu_read_unlock() is called with one of
+ * rt_mutex_unlock()'s locks held.  Such preemption can be avoided in
+ * a number of ways, for example, by invoking preempt_disable() before
+ * critical section's outermost rcu_read_lock().
+ *
+ * Given that the set of locks acquired by rt_mutex_unlock() might change
+ * at any time, a somewhat more future-proofed approach is to make sure
+ * that that preemption never happens within any RCU read-side critical
+ * section whose outermost rcu_read_unlock() is called with irqs disabled.
+ * This approach relies on the fact that rt_mutex_unlock() currently only
+ * acquires irq-disabled locks.
+ *
+ * The second of these two approaches is best in most situations,
+ * however, the first approach can also be useful, at least to those
+ * developers willing to keep abreast of the set of locks acquired by
+ * rt_mutex_unlock().
+ *
  * See rcu_read_lock() for more information.
  */
 static inline void rcu_read_unlock(void)
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 7b0e4b425cdf..c5ed83f49c4e 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -396,6 +396,7 @@ void regmap_exit(struct regmap *map);
 int regmap_reinit_cache(struct regmap *map,
                         const struct regmap_config *config);
 struct regmap *dev_get_regmap(struct device *dev, const char *name);
+struct device *regmap_get_device(struct regmap *map);
 int regmap_write(struct regmap *map, unsigned int reg, unsigned int val);
 int regmap_write_async(struct regmap *map, unsigned int reg, unsigned int val);
 int regmap_raw_write(struct regmap *map, unsigned int reg,
@@ -729,6 +730,12 @@ static inline struct regmap *dev_get_regmap(struct device *dev,
         return NULL;
 }
 
+static inline struct device *regmap_get_device(struct regmap *map)
+{
+        WARN_ONCE(1, "regmap API is disabled");
+        return NULL;
+}
+
 #endif
 
 #endif
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 75307447cef9..d8ecefaf63ca 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -322,18 +322,4 @@ struct ab8500_regulator_platform_data {
         struct regulator_init_data *ext_regulator;
 };
 
-#ifdef CONFIG_REGULATOR_AB8500_DEBUG
-int ab8500_regulator_debug_init(struct platform_device *pdev);
-int ab8500_regulator_debug_exit(struct platform_device *pdev);
-#else
-static inline int ab8500_regulator_debug_init(struct platform_device *pdev)
-{
-        return 0;
-}
-static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
-{
-        return 0;
-}
-#endif
-
 #endif
diff --git a/include/linux/regulator/act8865.h b/include/linux/regulator/act8865.h
index 49206c1b4905..b6c4909b33af 100644
--- a/include/linux/regulator/act8865.h
+++ b/include/linux/regulator/act8865.h
@@ -1,5 +1,5 @@
 /*
- * act8865.h  --  Voltage regulation for the active-semi act8865
+ * act8865.h  --  Voltage regulation for active-semi act88xx PMUs
  *
  * Copyright (C) 2013 Atmel Corporation.
  *
@@ -29,6 +29,27 @@ enum {
         ACT8865_REG_NUM,
 };
 
+enum {
+        ACT8846_ID_REG1,
+        ACT8846_ID_REG2,
+        ACT8846_ID_REG3,
+        ACT8846_ID_REG4,
+        ACT8846_ID_REG5,
+        ACT8846_ID_REG6,
+        ACT8846_ID_REG7,
+        ACT8846_ID_REG8,
+        ACT8846_ID_REG9,
+        ACT8846_ID_REG10,
+        ACT8846_ID_REG11,
+        ACT8846_ID_REG12,
+        ACT8846_REG_NUM,
+};
+
+enum {
+        ACT8865,
+        ACT8846,
+};
+
 /**
  * act8865_regulator_data - regulator data
  * @id: regulator id
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 14ec18d5e18b..f8a8733068a7 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -37,6 +37,7 @@
 
 struct device;
 struct notifier_block;
+struct regmap;
 
 /*
  * Regulator operating modes.
@@ -215,6 +216,13 @@ int regulator_set_optimum_mode(struct regulator *regulator, int load_uA);
 
 int regulator_allow_bypass(struct regulator *regulator, bool allow);
 
+struct regmap *regulator_get_regmap(struct regulator *regulator);
+int regulator_get_hardware_vsel_register(struct regulator *regulator,
+                                         unsigned *vsel_reg,
+                                         unsigned *vsel_mask);
+int regulator_list_hardware_vsel(struct regulator *regulator,
+                                 unsigned selector);
+
 /* regulator notifier block */
 int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb);
@@ -457,6 +465,24 @@ static inline int regulator_allow_bypass(struct regulator *regulator,
         return 0;
 }
 
+static inline struct regmap *regulator_get_regmap(struct regulator *regulator)
+{
+        return ERR_PTR(-EOPNOTSUPP);
+}
+
+static inline int regulator_get_hardware_vsel_register(struct regulator *regulator,
+                                                       unsigned *vsel_reg,
+                                                       unsigned *vsel_mask)
+{
+        return -EOPNOTSUPP;
+}
+
+static inline int regulator_list_hardware_vsel(struct regulator *regulator,
+                                               unsigned selector)
+{
+        return -EOPNOTSUPP;
+}
+
 static inline int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb)
 {
diff --git a/include/linux/regulator/da9211.h b/include/linux/regulator/da9211.h
new file mode 100644
index 000000000000..0981ce0e72cc
--- /dev/null
+++ b/include/linux/regulator/da9211.h
@@ -0,0 +1,32 @@
+/*
+ * da9211.h - Regulator device driver for DA9211
+ * Copyright (C) 2014  Dialog Semiconductor Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ */
+
+#ifndef __LINUX_REGULATOR_DA9211_H
+#define __LINUX_REGULATOR_DA9211_H
+
+#include <linux/regulator/machine.h>
+
+#define DA9211_MAX_REGULATORS   2
+
+struct da9211_pdata {
+        /*
+         * Number of buck
+         * 1 : 4 phase 1 buck
+         * 2 : 2 phase 2 buck
+         */
+        int num_buck;
+        struct regulator_init_data *init_data;
+};
+#endif
diff --git a/include/linux/reservation.h b/include/linux/reservation.h
index 813dae960ebd..5a0b64cf68b4 100644
--- a/include/linux/reservation.h
+++ b/include/linux/reservation.h
@@ -6,7 +6,7 @@
  * Copyright (C) 2012 Texas Instruments
  *
  * Authors:
- * Rob Clark <rob.clark@linaro.org>
+ * Rob Clark <robdclark@gmail.com>
  * Maarten Lankhorst <maarten.lankhorst@canonical.com>
  * Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  *
@@ -40,23 +40,103 @@
 #define _LINUX_RESERVATION_H
 
 #include <linux/ww_mutex.h>
+#include <linux/fence.h>
+#include <linux/slab.h>
+#include <linux/seqlock.h>
+#include <linux/rcupdate.h>
 
 extern struct ww_class reservation_ww_class;
+extern struct lock_class_key reservation_seqcount_class;
+extern const char reservation_seqcount_string[];
+
+struct reservation_object_list {
+        struct rcu_head rcu;
+        u32 shared_count, shared_max;
+        struct fence __rcu *shared[];
+};
 
 struct reservation_object {
         struct ww_mutex lock;
+        seqcount_t seq;
+
+        struct fence __rcu *fence_excl;
+        struct reservation_object_list __rcu *fence;
+        struct reservation_object_list *staged;
 };
 
+#define reservation_object_held(obj) lockdep_is_held(&(obj)->lock.base)
+#define reservation_object_assert_held(obj) \
+        lockdep_assert_held(&(obj)->lock.base)
+
 static inline void
 reservation_object_init(struct reservation_object *obj)
 {
         ww_mutex_init(&obj->lock, &reservation_ww_class);
+
+        __seqcount_init(&obj->seq, reservation_seqcount_string, &reservation_seqcount_class);
+        RCU_INIT_POINTER(obj->fence, NULL);
+        RCU_INIT_POINTER(obj->fence_excl, NULL);
+        obj->staged = NULL;
 }
 
 static inline void
 reservation_object_fini(struct reservation_object *obj)
 {
+        int i;
+        struct reservation_object_list *fobj;
+        struct fence *excl;
+
+        /*
+         * This object should be dead and all references must have
+         * been released to it, so no need to be protected with rcu.
+         */
+        excl = rcu_dereference_protected(obj->fence_excl, 1);
+        if (excl)
+                fence_put(excl);
+
+        fobj = rcu_dereference_protected(obj->fence, 1);
+        if (fobj) {
+                for (i = 0; i < fobj->shared_count; ++i)
+                        fence_put(rcu_dereference_protected(fobj->shared[i], 1));
+
+                kfree(fobj);
+        }
+        kfree(obj->staged);
+
         ww_mutex_destroy(&obj->lock);
 }
 
+static inline struct reservation_object_list *
+reservation_object_get_list(struct reservation_object *obj)
+{
+        return rcu_dereference_protected(obj->fence,
+                                         reservation_object_held(obj));
+}
+
+static inline struct fence *
+reservation_object_get_excl(struct reservation_object *obj)
+{
+        return rcu_dereference_protected(obj->fence_excl,
+                                         reservation_object_held(obj));
+}
+
+int reservation_object_reserve_shared(struct reservation_object *obj);
+void reservation_object_add_shared_fence(struct reservation_object *obj,
+                                         struct fence *fence);
+
+void reservation_object_add_excl_fence(struct reservation_object *obj,
+                                       struct fence *fence);
+
+int reservation_object_get_fences_rcu(struct reservation_object *obj,
+                                      struct fence **pfence_excl,
+                                      unsigned *pshared_count,
+                                      struct fence ***pshared);
+
+long reservation_object_wait_timeout_rcu(struct reservation_object *obj,
+                                         bool wait_all, bool intr,
+                                         unsigned long timeout);
+
+bool reservation_object_test_signaled_rcu(struct reservation_object *obj,
+                                          bool test_all);
+
 #endif /* _LINUX_RESERVATION_H */
diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h
new file mode 100644
index 000000000000..9cda293c867d
--- /dev/null
+++ b/include/linux/rhashtable.h
@@ -0,0 +1,213 @@
+/*
+ * Resizable, Scalable, Concurrent Hash Table
+ *
+ * Copyright (c) 2014 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
+ *
+ * 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_RHASHTABLE_H
+#define _LINUX_RHASHTABLE_H
+
+#include <linux/rculist.h>
+
+struct rhash_head {
+        struct rhash_head               *next;
+};
+
+#define INIT_HASH_HEAD(ptr) ((ptr)->next = NULL)
+
+struct bucket_table {
+        size_t                          size;
+        struct rhash_head __rcu         *buckets[];
+};
+
+typedef u32 (*rht_hashfn_t)(const void *data, u32 len, u32 seed);
+typedef u32 (*rht_obj_hashfn_t)(const void *data, u32 seed);
+
+struct rhashtable;
+
+/**
+ * struct rhashtable_params - Hash table construction parameters
+ * @nelem_hint: Hint on number of elements, should be 75% of desired size
+ * @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
+ * @hashfn: Function to hash key
+ * @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
+ * @mutex_is_held: Must return true if protecting mutex is held
+ */
+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;
+        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);
+        int                     (*mutex_is_held)(void);
+};
+
+/**
+ * struct rhashtable - Hash table handle
+ * @tbl: Bucket table
+ * @nelems: Number of elements in table
+ * @shift: Current size (1 << shift)
+ * @p: Configuration parameters
+ */
+struct rhashtable {
+        struct bucket_table __rcu       *tbl;
+        size_t                          nelems;
+        size_t                          shift;
+        struct rhashtable_params        p;
+};
+
+#ifdef CONFIG_PROVE_LOCKING
+int lockdep_rht_mutex_is_held(const struct rhashtable *ht);
+#else
+static inline int lockdep_rht_mutex_is_held(const struct rhashtable *ht)
+{
+        return 1;
+}
+#endif /* CONFIG_PROVE_LOCKING */
+
+int rhashtable_init(struct rhashtable *ht, struct rhashtable_params *params);
+
+u32 rhashtable_hashfn(const struct rhashtable *ht, const void *key, u32 len);
+u32 rhashtable_obj_hashfn(const struct rhashtable *ht, void *ptr);
+
+void rhashtable_insert(struct rhashtable *ht, struct rhash_head *node, gfp_t);
+bool rhashtable_remove(struct rhashtable *ht, struct rhash_head *node, gfp_t);
+void rhashtable_remove_pprev(struct rhashtable *ht, struct rhash_head *obj,
+                             struct rhash_head **pprev, gfp_t flags);
+
+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, gfp_t flags);
+int rhashtable_shrink(struct rhashtable *ht, gfp_t flags);
+
+void *rhashtable_lookup(const struct rhashtable *ht, const void *key);
+void *rhashtable_lookup_compare(const struct rhashtable *ht, u32 hash,
+                                bool (*compare)(void *, void *), void *arg);
+
+void rhashtable_destroy(const struct rhashtable *ht);
+
+#define rht_dereference(p, ht) \
+        rcu_dereference_protected(p, lockdep_rht_mutex_is_held(ht))
+
+#define rht_dereference_rcu(p, ht) \
+        rcu_dereference_check(p, lockdep_rht_mutex_is_held(ht))
+
+/* Internal, use rht_obj() instead */
+#define rht_entry(ptr, type, member) container_of(ptr, type, member)
+#define rht_entry_safe(ptr, type, member) \
+({ \
+        typeof(ptr) __ptr = (ptr); \
+           __ptr ? rht_entry(__ptr, type, member) : NULL; \
+})
+#define rht_entry_safe_rcu(ptr, type, member) \
+({ \
+        typeof(*ptr) __rcu *__ptr = (typeof(*ptr) __rcu __force *)ptr; \
+        __ptr ? container_of((typeof(ptr))rcu_dereference_raw(__ptr), type, member) : NULL; \
+})
+
+#define rht_next_entry_safe(pos, ht, member) \
+({ \
+        pos ? rht_entry_safe(rht_dereference((pos)->member.next, ht), \
+                             typeof(*(pos)), member) : NULL; \
+})
+
+/**
+ * rht_for_each - iterate over hash chain
+ * @pos:        &struct rhash_head to use as a loop cursor.
+ * @head:       head of the hash chain (struct rhash_head *)
+ * @ht:         pointer to your struct rhashtable
+ */
+#define rht_for_each(pos, head, ht) \
+        for (pos = rht_dereference(head, ht); \
+             pos; \
+             pos = rht_dereference((pos)->next, ht))
+
+/**
+ * rht_for_each_entry - iterate over hash chain of given type
+ * @pos:        type * to use as a loop cursor.
+ * @head:       head of the hash chain (struct rhash_head *)
+ * @ht:         pointer to your struct rhashtable
+ * @member:     name of the rhash_head within the hashable struct.
+ */
+#define rht_for_each_entry(pos, head, ht, member) \
+        for (pos = rht_entry_safe(rht_dereference(head, ht), \
+                                   typeof(*(pos)), member); \
+             pos; \
+             pos = rht_next_entry_safe(pos, ht, member))
+
+/**
+ * rht_for_each_entry_safe - safely iterate over hash chain of given type
+ * @pos:        type * to use as a loop cursor.
+ * @n:          type * to use for temporary next object storage
+ * @head:       head of the hash chain (struct rhash_head *)
+ * @ht:         pointer to your struct rhashtable
+ * @member:     name of the rhash_head within the hashable struct.
+ *
+ * This hash chain list-traversal primitive allows for the looped code to
+ * remove the loop cursor from the list.
+ */
+#define rht_for_each_entry_safe(pos, n, head, ht, member)               \
+        for (pos = rht_entry_safe(rht_dereference(head, ht), \
+                                  typeof(*(pos)), member), \
+             n = rht_next_entry_safe(pos, ht, member); \
+             pos; \
+             pos = n, \
+             n = rht_next_entry_safe(pos, ht, member))
+
+/**
+ * rht_for_each_rcu - iterate over rcu hash chain
+ * @pos:        &struct rhash_head to use as a loop cursor.
+ * @head:       head of the hash chain (struct rhash_head *)
+ * @ht:         pointer to your struct rhashtable
+ *
+ * This hash chain list-traversal primitive may safely run concurrently with
+ * the _rcu fkht mutation primitives such as rht_insert() as long as the
+ * traversal is guarded by rcu_read_lock().
+ */
+#define rht_for_each_rcu(pos, head, ht) \
+        for (pos = rht_dereference_rcu(head, ht); \
+             pos; \
+             pos = rht_dereference_rcu((pos)->next, ht))
+
+/**
+ * rht_for_each_entry_rcu - iterate over rcu hash chain of given type
+ * @pos:        type * to use as a loop cursor.
+ * @head:       head of the hash chain (struct rhash_head *)
+ * @member:     name of the rhash_head within the hashable struct.
+ *
+ * This hash chain list-traversal primitive may safely run concurrently with
+ * the _rcu fkht mutation primitives such as rht_insert() as long as the
+ * traversal is guarded by rcu_read_lock().
+ */
+#define rht_for_each_entry_rcu(pos, head, member) \
+        for (pos = rht_entry_safe_rcu(head, typeof(*(pos)), member); \
+             pos; \
+             pos = rht_entry_safe_rcu((pos)->member.next, \
+                                      typeof(*(pos)), member))
+
+#endif /* _LINUX_RHASHTABLE_H */
diff --git a/include/linux/rndis.h b/include/linux/rndis.h
index 0c8dc7195cdb..93c0a64aefa6 100644
--- a/include/linux/rndis.h
+++ b/include/linux/rndis.h
@@ -65,6 +65,7 @@
 #define RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION  0x40010012
 #define RNDIS_STATUS_WW_INDICATION              RDIA_SPECIFIC_INDICATION
 #define RNDIS_STATUS_LINK_SPEED_CHANGE          0x40010013L
+#define RNDIS_STATUS_NETWORK_CHANGE             0x40010018
 
 #define RNDIS_STATUS_NOT_RESETTABLE             0x80010001
 #define RNDIS_STATUS_SOFT_ERRORS                0x80010003
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
index 3aed8d737e1a..1abba5ce2a2f 100644
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -90,11 +90,9 @@ extern void __rt_mutex_init(struct rt_mutex *lock, const char *name);
 extern void rt_mutex_destroy(struct rt_mutex *lock);
 
 extern void rt_mutex_lock(struct rt_mutex *lock);
-extern int rt_mutex_lock_interruptible(struct rt_mutex *lock,
-                                                int detect_deadlock);
+extern int rt_mutex_lock_interruptible(struct rt_mutex *lock);
 extern int rt_mutex_timed_lock(struct rt_mutex *lock,
-                                        struct hrtimer_sleeper *timeout,
-                                        int detect_deadlock);
+                               struct hrtimer_sleeper *timeout);
 
 extern int rt_mutex_trylock(struct rt_mutex *lock);
 
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 953937ea5233..167bae7bdfa4 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -78,6 +78,7 @@ extern void __rtnl_unlock(void);
 extern int ndo_dflt_fdb_dump(struct sk_buff *skb,
                              struct netlink_callback *cb,
                              struct net_device *dev,
+                             struct net_device *filter_dev,
                              int idx);
 extern int ndo_dflt_fdb_add(struct ndmsg *ndm,
                             struct nlattr *tb[],
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
index a964f7285600..f4ec8bbcb372 100644
--- a/include/linux/scatterlist.h
+++ b/include/linux/scatterlist.h
@@ -229,10 +229,10 @@ void sg_init_one(struct scatterlist *, const void *, unsigned int);
 typedef struct scatterlist *(sg_alloc_fn)(unsigned int, gfp_t);
 typedef void (sg_free_fn)(struct scatterlist *, unsigned int);
 
-void __sg_free_table(struct sg_table *, unsigned int, sg_free_fn *);
+void __sg_free_table(struct sg_table *, unsigned int, bool, sg_free_fn *);
 void sg_free_table(struct sg_table *);
-int __sg_alloc_table(struct sg_table *, unsigned int, unsigned int, gfp_t,
-                     sg_alloc_fn *);
+int __sg_alloc_table(struct sg_table *, unsigned int, unsigned int,
+                     struct scatterlist *, gfp_t, sg_alloc_fn *);
 int sg_alloc_table(struct sg_table *, unsigned int, gfp_t);
 int sg_alloc_table_from_pages(struct sg_table *sgt,
         struct page **pages, unsigned int n_pages,
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 0376b054a0d0..84729f7c472c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -168,8 +168,7 @@ extern int nr_processes(void);
 extern unsigned long nr_running(void);
 extern unsigned long nr_iowait(void);
 extern unsigned long nr_iowait_cpu(int cpu);
-extern unsigned long this_cpu_load(void);
-
+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);
@@ -813,7 +812,7 @@ struct task_delay_info {
          * associated with the operation is added to XXX_delay.
          * XXX_delay contains the accumulated delay time in nanoseconds.
          */
-        struct timespec blkio_start, blkio_end; /* Shared by blkio, swapin */
+        u64 blkio_start;        /* Shared by blkio, swapin */
         u64 blkio_delay;        /* wait for sync block io completion */
         u64 swapin_delay;       /* wait for swapin block io completion */
         u32 blkio_count;        /* total count of the number of sync block */
@@ -821,7 +820,7 @@ struct task_delay_info {
         u32 swapin_count;       /* total count of the number of swapin block */
                                 /* io operations performed */
 
-        struct timespec freepages_start, freepages_end;
+        u64 freepages_start;
         u64 freepages_delay;    /* wait for memory reclaim */
         u32 freepages_count;    /* total count of memory reclaim */
 };
@@ -1270,9 +1269,6 @@ struct task_struct {
 #ifdef CONFIG_TREE_PREEMPT_RCU
         struct rcu_node *rcu_blocked_node;
 #endif /* #ifdef CONFIG_TREE_PREEMPT_RCU */
-#ifdef CONFIG_RCU_BOOST
-        struct rt_mutex *rcu_boost_mutex;
-#endif /* #ifdef CONFIG_RCU_BOOST */
 
 #if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
         struct sched_info sched_info;
@@ -1307,13 +1303,12 @@ struct task_struct {
                                  * execve */
         unsigned in_iowait:1;
 
-        /* task may not gain privileges */
-        unsigned no_new_privs:1;
-
         /* Revert to default priority/policy when forking */
         unsigned sched_reset_on_fork:1;
         unsigned sched_contributes_to_load:1;
 
+        unsigned long atomic_flags; /* Flags needing atomic access. */
+
         pid_t pid;
         pid_t tgid;
 
@@ -1367,8 +1362,8 @@ struct task_struct {
         } vtime_snap_whence;
 #endif
         unsigned long nvcsw, nivcsw; /* context switch counts */
-        struct timespec start_time;             /* monotonic time */
-        struct timespec real_start_time;        /* boot based time */
+        u64 start_time;         /* monotonic time in nsec */
+        u64 real_start_time;    /* boot based time in nsec */
 /* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
         unsigned long min_flt, maj_flt;
 
@@ -1440,8 +1435,6 @@ struct task_struct {
         struct rb_node *pi_waiters_leftmost;
         /* Deadlock detection and priority inheritance handling */
         struct rt_mutex_waiter *pi_blocked_on;
-        /* Top pi_waiters task */
-        struct task_struct *pi_top_task;
 #endif
 
 #ifdef CONFIG_DEBUG_MUTEXES
@@ -1967,6 +1960,19 @@ static inline void memalloc_noio_restore(unsigned int flags)
         current->flags = (current->flags & ~PF_MEMALLOC_NOIO) | flags;
 }
 
+/* Per-process atomic flags. */
+#define PFA_NO_NEW_PRIVS 0x00000001     /* May not gain new privileges. */
+
+static inline bool task_no_new_privs(struct task_struct *p)
+{
+        return test_bit(PFA_NO_NEW_PRIVS, &p->atomic_flags);
+}
+
+static inline void task_set_no_new_privs(struct task_struct *p)
+{
+        set_bit(PFA_NO_NEW_PRIVS, &p->atomic_flags);
+}
+
 /*
  * task->jobctl flags
  */
@@ -2009,9 +2015,6 @@ static inline void rcu_copy_process(struct task_struct *p)
 #ifdef CONFIG_TREE_PREEMPT_RCU
         p->rcu_blocked_node = NULL;
 #endif /* #ifdef CONFIG_TREE_PREEMPT_RCU */
-#ifdef CONFIG_RCU_BOOST
-        p->rcu_boost_mutex = NULL;
-#endif /* #ifdef CONFIG_RCU_BOOST */
         INIT_LIST_HEAD(&p->rcu_node_entry);
 }
 
@@ -2788,7 +2791,7 @@ static inline bool __must_check current_set_polling_and_test(void)
 
         /*
          * Polling state must be visible before we test NEED_RESCHED,
-         * paired by resched_task()
+         * paired by resched_curr()
          */
         smp_mb__after_atomic();
 
@@ -2806,7 +2809,7 @@ static inline bool __must_check current_clr_polling_and_test(void)
 
         /*
          * Polling state must be visible before we test NEED_RESCHED,
-         * paired by resched_task()
+         * paired by resched_curr()
          */
         smp_mb__after_atomic();
 
@@ -2838,7 +2841,7 @@ static inline void current_clr_polling(void)
          * TIF_NEED_RESCHED and the IPI handler, scheduler_ipi(), will also
          * fold.
          */
-        smp_mb(); /* paired with resched_task() */
+        smp_mb(); /* paired with resched_curr() */
 
         preempt_fold_need_resched();
 }
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
index 4054b0994071..5d586a45a319 100644
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@ -3,6 +3,8 @@
 
 #include <uapi/linux/seccomp.h>
 
+#define SECCOMP_FILTER_FLAG_MASK        (SECCOMP_FILTER_FLAG_TSYNC)
+
 #ifdef CONFIG_SECCOMP
 
 #include <linux/thread_info.h>
@@ -14,11 +16,11 @@ struct seccomp_filter;
  *
  * @mode:  indicates one of the valid values above for controlled
  *         system calls available to a process.
- * @filter: The metadata and ruleset for determining what system calls
- *          are allowed for a task.
+ * @filter: must always point to a valid seccomp-filter or NULL as it is
+ *          accessed without locking during system call entry.
  *
  *          @filter must only be accessed from the context of current as there
- *          is no locking.
+ *          is no read locking.
  */
 struct seccomp {
         int mode;
diff --git a/include/linux/security.h b/include/linux/security.h
index 9c6b9722ff48..623f90e5f38d 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -702,6 +702,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      @inode points to the inode to use as a reference.
  *      The current task must be the one that nominated @inode.
  *      Return 0 if successful.
+ * @kernel_fw_from_file:
+ *      Load firmware from userspace (not called for built-in firmware).
+ *      @file contains the file structure pointing to the file containing
+ *      the firmware to load. This argument will be NULL if the firmware
+ *      was loaded via the uevent-triggered blob-based interface exposed
+ *      by CONFIG_FW_LOADER_USER_HELPER.
+ *      @buf pointer to buffer containing firmware contents.
+ *      @size length of the firmware contents.
+ *      Return 0 if permission is granted.
  * @kernel_module_request:
  *      Ability to trigger the kernel to automatically upcall to userspace for
  *      userspace to load a kernel module with the given name.
@@ -1565,6 +1574,7 @@ struct security_operations {
         void (*cred_transfer)(struct cred *new, const struct cred *old);
         int (*kernel_act_as)(struct cred *new, u32 secid);
         int (*kernel_create_files_as)(struct cred *new, struct inode *inode);
+        int (*kernel_fw_from_file)(struct file *file, char *buf, size_t size);
         int (*kernel_module_request)(char *kmod_name);
         int (*kernel_module_from_file)(struct file *file);
         int (*task_fix_setuid) (struct cred *new, const struct cred *old,
@@ -1837,6 +1847,7 @@ int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp);
 void security_transfer_creds(struct cred *new, const struct cred *old);
 int security_kernel_act_as(struct cred *new, u32 secid);
 int security_kernel_create_files_as(struct cred *new, struct inode *inode);
+int security_kernel_fw_from_file(struct file *file, char *buf, size_t size);
 int security_kernel_module_request(char *kmod_name);
 int security_kernel_module_from_file(struct file *file);
 int security_task_fix_setuid(struct cred *new, const struct cred *old,
@@ -2363,6 +2374,12 @@ static inline int security_kernel_create_files_as(struct cred *cred,
         return 0;
 }
 
+static inline int security_kernel_fw_from_file(struct file *file,
+                                               char *buf, size_t size)
+{
+        return 0;
+}
+
 static inline int security_kernel_module_request(char *kmod_name)
 {
         return 0;
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index 535f158977b9..cc359636cfa3 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -117,6 +117,22 @@ repeat:
 }
 
 /**
+ * raw_read_seqcount - Read the raw seqcount
+ * @s: pointer to seqcount_t
+ * Returns: count to be passed to read_seqcount_retry
+ *
+ * raw_read_seqcount opens a read critical section of the given
+ * seqcount without any lockdep checking and without checking or
+ * masking the LSB. Calling code is responsible for handling that.
+ */
+static inline unsigned raw_read_seqcount(const seqcount_t *s)
+{
+        unsigned ret = ACCESS_ONCE(s->sequence);
+        smp_rmb();
+        return ret;
+}
+
+/**
  * raw_read_seqcount_begin - start seq-read critical section w/o lockdep
  * @s: pointer to seqcount_t
  * Returns: count to be passed to read_seqcount_retry
@@ -164,8 +180,6 @@ 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);
-
-        seqcount_lockdep_reader_access(s);
         smp_rmb();
         return ret & ~1;
 }
@@ -220,6 +234,17 @@ static inline void raw_write_seqcount_end(seqcount_t *s)
 }
 
 /*
+ * raw_write_seqcount_latch - redirect readers to even/odd copy
+ * @s: pointer to seqcount_t
+ */
+static inline void raw_write_seqcount_latch(seqcount_t *s)
+{
+       smp_wmb();      /* prior stores before incrementing "sequence" */
+       s->sequence++;
+       smp_wmb();      /* increment "sequence" before following stores */
+}
+
+/*
  * Sequence counter only version assumes that callers are using their
  * own mutexing.
  */
diff --git a/include/linux/seqno-fence.h b/include/linux/seqno-fence.h
new file mode 100644
index 000000000000..3d6003de4b0d
--- /dev/null
+++ b/include/linux/seqno-fence.h
@@ -0,0 +1,116 @@
+/*
+ * seqno-fence, using a dma-buf to synchronize fencing
+ *
+ * Copyright (C) 2012 Texas Instruments
+ * Copyright (C) 2012 Canonical Ltd
+ * Authors:
+ *   Rob Clark <robdclark@gmail.com>
+ *   Maarten Lankhorst <maarten.lankhorst@canonical.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 __LINUX_SEQNO_FENCE_H
+#define __LINUX_SEQNO_FENCE_H
+
+#include <linux/fence.h>
+#include <linux/dma-buf.h>
+
+enum seqno_fence_condition {
+        SEQNO_FENCE_WAIT_GEQUAL,
+        SEQNO_FENCE_WAIT_NONZERO
+};
+
+struct seqno_fence {
+        struct fence base;
+
+        const struct fence_ops *ops;
+        struct dma_buf *sync_buf;
+        uint32_t seqno_ofs;
+        enum seqno_fence_condition condition;
+};
+
+extern const struct fence_ops seqno_fence_ops;
+
+/**
+ * to_seqno_fence - cast a fence to a seqno_fence
+ * @fence: fence to cast to a seqno_fence
+ *
+ * Returns NULL if the fence is not a seqno_fence,
+ * or the seqno_fence otherwise.
+ */
+static inline struct seqno_fence *
+to_seqno_fence(struct fence *fence)
+{
+        if (fence->ops != &seqno_fence_ops)
+                return NULL;
+        return container_of(fence, struct seqno_fence, base);
+}
+
+/**
+ * seqno_fence_init - initialize a seqno fence
+ * @fence: seqno_fence to initialize
+ * @lock: pointer to spinlock to use for fence
+ * @sync_buf: buffer containing the memory location to signal on
+ * @context: the execution context this fence is a part of
+ * @seqno_ofs: the offset within @sync_buf
+ * @seqno: the sequence # to signal on
+ * @ops: the fence_ops for operations on this seqno fence
+ *
+ * This function initializes a struct seqno_fence with passed parameters,
+ * and takes a reference on sync_buf which is released on fence destruction.
+ *
+ * A seqno_fence is a dma_fence which can complete in software when
+ * enable_signaling is called, but it also completes when
+ * (s32)((sync_buf)[seqno_ofs] - seqno) >= 0 is true
+ *
+ * The seqno_fence will take a refcount on the sync_buf until it's
+ * destroyed, but actual lifetime of sync_buf may be longer if one of the
+ * callers take a reference to it.
+ *
+ * Certain hardware have instructions to insert this type of wait condition
+ * in the command stream, so no intervention from software would be needed.
+ * This type of fence can be destroyed before completed, however a reference
+ * on the sync_buf dma-buf can be taken. It is encouraged to re-use the same
+ * dma-buf for sync_buf, since mapping or unmapping the sync_buf to the
+ * device's vm can be expensive.
+ *
+ * It is recommended for creators of seqno_fence to call fence_signal
+ * before destruction. This will prevent possible issues from wraparound at
+ * time of issue vs time of check, since users can check fence_is_signaled
+ * before submitting instructions for the hardware to wait on the fence.
+ * However, when ops.enable_signaling is not called, it doesn't have to be
+ * done as soon as possible, just before there's any real danger of seqno
+ * wraparound.
+ */
+static inline void
+seqno_fence_init(struct seqno_fence *fence, spinlock_t *lock,
+                 struct dma_buf *sync_buf,  uint32_t context,
+                 uint32_t seqno_ofs, uint32_t seqno,
+                 enum seqno_fence_condition cond,
+                 const struct fence_ops *ops)
+{
+        BUG_ON(!fence || !sync_buf || !ops);
+        BUG_ON(!ops->wait || !ops->enable_signaling ||
+               !ops->get_driver_name || !ops->get_timeline_name);
+
+        /*
+         * ops is used in fence_init for get_driver_name, so needs to be
+         * initialized first
+         */
+        fence->ops = ops;
+        fence_init(&fence->base, &seqno_fence_ops, lock, context, seqno);
+        get_dma_buf(sync_buf);
+        fence->sync_buf = sync_buf;
+        fence->seqno_ofs = seqno_ofs;
+        fence->condition = cond;
+}
+
+#endif /* __LINUX_SEQNO_FENCE_H */
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index af47a8af6024..f93649e22c43 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -74,8 +74,10 @@ struct uart_8250_port {
         struct list_head        list;           /* ports on this IRQ */
         unsigned short          capabilities;   /* port capabilities */
         unsigned short          bugs;           /* port bugs */
+        bool                    fifo_bug;       /* min RX trigger if enabled */
         unsigned int            tx_loadsz;      /* transmit fifo load size */
         unsigned char           acr;
+        unsigned char           fcr;
         unsigned char           ier;
         unsigned char           lcr;
         unsigned char           mcr;
@@ -100,6 +102,11 @@ struct uart_8250_port {
         void                    (*dl_write)(struct uart_8250_port *, int);
 };
 
+static inline struct uart_8250_port *up_to_u8250p(struct uart_port *up)
+{
+        return container_of(up, struct uart_8250_port, port);
+}
+
 int serial8250_register_8250_port(struct uart_8250_port *);
 void serial8250_unregister_port(int line);
 void serial8250_suspend_port(int line);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 5bbb809ee197..cf3a1e789bf5 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -199,6 +199,8 @@ struct uart_port {
         unsigned char           suspended;
         unsigned char           irq_wake;
         unsigned char           unused[2];
+        struct attribute_group  *attr_group;            /* port specific attributes */
+        const struct attribute_group **tty_groups;      /* all attributes (serial core use only) */
         void                    *private_data;          /* generic platform data pointer */
 };
 
diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
index 4723bbfa1c26..a6e555cbe05c 100644
--- a/include/linux/sfi_acpi.h
+++ b/include/linux/sfi_acpi.h
@@ -63,8 +63,6 @@
 #include <linux/sfi.h>
 
 #ifdef CONFIG_SFI
-#include <acpi/acpi.h>  /* FIXME: inclusion should be removed */
-
 extern int sfi_acpi_table_parse(char *signature, char *oem_id,
                                 char *oem_table_id,
                                 int (*handler)(struct acpi_table_header *));
@@ -78,7 +76,6 @@ static inline int __init acpi_sfi_table_parse(char *signature,
         return sfi_acpi_table_parse(signature, NULL, NULL, handler);
 }
 #else /* !CONFIG_SFI */
-
 static inline int sfi_acpi_table_parse(char *signature, char *oem_id,
                                 char *oem_table_id,
                                 int (*handler)(struct acpi_table_header *))
diff --git a/include/linux/sh_timer.h b/include/linux/sh_timer.h
index 8e1e036d6d45..64638b058076 100644
--- a/include/linux/sh_timer.h
+++ b/include/linux/sh_timer.h
@@ -2,11 +2,6 @@
 #define __SH_TIMER_H__
 
 struct sh_timer_config {
-        char *name;
-        long channel_offset;
-        int timer_bit;
-        unsigned long clockevent_rating;
-        unsigned long clocksource_rating;
         unsigned int channels_mask;
 };
 
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index ec89301ada41..11c270551d25 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -112,8 +112,7 @@
 #define CHECKSUM_COMPLETE       2
 #define CHECKSUM_PARTIAL        3
 
-#define SKB_DATA_ALIGN(X)       (((X) + (SMP_CACHE_BYTES - 1)) & \
-                                 ~(SMP_CACHE_BYTES - 1))
+#define SKB_DATA_ALIGN(X)       ALIGN(X, SMP_CACHE_BYTES)
 #define SKB_WITH_OVERHEAD(X)    \
         ((X) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
 #define SKB_MAX_ORDER(X, ORDER) \
@@ -211,18 +210,9 @@ static inline void skb_frag_size_sub(skb_frag_t *frag, int delta)
  * struct skb_shared_hwtstamps - hardware time stamps
  * @hwtstamp:   hardware time stamp transformed into duration
  *              since arbitrary point in time
- * @syststamp:  hwtstamp transformed to system time base
  *
  * Software time stamps generated by ktime_get_real() are stored in
- * skb->tstamp. The relation between the different kinds of time
- * stamps is as follows:
- *
- * syststamp and tstamp can be compared against each other in
- * arbitrary combinations.  The accuracy of a
- * syststamp/tstamp/"syststamp from other device" comparison is
- * limited by the accuracy of the transformation into system time
- * base. This depends on the device driver and its underlying
- * hardware.
+ * skb->tstamp.
  *
  * hwtstamps can only be compared against other hwtstamps from
  * the same device.
@@ -232,7 +222,6 @@ static inline void skb_frag_size_sub(skb_frag_t *frag, int delta)
  */
 struct skb_shared_hwtstamps {
         ktime_t hwtstamp;
-        ktime_t syststamp;
 };
 
 /* Definitions for tx_flags in struct skb_shared_info */
@@ -240,7 +229,7 @@ enum {
         /* generate hardware time stamp */
         SKBTX_HW_TSTAMP = 1 << 0,
 
-        /* generate software time stamp */
+        /* generate software time stamp when queueing packet to NIC */
         SKBTX_SW_TSTAMP = 1 << 1,
 
         /* device driver is going to provide hardware time stamp */
@@ -258,8 +247,19 @@ enum {
          * all frags to avoid possible bad checksum
          */
         SKBTX_SHARED_FRAG = 1 << 5,
+
+        /* generate software time stamp when entering packet scheduling */
+        SKBTX_SCHED_TSTAMP = 1 << 6,
+
+        /* generate software timestamp on peer data acknowledgment */
+        SKBTX_ACK_TSTAMP = 1 << 7,
 };
 
+#define SKBTX_ANY_SW_TSTAMP     (SKBTX_SW_TSTAMP    | \
+                                 SKBTX_SCHED_TSTAMP | \
+                                 SKBTX_ACK_TSTAMP)
+#define SKBTX_ANY_TSTAMP        (SKBTX_HW_TSTAMP | SKBTX_ANY_SW_TSTAMP)
+
 /*
  * The callback notifies userspace to release buffers when skb DMA is done in
  * lower device, the skb last reference should be 0 when calling this.
@@ -286,6 +286,7 @@ struct skb_shared_info {
         unsigned short  gso_type;
         struct sk_buff  *frag_list;
         struct skb_shared_hwtstamps hwtstamps;
+        u32             tskey;
         __be32          ip6_frag_id;
 
         /*
@@ -455,6 +456,7 @@ static inline u32 skb_mstamp_us_delta(const struct skb_mstamp *t1,
  *      @ooo_okay: allow the mapping of a socket to a queue to be changed
  *      @l4_hash: indicate hash is a canonical 4-tuple hash over transport
  *              ports.
+ *      @sw_hash: indicates hash was computed in software stack
  *      @wifi_acked_valid: wifi_acked was set
  *      @wifi_acked: whether frame was acked on wifi or not
  *      @no_fcs:  Request NIC to treat last 4 bytes as Ethernet FCS
@@ -562,6 +564,7 @@ struct sk_buff {
         __u8                    pfmemalloc:1;
         __u8                    ooo_okay:1;
         __u8                    l4_hash:1;
+        __u8                    sw_hash:1;
         __u8                    wifi_acked_valid:1;
         __u8                    wifi_acked:1;
         __u8                    no_fcs:1;
@@ -575,7 +578,7 @@ struct sk_buff {
         __u8                    encap_hdr_csum:1;
         __u8                    csum_valid:1;
         __u8                    csum_complete_sw:1;
-        /* 3/5 bit hole (depending on ndisc_nodetype presence) */
+        /* 2/4 bit hole (depending on ndisc_nodetype presence) */
         kmemcheck_bitfield_end(flags2);
 
 #if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL
@@ -830,13 +833,14 @@ static inline void
 skb_set_hash(struct sk_buff *skb, __u32 hash, enum pkt_hash_types type)
 {
         skb->l4_hash = (type == PKT_HASH_TYPE_L4);
+        skb->sw_hash = 0;
         skb->hash = hash;
 }
 
 void __skb_get_hash(struct sk_buff *skb);
 static inline __u32 skb_get_hash(struct sk_buff *skb)
 {
-        if (!skb->l4_hash)
+        if (!skb->l4_hash && !skb->sw_hash)
                 __skb_get_hash(skb);
 
         return skb->hash;
@@ -850,6 +854,7 @@ static inline __u32 skb_get_hash_raw(const struct sk_buff *skb)
 static inline void skb_clear_hash(struct sk_buff *skb)
 {
         skb->hash = 0;
+        skb->sw_hash = 0;
         skb->l4_hash = 0;
 }
 
@@ -862,6 +867,7 @@ static inline void skb_clear_hash_if_not_l4(struct sk_buff *skb)
 static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from)
 {
         to->hash = from->hash;
+        to->sw_hash = from->sw_hash;
         to->l4_hash = from->l4_hash;
 };
 
@@ -2697,6 +2703,10 @@ static inline bool skb_defer_rx_timestamp(struct sk_buff *skb)
 void skb_complete_tx_timestamp(struct sk_buff *skb,
                                struct skb_shared_hwtstamps *hwtstamps);
 
+void __skb_tstamp_tx(struct sk_buff *orig_skb,
+                     struct skb_shared_hwtstamps *hwtstamps,
+                     struct sock *sk, int tstype);
+
 /**
  * skb_tstamp_tx - queue clone of skb with send time stamps
  * @orig_skb:   the original outgoing packet
@@ -3005,7 +3015,7 @@ static inline bool skb_rx_queue_recorded(const struct sk_buff *skb)
         return skb->queue_mapping != 0;
 }
 
-u16 __skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb,
+u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb,
                   unsigned int num_tx_queues);
 
 static inline struct sec_path *skb_sec_path(struct sk_buff *skb)
diff --git a/include/linux/spi/cc2520.h b/include/linux/spi/cc2520.h
new file mode 100644
index 000000000000..85b8ee67e937
--- /dev/null
+++ b/include/linux/spi/cc2520.h
@@ -0,0 +1,26 @@
+/* Header file for cc2520 radio driver
+ *
+ * Copyright (C) 2014 Varka Bhadram <varkab@cdac.in>
+ *                    Md.Jamal Mohiuddin <mjmohiuddin@cdac.in>
+ *                    P Sowjanya <sowjanyap@cdac.in>
+ *
+ * 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 __CC2520_H
+#define __CC2520_H
+
+struct cc2520_platform_data {
+        int fifo;
+        int fifop;
+        int cca;
+        int sfd;
+        int reset;
+        int vreg;
+};
+
+#endif
diff --git a/include/linux/spi/sh_msiof.h b/include/linux/spi/sh_msiof.h
index 2e8db3d2d2e5..88a14d81c49e 100644
--- a/include/linux/spi/sh_msiof.h
+++ b/include/linux/spi/sh_msiof.h
@@ -5,6 +5,8 @@ struct sh_msiof_spi_info {
         int tx_fifo_override;
         int rx_fifo_override;
         u16 num_chipselect;
+        unsigned int dma_tx_id;
+        unsigned int dma_rx_id;
 };
 
 #endif /* __SPI_SH_MSIOF_H__ */
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index f9f931c89e3e..f7b9100686c3 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -345,6 +345,43 @@
 #define  SSB_SPROM4_TXPID5GH2_SHIFT     0
 #define  SSB_SPROM4_TXPID5GH3           0xFF00
 #define  SSB_SPROM4_TXPID5GH3_SHIFT     8
+
+/* There are 4 blocks with power info sharing the same layout */
+#define SSB_SPROM4_PWR_INFO_CORE0       0x0080
+#define SSB_SPROM4_PWR_INFO_CORE1       0x00AE
+#define SSB_SPROM4_PWR_INFO_CORE2       0x00DC
+#define SSB_SPROM4_PWR_INFO_CORE3       0x010A
+
+#define SSB_SPROM4_2G_MAXP_ITSSI        0x00    /* 2 GHz ITSSI and 2 GHz Max Power */
+#define  SSB_SPROM4_2G_MAXP             0x00FF
+#define  SSB_SPROM4_2G_ITSSI            0xFF00
+#define  SSB_SPROM4_2G_ITSSI_SHIFT      8
+#define SSB_SPROM4_2G_PA_0              0x02    /* 2 GHz power amp */
+#define SSB_SPROM4_2G_PA_1              0x04
+#define SSB_SPROM4_2G_PA_2              0x06
+#define SSB_SPROM4_2G_PA_3              0x08
+#define SSB_SPROM4_5G_MAXP_ITSSI        0x0A    /* 5 GHz ITSSI and 5.3 GHz Max Power */
+#define  SSB_SPROM4_5G_MAXP             0x00FF
+#define  SSB_SPROM4_5G_ITSSI            0xFF00
+#define  SSB_SPROM4_5G_ITSSI_SHIFT      8
+#define SSB_SPROM4_5GHL_MAXP            0x0C    /* 5.2 GHz and 5.8 GHz Max Power */
+#define  SSB_SPROM4_5GH_MAXP            0x00FF
+#define  SSB_SPROM4_5GL_MAXP            0xFF00
+#define  SSB_SPROM4_5GL_MAXP_SHIFT      8
+#define SSB_SPROM4_5G_PA_0              0x0E    /* 5.3 GHz power amp */
+#define SSB_SPROM4_5G_PA_1              0x10
+#define SSB_SPROM4_5G_PA_2              0x12
+#define SSB_SPROM4_5G_PA_3              0x14
+#define SSB_SPROM4_5GL_PA_0             0x16    /* 5.2 GHz power amp */
+#define SSB_SPROM4_5GL_PA_1             0x18
+#define SSB_SPROM4_5GL_PA_2             0x1A
+#define SSB_SPROM4_5GL_PA_3             0x1C
+#define SSB_SPROM4_5GH_PA_0             0x1E    /* 5.8 GHz power amp */
+#define SSB_SPROM4_5GH_PA_1             0x20
+#define SSB_SPROM4_5GH_PA_2             0x22
+#define SSB_SPROM4_5GH_PA_3             0x24
+
+/* TODO: Make it deprecated */
 #define SSB_SPROM4_MAXP_BG              0x0080  /* Max Power BG in path 1 */
 #define  SSB_SPROM4_MAXP_BG_MASK        0x00FF  /* Mask for Max Power BG */
 #define  SSB_SPROM4_ITSSI_BG            0xFF00  /* Mask for path 1 itssi_bg */
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 6f27d4f957bd..cd63851b57f2 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -112,6 +112,8 @@ struct plat_stmmacenet_data {
         int riwt_off;
         int max_speed;
         int maxmtu;
+        int multicast_filter_bins;
+        int unicast_filter_entries;
         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/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index ad7dbe2cfecd..1a8959944c5f 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -236,7 +236,7 @@ void *		rpc_malloc(struct rpc_task *, size_t);
 void            rpc_free(void *);
 int             rpciod_up(void);
 void            rpciod_down(void);
-int             __rpc_wait_for_completion_task(struct rpc_task *task, int (*)(void *));
+int             __rpc_wait_for_completion_task(struct rpc_task *task, wait_bit_action_f *);
 #ifdef RPC_DEBUG
 struct net;
 void            rpc_show_tasks(struct net *);
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index b0881a0ed322..701daff5d899 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -866,4 +866,9 @@ asmlinkage long sys_process_vm_writev(pid_t pid,
 asmlinkage long sys_kcmp(pid_t pid1, pid_t pid2, int type,
                          unsigned long idx1, unsigned long idx2);
 asmlinkage long sys_finit_module(int fd, const char __user *uargs, int flags);
+asmlinkage long sys_seccomp(unsigned int op, unsigned int flags,
+                            const char __user *uargs);
+asmlinkage long sys_getrandom(char __user *buf, size_t count,
+                              unsigned int flags);
+
 #endif
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index a0513210798f..fa5258f322e7 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -111,10 +111,7 @@ struct tcp_request_sock_ops;
 
 struct tcp_request_sock {
         struct inet_request_sock        req;
-#ifdef CONFIG_TCP_MD5SIG
-        /* Only used by TCP MD5 Signature so far. */
         const struct tcp_request_sock_ops *af_specific;
-#endif
         struct sock                     *listener; /* needed for TFO */
         u32                             rcv_isn;
         u32                             snt_isn;
diff --git a/include/linux/tick.h b/include/linux/tick.h
index b84773cb9f4c..059052306831 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -12,6 +12,7 @@
 #include <linux/hrtimer.h>
 #include <linux/context_tracking_state.h>
 #include <linux/cpumask.h>
+#include <linux/sched.h>
 
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
 
@@ -162,6 +163,7 @@ static inline u64 get_cpu_iowait_time_us(int cpu, u64 *unused) { return -1; }
 #ifdef CONFIG_NO_HZ_FULL
 extern bool tick_nohz_full_running;
 extern cpumask_var_t tick_nohz_full_mask;
+extern cpumask_var_t housekeeping_mask;
 
 static inline bool tick_nohz_full_enabled(void)
 {
@@ -181,7 +183,13 @@ static inline bool tick_nohz_full_cpu(int cpu)
 
 extern void tick_nohz_init(void);
 extern void __tick_nohz_full_check(void);
-extern void tick_nohz_full_kick(void);
+extern void tick_nohz_full_kick_cpu(int cpu);
+
+static inline void tick_nohz_full_kick(void)
+{
+        tick_nohz_full_kick_cpu(smp_processor_id());
+}
+
 extern void tick_nohz_full_kick_all(void);
 extern void __tick_nohz_task_switch(struct task_struct *tsk);
 #else
@@ -189,11 +197,30 @@ static inline void tick_nohz_init(void) { }
 static inline bool tick_nohz_full_enabled(void) { return false; }
 static inline bool tick_nohz_full_cpu(int cpu) { return false; }
 static inline void __tick_nohz_full_check(void) { }
+static inline void tick_nohz_full_kick_cpu(int cpu) { }
 static inline void tick_nohz_full_kick(void) { }
 static inline void tick_nohz_full_kick_all(void) { }
 static inline void __tick_nohz_task_switch(struct task_struct *tsk) { }
 #endif
 
+static inline bool is_housekeeping_cpu(int cpu)
+{
+#ifdef CONFIG_NO_HZ_FULL
+        if (tick_nohz_full_enabled())
+                return cpumask_test_cpu(cpu, housekeeping_mask);
+#endif
+        return true;
+}
+
+static inline void housekeeping_affine(struct task_struct *t)
+{
+#ifdef CONFIG_NO_HZ_FULL
+        if (tick_nohz_full_enabled())
+                set_cpus_allowed_ptr(t, housekeeping_mask);
+
+#endif
+}
+
 static inline void tick_nohz_full_check(void)
 {
         if (tick_nohz_full_enabled())
diff --git a/include/linux/time.h b/include/linux/time.h
index d5d229b2e5af..8c42cf8d2444 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -4,19 +4,10 @@
 # include <linux/cache.h>
 # include <linux/seqlock.h>
 # include <linux/math64.h>
-#include <uapi/linux/time.h>
+# include <linux/time64.h>
 
 extern struct timezone sys_tz;
 
-/* Parameters used to convert the timespec values: */
-#define MSEC_PER_SEC    1000L
-#define USEC_PER_MSEC   1000L
-#define NSEC_PER_USEC   1000L
-#define NSEC_PER_MSEC   1000000L
-#define USEC_PER_SEC    1000000L
-#define NSEC_PER_SEC    1000000000L
-#define FSEC_PER_SEC    1000000000000000LL
-
 #define TIME_T_MAX      (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1)
 
 static inline int timespec_equal(const struct timespec *a,
@@ -84,13 +75,6 @@ static inline struct timespec timespec_sub(struct timespec lhs,
         return ts_delta;
 }
 
-#define KTIME_MAX                       ((s64)~((u64)1 << 63))
-#if (BITS_PER_LONG == 64)
-# define KTIME_SEC_MAX                  (KTIME_MAX / NSEC_PER_SEC)
-#else
-# define KTIME_SEC_MAX                  LONG_MAX
-#endif
-
 /*
  * Returns true if the timespec is norm, false if denorm:
  */
@@ -115,27 +99,7 @@ static inline bool timespec_valid_strict(const struct timespec *ts)
         return true;
 }
 
-extern bool persistent_clock_exist;
-
-static inline bool has_persistent_clock(void)
-{
-        return persistent_clock_exist;
-}
-
-extern void read_persistent_clock(struct timespec *ts);
-extern void read_boot_clock(struct timespec *ts);
-extern int persistent_clock_is_local;
-extern int update_persistent_clock(struct timespec now);
-void timekeeping_init(void);
-extern int timekeeping_suspended;
-
-unsigned long get_seconds(void);
-struct timespec current_kernel_time(void);
-struct timespec __current_kernel_time(void); /* does not take xtime_lock */
-struct timespec get_monotonic_coarse(void);
-void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim,
-                                struct timespec *wtom, struct timespec *sleep);
-void timekeeping_inject_sleeptime(struct timespec *delta);
+extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
 
 #define CURRENT_TIME            (current_kernel_time())
 #define CURRENT_TIME_SEC        ((struct timespec) { get_seconds(), 0 })
@@ -153,33 +117,14 @@ void timekeeping_inject_sleeptime(struct timespec *delta);
 extern u32 (*arch_gettimeoffset)(void);
 #endif
 
-extern void do_gettimeofday(struct timeval *tv);
-extern int do_settimeofday(const struct timespec *tv);
-extern int do_sys_settimeofday(const struct timespec *tv,
-                               const struct timezone *tz);
-#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
-extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags);
 struct itimerval;
 extern int do_setitimer(int which, struct itimerval *value,
                         struct itimerval *ovalue);
-extern unsigned int alarm_setitimer(unsigned int seconds);
 extern int do_getitimer(int which, struct itimerval *value);
-extern int __getnstimeofday(struct timespec *tv);
-extern void getnstimeofday(struct timespec *tv);
-extern void getrawmonotonic(struct timespec *ts);
-extern void getnstime_raw_and_real(struct timespec *ts_raw,
-                struct timespec *ts_real);
-extern void getboottime(struct timespec *ts);
-extern void monotonic_to_bootbased(struct timespec *ts);
-extern void get_monotonic_boottime(struct timespec *ts);
 
-extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
-extern int timekeeping_valid_for_hres(void);
-extern u64 timekeeping_max_deferment(void);
-extern int timekeeping_inject_offset(struct timespec *ts);
-extern s32 timekeeping_get_tai_offset(void);
-extern void timekeeping_set_tai_offset(s32 tai_offset);
-extern void timekeeping_clocktai(struct timespec *ts);
+extern unsigned int alarm_setitimer(unsigned int seconds);
+
+extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags);
 
 struct tms;
 extern void do_sys_times(struct tms *);
diff --git a/include/linux/time64.h b/include/linux/time64.h
new file mode 100644
index 000000000000..a3831478d9cf
--- /dev/null
+++ b/include/linux/time64.h
@@ -0,0 +1,190 @@
+#ifndef _LINUX_TIME64_H
+#define _LINUX_TIME64_H
+
+#include <uapi/linux/time.h>
+
+typedef __s64 time64_t;
+
+/*
+ * This wants to go into uapi/linux/time.h once we agreed about the
+ * userspace interfaces.
+ */
+#if __BITS_PER_LONG == 64
+# define timespec64 timespec
+#else
+struct timespec64 {
+        time64_t        tv_sec;                 /* seconds */
+        long            tv_nsec;                /* nanoseconds */
+};
+#endif
+
+/* Parameters used to convert the timespec values: */
+#define MSEC_PER_SEC    1000L
+#define USEC_PER_MSEC   1000L
+#define NSEC_PER_USEC   1000L
+#define NSEC_PER_MSEC   1000000L
+#define USEC_PER_SEC    1000000L
+#define NSEC_PER_SEC    1000000000L
+#define FSEC_PER_SEC    1000000000000000LL
+
+/* Located here for timespec[64]_valid_strict */
+#define KTIME_MAX                       ((s64)~((u64)1 << 63))
+#define KTIME_SEC_MAX                   (KTIME_MAX / NSEC_PER_SEC)
+
+#if __BITS_PER_LONG == 64
+
+static inline struct timespec timespec64_to_timespec(const struct timespec64 ts64)
+{
+        return ts64;
+}
+
+static inline struct timespec64 timespec_to_timespec64(const struct timespec ts)
+{
+        return ts;
+}
+
+# define timespec64_equal               timespec_equal
+# define timespec64_compare             timespec_compare
+# define set_normalized_timespec64      set_normalized_timespec
+# define timespec64_add_safe            timespec_add_safe
+# define timespec64_add                 timespec_add
+# define timespec64_sub                 timespec_sub
+# define timespec64_valid               timespec_valid
+# define timespec64_valid_strict        timespec_valid_strict
+# define timespec64_to_ns               timespec_to_ns
+# define ns_to_timespec64               ns_to_timespec
+# define timespec64_add_ns              timespec_add_ns
+
+#else
+
+static inline struct timespec timespec64_to_timespec(const struct timespec64 ts64)
+{
+        struct timespec ret;
+
+        ret.tv_sec = (time_t)ts64.tv_sec;
+        ret.tv_nsec = ts64.tv_nsec;
+        return ret;
+}
+
+static inline struct timespec64 timespec_to_timespec64(const struct timespec ts)
+{
+        struct timespec64 ret;
+
+        ret.tv_sec = ts.tv_sec;
+        ret.tv_nsec = ts.tv_nsec;
+        return ret;
+}
+
+static inline int timespec64_equal(const struct timespec64 *a,
+                                   const struct timespec64 *b)
+{
+        return (a->tv_sec == b->tv_sec) && (a->tv_nsec == b->tv_nsec);
+}
+
+/*
+ * lhs < rhs:  return <0
+ * lhs == rhs: return 0
+ * lhs > rhs:  return >0
+ */
+static inline int timespec64_compare(const struct timespec64 *lhs, const struct timespec64 *rhs)
+{
+        if (lhs->tv_sec < rhs->tv_sec)
+                return -1;
+        if (lhs->tv_sec > rhs->tv_sec)
+                return 1;
+        return lhs->tv_nsec - rhs->tv_nsec;
+}
+
+extern void set_normalized_timespec64(struct timespec64 *ts, time64_t sec, s64 nsec);
+
+/*
+ * timespec64_add_safe assumes both values are positive and checks for
+ * overflow. It will return TIME_T_MAX if the returned value would be
+ * smaller then either of the arguments.
+ */
+extern struct timespec64 timespec64_add_safe(const struct timespec64 lhs,
+                                         const struct timespec64 rhs);
+
+
+static inline struct timespec64 timespec64_add(struct timespec64 lhs,
+                                                struct timespec64 rhs)
+{
+        struct timespec64 ts_delta;
+        set_normalized_timespec64(&ts_delta, lhs.tv_sec + rhs.tv_sec,
+                                lhs.tv_nsec + rhs.tv_nsec);
+        return ts_delta;
+}
+
+/*
+ * sub = lhs - rhs, in normalized form
+ */
+static inline struct timespec64 timespec64_sub(struct timespec64 lhs,
+                                                struct timespec64 rhs)
+{
+        struct timespec64 ts_delta;
+        set_normalized_timespec64(&ts_delta, lhs.tv_sec - rhs.tv_sec,
+                                lhs.tv_nsec - rhs.tv_nsec);
+        return ts_delta;
+}
+
+/*
+ * Returns true if the timespec64 is norm, false if denorm:
+ */
+static inline bool timespec64_valid(const struct timespec64 *ts)
+{
+        /* Dates before 1970 are bogus */
+        if (ts->tv_sec < 0)
+                return false;
+        /* Can't have more nanoseconds then a second */
+        if ((unsigned long)ts->tv_nsec >= NSEC_PER_SEC)
+                return false;
+        return true;
+}
+
+static inline bool timespec64_valid_strict(const struct timespec64 *ts)
+{
+        if (!timespec64_valid(ts))
+                return false;
+        /* Disallow values that could overflow ktime_t */
+        if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX)
+                return false;
+        return true;
+}
+
+/**
+ * timespec64_to_ns - Convert timespec64 to nanoseconds
+ * @ts:         pointer to the timespec64 variable to be converted
+ *
+ * Returns the scalar nanosecond representation of the timespec64
+ * parameter.
+ */
+static inline s64 timespec64_to_ns(const struct timespec64 *ts)
+{
+        return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;
+}
+
+/**
+ * ns_to_timespec64 - Convert nanoseconds to timespec64
+ * @nsec:       the nanoseconds value to be converted
+ *
+ * Returns the timespec64 representation of the nsec parameter.
+ */
+extern struct timespec64 ns_to_timespec64(const s64 nsec);
+
+/**
+ * timespec64_add_ns - Adds nanoseconds to a timespec64
+ * @a:          pointer to timespec64 to be incremented
+ * @ns:         unsigned nanoseconds value to be added
+ *
+ * This must always be inlined because its used from the x86-64 vdso,
+ * which cannot call other kernel functions.
+ */
+static __always_inline void timespec64_add_ns(struct timespec64 *a, u64 ns)
+{
+        a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
+        a->tv_nsec = ns;
+}
+
+#endif
+
+#endif /* _LINUX_TIME64_H */
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index c1825eb436ed..95640dcd1899 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -10,77 +10,100 @@
 #include <linux/jiffies.h>
 #include <linux/time.h>
 
-/* Structure holding internal timekeeping values. */
-struct timekeeper {
-        /* Current clocksource used for timekeeping. */
+/**
+ * struct tk_read_base - base structure for timekeeping readout
+ * @clock:      Current clocksource used for timekeeping.
+ * @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
+ * @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
+ *
+ * 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.
+ */
+struct tk_read_base {
         struct clocksource      *clock;
-        /* NTP adjusted clock multiplier */
+        cycle_t                 (*read)(struct clocksource *cs);
+        cycle_t                 mask;
+        cycle_t                 cycle_last;
         u32                     mult;
-        /* The shift value of the current clocksource. */
         u32                     shift;
-        /* Number of clock cycles in one NTP interval. */
+        u64                     xtime_nsec;
+        ktime_t                 base_mono;
+};
+
+/**
+ * struct timekeeper - Structure holding internal timekeeping values.
+ * @tkr:                The readout base structure
+ * @xtime_sec:          Current CLOCK_REALTIME time in seconds
+ * @wall_to_monotonic:  CLOCK_REALTIME to CLOCK_MONOTONIC offset
+ * @offs_real:          Offset clock monotonic -> clock realtime
+ * @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
+ *                      interval.
+ * @xtime_remainder:    Shifted nano seconds left over when rounding
+ *                      @cycle_interval
+ * @raw_interval:       Raw nano seconds accumulated per NTP interval.
+ * @ntp_error:          Difference between accumulated time and NTP time in ntp
+ *                      shifted nano seconds.
+ * @ntp_error_shift:    Shift conversion between clock shifted nano seconds and
+ *                      ntp shifted nano seconds.
+ *
+ * Note: For timespec(64) based interfaces wall_to_monotonic is what
+ * we need to add to xtime (or xtime corrected for sub jiffie times)
+ * to get to monotonic time.  Monotonic is pegged at zero at system
+ * boot time, so wall_to_monotonic will be negative, however, we will
+ * ALWAYS keep the tv_nsec part positive so we can use the usual
+ * normalization.
+ *
+ * wall_to_monotonic is moved after resume from suspend for the
+ * monotonic time not to jump. We need to add total_sleep_time to
+ * wall_to_monotonic to get the real boot based time offset.
+ *
+ * wall_to_monotonic is no longer the boot time, getboottime must be
+ * used instead.
+ */
+struct timekeeper {
+        struct tk_read_base     tkr;
+        u64                     xtime_sec;
+        struct timespec64       wall_to_monotonic;
+        ktime_t                 offs_real;
+        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 */
         cycle_t                 cycle_interval;
-        /* Last cycle value (also stored in clock->cycle_last) */
-        cycle_t                 cycle_last;
-        /* Number of clock shifted nano seconds in one NTP interval. */
         u64                     xtime_interval;
-        /* shifted nano seconds left over when rounding cycle_interval */
         s64                     xtime_remainder;
-        /* Raw nano seconds accumulated per NTP interval. */
         u32                     raw_interval;
-
-        /* Current CLOCK_REALTIME time in seconds */
-        u64                     xtime_sec;
-        /* Clock shifted nano seconds */
-        u64                     xtime_nsec;
-
+        /* The ntp_tick_length() value currently being used.
+         * This cached copy ensures we consistently apply the tick
+         * length for an entire tick, as ntp_tick_length may change
+         * mid-tick, and we don't want to apply that new value to
+         * the tick in progress.
+         */
+        u64                     ntp_tick;
         /* Difference between accumulated time and NTP time in ntp
          * shifted nano seconds. */
         s64                     ntp_error;
-        /* Shift conversion between clock shifted nano seconds and
-         * ntp shifted nano seconds. */
         u32                     ntp_error_shift;
-
-        /*
-         * wall_to_monotonic is what we need to add to xtime (or xtime corrected
-         * for sub jiffie times) to get to monotonic time.  Monotonic is pegged
-         * at zero at system boot time, so wall_to_monotonic will be negative,
-         * however, we will ALWAYS keep the tv_nsec part positive so we can use
-         * the usual normalization.
-         *
-         * wall_to_monotonic is moved after resume from suspend for the
-         * monotonic time not to jump. We need to add total_sleep_time to
-         * wall_to_monotonic to get the real boot based time offset.
-         *
-         * - wall_to_monotonic is no longer the boot time, getboottime must be
-         * used instead.
-         */
-        struct timespec         wall_to_monotonic;
-        /* Offset clock monotonic -> clock realtime */
-        ktime_t                 offs_real;
-        /* time spent in suspend */
-        struct timespec         total_sleep_time;
-        /* Offset clock monotonic -> clock boottime */
-        ktime_t                 offs_boot;
-        /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */
-        struct timespec         raw_time;
-        /* The current UTC to TAI offset in seconds */
-        s32                     tai_offset;
-        /* Offset clock monotonic -> clock tai */
-        ktime_t                 offs_tai;
-
+        u32                     ntp_err_mult;
 };
 
-static inline struct timespec tk_xtime(struct timekeeper *tk)
-{
-        struct timespec ts;
-
-        ts.tv_sec = tk->xtime_sec;
-        ts.tv_nsec = (long)(tk->xtime_nsec >> tk->shift);
-        return ts;
-}
-
-
 #ifdef CONFIG_GENERIC_TIME_VSYSCALL
 
 extern void update_vsyscall(struct timekeeper *tk);
@@ -89,17 +112,10 @@ extern void update_vsyscall_tz(void);
 #elif defined(CONFIG_GENERIC_TIME_VSYSCALL_OLD)
 
 extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
-                                struct clocksource *c, u32 mult);
+                                struct clocksource *c, u32 mult,
+                                cycle_t cycle_last);
 extern void update_vsyscall_tz(void);
 
-static inline void update_vsyscall(struct timekeeper *tk)
-{
-        struct timespec xt;
-
-        xt = tk_xtime(tk);
-        update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->clock, tk->mult);
-}
-
 #else
 
 static inline void update_vsyscall(struct timekeeper *tk)
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
new file mode 100644
index 000000000000..1caa6b04fdc5
--- /dev/null
+++ b/include/linux/timekeeping.h
@@ -0,0 +1,209 @@
+#ifndef _LINUX_TIMEKEEPING_H
+#define _LINUX_TIMEKEEPING_H
+
+/* Included from linux/ktime.h */
+
+void timekeeping_init(void);
+extern int timekeeping_suspended;
+
+/*
+ * Get and set timeofday
+ */
+extern void do_gettimeofday(struct timeval *tv);
+extern int do_settimeofday(const struct timespec *tv);
+extern int do_sys_settimeofday(const struct timespec *tv,
+                               const struct timezone *tz);
+
+/*
+ * Kernel time accessors
+ */
+unsigned long get_seconds(void);
+struct timespec current_kernel_time(void);
+/* does not take xtime_lock */
+struct timespec __current_kernel_time(void);
+
+/*
+ * timespec based interfaces
+ */
+struct timespec get_monotonic_coarse(void);
+extern void getrawmonotonic(struct timespec *ts);
+extern void ktime_get_ts64(struct timespec64 *ts);
+
+extern int __getnstimeofday64(struct timespec64 *tv);
+extern void getnstimeofday64(struct timespec64 *tv);
+
+#if BITS_PER_LONG == 64
+static inline int __getnstimeofday(struct timespec *ts)
+{
+        return __getnstimeofday64(ts);
+}
+
+static inline void getnstimeofday(struct timespec *ts)
+{
+        getnstimeofday64(ts);
+}
+
+static inline void ktime_get_ts(struct timespec *ts)
+{
+        ktime_get_ts64(ts);
+}
+
+static inline void ktime_get_real_ts(struct timespec *ts)
+{
+        getnstimeofday64(ts);
+}
+
+#else
+static inline int __getnstimeofday(struct timespec *ts)
+{
+        struct timespec64 ts64;
+        int ret = __getnstimeofday64(&ts64);
+
+        *ts = timespec64_to_timespec(ts64);
+        return ret;
+}
+
+static inline void getnstimeofday(struct timespec *ts)
+{
+        struct timespec64 ts64;
+
+        getnstimeofday64(&ts64);
+        *ts = timespec64_to_timespec(ts64);
+}
+
+static inline void ktime_get_ts(struct timespec *ts)
+{
+        struct timespec64 ts64;
+
+        ktime_get_ts64(&ts64);
+        *ts = timespec64_to_timespec(ts64);
+}
+
+static inline void ktime_get_real_ts(struct timespec *ts)
+{
+        struct timespec64 ts64;
+
+        getnstimeofday64(&ts64);
+        *ts = timespec64_to_timespec(ts64);
+}
+#endif
+
+extern void getboottime(struct timespec *ts);
+
+#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
+#define ktime_get_real_ts64(ts) getnstimeofday64(ts)
+
+/*
+ * ktime_t based interfaces
+ */
+
+enum tk_offsets {
+        TK_OFFS_REAL,
+        TK_OFFS_BOOT,
+        TK_OFFS_TAI,
+        TK_OFFS_MAX,
+};
+
+extern ktime_t ktime_get(void);
+extern ktime_t ktime_get_with_offset(enum tk_offsets offs);
+extern ktime_t ktime_mono_to_any(ktime_t tmono, enum tk_offsets offs);
+extern ktime_t ktime_get_raw(void);
+
+/**
+ * ktime_get_real - get the real (wall-) time in ktime_t format
+ */
+static inline ktime_t ktime_get_real(void)
+{
+        return ktime_get_with_offset(TK_OFFS_REAL);
+}
+
+/**
+ * ktime_get_boottime - Returns monotonic time since boot in ktime_t format
+ *
+ * This is similar to CLOCK_MONTONIC/ktime_get, but also includes the
+ * time spent in suspend.
+ */
+static inline ktime_t ktime_get_boottime(void)
+{
+        return ktime_get_with_offset(TK_OFFS_BOOT);
+}
+
+/**
+ * ktime_get_clocktai - Returns the TAI time of day in ktime_t format
+ */
+static inline ktime_t ktime_get_clocktai(void)
+{
+        return ktime_get_with_offset(TK_OFFS_TAI);
+}
+
+/**
+ * ktime_mono_to_real - Convert monotonic time to clock realtime
+ */
+static inline ktime_t ktime_mono_to_real(ktime_t mono)
+{
+        return ktime_mono_to_any(mono, TK_OFFS_REAL);
+}
+
+static inline u64 ktime_get_ns(void)
+{
+        return ktime_to_ns(ktime_get());
+}
+
+static inline u64 ktime_get_real_ns(void)
+{
+        return ktime_to_ns(ktime_get_real());
+}
+
+static inline u64 ktime_get_boot_ns(void)
+{
+        return ktime_to_ns(ktime_get_boottime());
+}
+
+static inline u64 ktime_get_raw_ns(void)
+{
+        return ktime_to_ns(ktime_get_raw());
+}
+
+extern u64 ktime_get_mono_fast_ns(void);
+
+/*
+ * Timespec interfaces utilizing the ktime based ones
+ */
+static inline void get_monotonic_boottime(struct timespec *ts)
+{
+        *ts = ktime_to_timespec(ktime_get_boottime());
+}
+
+static inline void timekeeping_clocktai(struct timespec *ts)
+{
+        *ts = ktime_to_timespec(ktime_get_clocktai());
+}
+
+/*
+ * RTC specific
+ */
+extern void timekeeping_inject_sleeptime(struct timespec *delta);
+
+/*
+ * PPS accessor
+ */
+extern void getnstime_raw_and_real(struct timespec *ts_raw,
+                                   struct timespec *ts_real);
+
+/*
+ * 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_boot_clock(struct timespec *ts);
+extern int update_persistent_clock(struct timespec now);
+
+
+#endif
diff --git a/include/linux/timerfd.h b/include/linux/timerfd.h
index d3b57fa12225..bd36ce431e32 100644
--- a/include/linux/timerfd.h
+++ b/include/linux/timerfd.h
@@ -11,6 +11,9 @@
 /* For O_CLOEXEC and O_NONBLOCK */
 #include <linux/fcntl.h>
 
+/* For _IO helpers */
+#include <linux/ioctl.h>
+
 /*
  * CAREFUL: Check include/asm-generic/fcntl.h when defining
  * new flags, since they might collide with O_* ones. We want
@@ -29,4 +32,6 @@
 /* Flags for timerfd_settime.  */
 #define TFD_SETTIME_FLAGS (TFD_TIMER_ABSTIME | TFD_TIMER_CANCEL_ON_SET)
 
+#define TFD_IOC_SET_TICKS       _IOW('T', 0, u64)
+
 #endif /* _LINUX_TIMERFD_H */
diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index fff1d0976f80..8350c538b486 100644
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -39,6 +39,9 @@ struct tpm_class_ops {
         int (*send) (struct tpm_chip *chip, u8 *buf, size_t len);
         void (*cancel) (struct tpm_chip *chip);
         u8 (*status) (struct tpm_chip *chip);
+        bool (*update_timeouts)(struct tpm_chip *chip,
+                                unsigned long *timeout_cap);
+
 };
 
 #if defined(CONFIG_TCG_TPM) || defined(CONFIG_TCG_TPM_MODULE)
diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h
index 136116924d8d..ea6c9dea79e3 100644
--- a/include/linux/trace_seq.h
+++ b/include/linux/trace_seq.h
@@ -25,6 +25,21 @@ trace_seq_init(struct trace_seq *s)
         s->full = 0;
 }
 
+/**
+ * trace_seq_buffer_ptr - return pointer to next location in buffer
+ * @s: trace sequence descriptor
+ *
+ * Returns the pointer to the buffer where the next write to
+ * the buffer will happen. This is useful to save the location
+ * that is about to be written to and then return the result
+ * of that write.
+ */
+static inline unsigned char *
+trace_seq_buffer_ptr(struct trace_seq *s)
+{
+        return s->buffer + s->len;
+}
+
 /*
  * Currently only defined when tracing is enabled.
  */
@@ -36,14 +51,13 @@ int trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args);
 extern int
 trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary);
 extern int trace_print_seq(struct seq_file *m, struct trace_seq *s);
-extern ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
-                                 size_t cnt);
+extern int trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
+                             int cnt);
 extern int trace_seq_puts(struct trace_seq *s, const char *str);
 extern int trace_seq_putc(struct trace_seq *s, unsigned char c);
-extern int trace_seq_putmem(struct trace_seq *s, const void *mem, size_t len);
+extern int trace_seq_putmem(struct trace_seq *s, const void *mem, unsigned int len);
 extern int trace_seq_putmem_hex(struct trace_seq *s, const void *mem,
-                                size_t len);
-extern void *trace_seq_reserve(struct trace_seq *s, size_t len);
+                                unsigned int len);
 extern int trace_seq_path(struct trace_seq *s, const struct path *path);
 
 extern int trace_seq_bitmask(struct trace_seq *s, const unsigned long *maskp,
@@ -71,8 +85,8 @@ static inline int trace_print_seq(struct seq_file *m, struct trace_seq *s)
 {
         return 0;
 }
-static inline ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
-                                 size_t cnt)
+static inline int trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
+                                    int cnt)
 {
         return 0;
 }
@@ -85,19 +99,15 @@ static inline int trace_seq_putc(struct trace_seq *s, unsigned char c)
         return 0;
 }
 static inline int
-trace_seq_putmem(struct trace_seq *s, const void *mem, size_t len)
+trace_seq_putmem(struct trace_seq *s, const void *mem, unsigned int len)
 {
         return 0;
 }
 static inline int trace_seq_putmem_hex(struct trace_seq *s, const void *mem,
-                                       size_t len)
+                                       unsigned int len)
 {
         return 0;
 }
-static inline void *trace_seq_reserve(struct trace_seq *s, size_t len)
-{
-        return NULL;
-}
 static inline int trace_seq_path(struct trace_seq *s, const struct path *path)
 {
         return 0;
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 1c3316a47d7e..84132942902a 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -477,13 +477,11 @@ extern int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
                         unsigned int cmd, unsigned long arg);
 extern int tty_perform_flush(struct tty_struct *tty, unsigned long arg);
 extern void tty_default_fops(struct file_operations *fops);
-extern struct tty_struct *alloc_tty_struct(void);
+extern struct tty_struct *alloc_tty_struct(struct tty_driver *driver, int idx);
 extern int tty_alloc_file(struct file *file);
 extern void tty_add_file(struct tty_struct *tty, struct file *file);
 extern void tty_free_file(struct file *file);
 extern void free_tty_struct(struct tty_struct *tty);
-extern void initialize_tty_struct(struct tty_struct *tty,
-                struct tty_driver *driver, int idx);
 extern void deinitialize_tty_struct(struct tty_struct *tty);
 extern struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx);
 extern int tty_release(struct inode *inode, struct file *filp);
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 756a60989294..e48c608a8fa8 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -35,14 +35,14 @@
  *      This routine is mandatory; if this routine is not filled in,
  *      the attempted open will fail with ENODEV.
  *
- *      Required method.
- *     
+ *      Required method. Called with tty lock held.
+ *
  * void (*close)(struct tty_struct * tty, struct file * filp);
  *
  *      This routine is called when a particular tty device is closed.
  *      Note: called even if the corresponding open() failed.
  *
- *      Required method.
+ *      Required method. Called with tty lock held.
  *
  * void (*shutdown)(struct tty_struct * tty);
  *
@@ -172,6 +172,8 @@
  *
  *      Optional:
  *
+ *      Called with tty lock held.
+ *
  * int (*break_ctl)(struct tty_struct *tty, int state);
  *
  *      This optional routine requests the tty driver to turn on or
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 7373203140e7..c330f5ef42cf 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -386,6 +386,21 @@ struct usb_composite_driver {
 
 extern int usb_composite_probe(struct usb_composite_driver *driver);
 extern void usb_composite_unregister(struct usb_composite_driver *driver);
+
+/**
+ * module_usb_composite_driver() - Helper macro for registering a USB gadget
+ * composite driver
+ * @__usb_composite_driver: usb_composite_driver struct
+ *
+ * Helper macro for USB gadget composite 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_usb_composite_driver(__usb_composite_driver) \
+        module_driver(__usb_composite_driver, usb_composite_probe, \
+                       usb_composite_unregister)
+
 extern void usb_composite_setup_continue(struct usb_composite_dev *cdev);
 extern int composite_dev_prepare(struct usb_composite_driver *composite,
                 struct usb_composite_dev *cdev);
diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h
index 52f944dfe2fd..55a17b188daa 100644
--- a/include/linux/usb/quirks.h
+++ b/include/linux/usb/quirks.h
@@ -30,4 +30,15 @@
    descriptor */
 #define USB_QUIRK_DELAY_INIT            0x00000040
 
+/*
+ * For high speed and super speed interupt endpoints, the USB 2.0 and
+ * USB 3.0 spec require the interval in microframes
+ * (1 microframe = 125 microseconds) to be calculated as
+ * interval = 2 ^ (bInterval-1).
+ *
+ * Devices with this quirk report their bInterval as the result of this
+ * calculation instead of the exponent variable used in the calculation.
+ */
+#define USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL  0x00000080
+
 #endif /* __LINUX_USB_QUIRKS_H */
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index e452ba6ec6bd..d5952bb66752 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -153,6 +153,9 @@ struct renesas_usbhs_driver_param {
          */
         int pio_dma_border; /* default is 64byte */
 
+        u32 type;
+        u32 enable_gpio;
+
         /*
          * option:
          */
@@ -160,6 +163,9 @@ struct renesas_usbhs_driver_param {
         u32 has_sudmac:1; /* for SUDMAC */
 };
 
+#define USBHS_TYPE_R8A7790 1
+#define USBHS_TYPE_R8A7791 2
+
 /*
  * option:
  *
diff --git a/include/linux/usb/usb338x.h b/include/linux/usb/usb338x.h
new file mode 100644
index 000000000000..f92eb635b9d3
--- /dev/null
+++ b/include/linux/usb/usb338x.h
@@ -0,0 +1,199 @@
+/*
+ * USB 338x super/high/full speed USB device controller.
+ * Unlike many such controllers, this one talks PCI.
+ *
+ * Copyright (C) 2002 NetChip Technology, Inc. (http://www.netchip.com)
+ * Copyright (C) 2003 David Brownell
+ * Copyright (C) 2014 Ricardo Ribalda - Qtechnology/AS
+ *
+ * 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.
+ *
+ * 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 __LINUX_USB_USB338X_H
+#define __LINUX_USB_USB338X_H
+
+#include <linux/usb/net2280.h>
+
+/*
+ * Extra defined bits for net2280 registers
+ */
+#define     SCRATCH                           0x0b
+
+#define     DEFECT7374_FSM_FIELD                28
+#define     SUPER_SPEED                          8
+#define     DMA_REQUEST_OUTSTANDING              5
+#define     DMA_PAUSE_DONE_INTERRUPT            26
+#define     SET_ISOCHRONOUS_DELAY               24
+#define     SET_SEL                             22
+#define     SUPER_SPEED_MODE                     8
+
+/*ep_cfg*/
+#define     MAX_BURST_SIZE                      24
+#define     EP_FIFO_BYTE_COUNT                  16
+#define     IN_ENDPOINT_ENABLE                  14
+#define     IN_ENDPOINT_TYPE                    12
+#define     OUT_ENDPOINT_ENABLE                 10
+#define     OUT_ENDPOINT_TYPE                    8
+
+struct usb338x_usb_ext_regs {
+        u32     usbclass;
+#define     DEVICE_PROTOCOL                     16
+#define     DEVICE_SUB_CLASS                     8
+#define     DEVICE_CLASS                         0
+        u32     ss_sel;
+#define     U2_SYSTEM_EXIT_LATENCY               8
+#define     U1_SYSTEM_EXIT_LATENCY               0
+        u32     ss_del;
+#define     U2_DEVICE_EXIT_LATENCY               8
+#define     U1_DEVICE_EXIT_LATENCY               0
+        u32     usb2lpm;
+#define     USB_L1_LPM_HIRD                      2
+#define     USB_L1_LPM_REMOTE_WAKE               1
+#define     USB_L1_LPM_SUPPORT                   0
+        u32     usb3belt;
+#define     BELT_MULTIPLIER                     10
+#define     BEST_EFFORT_LATENCY_TOLERANCE        0
+        u32     usbctl2;
+#define     LTM_ENABLE                           7
+#define     U2_ENABLE                            6
+#define     U1_ENABLE                            5
+#define     FUNCTION_SUSPEND                     4
+#define     USB3_CORE_ENABLE                     3
+#define     USB2_CORE_ENABLE                     2
+#define     SERIAL_NUMBER_STRING_ENABLE          0
+        u32     in_timeout;
+#define     GPEP3_TIMEOUT                       19
+#define     GPEP2_TIMEOUT                       18
+#define     GPEP1_TIMEOUT                       17
+#define     GPEP0_TIMEOUT                       16
+#define     GPEP3_TIMEOUT_VALUE                 13
+#define     GPEP3_TIMEOUT_ENABLE                12
+#define     GPEP2_TIMEOUT_VALUE                  9
+#define     GPEP2_TIMEOUT_ENABLE                 8
+#define     GPEP1_TIMEOUT_VALUE                  5
+#define     GPEP1_TIMEOUT_ENABLE                 4
+#define     GPEP0_TIMEOUT_VALUE                  1
+#define     GPEP0_TIMEOUT_ENABLE                 0
+        u32     isodelay;
+#define     ISOCHRONOUS_DELAY                    0
+} __packed;
+
+struct usb338x_fifo_regs {
+        /* offset 0x0500, 0x0520, 0x0540, 0x0560, 0x0580 */
+        u32     ep_fifo_size_base;
+#define     IN_FIFO_BASE_ADDRESS                                22
+#define     IN_FIFO_SIZE                                        16
+#define     OUT_FIFO_BASE_ADDRESS                               6
+#define     OUT_FIFO_SIZE                                       0
+        u32     ep_fifo_out_wrptr;
+        u32     ep_fifo_out_rdptr;
+        u32     ep_fifo_in_wrptr;
+        u32     ep_fifo_in_rdptr;
+        u32     unused[3];
+} __packed;
+
+
+/* Link layer */
+struct usb338x_ll_regs {
+        /* offset 0x700 */
+        u32   ll_ltssm_ctrl1;
+        u32   ll_ltssm_ctrl2;
+        u32   ll_ltssm_ctrl3;
+        u32   unused[2];
+        u32   ll_general_ctrl0;
+        u32   ll_general_ctrl1;
+#define     PM_U3_AUTO_EXIT                                     29
+#define     PM_U2_AUTO_EXIT                                     28
+#define     PM_U1_AUTO_EXIT                                     27
+#define     PM_FORCE_U2_ENTRY                                   26
+#define     PM_FORCE_U1_ENTRY                                   25
+#define     PM_LGO_COLLISION_SEND_LAU                           24
+#define     PM_DIR_LINK_REJECT                                  23
+#define     PM_FORCE_LINK_ACCEPT                                22
+#define     PM_DIR_ENTRY_U3                                     20
+#define     PM_DIR_ENTRY_U2                                     19
+#define     PM_DIR_ENTRY_U1                                     18
+#define     PM_U2_ENABLE                                        17
+#define     PM_U1_ENABLE                                        16
+#define     SKP_THRESHOLD_ADJUST_FMW                            8
+#define     RESEND_DPP_ON_LRTY_FMW                              7
+#define     DL_BIT_VALUE_FMW                                    6
+#define     FORCE_DL_BIT                                        5
+        u32   ll_general_ctrl2;
+#define     SELECT_INVERT_LANE_POLARITY                         7
+#define     FORCE_INVERT_LANE_POLARITY                          6
+        u32   ll_general_ctrl3;
+        u32   ll_general_ctrl4;
+        u32   ll_error_gen;
+} __packed;
+
+struct usb338x_ll_lfps_regs {
+        /* offset 0x748 */
+        u32   ll_lfps_5;
+#define     TIMER_LFPS_6US                                      16
+        u32   ll_lfps_6;
+#define     TIMER_LFPS_80US                                     0
+} __packed;
+
+struct usb338x_ll_tsn_regs {
+        /* offset 0x77C */
+        u32   ll_tsn_counters_2;
+#define     HOT_TX_NORESET_TS2                                  24
+        u32   ll_tsn_counters_3;
+#define     HOT_RX_RESET_TS2                                    0
+} __packed;
+
+struct usb338x_ll_chi_regs {
+        /* offset 0x79C */
+        u32   ll_tsn_chicken_bit;
+#define     RECOVERY_IDLE_TO_RECOVER_FMW                        3
+} __packed;
+
+/* protocol layer */
+struct usb338x_pl_regs {
+        /* offset 0x800 */
+        u32   pl_reg_1;
+        u32   pl_reg_2;
+        u32   pl_reg_3;
+        u32   pl_reg_4;
+        u32   pl_ep_ctrl;
+        /* Protocol Layer Endpoint Control*/
+#define     PL_EP_CTRL                                  0x810
+#define     ENDPOINT_SELECT                             0
+        /* [4:0] */
+#define     EP_INITIALIZED                              16
+#define     SEQUENCE_NUMBER_RESET                       17
+#define     CLEAR_ACK_ERROR_CODE                        20
+        u32   pl_reg_6;
+        u32   pl_reg_7;
+        u32   pl_reg_8;
+        u32   pl_ep_status_1;
+        /* Protocol Layer Endpoint Status 1*/
+#define     PL_EP_STATUS_1                              0x820
+#define     STATE                                       16
+#define     ACK_GOOD_NORMAL                             0x11
+#define     ACK_GOOD_MORE_ACKS_TO_COME                  0x16
+        u32   pl_ep_status_2;
+        u32   pl_ep_status_3;
+        /* Protocol Layer Endpoint Status 3*/
+#define     PL_EP_STATUS_3                              0x828
+#define     SEQUENCE_NUMBER                             0
+        u32   pl_ep_status_4;
+        /* Protocol Layer Endpoint Status 4*/
+#define     PL_EP_STATUS_4                              0x82c
+        u32   pl_ep_cfg_4;
+        /* Protocol Layer Endpoint Configuration 4*/
+#define     PL_EP_CFG_4                                 0x830
+#define     NON_CTRL_IN_TOLERATE_BAD_DIR                6
+} __packed;
+
+#endif /* __LINUX_USB_USB338X_H */
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 0662e98fef72..26088feb6608 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -148,6 +148,9 @@ struct driver_info {
         struct sk_buff  *(*tx_fixup)(struct usbnet *dev,
                                 struct sk_buff *skb, gfp_t flags);
 
+        /* recover from timeout */
+        void    (*recover)(struct usbnet *dev);
+
         /* early initialization code, can sleep. This is for minidrivers
          * having 'subminidrivers' that need to do extra initialization
          * right after minidriver have initialized hardware. */
diff --git a/include/linux/usb/xhci_pdriver.h b/include/linux/usb/xhci_pdriver.h
new file mode 100644
index 000000000000..376654b5b0f7
--- /dev/null
+++ b/include/linux/usb/xhci_pdriver.h
@@ -0,0 +1,27 @@
+/*
+ * 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 __USB_CORE_XHCI_PDRIVER_H
+#define __USB_CORE_XHCI_PDRIVER_H
+
+/**
+ * struct usb_xhci_pdata - platform_data for generic xhci platform driver
+ *
+ * @usb3_lpm_capable:   determines if this xhci platform supports USB3
+ *                      LPM capability
+ *
+ */
+struct usb_xhci_pdata {
+        unsigned        usb3_lpm_capable:1;
+};
+
+#endif /* __USB_CORE_XHCI_PDRIVER_H */
diff --git a/include/linux/verify_pefile.h b/include/linux/verify_pefile.h
new file mode 100644
index 000000000000..ac34819214f9
--- /dev/null
+++ b/include/linux/verify_pefile.h
@@ -0,0 +1,18 @@
+/* Signed PE file verification
+ *
+ * Copyright (C) 2014 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_VERIFY_PEFILE_H
+#define _LINUX_VERIFY_PEFILE_H
+
+extern int verify_pefile_signature(const void *pebuf, unsigned pelen,
+                                   struct key *trusted_keyring, bool *_trusted);
+
+#endif /* _LINUX_VERIFY_PEFILE_H */
diff --git a/include/linux/wait.h b/include/linux/wait.h
index bd68819f0815..6fb1ba5f9b2f 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -25,6 +25,7 @@ struct wait_bit_key {
         void                    *flags;
         int                     bit_nr;
 #define WAIT_ATOMIC_T_BIT_NR    -1
+        unsigned long           private;
 };
 
 struct wait_bit_queue {
@@ -141,18 +142,19 @@ __remove_wait_queue(wait_queue_head_t *head, wait_queue_t *old)
         list_del(&old->task_list);
 }
 
+typedef int wait_bit_action_f(struct wait_bit_key *);
 void __wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key);
 void __wake_up_locked_key(wait_queue_head_t *q, unsigned int mode, void *key);
 void __wake_up_sync_key(wait_queue_head_t *q, unsigned int mode, int nr, void *key);
 void __wake_up_locked(wait_queue_head_t *q, unsigned int mode, int nr);
 void __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr);
 void __wake_up_bit(wait_queue_head_t *, void *, int);
-int __wait_on_bit(wait_queue_head_t *, struct wait_bit_queue *, int (*)(void *), unsigned);
-int __wait_on_bit_lock(wait_queue_head_t *, struct wait_bit_queue *, int (*)(void *), unsigned);
+int __wait_on_bit(wait_queue_head_t *, struct wait_bit_queue *, wait_bit_action_f *, unsigned);
+int __wait_on_bit_lock(wait_queue_head_t *, struct wait_bit_queue *, wait_bit_action_f *, unsigned);
 void wake_up_bit(void *, int);
 void wake_up_atomic_t(atomic_t *);
-int out_of_line_wait_on_bit(void *, int, int (*)(void *), unsigned);
-int out_of_line_wait_on_bit_lock(void *, int, int (*)(void *), unsigned);
+int out_of_line_wait_on_bit(void *, int, wait_bit_action_f *, unsigned);
+int out_of_line_wait_on_bit_lock(void *, int, wait_bit_action_f *, unsigned);
 int out_of_line_wait_on_atomic_t(atomic_t *, int (*)(atomic_t *), unsigned);
 wait_queue_head_t *bit_waitqueue(void *, int);
 
@@ -854,11 +856,14 @@ int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key);
                 (wait)->flags = 0;                                      \
         } while (0)
 
+
+extern int bit_wait(struct wait_bit_key *);
+extern int bit_wait_io(struct wait_bit_key *);
+
 /**
  * wait_on_bit - wait for a bit to be cleared
  * @word: the word being waited on, a kernel virtual address
  * @bit: the bit of the word being waited on
- * @action: the function used to sleep, which may take special actions
  * @mode: the task state to sleep in
  *
  * There is a standard hashed waitqueue table for generic use. This
@@ -867,9 +872,62 @@ int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key);
  * call wait_on_bit() in threads waiting for the bit to clear.
  * One uses wait_on_bit() where one is waiting for the bit to clear,
  * but has no intention of setting it.
+ * Returned value will be zero if the bit was cleared, or non-zero
+ * if the process received a signal and the mode permitted wakeup
+ * on that signal.
+ */
+static inline int
+wait_on_bit(void *word, int bit, unsigned mode)
+{
+        if (!test_bit(bit, word))
+                return 0;
+        return out_of_line_wait_on_bit(word, bit,
+                                       bit_wait,
+                                       mode);
+}
+
+/**
+ * wait_on_bit_io - wait for a bit to be cleared
+ * @word: the word being waited on, a kernel virtual address
+ * @bit: the bit of the word being waited on
+ * @mode: the task state to sleep in
+ *
+ * Use the standard hashed waitqueue table to wait for a bit
+ * to be cleared.  This is similar to wait_on_bit(), but calls
+ * io_schedule() instead of schedule() for the actual waiting.
+ *
+ * Returned value will be zero if the bit was cleared, or non-zero
+ * if the process received a signal and the mode permitted wakeup
+ * on that signal.
+ */
+static inline int
+wait_on_bit_io(void *word, int bit, unsigned mode)
+{
+        if (!test_bit(bit, word))
+                return 0;
+        return out_of_line_wait_on_bit(word, bit,
+                                       bit_wait_io,
+                                       mode);
+}
+
+/**
+ * wait_on_bit_action - wait for a bit to be cleared
+ * @word: the word being waited on, a kernel virtual address
+ * @bit: the bit of the word being waited on
+ * @action: the function used to sleep, which may take special actions
+ * @mode: the task state to sleep in
+ *
+ * Use the standard hashed waitqueue table to wait for a bit
+ * to be cleared, and allow the waiting action to be specified.
+ * This is like wait_on_bit() but allows fine control of how the waiting
+ * is done.
+ *
+ * Returned value will be zero if the bit was cleared, or non-zero
+ * if the process received a signal and the mode permitted wakeup
+ * on that signal.
  */
 static inline int
-wait_on_bit(void *word, int bit, int (*action)(void *), unsigned mode)
+wait_on_bit_action(void *word, int bit, wait_bit_action_f *action, unsigned mode)
 {
         if (!test_bit(bit, word))
                 return 0;
@@ -880,7 +938,6 @@ wait_on_bit(void *word, int bit, int (*action)(void *), unsigned mode)
  * wait_on_bit_lock - wait for a bit to be cleared, when wanting to set it
  * @word: the word being waited on, a kernel virtual address
  * @bit: the bit of the word being waited on
- * @action: the function used to sleep, which may take special actions
  * @mode: the task state to sleep in
  *
  * There is a standard hashed waitqueue table for generic use. This
@@ -891,9 +948,61 @@ wait_on_bit(void *word, int bit, int (*action)(void *), unsigned mode)
  * wait_on_bit() in threads waiting to be able to set the bit.
  * One uses wait_on_bit_lock() where one is waiting for the bit to
  * clear with the intention of setting it, and when done, clearing it.
+ *
+ * Returns zero if the bit was (eventually) found to be clear and was
+ * set.  Returns non-zero if a signal was delivered to the process and
+ * the @mode allows that signal to wake the process.
+ */
+static inline int
+wait_on_bit_lock(void *word, int bit, unsigned mode)
+{
+        if (!test_and_set_bit(bit, word))
+                return 0;
+        return out_of_line_wait_on_bit_lock(word, bit, bit_wait, mode);
+}
+
+/**
+ * wait_on_bit_lock_io - wait for a bit to be cleared, when wanting to set it
+ * @word: the word being waited on, a kernel virtual address
+ * @bit: the bit of the word being waited on
+ * @mode: the task state to sleep in
+ *
+ * Use the standard hashed waitqueue table to wait for a bit
+ * to be cleared and then to atomically set it.  This is similar
+ * to wait_on_bit(), but calls io_schedule() instead of schedule()
+ * for the actual waiting.
+ *
+ * Returns zero if the bit was (eventually) found to be clear and was
+ * set.  Returns non-zero if a signal was delivered to the process and
+ * the @mode allows that signal to wake the process.
+ */
+static inline int
+wait_on_bit_lock_io(void *word, int bit, unsigned mode)
+{
+        if (!test_and_set_bit(bit, word))
+                return 0;
+        return out_of_line_wait_on_bit_lock(word, bit, bit_wait_io, mode);
+}
+
+/**
+ * wait_on_bit_lock_action - wait for a bit to be cleared, when wanting to set it
+ * @word: the word being waited on, a kernel virtual address
+ * @bit: the bit of the word being waited on
+ * @action: the function used to sleep, which may take special actions
+ * @mode: the task state to sleep in
+ *
+ * Use the standard hashed waitqueue table to wait for a bit
+ * to be cleared and then to set it, and allow the waiting action
+ * to be specified.
+ * This is like wait_on_bit() but allows fine control of how the waiting
+ * is done.
+ *
+ * Returns zero if the bit was (eventually) found to be clear and was
+ * set.  Returns non-zero if a signal was delivered to the process and
+ * the @mode allows that signal to wake the process.
  */
 static inline int
-wait_on_bit_lock(void *word, int bit, int (*action)(void *), unsigned mode)
+wait_on_bit_lock_action(void *word, int bit, wait_bit_action_f *action, unsigned mode)
 {
         if (!test_and_set_bit(bit, word))
                 return 0;
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 5777c13849ba..a219be961c0a 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -90,7 +90,6 @@ struct writeback_control {
  * fs/fs-writeback.c
  */     
 struct bdi_writeback;
-int inode_wait(void *);
 void writeback_inodes_sb(struct super_block *, enum wb_reason reason);
 void writeback_inodes_sb_nr(struct super_block *, unsigned long nr,
                                                         enum wb_reason reason);
@@ -105,7 +104,7 @@ void inode_wait_for_writeback(struct inode *inode);
 static inline void wait_on_inode(struct inode *inode)
 {
         might_sleep();
-        wait_on_bit(&inode->i_state, __I_NEW, inode_wait, TASK_UNINTERRUPTIBLE);
+        wait_on_bit(&inode->i_state, __I_NEW, TASK_UNINTERRUPTIBLE);
 }
 
 /*
diff --git a/include/media/atmel-isi.h b/include/media/atmel-isi.h
index 2b023471ac89..c2e570336269 100644
--- a/include/media/atmel-isi.h
+++ b/include/media/atmel-isi.h
@@ -106,6 +106,8 @@
 #define ISI_DATAWIDTH_8                         0x01
 #define ISI_DATAWIDTH_10                        0x02
 
+struct v4l2_async_subdev;
+
 struct isi_platform_data {
         u8 has_emb_sync;
         u8 emb_crc_sync;
@@ -118,6 +120,8 @@ struct isi_platform_data {
         u32 frate;
         /* Using for ISI_MCK */
         u32 mck_hz;
+        struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */
+        int *asd_sizes;         /* 0-terminated array of asd group sizes */
 };
 
 #endif /* __ATMEL_ISI_H__ */
diff --git a/include/media/blackfin/ppi.h b/include/media/blackfin/ppi.h
index d0697f4edf87..4900baedd55a 100644
--- a/include/media/blackfin/ppi.h
+++ b/include/media/blackfin/ppi.h
@@ -83,6 +83,7 @@ struct ppi_info {
 };
 
 struct ppi_if {
+        struct device *dev;
         unsigned long ppi_control;
         const struct ppi_ops *ops;
         const struct ppi_info *info;
@@ -91,6 +92,7 @@ struct ppi_if {
         void *priv;
 };
 
-struct ppi_if *ppi_create_instance(const struct ppi_info *info);
+struct ppi_if *ppi_create_instance(struct platform_device *pdev,
+                        const struct ppi_info *info);
 void ppi_delete_instance(struct ppi_if *ppi);
 #endif
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index e221bc74020b..d8564354debb 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -20,7 +20,8 @@ struct IR_i2c {
         struct delayed_work    work;
         char                   name[32];
         char                   phys[32];
-        int                    (*get_key)(struct IR_i2c*, u32*, u32*);
+        int                    (*get_key)(struct IR_i2c *ir, enum rc_type *protocol,
+                                          u32 *scancode, u8 *toggle);
 };
 
 enum ir_kbd_get_key_fn {
@@ -44,7 +45,8 @@ struct IR_i2c_init_data {
          * Specify either a function pointer or a value indicating one of
          * ir_kbd_i2c's internal get_key functions
          */
-        int                    (*get_key)(struct IR_i2c*, u32*, u32*);
+        int                    (*get_key)(struct IR_i2c *ir, enum rc_type *protocol,
+                                          u32 *scancode, u8 *toggle);
         enum ir_kbd_get_key_fn internal_get_key_func;
 
         struct rc_dev           *rc_dev;
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index fde142e5f25a..2c7fbca40b69 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -26,7 +26,7 @@ extern int rc_core_debug;
 #define IR_dprintk(level, fmt, ...)                             \
 do {                                                            \
         if (rc_core_debug >= level)                             \
-                pr_debug("%s: " fmt, __func__, ##__VA_ARGS__);  \
+                printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);  \
 } while (0)
 
 enum rc_driver_type {
@@ -74,21 +74,25 @@ enum rc_filter_type {
  * @input_dev: the input child device used to communicate events to userspace
  * @driver_type: specifies if protocol decoding is done in hardware or software
  * @idle: used to keep track of RX state
- * @allowed_protocols: bitmask with the supported RC_BIT_* protocols for each
- *      filter type
- * @enabled_protocols: bitmask with the enabled RC_BIT_* protocols for each
- *      filter type
- * @scanmask: some hardware decoders are not capable of providing the full
+ * @allowed_protocols: bitmask with the supported RC_BIT_* protocols
+ * @enabled_protocols: bitmask with the enabled RC_BIT_* protocols
+ * @allowed_wakeup_protocols: bitmask with the supported RC_BIT_* wakeup protocols
+ * @enabled_wakeup_protocols: bitmask with the enabled RC_BIT_* wakeup protocols
+ * @scancode_filter: scancode filter
+ * @scancode_wakeup_filter: scancode wakeup filters
+ * @scancode_mask: some hardware decoders are not capable of providing the full
  *      scancode to the application. As this is a hardware limit, we can't do
  *      anything with it. Yet, as the same keycode table can be used with other
  *      devices, a mask is provided to allow its usage. Drivers should generally
  *      leave this field in blank
+ * @users: number of current users of the device
  * @priv: driver-specific data
  * @keylock: protects the remaining members of the struct
  * @keypressed: whether a key is currently pressed
  * @keyup_jiffies: time (in jiffies) when the current keypress should be released
  * @timer_keyup: timer for releasing a keypress
  * @last_keycode: keycode of last keypress
+ * @last_protocol: protocol of last keypress
  * @last_scancode: scancode of last keypress
  * @last_toggle: toggle value of last command
  * @timeout: optional time after which device stops sending data
@@ -96,7 +100,6 @@ enum rc_filter_type {
  * @max_timeout: maximum timeout supported by device
  * @rx_resolution : resolution (in ns) of input sampler
  * @tx_resolution: resolution (in ns) of output sampler
- * @scancode_filters: scancode filters (indexed by enum rc_filter_type)
  * @change_protocol: allow changing the protocol used on hardware decoders
  * @change_wakeup_protocol: allow changing the protocol used for wakeup
  *      filtering
@@ -113,7 +116,7 @@ enum rc_filter_type {
  *      device doesn't interrupt host until it sees IR pulses
  * @s_learning_mode: enable wide band receiver used for learning
  * @s_carrier_report: enable carrier reports
- * @s_filter: set the scancode filter 
+ * @s_filter: set the scancode filter
  * @s_wakeup_filter: set the wakeup scancode filter
  */
 struct rc_dev {
@@ -131,16 +134,21 @@ struct rc_dev {
         struct input_dev                *input_dev;
         enum rc_driver_type             driver_type;
         bool                            idle;
-        u64                             allowed_protocols[RC_FILTER_MAX];
-        u64                             enabled_protocols[RC_FILTER_MAX];
+        u64                             allowed_protocols;
+        u64                             enabled_protocols;
+        u64                             allowed_wakeup_protocols;
+        u64                             enabled_wakeup_protocols;
+        struct rc_scancode_filter       scancode_filter;
+        struct rc_scancode_filter       scancode_wakeup_filter;
+        u32                             scancode_mask;
         u32                             users;
-        u32                             scanmask;
         void                            *priv;
         spinlock_t                      keylock;
         bool                            keypressed;
         unsigned long                   keyup_jiffies;
         struct timer_list               timer_keyup;
         u32                             last_keycode;
+        enum rc_type                    last_protocol;
         u32                             last_scancode;
         u8                              last_toggle;
         u32                             timeout;
@@ -148,7 +156,6 @@ struct rc_dev {
         u32                             max_timeout;
         u32                             rx_resolution;
         u32                             tx_resolution;
-        struct rc_scancode_filter       scancode_filters[RC_FILTER_MAX];
         int                             (*change_protocol)(struct rc_dev *dev, u64 *rc_type);
         int                             (*change_wakeup_protocol)(struct rc_dev *dev, u64 *rc_type);
         int                             (*open)(struct rc_dev *dev);
@@ -169,42 +176,6 @@ struct rc_dev {
 
 #define to_rc_dev(d) container_of(d, struct rc_dev, dev)
 
-static inline bool rc_protocols_allowed(struct rc_dev *rdev, u64 protos)
-{
-        return rdev->allowed_protocols[RC_FILTER_NORMAL] & protos;
-}
-
-/* should be called prior to registration or with mutex held */
-static inline void rc_set_allowed_protocols(struct rc_dev *rdev, u64 protos)
-{
-        rdev->allowed_protocols[RC_FILTER_NORMAL] = protos;
-}
-
-static inline bool rc_protocols_enabled(struct rc_dev *rdev, u64 protos)
-{
-        return rdev->enabled_protocols[RC_FILTER_NORMAL] & protos;
-}
-
-/* should be called prior to registration or with mutex held */
-static inline void rc_set_enabled_protocols(struct rc_dev *rdev, u64 protos)
-{
-        rdev->enabled_protocols[RC_FILTER_NORMAL] = protos;
-}
-
-/* should be called prior to registration or with mutex held */
-static inline void rc_set_allowed_wakeup_protocols(struct rc_dev *rdev,
-                                                   u64 protos)
-{
-        rdev->allowed_protocols[RC_FILTER_WAKEUP] = protos;
-}
-
-/* should be called prior to registration or with mutex held */
-static inline void rc_set_enabled_wakeup_protocols(struct rc_dev *rdev,
-                                                   u64 protos)
-{
-        rdev->enabled_protocols[RC_FILTER_WAKEUP] = protos;
-}
-
 /*
  * From rc-main.c
  * Those functions can be used on any type of Remote Controller. They
@@ -221,8 +192,8 @@ int rc_open(struct rc_dev *rdev);
 void rc_close(struct rc_dev *rdev);
 
 void rc_repeat(struct rc_dev *dev);
-void rc_keydown(struct rc_dev *dev, int scancode, u8 toggle);
-void rc_keydown_notimeout(struct rc_dev *dev, int scancode, u8 toggle);
+void rc_keydown(struct rc_dev *dev, enum rc_type protocol, u32 scancode, u8 toggle);
+void rc_keydown_notimeout(struct rc_dev *dev, enum rc_type protocol, u32 scancode, u8 toggle);
 void rc_keyup(struct rc_dev *dev);
 u32 rc_g_keycode_from_table(struct rc_dev *dev, u32 scancode);
 
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index e5aa2409c0ea..80f951890b4c 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -31,6 +31,7 @@ enum rc_type {
         RC_TYPE_RC6_6A_32       = 16,   /* Philips RC6-6A-32 protocol */
         RC_TYPE_RC6_MCE         = 17,   /* MCE (Philips RC6-6A-32 subtype) protocol */
         RC_TYPE_SHARP           = 18,   /* Sharp protocol */
+        RC_TYPE_XMP             = 19,   /* XMP protocol */
 };
 
 #define RC_BIT_NONE             0
@@ -53,6 +54,7 @@ enum rc_type {
 #define RC_BIT_RC6_6A_32        (1 << RC_TYPE_RC6_6A_32)
 #define RC_BIT_RC6_MCE          (1 << RC_TYPE_RC6_MCE)
 #define RC_BIT_SHARP            (1 << RC_TYPE_SHARP)
+#define RC_BIT_XMP              (1 << RC_TYPE_XMP)
 
 #define RC_BIT_ALL      (RC_BIT_UNKNOWN | RC_BIT_OTHER | RC_BIT_LIRC | \
                          RC_BIT_RC5 | RC_BIT_RC5X | RC_BIT_RC5_SZ | \
@@ -60,7 +62,19 @@ enum rc_type {
                          RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20 | \
                          RC_BIT_NEC | RC_BIT_SANYO | RC_BIT_MCE_KBD | \
                          RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 | \
-                         RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE | RC_BIT_SHARP)
+                         RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE | RC_BIT_SHARP | \
+                         RC_BIT_XMP)
+
+
+#define RC_SCANCODE_UNKNOWN(x)                  (x)
+#define RC_SCANCODE_OTHER(x)                    (x)
+#define RC_SCANCODE_NEC(addr, cmd)              (((addr) << 8) | (cmd))
+#define RC_SCANCODE_NECX(addr, cmd)             (((addr) << 8) | (cmd))
+#define RC_SCANCODE_NEC32(data)                 ((data) & 0xffffffff)
+#define RC_SCANCODE_RC5(sys, cmd)               (((sys) << 8) | (cmd))
+#define RC_SCANCODE_RC5_SZ(sys, cmd)            (((sys) << 8) | (cmd))
+#define RC_SCANCODE_RC6_0(sys, cmd)             (((sys) << 8) | (cmd))
+#define RC_SCANCODE_RC6_6A(vendor, sys, cmd)    (((vendor) << 16) | ((sys) << 8) | (cmd))
 
 struct rc_map_table {
         u32     scancode;
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 16f7f2606516..b7cd7a665e35 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -36,6 +36,25 @@ struct v4l2_subscribed_event;
 struct v4l2_fh;
 struct poll_table_struct;
 
+/** union v4l2_ctrl_ptr - A pointer to a control value.
+ * @p_s32:      Pointer to a 32-bit signed value.
+ * @p_s64:      Pointer to a 64-bit signed value.
+ * @p_u8:       Pointer to a 8-bit unsigned value.
+ * @p_u16:      Pointer to a 16-bit unsigned value.
+ * @p_u32:      Pointer to a 32-bit unsigned value.
+ * @p_char:     Pointer to a string.
+ * @p:          Pointer to a compound value.
+ */
+union v4l2_ctrl_ptr {
+        s32 *p_s32;
+        s64 *p_s64;
+        u8 *p_u8;
+        u16 *p_u16;
+        u32 *p_u32;
+        char *p_char;
+        void *p;
+};
+
 /** struct v4l2_ctrl_ops - The control operations that the driver has to provide.
   * @g_volatile_ctrl: Get a new value for this control. Generally only relevant
   *             for volatile (and usually read-only) controls such as a control
@@ -54,6 +73,23 @@ struct v4l2_ctrl_ops {
         int (*s_ctrl)(struct v4l2_ctrl *ctrl);
 };
 
+/** struct v4l2_ctrl_type_ops - The control type operations that the driver has to provide.
+  * @equal: return true if both values are equal.
+  * @init: initialize the value.
+  * @log: log the value.
+  * @validate: validate the value. Return 0 on success and a negative value otherwise.
+  */
+struct v4l2_ctrl_type_ops {
+        bool (*equal)(const struct v4l2_ctrl *ctrl, u32 idx,
+                      union v4l2_ctrl_ptr ptr1,
+                      union v4l2_ctrl_ptr ptr2);
+        void (*init)(const struct v4l2_ctrl *ctrl, u32 idx,
+                     union v4l2_ctrl_ptr ptr);
+        void (*log)(const struct v4l2_ctrl *ctrl);
+        int (*validate)(const struct v4l2_ctrl *ctrl, u32 idx,
+                        union v4l2_ctrl_ptr ptr);
+};
+
 typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
 
 /** struct v4l2_ctrl - The control structure.
@@ -66,6 +102,8 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
   * @is_new:    Set when the user specified a new value for this control. It
   *             is also set when called from v4l2_ctrl_handler_setup. Drivers
   *             should never set this flag.
+  * @has_changed: Set when the current value differs from the new value. Drivers
+  *             should never use this flag.
   * @is_private: If set, then this control is private to its handler and it
   *             will not be added to any other handlers. Drivers can set
   *             this flag.
@@ -73,6 +111,13 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
   *             members are in 'automatic' mode or 'manual' mode. This is
   *             used for autogain/gain type clusters. Drivers should never
   *             set this flag directly.
+  * @is_int:    If set, then this control has a simple integer value (i.e. it
+  *             uses ctrl->val).
+  * @is_string: If set, then this control has type V4L2_CTRL_TYPE_STRING.
+  * @is_ptr:    If set, then this control is an array and/or has type >= V4L2_CTRL_COMPOUND_TYPES
+  *             and/or has type V4L2_CTRL_TYPE_STRING. In other words, struct
+  *             v4l2_ext_control uses field p to point to the data.
+  * @is_array: If set, then this control contains an N-dimensional array.
   * @has_volatiles: If set, then one or more members of the cluster are volatile.
   *             Drivers should never touch this flag.
   * @call_notify: If set, then call the handler's notify function whenever the
@@ -83,6 +128,7 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
   *             value, then the whole cluster is in manual mode. Drivers should
   *             never set this flag directly.
   * @ops:       The control ops.
+  * @type_ops:  The control type ops.
   * @id:        The control ID.
   * @name:      The control name.
   * @type:      The control type.
@@ -90,6 +136,10 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
   * @maximum:   The control's maximum value.
   * @default_value: The control's default value.
   * @step:      The control's step value for non-menu controls.
+  * @elems:     The number of elements in the N-dimensional array.
+  * @elem_size: The size in bytes of the control.
+  * @dims:      The size of each dimension.
+  * @nr_of_dims:The number of dimensions in @dims.
   * @menu_skip_mask: The control's skip mask for menu controls. This makes it
   *             easy to skip menu items that are not valid. If bit X is set,
   *             then menu item X is skipped. Of course, this only works for
@@ -104,7 +154,6 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
   * @cur:       The control's current value.
   * @val:       The control's new s32 value.
   * @val64:     The control's new s64 value.
-  * @string:    The control's new string value.
   * @priv:      The control's private pointer. For use by the driver. It is
   *             untouched by the control framework. Note that this pointer is
   *             not freed when the control is deleted. Should this be needed
@@ -121,37 +170,44 @@ struct v4l2_ctrl {
         unsigned int done:1;
 
         unsigned int is_new:1;
+        unsigned int has_changed:1;
         unsigned int is_private:1;
         unsigned int is_auto:1;
+        unsigned int is_int:1;
+        unsigned int is_string:1;
+        unsigned int is_ptr:1;
+        unsigned int is_array:1;
         unsigned int has_volatiles:1;
         unsigned int call_notify:1;
         unsigned int manual_mode_value:8;
 
         const struct v4l2_ctrl_ops *ops;
+        const struct v4l2_ctrl_type_ops *type_ops;
         u32 id;
         const char *name;
         enum v4l2_ctrl_type type;
-        s32 minimum, maximum, default_value;
+        s64 minimum, maximum, default_value;
+        u32 elems;
+        u32 elem_size;
+        u32 dims[V4L2_CTRL_MAX_DIMS];
+        u32 nr_of_dims;
         union {
-                u32 step;
-                u32 menu_skip_mask;
+                u64 step;
+                u64 menu_skip_mask;
         };
         union {
                 const char * const *qmenu;
                 const s64 *qmenu_int;
         };
         unsigned long flags;
-        union {
+        void *priv;
+        s32 val;
+        struct {
                 s32 val;
-                s64 val64;
-                char *string;
         } cur;
-        union {
-                s32 val;
-                s64 val64;
-                char *string;
-        };
-        void *priv;
+
+        union v4l2_ctrl_ptr p_new;
+        union v4l2_ctrl_ptr p_cur;
 };
 
 /** struct v4l2_ctrl_ref - The control reference.
@@ -205,6 +261,7 @@ struct v4l2_ctrl_handler {
 
 /** struct v4l2_ctrl_config - Control configuration structure.
   * @ops:       The control ops.
+  * @type_ops:  The control type ops. Only needed for compound controls.
   * @id:        The control ID.
   * @name:      The control name.
   * @type:      The control type.
@@ -212,13 +269,15 @@ struct v4l2_ctrl_handler {
   * @max:       The control's maximum value.
   * @step:      The control's step value for non-menu controls.
   * @def:       The control's default value.
+  * @dims:      The size of each dimension.
+  * @elem_size: The size in bytes of the control.
   * @flags:     The control's flags.
   * @menu_skip_mask: The control's skip mask for menu controls. This makes it
   *             easy to skip menu items that are not valid. If bit X is set,
   *             then menu item X is skipped. Of course, this only works for
-  *             menus with <= 32 menu items. There are no menus that come
+  *             menus with <= 64 menu items. There are no menus that come
   *             close to that number, so this is OK. Should we ever need more,
-  *             then this will have to be extended to a u64 or a bit array.
+  *             then this will have to be extended to a bit array.
   * @qmenu:     A const char * array for all menu items. Array entries that are
   *             empty strings ("") correspond to non-existing menu items (this
   *             is in addition to the menu_skip_mask above). The last entry
@@ -228,15 +287,18 @@ struct v4l2_ctrl_handler {
   */
 struct v4l2_ctrl_config {
         const struct v4l2_ctrl_ops *ops;
+        const struct v4l2_ctrl_type_ops *type_ops;
         u32 id;
         const char *name;
         enum v4l2_ctrl_type type;
-        s32 min;
-        s32 max;
-        u32 step;
-        s32 def;
+        s64 min;
+        s64 max;
+        u64 step;
+        s64 def;
+        u32 dims[V4L2_CTRL_MAX_DIMS];
+        u32 elem_size;
         u32 flags;
-        u32 menu_skip_mask;
+        u64 menu_skip_mask;
         const char * const *qmenu;
         const s64 *qmenu_int;
         unsigned int is_private:1;
@@ -257,7 +319,7 @@ struct v4l2_ctrl_config {
   * control framework this function will no longer be exported.
   */
 void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
-                    s32 *min, s32 *max, s32 *step, s32 *def, u32 *flags);
+                    s64 *min, s64 *max, u64 *step, s64 *def, u32 *flags);
 
 
 /** v4l2_ctrl_handler_init_class() - Initialize the control handler.
@@ -307,6 +369,24 @@ int v4l2_ctrl_handler_init_class(struct v4l2_ctrl_handler *hdl,
   */
 void v4l2_ctrl_handler_free(struct v4l2_ctrl_handler *hdl);
 
+/** v4l2_ctrl_lock() - Helper function to lock the handler
+  * associated with the control.
+  * @ctrl:      The control to lock.
+  */
+static inline void v4l2_ctrl_lock(struct v4l2_ctrl *ctrl)
+{
+        mutex_lock(ctrl->handler->lock);
+}
+
+/** v4l2_ctrl_unlock() - Helper function to unlock the handler
+  * associated with the control.
+  * @ctrl:      The control to unlock.
+  */
+static inline void v4l2_ctrl_unlock(struct v4l2_ctrl *ctrl)
+{
+        mutex_unlock(ctrl->handler->lock);
+}
+
 /** v4l2_ctrl_handler_setup() - Call the s_ctrl op for all controls belonging
   * to the handler to initialize the hardware to the current control values.
   * @hdl:       The control handler.
@@ -362,7 +442,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_custom(struct v4l2_ctrl_handler *hdl,
   */
 struct v4l2_ctrl *v4l2_ctrl_new_std(struct v4l2_ctrl_handler *hdl,
                         const struct v4l2_ctrl_ops *ops,
-                        u32 id, s32 min, s32 max, u32 step, s32 def);
+                        u32 id, s64 min, s64 max, u64 step, s64 def);
 
 /** v4l2_ctrl_new_std_menu() - Allocate and initialize a new standard V4L2 menu control.
   * @hdl:       The control handler.
@@ -372,9 +452,9 @@ struct v4l2_ctrl *v4l2_ctrl_new_std(struct v4l2_ctrl_handler *hdl,
   * @mask:      The control's skip mask for menu controls. This makes it
   *             easy to skip menu items that are not valid. If bit X is set,
   *             then menu item X is skipped. Of course, this only works for
-  *             menus with <= 32 menu items. There are no menus that come
+  *             menus with <= 64 menu items. There are no menus that come
   *             close to that number, so this is OK. Should we ever need more,
-  *             then this will have to be extended to a u64 or a bit array.
+  *             then this will have to be extended to a bit array.
   * @def:       The control's default value.
   *
   * Same as v4l2_ctrl_new_std(), but @min is set to 0 and the @mask value
@@ -384,7 +464,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_std(struct v4l2_ctrl_handler *hdl,
   */
 struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl,
                         const struct v4l2_ctrl_ops *ops,
-                        u32 id, s32 max, s32 mask, s32 def);
+                        u32 id, u8 max, u64 mask, u8 def);
 
 /** v4l2_ctrl_new_std_menu_items() - Create a new standard V4L2 menu control
   * with driver specific menu.
@@ -395,9 +475,9 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl,
   * @mask:      The control's skip mask for menu controls. This makes it
   *             easy to skip menu items that are not valid. If bit X is set,
   *             then menu item X is skipped. Of course, this only works for
-  *             menus with <= 32 menu items. There are no menus that come
+  *             menus with <= 64 menu items. There are no menus that come
   *             close to that number, so this is OK. Should we ever need more,
-  *             then this will have to be extended to a u64 or a bit array.
+  *             then this will have to be extended to a bit array.
   * @def:       The control's default value.
   * @qmenu:     The new menu.
   *
@@ -406,8 +486,8 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl,
   *
   */
 struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items(struct v4l2_ctrl_handler *hdl,
-                        const struct v4l2_ctrl_ops *ops, u32 id, s32 max,
-                        s32 mask, s32 def, const char * const *qmenu);
+                        const struct v4l2_ctrl_ops *ops, u32 id, u8 max,
+                        u64 mask, u8 def, const char * const *qmenu);
 
 /** v4l2_ctrl_new_int_menu() - Create a new standard V4L2 integer menu control.
   * @hdl:       The control handler.
@@ -424,7 +504,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items(struct v4l2_ctrl_handler *hdl,
   */
 struct v4l2_ctrl *v4l2_ctrl_new_int_menu(struct v4l2_ctrl_handler *hdl,
                         const struct v4l2_ctrl_ops *ops,
-                        u32 id, s32 max, s32 def, const s64 *qmenu_int);
+                        u32 id, u8 max, u8 def, const s64 *qmenu_int);
 
 /** v4l2_ctrl_add_ctrl() - Add a control from another handler to this handler.
   * @hdl:       The control handler.
@@ -542,6 +622,11 @@ void v4l2_ctrl_activate(struct v4l2_ctrl *ctrl, bool active);
   */
 void v4l2_ctrl_grab(struct v4l2_ctrl *ctrl, bool grabbed);
 
+
+/** __v4l2_ctrl_modify_range() - Unlocked variant of v4l2_ctrl_modify_range() */
+int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl,
+                             s64 min, s64 max, u64 step, s64 def);
+
 /** v4l2_ctrl_modify_range() - Update the range of a control.
   * @ctrl:      The control to update.
   * @min:       The control's minimum value.
@@ -559,25 +644,16 @@ void v4l2_ctrl_grab(struct v4l2_ctrl *ctrl, bool grabbed);
   * This function assumes that the control handler is not locked and will
   * take the lock itself.
   */
-int v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl,
-                        s32 min, s32 max, u32 step, s32 def);
-
-/** v4l2_ctrl_lock() - Helper function to lock the handler
-  * associated with the control.
-  * @ctrl:      The control to lock.
-  */
-static inline void v4l2_ctrl_lock(struct v4l2_ctrl *ctrl)
+static inline int v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl,
+                                         s64 min, s64 max, u64 step, s64 def)
 {
-        mutex_lock(ctrl->handler->lock);
-}
+        int rval;
 
-/** v4l2_ctrl_unlock() - Helper function to unlock the handler
-  * associated with the control.
-  * @ctrl:      The control to unlock.
-  */
-static inline void v4l2_ctrl_unlock(struct v4l2_ctrl *ctrl)
-{
-        mutex_unlock(ctrl->handler->lock);
+        v4l2_ctrl_lock(ctrl);
+        rval = __v4l2_ctrl_modify_range(ctrl, min, max, step, def);
+        v4l2_ctrl_unlock(ctrl);
+
+        return rval;
 }
 
 /** v4l2_ctrl_notify() - Function to set a notify callback for a control.
@@ -605,6 +681,8 @@ void v4l2_ctrl_notify(struct v4l2_ctrl *ctrl, v4l2_ctrl_notify_fnc notify, void
   */
 s32 v4l2_ctrl_g_ctrl(struct v4l2_ctrl *ctrl);
 
+/** __v4l2_ctrl_s_ctrl() - Unlocked variant of v4l2_ctrl_s_ctrl(). */
+int __v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val);
 /** v4l2_ctrl_s_ctrl() - Helper function to set the control's value from within a driver.
   * @ctrl:      The control.
   * @val:       The new value.
@@ -615,7 +693,16 @@ s32 v4l2_ctrl_g_ctrl(struct v4l2_ctrl *ctrl);
   *
   * This function is for integer type controls only.
   */
-int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val);
+static inline int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val)
+{
+        int rval;
+
+        v4l2_ctrl_lock(ctrl);
+        rval = __v4l2_ctrl_s_ctrl(ctrl, val);
+        v4l2_ctrl_unlock(ctrl);
+
+        return rval;
+}
 
 /** v4l2_ctrl_g_ctrl_int64() - Helper function to get a 64-bit control's value from within a driver.
   * @ctrl:      The control.
@@ -628,6 +715,9 @@ int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val);
   */
 s64 v4l2_ctrl_g_ctrl_int64(struct v4l2_ctrl *ctrl);
 
+/** __v4l2_ctrl_s_ctrl_int64() - Unlocked variant of v4l2_ctrl_s_ctrl_int64(). */
+int __v4l2_ctrl_s_ctrl_int64(struct v4l2_ctrl *ctrl, s64 val);
+
 /** v4l2_ctrl_s_ctrl_int64() - Helper function to set a 64-bit control's value from within a driver.
   * @ctrl:      The control.
   * @val:       The new value.
@@ -638,7 +728,40 @@ s64 v4l2_ctrl_g_ctrl_int64(struct v4l2_ctrl *ctrl);
   *
   * This function is for 64-bit integer type controls only.
   */
-int v4l2_ctrl_s_ctrl_int64(struct v4l2_ctrl *ctrl, s64 val);
+static inline int v4l2_ctrl_s_ctrl_int64(struct v4l2_ctrl *ctrl, s64 val)
+{
+        int rval;
+
+        v4l2_ctrl_lock(ctrl);
+        rval = __v4l2_ctrl_s_ctrl_int64(ctrl, val);
+        v4l2_ctrl_unlock(ctrl);
+
+        return rval;
+}
+
+/** __v4l2_ctrl_s_ctrl_string() - Unlocked variant of v4l2_ctrl_s_ctrl_string(). */
+int __v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s);
+
+/** v4l2_ctrl_s_ctrl_string() - Helper function to set a control's string value from within a driver.
+  * @ctrl:      The control.
+  * @s:         The new string.
+  *
+  * This set the control's new string safely by going through the control
+  * framework. This function will lock the control's handler, so it cannot be
+  * used from within the &v4l2_ctrl_ops functions.
+  *
+  * This function is for string type controls only.
+  */
+static inline int v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s)
+{
+        int rval;
+
+        v4l2_ctrl_lock(ctrl);
+        rval = __v4l2_ctrl_s_ctrl_string(ctrl, s);
+        v4l2_ctrl_unlock(ctrl);
+
+        return rval;
+}
 
 /* Internal helper functions that deal with control events. */
 extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops;
@@ -659,6 +782,7 @@ unsigned int v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait);
 
 /* Helpers for ioctl_ops. If hdl == NULL then they will all return -EINVAL. */
 int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc);
+int v4l2_query_ext_ctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_query_ext_ctrl *qc);
 int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm);
 int v4l2_g_ctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_control *ctrl);
 int v4l2_s_ctrl(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index eec6e460f649..eb76cfd47189 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -44,8 +44,6 @@ struct v4l2_ctrl_handler;
 #define V4L2_FL_REGISTERED      (0)
 /* file->private_data points to struct v4l2_fh */
 #define V4L2_FL_USES_V4L2_FH    (1)
-/* Use the prio field of v4l2_fh for core priority checking */
-#define V4L2_FL_USE_FH_PRIO     (2)
 
 /* Priority helper functions */
 
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 50cf7c110a70..53605f0f9903 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -158,6 +158,8 @@ struct v4l2_ioctl_ops {
                 /* Control handling */
         int (*vidioc_queryctrl)        (struct file *file, void *fh,
                                         struct v4l2_queryctrl *a);
+        int (*vidioc_query_ext_ctrl)   (struct file *file, void *fh,
+                                        struct v4l2_query_ext_ctrl *a);
         int (*vidioc_g_ctrl)           (struct file *file, void *fh,
                                         struct v4l2_control *a);
         int (*vidioc_s_ctrl)           (struct file *file, void *fh,
diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
index 12ea5a6a4331..c5f3914bc4d8 100644
--- a/include/media/v4l2-mem2mem.h
+++ b/include/media/v4l2-mem2mem.h
@@ -95,6 +95,8 @@ void *v4l2_m2m_get_curr_priv(struct v4l2_m2m_dev *m2m_dev);
 struct vb2_queue *v4l2_m2m_get_vq(struct v4l2_m2m_ctx *m2m_ctx,
                                        enum v4l2_buf_type type);
 
+void v4l2_m2m_try_schedule(struct v4l2_m2m_ctx *m2m_ctx);
+
 void v4l2_m2m_job_finish(struct v4l2_m2m_dev *m2m_dev,
                          struct v4l2_m2m_ctx *m2m_ctx);
 
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index d8fb6012c10d..fb6fd4d8f4ed 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -53,6 +53,9 @@ struct videobuf_dmabuf {
 
         /* for kernel buffers */
         void                *vaddr;
+        struct page         **vaddr_pages;
+        dma_addr_t          *dma_addr;
+        struct device       *dev;
 
         /* for overlay buffers (pci-pci dma) */
         dma_addr_t          bus_addr;
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index 8fab6fa0dbfb..fc910a622451 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -294,15 +294,19 @@ struct vb2_buffer {
  *                      of already queued buffers in count parameter; driver
  *                      can return an error if hardware fails, in that case all
  *                      buffers that have been already given by the @buf_queue
- *                      callback are invalidated.
- *                      If there were not enough queued buffers to start
- *                      streaming, then this callback returns -ENOBUFS, and the
- *                      vb2 core will retry calling @start_streaming when a new
- *                      buffer is queued.
+ *                      callback are to be returned by the driver by calling
+ *                      @vb2_buffer_done(VB2_BUF_STATE_DEQUEUED).
+ *                      If you need a minimum number of buffers before you can
+ *                      start streaming, then set @min_buffers_needed in the
+ *                      vb2_queue structure. If that is non-zero then
+ *                      start_streaming won't be called until at least that
+ *                      many buffers have been queued up by userspace.
  * @stop_streaming:     called when 'streaming' state must be disabled; driver
  *                      should stop any DMA transactions or wait until they
  *                      finish and give back all buffers it got from buf_queue()
- *                      callback; may use vb2_wait_for_all_buffers() function
+ *                      callback by calling @vb2_buffer_done() with either
+ *                      VB2_BUF_STATE_DONE or VB2_BUF_STATE_ERROR; may use
+ *                      vb2_wait_for_all_buffers() function
  * @buf_queue:          passes buffer vb to the driver; driver may start
  *                      hardware operation on this buffer; driver should give
  *                      the buffer back by calling vb2_buffer_done() function;
@@ -375,6 +379,7 @@ struct v4l2_fh;
  * @streaming:  current streaming state
  * @start_streaming_called: start_streaming() was called successfully and we
  *              started streaming.
+ * @error:      a fatal error occurred on the queue
  * @fileio:     file io emulator internal data, used only if emulator is active
  * @threadio:   thread io internal data, used only if thread is active
  */
@@ -411,6 +416,7 @@ struct vb2_queue {
 
         unsigned int                    streaming:1;
         unsigned int                    start_streaming_called:1;
+        unsigned int                    error:1;
 
         struct vb2_fileio_data          *fileio;
         struct vb2_threadio_data        *threadio;
@@ -444,6 +450,7 @@ int vb2_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b);
 int __must_check vb2_queue_init(struct vb2_queue *q);
 
 void vb2_queue_release(struct vb2_queue *q);
+void vb2_queue_error(struct vb2_queue *q);
 
 int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b);
 int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb);
diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index 79b530fb2c4d..d184df1d0d41 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
@@ -75,20 +75,6 @@
          (((a)->s6_addr[14]) == (m)[6]) &&              \
          (((a)->s6_addr[15]) == (m)[7]))
 
-/* ipv6 address is unspecified */
-#define is_addr_unspecified(a)          \
-        ((((a)->s6_addr32[0]) == 0) &&  \
-         (((a)->s6_addr32[1]) == 0) &&  \
-         (((a)->s6_addr32[2]) == 0) &&  \
-         (((a)->s6_addr32[3]) == 0))
-
-/* compare ipv6 addresses prefixes */
-#define ipaddr_prefixcmp(addr1, addr2, length) \
-        (memcmp(addr1, addr2, length >> 3) == 0)
-
-/* local link, i.e. FE80::/10 */
-#define is_addr_link_local(a) (((a)->s6_addr16[0]) == htons(0xFE80))
-
 /*
  * check whether we can compress the IID to 16 bits,
  * it's possible for unicast adresses with first 49 bits are zero only.
@@ -100,22 +86,8 @@
          (((a)->s6_addr[12]) == 0xfe) &&        \
          (((a)->s6_addr[13]) == 0))
 
-/* multicast address */
-#define is_addr_mcast(a) (((a)->s6_addr[0]) == 0xFF)
-
 /* check whether the 112-bit gid of the multicast address is mappable to: */
 
-/* 9 bits, for FF02::1 (all nodes) and FF02::2 (all routers) addresses only. */
-#define lowpan_is_mcast_addr_compressable(a)    \
-        ((((a)->s6_addr16[1]) == 0) &&          \
-         (((a)->s6_addr16[2]) == 0) &&          \
-         (((a)->s6_addr16[3]) == 0) &&          \
-         (((a)->s6_addr16[4]) == 0) &&          \
-         (((a)->s6_addr16[5]) == 0) &&          \
-         (((a)->s6_addr16[6]) == 0) &&          \
-         (((a)->s6_addr[14])  == 0) &&          \
-         ((((a)->s6_addr[15]) == 1) || (((a)->s6_addr[15]) == 2)))
-
 /* 48 bits, FFXX::00XX:XXXX:XXXX */
 #define lowpan_is_mcast_addr_compressable48(a)  \
         ((((a)->s6_addr16[1]) == 0) &&          \
@@ -168,17 +140,6 @@
 #define LOWPAN_FRAGN_HEAD_SIZE  0x5
 
 /*
- * According IEEE802.15.4 standard:
- *   - MTU is 127 octets
- *   - maximum MHR size is 37 octets
- *   - MFR size is 2 octets
- *
- * so minimal payload size that we may guarantee is:
- *   MTU - MHR - MFR = 88 octets
- */
-#define LOWPAN_FRAG_SIZE        88
-
-/*
  * Values of fields within the IPHC encoding first byte
  * (C stands for compressed and I for inline)
  */
@@ -279,17 +240,6 @@ static inline int lowpan_fetch_skb_u8(struct sk_buff *skb, u8 *val)
         return 0;
 }
 
-static inline int lowpan_fetch_skb_u16(struct sk_buff *skb, u16 *val)
-{
-        if (unlikely(!pskb_may_pull(skb, 2)))
-                return -EINVAL;
-
-        *val = (skb->data[0] << 8) | skb->data[1];
-        skb_pull(skb, 2);
-
-        return 0;
-}
-
 static inline bool lowpan_fetch_skb(struct sk_buff *skb,
                 void *data, const unsigned int len)
 {
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 904777c1cd24..373000de610d 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -260,15 +260,15 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock);
 
 /* Skb helpers */
 struct l2cap_ctrl {
-        unsigned int    sframe:1,
-                        poll:1,
-                        final:1,
-                        fcs:1,
-                        sar:2,
-                        super:2;
-        __u16           reqseq;
-        __u16           txseq;
-        __u8            retries;
+        __u8    sframe:1,
+                poll:1,
+                final:1,
+                fcs:1,
+                sar:2,
+                super:2;
+        __u16   reqseq;
+        __u16   txseq;
+        __u8    retries;
 };
 
 struct hci_dev;
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 16587dcd6a91..3f8547f1c6f8 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -81,10 +81,54 @@
 
 /* HCI device quirks */
 enum {
+        /* When this quirk is set, the HCI Reset command is send when
+         * closing the transport instead of when opening it.
+         *
+         * This quirk must be set before hci_register_dev is called.
+         */
         HCI_QUIRK_RESET_ON_CLOSE,
+
+        /* When this quirk is set, the device is turned into a raw-only
+         * device and it will stay in unconfigured state.
+         *
+         * This quirk must be set before hci_register_dev is called.
+         */
         HCI_QUIRK_RAW_DEVICE,
+
+        /* When this quirk is set, the buffer sizes reported by
+         * HCI Read Buffer Size command are corrected if invalid.
+         *
+         * This quirk must be set before hci_register_dev is called.
+         */
         HCI_QUIRK_FIXUP_BUFFER_SIZE,
+
+        /* When this quirk is set, then no stored link key handling
+         * is performed. This is mainly due to the fact that the
+         * HCI Delete Stored Link Key command is advertised, but
+         * not supported.
+         *
+         * This quirk must be set before hci_register_dev is called.
+         */
         HCI_QUIRK_BROKEN_STORED_LINK_KEY,
+
+        /* When this quirk is set, an external configuration step
+         * is required and will be indicated with the controller
+         * configuation.
+         *
+         * This quirk can be set before hci_register_dev is called or
+         * during the hdev->setup vendor callback.
+         */
+        HCI_QUIRK_EXTERNAL_CONFIG,
+
+        /* When this quirk is set, the public Bluetooth address
+         * initially reported by HCI Read BD Address command
+         * is considered invalid. Controller configuration is
+         * required before this device can be used.
+         *
+         * This quirk can be set before hci_register_dev is called or
+         * during the hdev->setup vendor callback.
+         */
+        HCI_QUIRK_INVALID_BDADDR,
 };
 
 /* HCI device flags */
@@ -104,24 +148,34 @@ 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.
+ */
+enum {
+        HCI_DUT_MODE,
+        HCI_FORCE_SC,
+        HCI_FORCE_STATIC_ADDR,
+};
+
 /*
  * BR/EDR and/or LE controller flags: the flags defined here should represent
  * states from the controller.
  */
 enum {
         HCI_SETUP,
+        HCI_CONFIG,
         HCI_AUTO_OFF,
         HCI_RFKILLED,
         HCI_MGMT,
-        HCI_PAIRABLE,
+        HCI_BONDABLE,
         HCI_SERVICE_CACHE,
-        HCI_DEBUG_KEYS,
-        HCI_DUT_MODE,
-        HCI_FORCE_SC,
-        HCI_FORCE_STATIC_ADDR,
+        HCI_KEEP_DEBUG_KEYS,
+        HCI_USE_DEBUG_KEYS,
         HCI_UNREGISTER,
+        HCI_UNCONFIGURED,
         HCI_USER_CHANNEL,
-
+        HCI_EXT_CONFIGURED,
+        HCI_LE_ADV,
         HCI_LE_SCAN,
         HCI_SSP_ENABLED,
         HCI_SC_ENABLED,
@@ -139,7 +193,6 @@ enum {
         HCI_PERIODIC_INQ,
         HCI_FAST_CONNECTABLE,
         HCI_BREDR_ENABLED,
-        HCI_6LOWPAN_ENABLED,
         HCI_LE_SCAN_INTERRUPTED,
 };
 
@@ -147,34 +200,7 @@ enum {
  * or the HCI device is closed.
  */
 #define HCI_PERSISTENT_MASK (BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ) | \
-                              BIT(HCI_FAST_CONNECTABLE))
-
-/* HCI ioctl defines */
-#define HCIDEVUP        _IOW('H', 201, int)
-#define HCIDEVDOWN      _IOW('H', 202, int)
-#define HCIDEVRESET     _IOW('H', 203, int)
-#define HCIDEVRESTAT    _IOW('H', 204, int)
-
-#define HCIGETDEVLIST   _IOR('H', 210, int)
-#define HCIGETDEVINFO   _IOR('H', 211, int)
-#define HCIGETCONNLIST  _IOR('H', 212, int)
-#define HCIGETCONNINFO  _IOR('H', 213, int)
-#define HCIGETAUTHINFO  _IOR('H', 215, int)
-
-#define HCISETRAW       _IOW('H', 220, int)
-#define HCISETSCAN      _IOW('H', 221, int)
-#define HCISETAUTH      _IOW('H', 222, int)
-#define HCISETENCRYPT   _IOW('H', 223, int)
-#define HCISETPTYPE     _IOW('H', 224, int)
-#define HCISETLINKPOL   _IOW('H', 225, int)
-#define HCISETLINKMODE  _IOW('H', 226, int)
-#define HCISETACLMTU    _IOW('H', 227, int)
-#define HCISETSCOMTU    _IOW('H', 228, int)
-
-#define HCIBLOCKADDR    _IOW('H', 230, int)
-#define HCIUNBLOCKADDR  _IOW('H', 231, int)
-
-#define HCIINQUIRY      _IOR('H', 240, int)
+                              BIT(HCI_FAST_CONNECTABLE) | BIT(HCI_LE_ADV))
 
 /* HCI timeouts */
 #define HCI_DISCONN_TIMEOUT     msecs_to_jiffies(2000)  /* 2 seconds */
@@ -185,6 +211,7 @@ enum {
 #define HCI_AUTO_OFF_TIMEOUT    msecs_to_jiffies(2000)  /* 2 seconds */
 #define HCI_POWER_OFF_TIMEOUT   msecs_to_jiffies(5000)  /* 5 seconds */
 #define HCI_LE_CONN_TIMEOUT     msecs_to_jiffies(20000) /* 20 seconds */
+#define HCI_LE_AUTOCONN_TIMEOUT msecs_to_jiffies(2000)  /* 2 seconds */
 
 /* HCI data types */
 #define HCI_COMMAND_PKT         0x01
@@ -301,6 +328,11 @@ enum {
 #define LMP_HOST_LE_BREDR       0x04
 #define LMP_HOST_SC             0x08
 
+/* LE features */
+#define HCI_LE_ENCRYPTION               0x01
+#define HCI_LE_CONN_PARAM_REQ_PROC      0x02
+#define HCI_LE_PING                     0x10
+
 /* Connection modes */
 #define HCI_CM_ACTIVE   0x0000
 #define HCI_CM_HOLD     0x0001
@@ -347,17 +379,9 @@ enum {
 #define HCI_LK_CHANGED_COMBINATION      0x06
 #define HCI_LK_UNAUTH_COMBINATION_P256  0x07
 #define HCI_LK_AUTH_COMBINATION_P256    0x08
-/* The spec doesn't define types for SMP keys, the _MASTER suffix is implied */
-#define HCI_SMP_STK                     0x80
-#define HCI_SMP_STK_SLAVE               0x81
-#define HCI_SMP_LTK                     0x82
-#define HCI_SMP_LTK_SLAVE               0x83
-
-/* Long Term Key types */
-#define HCI_LTK_UNAUTH                  0x00
-#define HCI_LTK_AUTH                    0x01
 
 /* ---- HCI Error Codes ---- */
+#define HCI_ERROR_UNKNOWN_CONN_ID       0x02
 #define HCI_ERROR_AUTH_FAILURE          0x05
 #define HCI_ERROR_MEMORY_EXCEEDED       0x07
 #define HCI_ERROR_CONNECTION_TIMEOUT    0x08
@@ -367,6 +391,7 @@ enum {
 #define HCI_ERROR_REMOTE_POWER_OFF      0x15
 #define HCI_ERROR_LOCAL_HOST_TERM       0x16
 #define HCI_ERROR_PAIRING_NOT_ALLOWED   0x18
+#define HCI_ERROR_INVALID_LL_PARAMS     0x1E
 #define HCI_ERROR_ADVERTISING_TIMEOUT   0x3c
 
 /* Flow control modes */
@@ -376,6 +401,9 @@ enum {
 /* The core spec defines 127 as the "not available" value */
 #define HCI_TX_POWER_INVALID    127
 
+#define HCI_ROLE_MASTER         0x00
+#define HCI_ROLE_SLAVE          0x01
+
 /* Extended Inquiry Response field types */
 #define EIR_FLAGS               0x01 /* flags */
 #define EIR_UUID16_SOME         0x02 /* 16-bit UUID, more available */
@@ -536,6 +564,11 @@ struct hci_cp_read_remote_version {
         __le16   handle;
 } __packed;
 
+#define HCI_OP_READ_CLOCK_OFFSET        0x041f
+struct hci_cp_read_clock_offset {
+        __le16   handle;
+} __packed;
+
 #define HCI_OP_SETUP_SYNC_CONN          0x0428
 struct hci_cp_setup_sync_conn {
         __le16   handle;
@@ -1041,6 +1074,8 @@ struct hci_rp_read_data_block_size {
         __le16   num_blocks;
 } __packed;
 
+#define HCI_OP_READ_LOCAL_CODECS        0x100b
+
 #define HCI_OP_READ_PAGE_SCAN_ACTIVITY  0x0c1b
 struct hci_rp_read_page_scan_activity {
         __u8     status;
@@ -1085,6 +1120,18 @@ struct hci_rp_read_rssi {
         __s8     rssi;
 } __packed;
 
+#define HCI_OP_READ_CLOCK               0x1407
+struct hci_cp_read_clock {
+        __le16   handle;
+        __u8     which;
+} __packed;
+struct hci_rp_read_clock {
+        __u8     status;
+        __le16   handle;
+        __le32   clock;
+        __le16   accuracy;
+} __packed;
+
 #define HCI_OP_READ_LOCAL_AMP_INFO      0x1409
 struct hci_rp_read_local_amp_info {
         __u8     status;
@@ -1125,6 +1172,8 @@ struct hci_rp_write_remote_amp_assoc {
         __u8     phy_handle;
 } __packed;
 
+#define HCI_OP_GET_MWS_TRANSPORT_CONFIG 0x140c
+
 #define HCI_OP_ENABLE_DUT_MODE          0x1803
 
 #define HCI_OP_WRITE_SSP_DEBUG_MODE     0x1804
@@ -1291,6 +1340,23 @@ struct hci_rp_le_read_supported_states {
         __u8    le_states[8];
 } __packed;
 
+#define HCI_OP_LE_CONN_PARAM_REQ_REPLY  0x2020
+struct hci_cp_le_conn_param_req_reply {
+        __le16  handle;
+        __le16  interval_min;
+        __le16  interval_max;
+        __le16  latency;
+        __le16  timeout;
+        __le16  min_ce_len;
+        __le16  max_ce_len;
+} __packed;
+
+#define HCI_OP_LE_CONN_PARAM_REQ_NEG_REPLY      0x2021
+struct hci_cp_le_conn_param_req_neg_reply {
+        __le16  handle;
+        __u8    reason;
+} __packed;
+
 /* ---- HCI Events ---- */
 #define HCI_EV_INQUIRY_COMPLETE         0x01
 
@@ -1654,9 +1720,6 @@ struct hci_ev_sync_train_complete {
 
 #define HCI_EV_SLAVE_PAGE_RESP_TIMEOUT  0x54
 
-/* Low energy meta events */
-#define LE_CONN_ROLE_MASTER     0x00
-
 #define HCI_EV_LE_CONN_COMPLETE         0x01
 struct hci_ev_le_conn_complete {
         __u8     status;
@@ -1670,6 +1733,15 @@ struct hci_ev_le_conn_complete {
         __u8     clk_accurancy;
 } __packed;
 
+#define HCI_EV_LE_CONN_UPDATE_COMPLETE  0x03
+struct hci_ev_le_conn_update_complete {
+        __u8     status;
+        __le16   handle;
+        __le16   interval;
+        __le16   latency;
+        __le16   supervision_timeout;
+} __packed;
+
 #define HCI_EV_LE_LTK_REQ               0x05
 struct hci_ev_le_ltk_req {
         __le16  handle;
@@ -1677,6 +1749,15 @@ struct hci_ev_le_ltk_req {
         __le16  ediv;
 } __packed;
 
+#define HCI_EV_LE_REMOTE_CONN_PARAM_REQ 0x06
+struct hci_ev_le_remote_conn_param_req {
+        __le16 handle;
+        __le16 interval_min;
+        __le16 interval_max;
+        __le16 latency;
+        __le16 timeout;
+} __packed;
+
 /* Advertising report event types */
 #define LE_ADV_IND              0x00
 #define LE_ADV_DIRECT_IND       0x01
@@ -1768,126 +1849,4 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
 #define hci_handle(h)           (h & 0x0fff)
 #define hci_flags(h)            (h >> 12)
 
-/* ---- HCI Sockets ---- */
-
-/* Socket options */
-#define HCI_DATA_DIR    1
-#define HCI_FILTER      2
-#define HCI_TIME_STAMP  3
-
-/* CMSG flags */
-#define HCI_CMSG_DIR    0x0001
-#define HCI_CMSG_TSTAMP 0x0002
-
-struct sockaddr_hci {
-        sa_family_t    hci_family;
-        unsigned short hci_dev;
-        unsigned short hci_channel;
-};
-#define HCI_DEV_NONE    0xffff
-
-#define HCI_CHANNEL_RAW         0
-#define HCI_CHANNEL_USER        1
-#define HCI_CHANNEL_MONITOR     2
-#define HCI_CHANNEL_CONTROL     3
-
-struct hci_filter {
-        unsigned long type_mask;
-        unsigned long event_mask[2];
-        __le16 opcode;
-};
-
-struct hci_ufilter {
-        __u32  type_mask;
-        __u32  event_mask[2];
-        __le16 opcode;
-};
-
-#define HCI_FLT_TYPE_BITS       31
-#define HCI_FLT_EVENT_BITS      63
-#define HCI_FLT_OGF_BITS        63
-#define HCI_FLT_OCF_BITS        127
-
-/* ---- HCI Ioctl requests structures ---- */
-struct hci_dev_stats {
-        __u32 err_rx;
-        __u32 err_tx;
-        __u32 cmd_tx;
-        __u32 evt_rx;
-        __u32 acl_tx;
-        __u32 acl_rx;
-        __u32 sco_tx;
-        __u32 sco_rx;
-        __u32 byte_rx;
-        __u32 byte_tx;
-};
-
-struct hci_dev_info {
-        __u16 dev_id;
-        char  name[8];
-
-        bdaddr_t bdaddr;
-
-        __u32 flags;
-        __u8  type;
-
-        __u8  features[8];
-
-        __u32 pkt_type;
-        __u32 link_policy;
-        __u32 link_mode;
-
-        __u16 acl_mtu;
-        __u16 acl_pkts;
-        __u16 sco_mtu;
-        __u16 sco_pkts;
-
-        struct hci_dev_stats stat;
-};
-
-struct hci_conn_info {
-        __u16    handle;
-        bdaddr_t bdaddr;
-        __u8     type;
-        __u8     out;
-        __u16    state;
-        __u32    link_mode;
-};
-
-struct hci_dev_req {
-        __u16  dev_id;
-        __u32  dev_opt;
-};
-
-struct hci_dev_list_req {
-        __u16  dev_num;
-        struct hci_dev_req dev_req[0];  /* hci_dev_req structures */
-};
-
-struct hci_conn_list_req {
-        __u16  dev_id;
-        __u16  conn_num;
-        struct hci_conn_info conn_info[0];
-};
-
-struct hci_conn_info_req {
-        bdaddr_t bdaddr;
-        __u8     type;
-        struct   hci_conn_info conn_info[0];
-};
-
-struct hci_auth_info_req {
-        bdaddr_t bdaddr;
-        __u8     type;
-};
-
-struct hci_inquiry_req {
-        __u16 dev_id;
-        __u16 flags;
-        __u8  lap[3];
-        __u8  length;
-        __u8  num_rsp;
-};
-#define IREQ_CACHE_FLUSH 0x0001
-
 #endif /* __HCI_H */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index b386bf17e6c2..b5d5af3aa469 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -26,6 +26,7 @@
 #define __HCI_CORE_H
 
 #include <net/bluetooth/hci.h>
+#include <net/bluetooth/hci_sock.h>
 
 /* HCI priority */
 #define HCI_PRIO_MAX    7
@@ -71,6 +72,7 @@ struct discovery_state {
         bdaddr_t                last_adv_addr;
         u8                      last_adv_addr_type;
         s8                      last_adv_rssi;
+        u32                     last_adv_flags;
         u8                      last_adv_data[HCI_MAX_AD_LENGTH];
         u8                      last_adv_data_len;
 };
@@ -81,6 +83,7 @@ struct hci_conn_hash {
         unsigned int     amp_num;
         unsigned int     sco_num;
         unsigned int     le_num;
+        unsigned int     le_num_slave;
 };
 
 struct bdaddr_list {
@@ -170,6 +173,8 @@ struct hci_dev {
         __u8            bus;
         __u8            dev_type;
         bdaddr_t        bdaddr;
+        bdaddr_t        setup_addr;
+        bdaddr_t        public_addr;
         bdaddr_t        random_addr;
         bdaddr_t        static_addr;
         __u8            adv_addr_type;
@@ -198,15 +203,20 @@ struct hci_dev {
         __u16           page_scan_window;
         __u8            page_scan_type;
         __u8            le_adv_channel_map;
+        __u16           le_adv_min_interval;
+        __u16           le_adv_max_interval;
         __u8            le_scan_type;
         __u16           le_scan_interval;
         __u16           le_scan_window;
         __u16           le_conn_min_interval;
         __u16           le_conn_max_interval;
+        __u16           le_conn_latency;
+        __u16           le_supv_timeout;
         __u16           discov_interleaved_timeout;
         __u16           conn_info_min_age;
         __u16           conn_info_max_age;
         __u8            ssp_debug_mode;
+        __u32           clock;
 
         __u16           devid_source;
         __u16           devid_vendor;
@@ -273,7 +283,7 @@ struct hci_dev {
 
         struct delayed_work     service_cache;
 
-        struct timer_list       cmd_timer;
+        struct delayed_work     cmd_timer;
 
         struct work_struct      rx_work;
         struct work_struct      cmd_work;
@@ -299,6 +309,7 @@ struct hci_dev {
 
         struct list_head        mgmt_pending;
         struct list_head        blacklist;
+        struct list_head        whitelist;
         struct list_head        uuids;
         struct list_head        link_keys;
         struct list_head        long_term_keys;
@@ -307,6 +318,7 @@ struct hci_dev {
         struct list_head        le_white_list;
         struct list_head        le_conn_params;
         struct list_head        pend_le_conns;
+        struct list_head        pend_le_reports;
 
         struct hci_dev_stats    stat;
 
@@ -318,6 +330,7 @@ struct hci_dev {
 
         struct rfkill           *rfkill;
 
+        unsigned long           dbg_flags;
         unsigned long           dev_flags;
 
         struct delayed_work     le_scan_disable;
@@ -339,6 +352,7 @@ struct hci_dev {
         int (*setup)(struct hci_dev *hdev);
         int (*send)(struct hci_dev *hdev, struct sk_buff *skb);
         void (*notify)(struct hci_dev *hdev, unsigned int evt);
+        int (*set_bdaddr)(struct hci_dev *hdev, const bdaddr_t *bdaddr);
 };
 
 #define HCI_PHY_HANDLE(handle)  (handle & 0xff)
@@ -360,13 +374,13 @@ struct hci_conn {
         __u16           state;
         __u8            mode;
         __u8            type;
+        __u8            role;
         bool            out;
         __u8            attempt;
         __u8            dev_class[3];
         __u8            features[HCI_MAX_PAGES][8];
         __u16           pkt_type;
         __u16           link_policy;
-        __u32           link_mode;
         __u8            key_type;
         __u8            auth_type;
         __u8            sec_level;
@@ -377,20 +391,26 @@ struct hci_conn {
         __u32           passkey_notify;
         __u8            passkey_entered;
         __u16           disc_timeout;
+        __u16           conn_timeout;
         __u16           setting;
         __u16           le_conn_min_interval;
         __u16           le_conn_max_interval;
+        __u16           le_conn_interval;
+        __u16           le_conn_latency;
+        __u16           le_supv_timeout;
         __s8            rssi;
         __s8            tx_power;
         __s8            max_tx_power;
         unsigned long   flags;
 
+        __u32           clock;
+        __u16           clock_accuracy;
+
         unsigned long   conn_info_timestamp;
 
         __u8            remote_cap;
         __u8            remote_auth;
         __u8            remote_id;
-        bool            flush_key;
 
         unsigned int    sent;
 
@@ -407,7 +427,6 @@ struct hci_conn {
         struct hci_dev  *hdev;
         void            *l2cap_data;
         void            *sco_data;
-        void            *smp_conn;
         struct amp_mgr  *amp_mgr;
 
         struct hci_conn *link;
@@ -428,15 +447,20 @@ struct hci_chan {
 
 struct hci_conn_params {
         struct list_head list;
+        struct list_head action;
 
         bdaddr_t addr;
         u8 addr_type;
 
         u16 conn_min_interval;
         u16 conn_max_interval;
+        u16 conn_latency;
+        u16 supervision_timeout;
 
         enum {
                 HCI_AUTO_CONN_DISABLED,
+                HCI_AUTO_CONN_REPORT,
+                HCI_AUTO_CONN_DIRECT,
                 HCI_AUTO_CONN_ALWAYS,
                 HCI_AUTO_CONN_LINK_LOSS,
         } auto_connect;
@@ -501,8 +525,8 @@ struct inquiry_entry *hci_inquiry_cache_lookup_resolve(struct hci_dev *hdev,
                                                        int state);
 void hci_inquiry_cache_update_resolve(struct hci_dev *hdev,
                                       struct inquiry_entry *ie);
-bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
-                              bool name_known, bool *ssp);
+u32 hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
+                             bool name_known);
 void hci_inquiry_cache_flush(struct hci_dev *hdev);
 
 /* ----- HCI Connections ----- */
@@ -520,7 +544,13 @@ enum {
         HCI_CONN_AES_CCM,
         HCI_CONN_POWER_SAVE,
         HCI_CONN_REMOTE_OOB,
-        HCI_CONN_6LOWPAN,
+        HCI_CONN_FLUSH_KEY,
+        HCI_CONN_ENCRYPT,
+        HCI_CONN_AUTH,
+        HCI_CONN_SECURE,
+        HCI_CONN_FIPS,
+        HCI_CONN_STK_ENCRYPT,
+        HCI_CONN_AUTH_INITIATOR,
 };
 
 static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
@@ -550,6 +580,8 @@ static inline void hci_conn_hash_add(struct hci_dev *hdev, struct hci_conn *c)
                 break;
         case LE_LINK:
                 h->le_num++;
+                if (c->role == HCI_ROLE_SLAVE)
+                        h->le_num_slave++;
                 break;
         case SCO_LINK:
         case ESCO_LINK:
@@ -574,6 +606,8 @@ static inline void hci_conn_hash_del(struct hci_dev *hdev, struct hci_conn *c)
                 break;
         case LE_LINK:
                 h->le_num--;
+                if (c->role == HCI_ROLE_SLAVE)
+                        h->le_num_slave--;
                 break;
         case SCO_LINK:
         case ESCO_LINK:
@@ -670,7 +704,8 @@ void hci_disconnect(struct hci_conn *conn, __u8 reason);
 bool hci_setup_sync(struct hci_conn *conn, __u16 handle);
 void hci_sco_setup(struct hci_conn *conn, __u8 status);
 
-struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst);
+struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,
+                              u8 role);
 int hci_conn_del(struct hci_conn *conn);
 void hci_conn_hash_flush(struct hci_dev *hdev);
 void hci_conn_check_pending(struct hci_dev *hdev);
@@ -681,14 +716,16 @@ void hci_chan_list_flush(struct hci_conn *conn);
 struct hci_chan *hci_chan_lookup_handle(struct hci_dev *hdev, __u16 handle);
 
 struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
-                                u8 dst_type, u8 sec_level, u8 auth_type);
+                                u8 dst_type, u8 sec_level, u16 conn_timeout,
+                                u8 role);
 struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,
                                  u8 sec_level, u8 auth_type);
 struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,
                                  __u16 setting);
 int hci_conn_check_link_mode(struct hci_conn *conn);
 int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level);
-int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);
+int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type,
+                      bool initiator);
 int hci_conn_change_link_key(struct hci_conn *conn);
 int hci_conn_switch_role(struct hci_conn *conn, __u8 role);
 
@@ -825,30 +862,25 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg);
 int hci_get_auth_info(struct hci_dev *hdev, void __user *arg);
 int hci_inquiry(void __user *arg);
 
-struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev,
-                                         bdaddr_t *bdaddr, u8 type);
-int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
-int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
-
-struct bdaddr_list *hci_white_list_lookup(struct hci_dev *hdev,
-                                          bdaddr_t *bdaddr, u8 type);
-void hci_white_list_clear(struct hci_dev *hdev);
-int hci_white_list_add(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
-int hci_white_list_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
+struct bdaddr_list *hci_bdaddr_list_lookup(struct list_head *list,
+                                           bdaddr_t *bdaddr, u8 type);
+int hci_bdaddr_list_add(struct list_head *list, bdaddr_t *bdaddr, u8 type);
+int hci_bdaddr_list_del(struct list_head *list, bdaddr_t *bdaddr, u8 type);
+void hci_bdaddr_list_clear(struct list_head *list);
 
 struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,
                                                bdaddr_t *addr, u8 addr_type);
-int hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,
-                        u8 auto_connect, u16 conn_min_interval,
-                        u16 conn_max_interval);
+struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev,
+                                            bdaddr_t *addr, u8 addr_type);
+int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,
+                        u8 auto_connect);
 void hci_conn_params_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type);
-void hci_conn_params_clear(struct hci_dev *hdev);
+void hci_conn_params_clear_all(struct hci_dev *hdev);
+void hci_conn_params_clear_disabled(struct hci_dev *hdev);
 
-struct bdaddr_list *hci_pend_le_conn_lookup(struct hci_dev *hdev,
-                                            bdaddr_t *addr, u8 addr_type);
-void hci_pend_le_conn_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type);
-void hci_pend_le_conn_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type);
-void hci_pend_le_conns_clear(struct hci_dev *hdev);
+struct hci_conn_params *hci_pend_le_action_lookup(struct list_head *list,
+                                                  bdaddr_t *addr,
+                                                  u8 addr_type);
 
 void hci_update_background_scan(struct hci_dev *hdev);
 
@@ -856,15 +888,16 @@ void hci_uuids_clear(struct hci_dev *hdev);
 
 void hci_link_keys_clear(struct hci_dev *hdev);
 struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
-int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
-                     bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len);
+struct link_key *hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn,
+                                  bdaddr_t *bdaddr, u8 *val, u8 type,
+                                  u8 pin_len, bool *persistent);
 struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, __le64 rand,
-                             bool master);
+                             u8 role);
 struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
                             u8 addr_type, u8 type, u8 authenticated,
                             u8 tk[16], u8 enc_size, __le16 ediv, __le64 rand);
 struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                     u8 addr_type, bool master);
+                                     u8 addr_type, u8 role);
 int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type);
 void hci_smp_ltks_clear(struct hci_dev *hdev);
 int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
@@ -1021,7 +1054,7 @@ static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
         if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags))
                 return;
 
-        encrypt = (conn->link_mode & HCI_LM_ENCRYPT) ? 0x01 : 0x00;
+        encrypt = test_bit(HCI_CONN_ENCRYPT, &conn->flags) ? 0x01 : 0x00;
         l2cap_security_cfm(conn, status, encrypt);
 
         if (conn->security_cfm_cb)
@@ -1062,7 +1095,7 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status)
         if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags))
                 return;
 
-        encrypt = (conn->link_mode & HCI_LM_ENCRYPT) ? 0x01 : 0x00;
+        encrypt = test_bit(HCI_CONN_ENCRYPT, &conn->flags) ? 0x01 : 0x00;
 
         read_lock(&hci_cb_list_lock);
         list_for_each_entry(cb, &hci_cb_list, list) {
@@ -1147,7 +1180,7 @@ static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type)
 
 static inline bool hci_bdaddr_is_rpa(bdaddr_t *bdaddr, u8 addr_type)
 {
-        if (addr_type != 0x01)
+        if (addr_type != ADDR_LE_DEV_RANDOM)
                 return false;
 
         if ((bdaddr->b[5] & 0xc0) == 0x40)
@@ -1156,6 +1189,18 @@ static inline bool hci_bdaddr_is_rpa(bdaddr_t *bdaddr, u8 addr_type)
         return false;
 }
 
+static inline bool hci_is_identity_address(bdaddr_t *addr, u8 addr_type)
+{
+        if (addr_type == ADDR_LE_DEV_PUBLIC)
+                return true;
+
+        /* Check for Random Static address type */
+        if ((addr->b[5] & 0xc0) == 0xc0)
+                return true;
+
+        return false;
+}
+
 static inline struct smp_irk *hci_get_irk(struct hci_dev *hdev,
                                           bdaddr_t *bdaddr, u8 addr_type)
 {
@@ -1165,6 +1210,27 @@ static inline struct smp_irk *hci_get_irk(struct hci_dev *hdev,
         return hci_find_irk_by_rpa(hdev, bdaddr);
 }
 
+static inline int hci_check_conn_params(u16 min, u16 max, u16 latency,
+                                        u16 to_multiplier)
+{
+        u16 max_latency;
+
+        if (min > max || min < 6 || max > 3200)
+                return -EINVAL;
+
+        if (to_multiplier < 10 || to_multiplier > 3200)
+                return -EINVAL;
+
+        if (max >= to_multiplier * 8)
+                return -EINVAL;
+
+        max_latency = (to_multiplier * 8 / max) - 1;
+        if (latency > 499 || latency > max_latency)
+                return -EINVAL;
+
+        return 0;
+}
+
 int hci_register_cb(struct hci_cb *hcb);
 int hci_unregister_cb(struct hci_cb *hcb);
 
@@ -1185,6 +1251,7 @@ void hci_req_add(struct hci_request *req, u16 opcode, u32 plen,
 void hci_req_add_ev(struct hci_request *req, u16 opcode, u32 plen,
                     const void *param, u8 event);
 void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status);
+bool hci_req_pending(struct hci_dev *hdev);
 
 void hci_req_add_le_scan_disable(struct hci_request *req);
 void hci_req_add_le_passive_scan(struct hci_request *req);
@@ -1227,15 +1294,13 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event);
 #define DISCOV_BREDR_INQUIRY_LEN        0x08
 
 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);
 void mgmt_set_powered_failed(struct hci_dev *hdev, int err);
 int mgmt_powered(struct hci_dev *hdev, u8 powered);
+int mgmt_update_adv_data(struct hci_dev *hdev);
 void mgmt_discoverable_timeout(struct hci_dev *hdev);
-void mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);
-void mgmt_connectable(struct hci_dev *hdev, u8 connectable);
-void mgmt_advertising(struct hci_dev *hdev, u8 advertising);
-void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);
 void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
                        bool persistent);
 void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
@@ -1281,51 +1346,23 @@ void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192,
                                        u8 *randomizer192, u8 *hash256,
                                        u8 *randomizer256, u8 status);
 void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
-                       u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name,
-                       u8 ssp, u8 *eir, u16 eir_len, u8 *scan_rsp,
-                       u8 scan_rsp_len);
+                       u8 addr_type, u8 *dev_class, s8 rssi, u32 flags,
+                       u8 *eir, u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len);
 void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
                       u8 addr_type, s8 rssi, u8 *name, u8 name_len);
 void mgmt_discovering(struct hci_dev *hdev, u8 discovering);
-int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
-int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
 void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, bool persistent);
 void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk);
 void mgmt_new_csrk(struct hci_dev *hdev, struct smp_csrk *csrk,
                    bool persistent);
+void mgmt_new_conn_param(struct hci_dev *hdev, bdaddr_t *bdaddr,
+                         u8 bdaddr_type, u8 store_hint, u16 min_interval,
+                         u16 max_interval, u16 latency, u16 timeout);
 void mgmt_reenable_advertising(struct hci_dev *hdev);
 void mgmt_smp_complete(struct hci_conn *conn, bool complete);
 
-/* HCI info for socket */
-#define hci_pi(sk) ((struct hci_pinfo *) sk)
-
-struct hci_pinfo {
-        struct bt_sock    bt;
-        struct hci_dev    *hdev;
-        struct hci_filter filter;
-        __u32             cmsg_mask;
-        unsigned short   channel;
-};
-
-/* HCI security filter */
-#define HCI_SFLT_MAX_OGF  5
-
-struct hci_sec_filter {
-        __u32 type_mask;
-        __u32 event_mask[2];
-        __u32 ocf_mask[HCI_SFLT_MAX_OGF + 1][4];
-};
-
-/* ----- HCI requests ----- */
-#define HCI_REQ_DONE      0
-#define HCI_REQ_PEND      1
-#define HCI_REQ_CANCELED  2
-
-#define hci_req_lock(d)         mutex_lock(&d->req_lock)
-#define hci_req_unlock(d)       mutex_unlock(&d->req_lock)
-
-void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,
-                                        u16 latency, u16 to_multiplier);
+u8 hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency,
+                      u16 to_multiplier);
 void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand,
                                                         __u8 ltk[16]);
 
diff --git a/include/net/bluetooth/hci_sock.h b/include/net/bluetooth/hci_sock.h
new file mode 100644
index 000000000000..9a46d665c1b5
--- /dev/null
+++ b/include/net/bluetooth/hci_sock.h
@@ -0,0 +1,175 @@
+/*
+   BlueZ - Bluetooth protocol stack for Linux
+   Copyright (C) 2000-2001 Qualcomm Incorporated
+
+   Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.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;
+
+   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 OF THIRD PARTY RIGHTS.
+   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
+   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
+   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
+   SOFTWARE IS DISCLAIMED.
+*/
+
+#ifndef __HCI_SOCK_H
+#define __HCI_SOCK_H
+
+/* Socket options */
+#define HCI_DATA_DIR    1
+#define HCI_FILTER      2
+#define HCI_TIME_STAMP  3
+
+/* CMSG flags */
+#define HCI_CMSG_DIR    0x0001
+#define HCI_CMSG_TSTAMP 0x0002
+
+struct sockaddr_hci {
+        sa_family_t    hci_family;
+        unsigned short hci_dev;
+        unsigned short hci_channel;
+};
+#define HCI_DEV_NONE    0xffff
+
+#define HCI_CHANNEL_RAW         0
+#define HCI_CHANNEL_USER        1
+#define HCI_CHANNEL_MONITOR     2
+#define HCI_CHANNEL_CONTROL     3
+
+struct hci_filter {
+        unsigned long type_mask;
+        unsigned long event_mask[2];
+        __le16 opcode;
+};
+
+struct hci_ufilter {
+        __u32  type_mask;
+        __u32  event_mask[2];
+        __le16 opcode;
+};
+
+#define HCI_FLT_TYPE_BITS       31
+#define HCI_FLT_EVENT_BITS      63
+#define HCI_FLT_OGF_BITS        63
+#define HCI_FLT_OCF_BITS        127
+
+/* Ioctl defines */
+#define HCIDEVUP        _IOW('H', 201, int)
+#define HCIDEVDOWN      _IOW('H', 202, int)
+#define HCIDEVRESET     _IOW('H', 203, int)
+#define HCIDEVRESTAT    _IOW('H', 204, int)
+
+#define HCIGETDEVLIST   _IOR('H', 210, int)
+#define HCIGETDEVINFO   _IOR('H', 211, int)
+#define HCIGETCONNLIST  _IOR('H', 212, int)
+#define HCIGETCONNINFO  _IOR('H', 213, int)
+#define HCIGETAUTHINFO  _IOR('H', 215, int)
+
+#define HCISETRAW       _IOW('H', 220, int)
+#define HCISETSCAN      _IOW('H', 221, int)
+#define HCISETAUTH      _IOW('H', 222, int)
+#define HCISETENCRYPT   _IOW('H', 223, int)
+#define HCISETPTYPE     _IOW('H', 224, int)
+#define HCISETLINKPOL   _IOW('H', 225, int)
+#define HCISETLINKMODE  _IOW('H', 226, int)
+#define HCISETACLMTU    _IOW('H', 227, int)
+#define HCISETSCOMTU    _IOW('H', 228, int)
+
+#define HCIBLOCKADDR    _IOW('H', 230, int)
+#define HCIUNBLOCKADDR  _IOW('H', 231, int)
+
+#define HCIINQUIRY      _IOR('H', 240, int)
+
+/* Ioctl requests structures */
+struct hci_dev_stats {
+        __u32 err_rx;
+        __u32 err_tx;
+        __u32 cmd_tx;
+        __u32 evt_rx;
+        __u32 acl_tx;
+        __u32 acl_rx;
+        __u32 sco_tx;
+        __u32 sco_rx;
+        __u32 byte_rx;
+        __u32 byte_tx;
+};
+
+struct hci_dev_info {
+        __u16 dev_id;
+        char  name[8];
+
+        bdaddr_t bdaddr;
+
+        __u32 flags;
+        __u8  type;
+
+        __u8  features[8];
+
+        __u32 pkt_type;
+        __u32 link_policy;
+        __u32 link_mode;
+
+        __u16 acl_mtu;
+        __u16 acl_pkts;
+        __u16 sco_mtu;
+        __u16 sco_pkts;
+
+        struct hci_dev_stats stat;
+};
+
+struct hci_conn_info {
+        __u16    handle;
+        bdaddr_t bdaddr;
+        __u8     type;
+        __u8     out;
+        __u16    state;
+        __u32    link_mode;
+};
+
+struct hci_dev_req {
+        __u16  dev_id;
+        __u32  dev_opt;
+};
+
+struct hci_dev_list_req {
+        __u16  dev_num;
+        struct hci_dev_req dev_req[0];  /* hci_dev_req structures */
+};
+
+struct hci_conn_list_req {
+        __u16  dev_id;
+        __u16  conn_num;
+        struct hci_conn_info conn_info[0];
+};
+
+struct hci_conn_info_req {
+        bdaddr_t bdaddr;
+        __u8     type;
+        struct   hci_conn_info conn_info[0];
+};
+
+struct hci_auth_info_req {
+        bdaddr_t bdaddr;
+        __u8     type;
+};
+
+struct hci_inquiry_req {
+        __u16 dev_id;
+        __u16 flags;
+        __u8  lap[3];
+        __u8  length;
+        __u8  num_rsp;
+};
+#define IREQ_CACHE_FLUSH 0x0001
+
+#endif /* __HCI_SOCK_H */
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 4abdcb220e3a..8df15ad0d43f 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -134,10 +134,12 @@ struct l2cap_conninfo {
 #define L2CAP_FCS_CRC16         0x01
 
 /* L2CAP fixed channels */
-#define L2CAP_FC_L2CAP          0x02
+#define L2CAP_FC_SIG_BREDR      0x02
 #define L2CAP_FC_CONNLESS       0x04
 #define L2CAP_FC_A2MP           0x08
-#define L2CAP_FC_6LOWPAN        0x3e /* reserved and temporary value */
+#define L2CAP_FC_ATT            0x10
+#define L2CAP_FC_SIG_LE         0x20
+#define L2CAP_FC_SMP_LE         0x40
 
 /* L2CAP Control Field bit masks */
 #define L2CAP_CTRL_SAR                  0xC000
@@ -579,7 +581,7 @@ struct l2cap_chan {
         struct list_head        global_l;
 
         void                    *data;
-        struct l2cap_ops        *ops;
+        const struct l2cap_ops  *ops;
         struct mutex            lock;
 };
 
@@ -600,7 +602,12 @@ struct l2cap_ops {
         void                    (*set_shutdown) (struct l2cap_chan *chan);
         long                    (*get_sndtimeo) (struct l2cap_chan *chan);
         struct sk_buff          *(*alloc_skb) (struct l2cap_chan *chan,
+                                               unsigned long hdr_len,
                                                unsigned long len, int nb);
+        int                     (*memcpy_fromiovec) (struct l2cap_chan *chan,
+                                                     unsigned char *kdata,
+                                                     struct iovec *iov,
+                                                     int len);
 };
 
 struct l2cap_conn {
@@ -618,11 +625,10 @@ struct l2cap_conn {
 
         struct delayed_work     info_timer;
 
-        spinlock_t              lock;
-
         struct sk_buff          *rx_skb;
         __u32                   rx_len;
         __u8                    tx_ident;
+        struct mutex            ident_lock;
 
         struct sk_buff_head     pending_rx;
         struct work_struct      pending_rx_work;
@@ -856,6 +862,31 @@ static inline long l2cap_chan_no_get_sndtimeo(struct l2cap_chan *chan)
         return 0;
 }
 
+static inline int l2cap_chan_no_memcpy_fromiovec(struct l2cap_chan *chan,
+                                                 unsigned char *kdata,
+                                                 struct iovec *iov,
+                                                 int len)
+{
+        /* Following is safe since for compiler definitions of kvec and
+         * iovec are identical, yielding the same in-core layout and alignment
+         */
+        struct kvec *vec = (struct kvec *)iov;
+
+        while (len > 0) {
+                if (vec->iov_len) {
+                        int copy = min_t(unsigned int, len, vec->iov_len);
+                        memcpy(kdata, vec->iov_base, copy);
+                        len -= copy;
+                        kdata += copy;
+                        vec->iov_base += copy;
+                        vec->iov_len -= copy;
+                }
+                vec++;
+        }
+
+        return 0;
+}
+
 extern bool disable_ertm;
 
 int l2cap_init_sockets(void);
@@ -872,10 +903,9 @@ struct l2cap_chan *l2cap_chan_create(void);
 void l2cap_chan_close(struct l2cap_chan *chan, int reason);
 int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
                        bdaddr_t *dst, u8 dst_type);
-int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
-                                                                u32 priority);
+int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len);
 void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
-int l2cap_chan_check_security(struct l2cap_chan *chan);
+int l2cap_chan_check_security(struct l2cap_chan *chan, bool initiator);
 void l2cap_chan_set_defaults(struct l2cap_chan *chan);
 int l2cap_ertm_init(struct l2cap_chan *chan);
 void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan);
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index bcffc9ae0c89..414cd2f9a437 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -87,7 +87,7 @@ struct mgmt_rp_read_index_list {
 #define MGMT_SETTING_CONNECTABLE        0x00000002
 #define MGMT_SETTING_FAST_CONNECTABLE   0x00000004
 #define MGMT_SETTING_DISCOVERABLE       0x00000008
-#define MGMT_SETTING_PAIRABLE           0x00000010
+#define MGMT_SETTING_BONDABLE           0x00000010
 #define MGMT_SETTING_LINK_SECURITY      0x00000020
 #define MGMT_SETTING_SSP                0x00000040
 #define MGMT_SETTING_BREDR              0x00000080
@@ -97,6 +97,7 @@ struct mgmt_rp_read_index_list {
 #define MGMT_SETTING_SECURE_CONN        0x00000800
 #define MGMT_SETTING_DEBUG_KEYS         0x00001000
 #define MGMT_SETTING_PRIVACY            0x00002000
+#define MGMT_SETTING_CONFIGURATION      0x00004000
 
 #define MGMT_OP_READ_INFO               0x0004
 #define MGMT_READ_INFO_SIZE             0
@@ -130,7 +131,7 @@ struct mgmt_cp_set_discoverable {
 
 #define MGMT_OP_SET_FAST_CONNECTABLE    0x0008
 
-#define MGMT_OP_SET_PAIRABLE            0x0009
+#define MGMT_OP_SET_BONDABLE            0x0009
 
 #define MGMT_OP_SET_LINK_SECURITY       0x000A
 
@@ -424,6 +425,76 @@ struct mgmt_rp_get_conn_info {
         __s8    max_tx_power;
 } __packed;
 
+#define MGMT_OP_GET_CLOCK_INFO          0x0032
+struct mgmt_cp_get_clock_info {
+        struct mgmt_addr_info addr;
+} __packed;
+#define MGMT_GET_CLOCK_INFO_SIZE        MGMT_ADDR_INFO_SIZE
+struct mgmt_rp_get_clock_info {
+        struct mgmt_addr_info addr;
+        __le32  local_clock;
+        __le32  piconet_clock;
+        __le16  accuracy;
+} __packed;
+
+#define MGMT_OP_ADD_DEVICE              0x0033
+struct mgmt_cp_add_device {
+        struct mgmt_addr_info addr;
+        __u8    action;
+} __packed;
+#define MGMT_ADD_DEVICE_SIZE            (MGMT_ADDR_INFO_SIZE + 1)
+
+#define MGMT_OP_REMOVE_DEVICE           0x0034
+struct mgmt_cp_remove_device {
+        struct mgmt_addr_info addr;
+} __packed;
+#define MGMT_REMOVE_DEVICE_SIZE         MGMT_ADDR_INFO_SIZE
+
+struct mgmt_conn_param {
+        struct mgmt_addr_info addr;
+        __le16 min_interval;
+        __le16 max_interval;
+        __le16 latency;
+        __le16 timeout;
+} __packed;
+
+#define MGMT_OP_LOAD_CONN_PARAM         0x0035
+struct mgmt_cp_load_conn_param {
+        __le16 param_count;
+        struct mgmt_conn_param params[0];
+} __packed;
+#define MGMT_LOAD_CONN_PARAM_SIZE       2
+
+#define MGMT_OP_READ_UNCONF_INDEX_LIST  0x0036
+#define MGMT_READ_UNCONF_INDEX_LIST_SIZE 0
+struct mgmt_rp_read_unconf_index_list {
+        __le16  num_controllers;
+        __le16  index[0];
+} __packed;
+
+#define MGMT_OPTION_EXTERNAL_CONFIG     0x00000001
+#define MGMT_OPTION_PUBLIC_ADDRESS      0x00000002
+
+#define MGMT_OP_READ_CONFIG_INFO        0x0037
+#define MGMT_READ_CONFIG_INFO_SIZE      0
+struct mgmt_rp_read_config_info {
+        __le16  manufacturer;
+        __le32  supported_options;
+        __le32  missing_options;
+} __packed;
+
+#define MGMT_OP_SET_EXTERNAL_CONFIG     0x0038
+struct mgmt_cp_set_external_config {
+        __u8 config;
+} __packed;
+#define MGMT_SET_EXTERNAL_CONFIG_SIZE   1
+
+#define MGMT_OP_SET_PUBLIC_ADDRESS      0x0039
+struct mgmt_cp_set_public_address {
+        bdaddr_t bdaddr;
+} __packed;
+#define MGMT_SET_PUBLIC_ADDRESS_SIZE    6
+
 #define MGMT_EV_CMD_COMPLETE            0x0001
 struct mgmt_ev_cmd_complete {
         __le16  opcode;
@@ -522,6 +593,7 @@ struct mgmt_ev_auth_failed {
 
 #define MGMT_DEV_FOUND_CONFIRM_NAME    0x01
 #define MGMT_DEV_FOUND_LEGACY_PAIRING  0x02
+#define MGMT_DEV_FOUND_NOT_CONNECTABLE 0x04
 
 #define MGMT_EV_DEVICE_FOUND            0x0012
 struct mgmt_ev_device_found {
@@ -578,3 +650,30 @@ struct mgmt_ev_new_csrk {
         __u8 store_hint;
         struct mgmt_csrk_info key;
 } __packed;
+
+#define MGMT_EV_DEVICE_ADDED            0x001a
+struct mgmt_ev_device_added {
+        struct mgmt_addr_info addr;
+        __u8 action;
+} __packed;
+
+#define MGMT_EV_DEVICE_REMOVED          0x001b
+struct mgmt_ev_device_removed {
+        struct mgmt_addr_info addr;
+} __packed;
+
+#define MGMT_EV_NEW_CONN_PARAM          0x001c
+struct mgmt_ev_new_conn_param {
+        struct mgmt_addr_info addr;
+        __u8 store_hint;
+        __le16 min_interval;
+        __le16 max_interval;
+        __le16 latency;
+        __le16 timeout;
+} __packed;
+
+#define MGMT_EV_UNCONF_INDEX_ADDED      0x001d
+
+#define MGMT_EV_UNCONF_INDEX_REMOVED    0x001e
+
+#define MGMT_EV_NEW_CONFIG_OPTIONS      0x001f
diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h
index 2019d1a0996a..f40ddb4264fc 100644
--- a/include/net/bluetooth/sco.h
+++ b/include/net/bluetooth/sco.h
@@ -27,11 +27,6 @@
 
 /* SCO defaults */
 #define SCO_DEFAULT_MTU         500
-#define SCO_DEFAULT_FLUSH_TO    0xFFFF
-
-#define SCO_CONN_TIMEOUT        (HZ * 40)
-#define SCO_DISCONN_TIMEOUT     (HZ * 2)
-#define SCO_CONN_IDLE_TIMEOUT   (HZ * 60)
 
 /* SCO socket address */
 struct sockaddr_sco {
@@ -51,29 +46,4 @@ struct sco_conninfo {
         __u8  dev_class[3];
 };
 
-/* ---- SCO connections ---- */
-struct sco_conn {
-        struct hci_conn *hcon;
-
-        spinlock_t      lock;
-        struct sock     *sk;
-
-        unsigned int    mtu;
-};
-
-#define sco_conn_lock(c)        spin_lock(&c->lock);
-#define sco_conn_unlock(c)      spin_unlock(&c->lock);
-
-/* ----- SCO socket info ----- */
-#define sco_pi(sk) ((struct sco_pinfo *) sk)
-
-struct sco_pinfo {
-        struct bt_sock  bt;
-        bdaddr_t        src;
-        bdaddr_t        dst;
-        __u32           flags;
-        __u16           setting;
-        struct sco_conn *conn;
-};
-
 #endif /* __SCO_H */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index e46c437944f7..0a080c4de275 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2266,10 +2266,6 @@ struct cfg80211_qos_map {
  *
  * @get_antenna: Get current antenna configuration from device (tx_ant, rx_ant).
  *
- * @set_ringparam: Set tx and rx ring sizes.
- *
- * @get_ringparam: Get tx and rx ring current and maximum sizes.
- *
  * @tdls_mgmt: Transmit a TDLS management frame.
  * @tdls_oper: Perform a high-level TDLS operation (e.g. TDLS link setup).
  *
@@ -2278,16 +2274,6 @@ struct cfg80211_qos_map {
  *
  * @set_noack_map: Set the NoAck Map for the TIDs.
  *
- * @get_et_sset_count:  Ethtool API to get string-set count.
- *      See @ethtool_ops.get_sset_count
- *
- * @get_et_stats:  Ethtool API to get a set of u64 stats.
- *      See @ethtool_ops.get_ethtool_stats
- *
- * @get_et_strings:  Ethtool API to get a set of strings to describe stats
- *      and perhaps other supported types of ethtool data-sets.
- *      See @ethtool_ops.get_strings
- *
  * @get_channel: Get the current operating channel for the virtual interface.
  *      For monitor interfaces, it should return %NULL unless there's a single
  *      current monitoring channel.
@@ -2315,7 +2301,12 @@ struct cfg80211_qos_map {
  *      reliability. This operation can not fail.
  * @set_coalesce: Set coalesce parameters.
  *
- * @channel_switch: initiate channel-switch procedure (with CSA)
+ * @channel_switch: initiate channel-switch procedure (with CSA). Driver is
+ *      responsible for veryfing if the switch is possible. Since this is
+ *      inherently tricky driver may decide to disconnect an interface later
+ *      with cfg80211_stop_iface(). This doesn't mean driver can accept
+ *      everything. It should do it's best to verify requests and reject them
+ *      as soon as possible.
  *
  * @set_qos_map: Set QoS mapping information to the driver
  *
@@ -2503,10 +2494,6 @@ struct cfg80211_ops {
         int     (*set_antenna)(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant);
         int     (*get_antenna)(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant);
 
-        int     (*set_ringparam)(struct wiphy *wiphy, u32 tx, u32 rx);
-        void    (*get_ringparam)(struct wiphy *wiphy,
-                                 u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max);
-
         int     (*sched_scan_start)(struct wiphy *wiphy,
                                 struct net_device *dev,
                                 struct cfg80211_sched_scan_request *request);
@@ -2518,7 +2505,7 @@ struct cfg80211_ops {
         int     (*tdls_mgmt)(struct wiphy *wiphy, struct net_device *dev,
                              const u8 *peer, u8 action_code,  u8 dialog_token,
                              u16 status_code, u32 peer_capability,
-                             const u8 *buf, size_t len);
+                             bool initiator, const u8 *buf, size_t len);
         int     (*tdls_oper)(struct wiphy *wiphy, struct net_device *dev,
                              const u8 *peer, enum nl80211_tdls_operation oper);
 
@@ -2529,13 +2516,6 @@ struct cfg80211_ops {
                                   struct net_device *dev,
                                   u16 noack_map);
 
-        int     (*get_et_sset_count)(struct wiphy *wiphy,
-                                     struct net_device *dev, int sset);
-        void    (*get_et_stats)(struct wiphy *wiphy, struct net_device *dev,
-                                struct ethtool_stats *stats, u64 *data);
-        void    (*get_et_strings)(struct wiphy *wiphy, struct net_device *dev,
-                                  u32 sset, u8 *data);
-
         int     (*get_channel)(struct wiphy *wiphy,
                                struct wireless_dev *wdev,
                                struct cfg80211_chan_def *chandef);
@@ -4843,6 +4823,10 @@ void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev,
  */
 void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy);
 
+
+/* ethtool helper */
+void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info);
+
 /* Logging, debugging and troubleshooting/diagnostic helpers. */
 
 /* wiphy_printk helpers, similar to dev_printk */
diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h
index a975edf21b22..597b88a94332 100644
--- a/include/net/dcbnl.h
+++ b/include/net/dcbnl.h
@@ -81,8 +81,8 @@ struct dcbnl_rtnl_ops {
         void (*setbcncfg)(struct net_device *, int, u32);
         void (*getbcnrp)(struct net_device *, int, u8 *);
         void (*setbcnrp)(struct net_device *, int, u8);
-        u8   (*setapp)(struct net_device *, u8, u16, u8);
-        u8   (*getapp)(struct net_device *, u8, u16);
+        int  (*setapp)(struct net_device *, u8, u16, u8);
+        int  (*getapp)(struct net_device *, u8, u16);
         u8   (*getfeatcfg)(struct net_device *, int, u8 *);
         u8   (*setfeatcfg)(struct net_device *, int, u8);
 
diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h
index 7e64bd8bbda9..6667a054763a 100644
--- a/include/net/flow_keys.h
+++ b/include/net/flow_keys.h
@@ -1,6 +1,19 @@
 #ifndef _NET_FLOW_KEYS_H
 #define _NET_FLOW_KEYS_H
 
+/* struct flow_keys:
+ *      @src: source ip address in case of IPv4
+ *            For IPv6 it contains 32bit hash of src address
+ *      @dst: destination ip address in case of IPv4
+ *            For IPv6 it contains 32bit hash of dst address
+ *      @ports: port numbers of Transport header
+ *              port16[0]: src port number
+ *              port16[1]: dst port number
+ *      @thoff: Transport header offset
+ *      @n_proto: Network header protocol (eg. IPv4/IPv6)
+ *      @ip_proto: Transport header protocol (eg. TCP/UDP)
+ * All the members, except thoff, are in network byte order.
+ */
 struct flow_keys {
         /* (src,dst) must be grouped, in the same way than in IP header */
         __be32 src;
@@ -10,9 +23,11 @@ struct flow_keys {
                 __be16 port16[2];
         };
         u16 thoff;
+        u16 n_proto;
         u8 ip_proto;
 };
 
 bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow);
 __be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto);
+u32 flow_hash_from_keys(struct flow_keys *keys);
 #endif
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index b4956a5fcc3f..d07b1a64b4e7 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -205,6 +205,7 @@ struct inet6_dev {
         struct timer_list       rs_timer;
         __u8                    rs_probes;
 
+        __u8                    addr_gen_mode;
         unsigned long           tstamp; /* ipv6InterfaceTable update timestamp */
         struct rcu_head         rcu;
 };
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 6f59de98dabd..65a8855e99fe 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -4,10 +4,6 @@
 #include <linux/percpu_counter.h>
 
 struct netns_frags {
-        int                     nqueues;
-        struct list_head        lru_list;
-        spinlock_t              lru_lock;
-
         /* The percpu_counter "mem" need to be cacheline aligned.
          *  mem.count must not share cacheline with other writers
          */
@@ -19,25 +15,49 @@ struct netns_frags {
         int                     low_thresh;
 };
 
+/**
+ * fragment queue flags
+ *
+ * @INET_FRAG_FIRST_IN: first fragment has arrived
+ * @INET_FRAG_LAST_IN: final fragment has arrived
+ * @INET_FRAG_COMPLETE: frag queue has been processed and is due for destruction
+ * @INET_FRAG_EVICTED: frag queue is being evicted
+ */
+enum {
+        INET_FRAG_FIRST_IN      = BIT(0),
+        INET_FRAG_LAST_IN       = BIT(1),
+        INET_FRAG_COMPLETE      = BIT(2),
+        INET_FRAG_EVICTED       = BIT(3)
+};
+
+/**
+ * struct inet_frag_queue - fragment queue
+ *
+ * @lock: spinlock protecting the queue
+ * @timer: queue expiration timer
+ * @list: hash bucket list
+ * @refcnt: reference count of the queue
+ * @fragments: received fragments head
+ * @fragments_tail: received fragments tail
+ * @stamp: timestamp of the last received fragment
+ * @len: total length of the original datagram
+ * @meat: length of received fragments so far
+ * @flags: fragment queue flags
+ * @max_size: (ipv4 only) maximum received fragment size with IP_DF set
+ * @net: namespace that this frag belongs to
+ */
 struct inet_frag_queue {
         spinlock_t              lock;
-        struct timer_list       timer;      /* when will this queue expire? */
-        struct list_head        lru_list;   /* lru list member */
+        struct timer_list       timer;
         struct hlist_node       list;
         atomic_t                refcnt;
-        struct sk_buff          *fragments; /* list of received fragments */
+        struct sk_buff          *fragments;
         struct sk_buff          *fragments_tail;
         ktime_t                 stamp;
-        int                     len;        /* total length of orig datagram */
+        int                     len;
         int                     meat;
-        __u8                    last_in;    /* first/last segment arrived? */
-
-#define INET_FRAG_COMPLETE      4
-#define INET_FRAG_FIRST_IN      2
-#define INET_FRAG_LAST_IN       1
-
+        __u8                    flags;
         u16                     max_size;
-
         struct netns_frags      *net;
 };
 
@@ -48,7 +68,7 @@ struct inet_frag_queue {
  *             rounded up (SKB_TRUELEN(0) + sizeof(struct ipq or
  *             struct frag_queue))
  */
-#define INETFRAGS_MAXDEPTH              128
+#define INETFRAGS_MAXDEPTH      128
 
 struct inet_frag_bucket {
         struct hlist_head       chain;
@@ -57,49 +77,52 @@ struct inet_frag_bucket {
 
 struct inet_frags {
         struct inet_frag_bucket hash[INETFRAGS_HASHSZ];
-        /* This rwlock is a global lock (seperate per IPv4, IPv6 and
-         * netfilter). Important to keep this on a seperate cacheline.
-         * Its primarily a rebuild protection rwlock.
-         */
-        rwlock_t                lock ____cacheline_aligned_in_smp;
-        int                     secret_interval;
-        struct timer_list       secret_timer;
+
+        struct work_struct      frags_work;
+        unsigned int next_bucket;
+        unsigned long last_rebuild_jiffies;
+        bool rebuild;
 
         /* The first call to hashfn is responsible to initialize
          * rnd. This is best done with net_get_random_once.
+         *
+         * rnd_seqlock is used to let hash insertion detect
+         * when it needs to re-lookup the hash chain to use.
          */
         u32                     rnd;
+        seqlock_t               rnd_seqlock;
         int                     qsize;
 
-        unsigned int            (*hashfn)(struct inet_frag_queue *);
-        bool                    (*match)(struct inet_frag_queue *q, void *arg);
+        unsigned int            (*hashfn)(const struct inet_frag_queue *);
+        bool                    (*match)(const struct inet_frag_queue *q,
+                                         const void *arg);
         void                    (*constructor)(struct inet_frag_queue *q,
-                                                void *arg);
+                                               const void *arg);
         void                    (*destructor)(struct inet_frag_queue *);
         void                    (*skb_free)(struct sk_buff *);
         void                    (*frag_expire)(unsigned long data);
+        struct kmem_cache       *frags_cachep;
+        const char              *frags_cache_name;
 };
 
-void inet_frags_init(struct inet_frags *);
+int inet_frags_init(struct inet_frags *);
 void inet_frags_fini(struct inet_frags *);
 
 void inet_frags_init_net(struct netns_frags *nf);
 void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f);
 
 void inet_frag_kill(struct inet_frag_queue *q, struct inet_frags *f);
-void inet_frag_destroy(struct inet_frag_queue *q,
-                                struct inet_frags *f, int *work);
-int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f, bool force);
+void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f);
 struct inet_frag_queue *inet_frag_find(struct netns_frags *nf,
-                struct inet_frags *f, void *key, unsigned int hash)
-        __releases(&f->lock);
+                struct inet_frags *f, void *key, unsigned int hash);
+
 void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q,
                                    const char *prefix);
 
 static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)
 {
         if (atomic_dec_and_test(&q->refcnt))
-                inet_frag_destroy(q, f, NULL);
+                inet_frag_destroy(q, f);
 }
 
 /* Memory Tracking Functions. */
@@ -131,9 +154,9 @@ static inline void init_frag_mem_limit(struct netns_frags *nf)
         percpu_counter_init(&nf->mem, 0);
 }
 
-static inline int sum_frag_mem_limit(struct netns_frags *nf)
+static inline unsigned int sum_frag_mem_limit(struct netns_frags *nf)
 {
-        int res;
+        unsigned int res;
 
         local_bh_disable();
         res = percpu_counter_sum_positive(&nf->mem);
@@ -142,31 +165,6 @@ static inline int sum_frag_mem_limit(struct netns_frags *nf)
         return res;
 }
 
-static inline void inet_frag_lru_move(struct inet_frag_queue *q)
-{
-        spin_lock(&q->net->lru_lock);
-        if (!list_empty(&q->lru_list))
-                list_move_tail(&q->lru_list, &q->net->lru_list);
-        spin_unlock(&q->net->lru_lock);
-}
-
-static inline void inet_frag_lru_del(struct inet_frag_queue *q)
-{
-        spin_lock(&q->net->lru_lock);
-        list_del_init(&q->lru_list);
-        q->net->nqueues--;
-        spin_unlock(&q->net->lru_lock);
-}
-
-static inline void inet_frag_lru_add(struct netns_frags *nf,
-                                     struct inet_frag_queue *q)
-{
-        spin_lock(&nf->lru_lock);
-        list_add_tail(&q->lru_list, &nf->lru_list);
-        q->net->nqueues++;
-        spin_unlock(&nf->lru_lock);
-}
-
 /* RFC 3168 support :
  * We want to check ECN values of all fragments, do detect invalid combinations.
  * In ipq->ecn, we store the OR value of each ip4_frag_ecn() fragment value.
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index b1edf17bec01..a829b77523cf 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -88,8 +88,10 @@ struct inet_request_sock {
                                 acked      : 1,
                                 no_srccheck: 1;
         kmemcheck_bitfield_end(flags);
-        struct ip_options_rcu   *opt;
-        struct sk_buff          *pktopts;
+        union {
+                struct ip_options_rcu   *opt;
+                struct sk_buff          *pktopts;
+        };
         u32                     ir_mark;
 };
 
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 61474ea02152..6c566034e26d 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -108,6 +108,7 @@ struct inet_timewait_sock {
 #define tw_family               __tw_common.skc_family
 #define tw_state                __tw_common.skc_state
 #define tw_reuse                __tw_common.skc_reuse
+#define tw_ipv6only             __tw_common.skc_ipv6only
 #define tw_bound_dev_if         __tw_common.skc_bound_dev_if
 #define tw_node                 __tw_common.skc_nulls_node
 #define tw_bind_node            __tw_common.skc_bind_node
@@ -131,7 +132,7 @@ struct inet_timewait_sock {
         __be16                  tw_sport;
         kmemcheck_bitfield_begin(flags);
         /* And these are ours. */
-        unsigned int            tw_ipv6only     : 1,
+        unsigned int            tw_pad0         : 1,    /* 1 bit hole */
                                 tw_transparent  : 1,
                                 tw_flowlabel    : 20,
                                 tw_pad          : 2,    /* 2 bits hole */
diff --git a/include/net/ip.h b/include/net/ip.h
index 0e795df05ec9..db4a771b9ef3 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -31,6 +31,7 @@
 #include <net/route.h>
 #include <net/snmp.h>
 #include <net/flow.h>
+#include <net/flow_keys.h>
 
 struct sock;
 
@@ -215,6 +216,12 @@ static inline int inet_is_local_reserved_port(struct net *net, int port)
                 return 0;
         return test_bit(port, net->ipv4.sysctl_local_reserved_ports);
 }
+
+static inline bool sysctl_dev_name_is_allowed(const char *name)
+{
+        return strcmp(name, "default") != 0  && strcmp(name, "all") != 0;
+}
+
 #else
 static inline int inet_is_local_reserved_port(struct net *net, int port)
 {
@@ -309,16 +316,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
         }
 }
 
-#define IP_IDENTS_SZ 2048u
-extern atomic_t *ip_idents;
-
-static inline u32 ip_idents_reserve(u32 hash, int segs)
-{
-        atomic_t *id_ptr = ip_idents + hash % IP_IDENTS_SZ;
-
-        return atomic_add_return(segs, id_ptr) - segs;
-}
-
+u32 ip_idents_reserve(u32 hash, int segs);
 void __ip_select_ident(struct iphdr *iph, int segs);
 
 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
@@ -353,6 +351,19 @@ static inline __wsum inet_compute_pseudo(struct sk_buff *skb, int proto)
                                   skb->len, proto, 0);
 }
 
+static inline void inet_set_txhash(struct sock *sk)
+{
+        struct inet_sock *inet = inet_sk(sk);
+        struct flow_keys keys;
+
+        keys.src = inet->inet_saddr;
+        keys.dst = inet->inet_daddr;
+        keys.port16[0] = inet->inet_sport;
+        keys.port16[1] = inet->inet_dport;
+
+        sk->sk_txhash = flow_hash_from_keys(&keys);
+}
+
 /*
  *      Map a multicast IP onto multicast MAC for type ethernet.
  */
@@ -481,7 +492,6 @@ static inline struct sk_buff *ip_check_defrag(struct sk_buff *skb, u32 user)
 }
 #endif
 int ip_frag_mem(struct net *net);
-int ip_frag_nqueues(struct net *net);
 
 /*
  *      Functions provided by ip_forward.c
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index a4daf9eb8562..8dd8cab88b87 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -40,6 +40,7 @@ struct ip_tunnel_prl_entry {
 
 struct ip_tunnel_dst {
         struct dst_entry __rcu          *dst;
+        __be32                           saddr;
 };
 
 struct ip_tunnel {
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 574337fe72dd..a2db816e8461 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -19,6 +19,7 @@
 #include <net/if_inet6.h>
 #include <net/ndisc.h>
 #include <net/flow.h>
+#include <net/flow_keys.h>
 #include <net/snmp.h>
 
 #define SIN6_LEN_RFC2133        24
@@ -298,11 +299,6 @@ static inline bool ipv6_accept_ra(struct inet6_dev *idev)
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
-static inline int ip6_frag_nqueues(struct net *net)
-{
-        return net->ipv6.frags.nqueues;
-}
-
 static inline int ip6_frag_mem(struct net *net)
 {
         return sum_frag_mem_limit(&net->ipv6.frags);
@@ -495,8 +491,8 @@ struct ip6_create_arg {
         u8 ecn;
 };
 
-void ip6_frag_init(struct inet_frag_queue *q, void *a);
-bool ip6_frag_match(struct inet_frag_queue *q, void *a);
+void ip6_frag_init(struct inet_frag_queue *q, const void *a);
+bool ip6_frag_match(const struct inet_frag_queue *q, const void *a);
 
 /*
  *      Equivalent of ipv4 struct ip
@@ -557,24 +553,29 @@ static inline u32 __ipv6_addr_jhash(const struct in6_addr *a, const u32 initval)
 static inline bool ipv6_addr_loopback(const struct in6_addr *a)
 {
 #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
-        const unsigned long *ul = (const unsigned long *)a;
+        const __be64 *be = (const __be64 *)a;
 
-        return (ul[0] | (ul[1] ^ cpu_to_be64(1))) == 0UL;
+        return (be[0] | (be[1] ^ cpu_to_be64(1))) == 0UL;
 #else
         return (a->s6_addr32[0] | a->s6_addr32[1] |
-                a->s6_addr32[2] | (a->s6_addr32[3] ^ htonl(1))) == 0;
+                a->s6_addr32[2] | (a->s6_addr32[3] ^ cpu_to_be32(1))) == 0;
 #endif
 }
 
+/*
+ * Note that we must __force cast these to unsigned long to make sparse happy,
+ * since all of the endian-annotated types are fixed size regardless of arch.
+ */
 static inline bool ipv6_addr_v4mapped(const struct in6_addr *a)
 {
         return (
 #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
-                *(__be64 *)a |
+                *(unsigned long *)a |
 #else
-                (a->s6_addr32[0] | a->s6_addr32[1]) |
+                (__force unsigned long)(a->s6_addr32[0] | a->s6_addr32[1]) |
 #endif
-                (a->s6_addr32[2] ^ htonl(0x0000ffff))) == 0UL;
+                (__force unsigned long)(a->s6_addr32[2] ^
+                                        cpu_to_be32(0x0000ffff))) == 0UL;
 }
 
 /*
@@ -684,6 +685,50 @@ static inline int ip6_sk_dst_hoplimit(struct ipv6_pinfo *np, struct flowi6 *fl6,
         return hlimit;
 }
 
+#if IS_ENABLED(CONFIG_IPV6)
+static inline void ip6_set_txhash(struct sock *sk)
+{
+        struct inet_sock *inet = inet_sk(sk);
+        struct ipv6_pinfo *np = inet6_sk(sk);
+        struct flow_keys keys;
+
+        keys.src = (__force __be32)ipv6_addr_hash(&np->saddr);
+        keys.dst = (__force __be32)ipv6_addr_hash(&sk->sk_v6_daddr);
+        keys.port16[0] = inet->inet_sport;
+        keys.port16[1] = inet->inet_dport;
+
+        sk->sk_txhash = flow_hash_from_keys(&keys);
+}
+
+static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb,
+                                        __be32 flowlabel, bool autolabel)
+{
+        if (!flowlabel && (autolabel || net->ipv6.sysctl.auto_flowlabels)) {
+                __be32 hash;
+
+                hash = skb_get_hash(skb);
+
+                /* Since this is being sent on the wire obfuscate hash a bit
+                 * to minimize possbility that any useful information to an
+                 * attacker is leaked. Only lower 20 bits are relevant.
+                 */
+                hash ^= hash >> 12;
+
+                flowlabel = hash & IPV6_FLOWLABEL_MASK;
+        }
+
+        return flowlabel;
+}
+#else
+static inline void ip6_set_txhash(struct sock *sk) { }
+static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb,
+                                        __be32 flowlabel, bool autolabel)
+{
+        return flowlabel;
+}
+#endif
+
+
 /*
  *      Header manipulation
  */
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 421b6ecb4b2c..dae2e24616e1 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -754,20 +754,25 @@ struct ieee80211_tx_info {
 };
 
 /**
- * struct ieee80211_sched_scan_ies - scheduled scan IEs
+ * struct ieee80211_scan_ies - descriptors for different blocks of IEs
  *
- * This structure is used to pass the appropriate IEs to be used in scheduled
- * scans for all bands.  It contains both the IEs passed from the userspace
+ * This structure is used to point to different blocks of IEs in HW scan
+ * and scheduled scan. These blocks contain the IEs passed by userspace
  * and the ones generated by mac80211.
  *
- * @ie: array with the IEs for each supported band
- * @len: array with the total length of the IEs for each band
+ * @ies: pointers to band specific IEs.
+ * @len: lengths of band_specific IEs.
+ * @common_ies: IEs for all bands (especially vendor specific ones)
+ * @common_ie_len: length of the common_ies
  */
-struct ieee80211_sched_scan_ies {
-        u8 *ie[IEEE80211_NUM_BANDS];
+struct ieee80211_scan_ies {
+        const u8 *ies[IEEE80211_NUM_BANDS];
         size_t len[IEEE80211_NUM_BANDS];
+        const u8 *common_ies;
+        size_t common_ie_len;
 };
 
+
 static inline struct ieee80211_tx_info *IEEE80211_SKB_CB(struct sk_buff *skb)
 {
         return (struct ieee80211_tx_info *)skb->cb;
@@ -1601,11 +1606,8 @@ struct ieee80211_tx_control {
  *      is not enabled the default action is to disconnect when getting the
  *      CSA frame.
  *
- * @IEEE80211_HW_CHANGE_RUNNING_CHANCTX: The hardware can change a
- *      channel context on-the-fly.  This is needed for channel switch
- *      on single-channel hardware.  It can also be used as an
- *      optimization in certain channel switch cases with
- *      multi-channel.
+ * @IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS: The HW supports scanning on all bands
+ *      in one command, mac80211 doesn't have to run separate scans per band.
  */
 enum ieee80211_hw_flags {
         IEEE80211_HW_HAS_RATE_CONTROL                   = 1<<0,
@@ -1637,7 +1639,8 @@ enum ieee80211_hw_flags {
         IEEE80211_HW_TIMING_BEACON_ONLY                 = 1<<26,
         IEEE80211_HW_SUPPORTS_HT_CCK_RATES              = 1<<27,
         IEEE80211_HW_CHANCTX_STA_CSA                    = 1<<28,
-        IEEE80211_HW_CHANGE_RUNNING_CHANCTX             = 1<<29,
+        /* bit 29 unused */
+        IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS           = 1<<30,
 };
 
 /**
@@ -1764,6 +1767,19 @@ struct ieee80211_hw {
 };
 
 /**
+ * struct ieee80211_scan_request - hw scan request
+ *
+ * @ies: pointers different parts of IEs (in req.ie)
+ * @req: cfg80211 request.
+ */
+struct ieee80211_scan_request {
+        struct ieee80211_scan_ies ies;
+
+        /* Keep last */
+        struct cfg80211_scan_request req;
+};
+
+/**
  * wiphy_to_ieee80211_hw - return a mac80211 driver hw struct from a wiphy
  *
  * @wiphy: the &struct wiphy which we want to query
@@ -2764,6 +2780,15 @@ enum ieee80211_roc_type {
  *      mac80211 will transmit the frame right away.
  *      The callback is optional and can (should!) sleep.
  *
+ * @mgd_protect_tdls_discover: Protect a TDLS discovery session. After sending
+ *      a TDLS discovery-request, we expect a reply to arrive on the AP's
+ *      channel. We must stay on the channel (no PSM, scan, etc.), since a TDLS
+ *      setup-response is a direct packet not buffered by the AP.
+ *      mac80211 will call this function just before the transmission of a TDLS
+ *      discovery-request. The recommended period of protection is at least
+ *      2 * (DTIM period).
+ *      The callback is optional and can sleep.
+ *
  * @add_chanctx: Notifies device driver about new channel context creation.
  * @remove_chanctx: Notifies device driver about channel context destruction.
  * @change_chanctx: Notifies device driver about channel context changes that
@@ -2865,13 +2890,13 @@ struct ieee80211_ops {
         void (*set_default_unicast_key)(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif, int idx);
         int (*hw_scan)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                       struct cfg80211_scan_request *req);
+                       struct ieee80211_scan_request *req);
         void (*cancel_hw_scan)(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif);
         int (*sched_scan_start)(struct ieee80211_hw *hw,
                                 struct ieee80211_vif *vif,
                                 struct cfg80211_sched_scan_request *req,
-                                struct ieee80211_sched_scan_ies *ies);
+                                struct ieee80211_scan_ies *ies);
         int (*sched_scan_stop)(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif);
         void (*sw_scan_start)(struct ieee80211_hw *hw);
@@ -2981,6 +3006,9 @@ struct ieee80211_ops {
         void    (*mgd_prepare_tx)(struct ieee80211_hw *hw,
                                   struct ieee80211_vif *vif);
 
+        void    (*mgd_protect_tdls_discover)(struct ieee80211_hw *hw,
+                                             struct ieee80211_vif *vif);
+
         int (*add_chanctx)(struct ieee80211_hw *hw,
                            struct ieee80211_chanctx_conf *ctx);
         void (*remove_chanctx)(struct ieee80211_hw *hw,
@@ -4524,6 +4552,40 @@ void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap,
  */
 void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn);
 
+/**
+ * ieee80211_start_rx_ba_session_offl - start a Rx BA session
+ *
+ * Some device drivers may offload part of the Rx aggregation flow including
+ * AddBa/DelBa negotiation but may otherwise be incapable of full Rx
+ * reordering.
+ *
+ * Create structures responsible for reordering so device drivers may call here
+ * when they complete AddBa negotiation.
+ *
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback
+ * @addr: station mac address
+ * @tid: the rx tid
+ */
+void ieee80211_start_rx_ba_session_offl(struct ieee80211_vif *vif,
+                                        const u8 *addr, u16 tid);
+
+/**
+ * ieee80211_stop_rx_ba_session_offl - stop a Rx BA session
+ *
+ * Some device drivers may offload part of the Rx aggregation flow including
+ * AddBa/DelBa negotiation but may otherwise be incapable of full Rx
+ * reordering.
+ *
+ * Destroy structures responsible for reordering so device drivers may call here
+ * when they complete DelBa negotiation.
+ *
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback
+ * @addr: station mac address
+ * @tid: the rx tid
+ */
+void ieee80211_stop_rx_ba_session_offl(struct ieee80211_vif *vif,
+                                       const u8 *addr, u16 tid);
+
 /* Rate control API */
 
 /**
@@ -4815,4 +4877,17 @@ int ieee80211_parse_p2p_noa(const struct ieee80211_p2p_noa_attr *attr,
  */
 void ieee80211_update_p2p_noa(struct ieee80211_noa_data *data, u32 tsf);
 
+/**
+ * ieee80211_tdls_oper - request userspace to perform a TDLS operation
+ * @vif: virtual interface
+ * @peer: the peer's destination address
+ * @oper: the requested TDLS operation
+ * @reason_code: reason code for the operation, valid for TDLS teardown
+ * @gfp: allocation flags
+ *
+ * See cfg80211_tdls_oper_request().
+ */
+void ieee80211_tdls_oper_request(struct ieee80211_vif *vif, const u8 *peer,
+                                 enum nl80211_tdls_operation oper,
+                                 u16 reason_code, gfp_t gfp);
 #endif /* MAC80211_H */
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index a591053cae63..2e67cdd19cdc 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -80,6 +80,25 @@ struct ieee802154_dev {
 #define IEEE802154_HW_OMIT_CKSUM        0x00000001
 /* Indicates that receiver will autorespond with ACK frames. */
 #define IEEE802154_HW_AACK              0x00000002
+/* Indicates that transceiver will support transmit power setting. */
+#define IEEE802154_HW_TXPOWER           0x00000004
+/* Indicates that transceiver will support listen before transmit. */
+#define IEEE802154_HW_LBT               0x00000008
+/* Indicates that transceiver will support cca mode setting. */
+#define IEEE802154_HW_CCA_MODE          0x00000010
+/* Indicates that transceiver will support cca ed level setting. */
+#define IEEE802154_HW_CCA_ED_LEVEL      0x00000020
+/* Indicates that transceiver will support csma (max_be, min_be, csma retries)
+ * settings. */
+#define IEEE802154_HW_CSMA_PARAMS       0x00000040
+/* Indicates that transceiver will support ARET frame retries setting. */
+#define IEEE802154_HW_FRAME_RETRIES     0x00000080
+
+/* This groups the most common CSMA support fields into one. */
+#define IEEE802154_HW_CSMA              (IEEE802154_HW_CCA_MODE | \
+                                         IEEE802154_HW_CCA_ED_LEVEL | \
+                                         IEEE802154_HW_CSMA_PARAMS | \
+                                         IEEE802154_HW_FRAME_RETRIES)
 
 /* struct ieee802154_ops - callbacks from mac802154 to the driver
  *
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 0e3d08e4b1d3..57c880378443 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -18,7 +18,6 @@ struct nf_conntrack_ecache {
         u16 ctmask;             /* bitmask of ct events to be delivered */
         u16 expmask;            /* bitmask of expect events to be delivered */
         u32 portid;             /* netlink portid of destroyer */
-        struct timer_list timeout;
 };
 
 static inline struct nf_conntrack_ecache *
@@ -216,8 +215,23 @@ void nf_conntrack_ecache_pernet_fini(struct net *net);
 
 int nf_conntrack_ecache_init(void);
 void nf_conntrack_ecache_fini(void);
-#else /* CONFIG_NF_CONNTRACK_EVENTS */
 
+static inline void nf_conntrack_ecache_delayed_work(struct net *net)
+{
+        if (!delayed_work_pending(&net->ct.ecache_dwork)) {
+                schedule_delayed_work(&net->ct.ecache_dwork, HZ);
+                net->ct.ecache_dwork_pending = true;
+        }
+}
+
+static inline void nf_conntrack_ecache_work(struct net *net)
+{
+        if (net->ct.ecache_dwork_pending) {
+                net->ct.ecache_dwork_pending = false;
+                mod_delayed_work(system_wq, &net->ct.ecache_dwork, 0);
+        }
+}
+#else /* CONFIG_NF_CONNTRACK_EVENTS */
 static inline void nf_conntrack_event_cache(enum ip_conntrack_events event,
                                             struct nf_conn *ct) {}
 static inline int nf_conntrack_eventmask_report(unsigned int eventmask,
@@ -255,6 +269,14 @@ static inline int nf_conntrack_ecache_init(void)
 static inline void nf_conntrack_ecache_fini(void)
 {
 }
+
+static inline void nf_conntrack_ecache_delayed_work(struct net *net)
+{
+}
+
+static inline void nf_conntrack_ecache_work(struct net *net)
+{
+}
 #endif /* CONFIG_NF_CONNTRACK_EVENTS */
 
 #endif /*_NF_CONNTRACK_ECACHE_H*/
diff --git a/include/net/netfilter/nf_log.h b/include/net/netfilter/nf_log.h
index 99eac12d040b..534e1f2ac4fc 100644
--- a/include/net/netfilter/nf_log.h
+++ b/include/net/netfilter/nf_log.h
@@ -12,8 +12,11 @@
 #define NF_LOG_UID              0x08    /* Log UID owning local socket */
 #define NF_LOG_MASK             0x0f
 
-#define NF_LOG_TYPE_LOG         0x01
-#define NF_LOG_TYPE_ULOG        0x02
+enum nf_log_type {
+        NF_LOG_TYPE_LOG         = 0,
+        NF_LOG_TYPE_ULOG,
+        NF_LOG_TYPE_MAX
+};
 
 struct nf_loginfo {
         u_int8_t type;
@@ -40,10 +43,10 @@ typedef void nf_logfn(struct net *net,
                       const char *prefix);
 
 struct nf_logger {
-        struct module   *me;
-        nf_logfn        *logfn;
-        char            *name;
-        struct list_head        list[NFPROTO_NUMPROTO];
+        char                    *name;
+        enum nf_log_type        type;
+        nf_logfn                *logfn;
+        struct module           *me;
 };
 
 /* Function to register/unregister log function. */
@@ -58,6 +61,13 @@ int nf_log_bind_pf(struct net *net, u_int8_t pf,
                    const struct nf_logger *logger);
 void nf_log_unbind_pf(struct net *net, u_int8_t pf);
 
+int nf_logger_find_get(int pf, enum nf_log_type type);
+void nf_logger_put(int pf, enum nf_log_type type);
+void nf_logger_request_module(int pf, enum nf_log_type type);
+
+#define MODULE_ALIAS_NF_LOGGER(family, type) \
+        MODULE_ALIAS("nf-logger-" __stringify(family) "-" __stringify(type))
+
 /* Calls the registered backend logging function */
 __printf(8, 9)
 void nf_log_packet(struct net *net,
@@ -69,4 +79,24 @@ void nf_log_packet(struct net *net,
                    const struct nf_loginfo *li,
                    const char *fmt, ...);
 
+struct nf_log_buf;
+
+struct nf_log_buf *nf_log_buf_open(void);
+__printf(2, 3) int nf_log_buf_add(struct nf_log_buf *m, const char *f, ...);
+void nf_log_buf_close(struct nf_log_buf *m);
+
+/* common logging functions */
+int nf_log_dump_udp_header(struct nf_log_buf *m, const struct sk_buff *skb,
+                           u8 proto, int fragment, unsigned int offset);
+int nf_log_dump_tcp_header(struct nf_log_buf *m, const struct sk_buff *skb,
+                           u8 proto, int fragment, unsigned int offset,
+                           unsigned int logflags);
+void nf_log_dump_sk_uid_gid(struct nf_log_buf *m, struct sock *sk);
+void nf_log_dump_packet_common(struct nf_log_buf *m, 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 *loginfo,
+                               const char *prefix);
+
 #endif /* _NF_LOG_H */
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 713b0b88bd5a..c4d86198d3d6 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -6,6 +6,7 @@
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/nf_tables.h>
+#include <linux/u64_stats_sync.h>
 #include <net/netlink.h>
 
 #define NFT_JUMP_STACK_SIZE     16
@@ -528,8 +529,9 @@ enum nft_chain_type {
 };
 
 struct nft_stats {
-        u64 bytes;
-        u64 pkts;
+        u64                     bytes;
+        u64                     pkts;
+        struct u64_stats_sync   syncp;
 };
 
 #define NFT_HOOK_OPS_MAX                2
diff --git a/include/net/netfilter/xt_log.h b/include/net/netfilter/xt_log.h
deleted file mode 100644
index 9d9756cca013..000000000000
--- a/include/net/netfilter/xt_log.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#define S_SIZE (1024 - (sizeof(unsigned int) + 1))
-
-struct sbuff {
-        unsigned int    count;
-        char            buf[S_SIZE + 1];
-};
-static struct sbuff emergency, *emergency_ptr = &emergency;
-
-static __printf(2, 3) int sb_add(struct sbuff *m, const char *f, ...)
-{
-        va_list args;
-        int len;
-
-        if (likely(m->count < S_SIZE)) {
-                va_start(args, f);
-                len = vsnprintf(m->buf + m->count, S_SIZE - m->count, f, args);
-                va_end(args);
-                if (likely(m->count + len < S_SIZE)) {
-                        m->count += len;
-                        return 0;
-                }
-        }
-        m->count = S_SIZE;
-        printk_once(KERN_ERR KBUILD_MODNAME " please increase S_SIZE\n");
-        return -1;
-}
-
-static struct sbuff *sb_open(void)
-{
-        struct sbuff *m = kmalloc(sizeof(*m), GFP_ATOMIC);
-
-        if (unlikely(!m)) {
-                local_bh_disable();
-                do {
-                        m = xchg(&emergency_ptr, NULL);
-                } while (!m);
-        }
-        m->count = 0;
-        return m;
-}
-
-static void sb_close(struct sbuff *m)
-{
-        m->buf[m->count] = 0;
-        printk("%s\n", m->buf);
-
-        if (likely(m != &emergency))
-                kfree(m);
-        else {
-                emergency_ptr = m;
-                local_bh_enable();
-        }
-}
-
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 4fe018c48ed9..a4fc39bb3e4f 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -139,7 +139,7 @@ struct netlbl_lsm_cache {
 };
 
 /**
- * struct netlbl_lsm_secattr_catmap - NetLabel LSM secattr category bitmap
+ * struct netlbl_lsm_catmap - NetLabel LSM secattr category bitmap
  * @startbit: the value of the lowest order bit in the bitmap
  * @bitmap: the category bitmap
  * @next: pointer to the next bitmap "node" or NULL
@@ -162,10 +162,10 @@ struct netlbl_lsm_cache {
 #define NETLBL_CATMAP_SIZE              (NETLBL_CATMAP_MAPSIZE * \
                                          NETLBL_CATMAP_MAPCNT)
 #define NETLBL_CATMAP_BIT               (NETLBL_CATMAP_MAPTYPE)0x01
-struct netlbl_lsm_secattr_catmap {
+struct netlbl_lsm_catmap {
         u32 startbit;
         NETLBL_CATMAP_MAPTYPE bitmap[NETLBL_CATMAP_MAPCNT];
-        struct netlbl_lsm_secattr_catmap *next;
+        struct netlbl_lsm_catmap *next;
 };
 
 /**
@@ -209,7 +209,7 @@ struct netlbl_lsm_secattr {
         struct netlbl_lsm_cache *cache;
         struct {
                 struct {
-                        struct netlbl_lsm_secattr_catmap *cat;
+                        struct netlbl_lsm_catmap *cat;
                         u32 lvl;
                 } mls;
                 u32 secid;
@@ -258,7 +258,7 @@ static inline void netlbl_secattr_cache_free(struct netlbl_lsm_cache *cache)
 }
 
 /**
- * netlbl_secattr_catmap_alloc - Allocate a LSM secattr catmap
+ * netlbl_catmap_alloc - Allocate a LSM secattr catmap
  * @flags: memory allocation flags
  *
  * Description:
@@ -266,30 +266,28 @@ static inline void netlbl_secattr_cache_free(struct netlbl_lsm_cache *cache)
  * on failure.
  *
  */
-static inline struct netlbl_lsm_secattr_catmap *netlbl_secattr_catmap_alloc(
-                                                                   gfp_t flags)
+static inline struct netlbl_lsm_catmap *netlbl_catmap_alloc(gfp_t flags)
 {
-        return kzalloc(sizeof(struct netlbl_lsm_secattr_catmap), flags);
+        return kzalloc(sizeof(struct netlbl_lsm_catmap), flags);
 }
 
 /**
- * netlbl_secattr_catmap_free - Free a LSM secattr catmap
+ * netlbl_catmap_free - Free a LSM secattr catmap
  * @catmap: the category bitmap
  *
  * Description:
  * Free a LSM secattr catmap.
  *
  */
-static inline void netlbl_secattr_catmap_free(
-                                      struct netlbl_lsm_secattr_catmap *catmap)
+static inline void netlbl_catmap_free(struct netlbl_lsm_catmap *catmap)
 {
-        struct netlbl_lsm_secattr_catmap *iter;
+        struct netlbl_lsm_catmap *iter;
 
-        do {
+        while (catmap) {
                 iter = catmap;
                 catmap = catmap->next;
                 kfree(iter);
-        } while (catmap);
+        }
 }
 
 /**
@@ -321,7 +319,7 @@ static inline void netlbl_secattr_destroy(struct netlbl_lsm_secattr *secattr)
         if (secattr->flags & NETLBL_SECATTR_CACHE)
                 netlbl_secattr_cache_free(secattr->cache);
         if (secattr->flags & NETLBL_SECATTR_MLS_CAT)
-                netlbl_secattr_catmap_free(secattr->attr.mls.cat);
+                netlbl_catmap_free(secattr->attr.mls.cat);
 }
 
 /**
@@ -390,17 +388,22 @@ int netlbl_cfg_cipsov4_map_add(u32 doi,
 /*
  * LSM security attribute operations
  */
-int netlbl_secattr_catmap_walk(struct netlbl_lsm_secattr_catmap *catmap,
-                               u32 offset);
-int netlbl_secattr_catmap_walk_rng(struct netlbl_lsm_secattr_catmap *catmap,
-                                   u32 offset);
-int netlbl_secattr_catmap_setbit(struct netlbl_lsm_secattr_catmap *catmap,
-                                 u32 bit,
-                                 gfp_t flags);
-int netlbl_secattr_catmap_setrng(struct netlbl_lsm_secattr_catmap *catmap,
-                                 u32 start,
-                                 u32 end,
-                                 gfp_t flags);
+int netlbl_catmap_walk(struct netlbl_lsm_catmap *catmap, u32 offset);
+int netlbl_catmap_walkrng(struct netlbl_lsm_catmap *catmap, u32 offset);
+int netlbl_catmap_getlong(struct netlbl_lsm_catmap *catmap,
+                          u32 *offset,
+                          unsigned long *bitmap);
+int netlbl_catmap_setbit(struct netlbl_lsm_catmap **catmap,
+                         u32 bit,
+                         gfp_t flags);
+int netlbl_catmap_setrng(struct netlbl_lsm_catmap **catmap,
+                         u32 start,
+                         u32 end,
+                         gfp_t flags);
+int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
+                          u32 offset,
+                          unsigned long bitmap,
+                          gfp_t flags);
 
 /*
  * LSM protocol operations (NetLabel LSM/kernel API)
@@ -492,30 +495,39 @@ static inline int netlbl_cfg_cipsov4_map_add(u32 doi,
 {
         return -ENOSYS;
 }
-static inline int netlbl_secattr_catmap_walk(
-                                      struct netlbl_lsm_secattr_catmap *catmap,
-                                      u32 offset)
+static inline int netlbl_catmap_walk(struct netlbl_lsm_catmap *catmap,
+                                     u32 offset)
 {
         return -ENOENT;
 }
-static inline int netlbl_secattr_catmap_walk_rng(
-                                      struct netlbl_lsm_secattr_catmap *catmap,
-                                      u32 offset)
+static inline int netlbl_catmap_walkrng(struct netlbl_lsm_catmap *catmap,
+                                        u32 offset)
 {
         return -ENOENT;
 }
-static inline int netlbl_secattr_catmap_setbit(
-                                      struct netlbl_lsm_secattr_catmap *catmap,
-                                      u32 bit,
-                                      gfp_t flags)
+static inline int netlbl_catmap_getlong(struct netlbl_lsm_catmap *catmap,
+                                        u32 *offset,
+                                        unsigned long *bitmap)
 {
         return 0;
 }
-static inline int netlbl_secattr_catmap_setrng(
-                                      struct netlbl_lsm_secattr_catmap *catmap,
-                                      u32 start,
-                                      u32 end,
-                                      gfp_t flags)
+static inline int netlbl_catmap_setbit(struct netlbl_lsm_catmap **catmap,
+                                       u32 bit,
+                                       gfp_t flags)
+{
+        return 0;
+}
+static inline int netlbl_catmap_setrng(struct netlbl_lsm_catmap **catmap,
+                                       u32 start,
+                                       u32 end,
+                                       gfp_t flags)
+{
+        return 0;
+}
+static int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
+                                 u32 offset,
+                                 unsigned long bitmap,
+                                 gfp_t flags)
 {
         return 0;
 }
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 2b47eaadba8f..6c1076275aaa 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -949,12 +949,12 @@ static inline int nla_put_flag(struct sk_buff *skb, int attrtype)
  * nla_put_msecs - Add a msecs netlink attribute to a socket buffer
  * @skb: socket buffer to add attribute to
  * @attrtype: attribute type
- * @jiffies: number of msecs in jiffies
+ * @njiffies: number of jiffies to convert to msecs
  */
 static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
-                                unsigned long jiffies)
+                                unsigned long njiffies)
 {
-        u64 tmp = jiffies_to_msecs(jiffies);
+        u64 tmp = jiffies_to_msecs(njiffies);
         return nla_put(skb, attrtype, sizeof(u64), &tmp);
 }
 
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index 773cce308bc6..29d6a94db54d 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -4,6 +4,7 @@
 #include <linux/list.h>
 #include <linux/list_nulls.h>
 #include <linux/atomic.h>
+#include <linux/workqueue.h>
 #include <linux/netfilter/nf_conntrack_tcp.h>
 #include <linux/seqlock.h>
 
@@ -73,6 +74,10 @@ struct ct_pcpu {
 struct netns_ct {
         atomic_t                count;
         unsigned int            expect_count;
+#ifdef CONFIG_NF_CONNTRACK_EVENTS
+        struct delayed_work ecache_dwork;
+        bool ecache_dwork_pending;
+#endif
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *sysctl_header;
         struct ctl_table_header *acct_sysctl_header;
@@ -82,7 +87,6 @@ struct netns_ct {
 #endif
         char                    *slabname;
         unsigned int            sysctl_log_invalid; /* Log invalid packets */
-        unsigned int            sysctl_events_retry_timeout;
         int                     sysctl_events;
         int                     sysctl_acct;
         int                     sysctl_auto_assign_helper;
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 19d3446e59d2..eade27adecf3 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -28,6 +28,7 @@ struct netns_sysctl_ipv6 {
         int ip6_rt_mtu_expires;
         int ip6_rt_min_advmss;
         int flowlabel_consistency;
+        int auto_flowlabels;
         int icmpv6_time;
         int anycast_src_echo_reply;
         int fwmark_reflect;
diff --git a/include/net/netns/nftables.h b/include/net/netns/nftables.h
index 26a394cb91a8..eee608b12cc9 100644
--- a/include/net/netns/nftables.h
+++ b/include/net/netns/nftables.h
@@ -13,8 +13,8 @@ struct netns_nftables {
         struct nft_af_info      *inet;
         struct nft_af_info      *arp;
         struct nft_af_info      *bridge;
+        unsigned int            base_seq;
         u8                      gencursor;
-        u8                      genctr;
 };
 
 #endif
diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h
index 02fe40f8c8fd..c24060ee411e 100644
--- a/include/net/netns/x_tables.h
+++ b/include/net/netns/x_tables.h
@@ -15,11 +15,5 @@ struct netns_xt {
         struct ebt_table *frame_filter;
         struct ebt_table *frame_nat;
 #endif
-#if IS_ENABLED(CONFIG_IP_NF_TARGET_ULOG)
-        bool ulog_warn_deprecated;
-#endif
-#if IS_ENABLED(CONFIG_BRIDGE_EBT_ULOG)
-        bool ebt_ulog_warn_deprecated;
-#endif
 };
 #endif
diff --git a/include/net/nfc/digital.h b/include/net/nfc/digital.h
index bdf55c3b7a19..d9a5cf7ac1c4 100644
--- a/include/net/nfc/digital.h
+++ b/include/net/nfc/digital.h
@@ -49,6 +49,7 @@ enum {
         NFC_DIGITAL_FRAMING_NFCA_SHORT = 0,
         NFC_DIGITAL_FRAMING_NFCA_STANDARD,
         NFC_DIGITAL_FRAMING_NFCA_STANDARD_WITH_CRC_A,
+        NFC_DIGITAL_FRAMING_NFCA_ANTICOL_COMPLETE,
 
         NFC_DIGITAL_FRAMING_NFCA_T1T,
         NFC_DIGITAL_FRAMING_NFCA_T2T,
@@ -126,6 +127,15 @@ typedef void (*nfc_digital_cmd_complete_t)(struct nfc_digital_dev *ddev,
  *      the NFC-DEP ATR_REQ command through cb. The digital stack deducts the RF
  *      tech by analyzing the SoD of the frame containing the ATR_REQ command.
  *      This is an asynchronous function.
+ * @tg_listen_md: If supported, put the device in automatic listen mode with
+ *      mode detection but without automatic anti-collision. In this mode, the
+ *      device automatically detects the RF technology.  What the actual
+ *      RF technology is can be retrieved by calling @tg_get_rf_tech.
+ *      The digital stack will then perform the appropriate anti-collision
+ *      sequence.  This is an asynchronous function.
+ * @tg_get_rf_tech: Required when @tg_listen_md is supported, unused otherwise.
+ *      Return the RF Technology that was detected by the @tg_listen_md call.
+ *      This is a synchronous function.
  *
  * @switch_rf: Turns device radio on or off. The stack does not call explicitly
  *      switch_rf to turn the radio on. A call to in|tg_configure_hw must turn
@@ -160,6 +170,9 @@ struct nfc_digital_ops {
                               struct digital_tg_mdaa_params *mdaa_params,
                               u16 timeout, nfc_digital_cmd_complete_t cb,
                               void *arg);
+        int (*tg_listen_md)(struct nfc_digital_dev *ddev, u16 timeout,
+                            nfc_digital_cmd_complete_t cb, void *arg);
+        int (*tg_get_rf_tech)(struct nfc_digital_dev *ddev, u8 *rf_tech);
 
         int (*switch_rf)(struct nfc_digital_dev *ddev, bool on);
         void (*abort_cmd)(struct nfc_digital_dev *ddev);
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
index 61286db54388..7ee8f4cc610b 100644
--- a/include/net/nfc/hci.h
+++ b/include/net/nfc/hci.h
@@ -37,6 +37,7 @@ struct nfc_hci_ops {
         int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
         int (*start_poll) (struct nfc_hci_dev *hdev,
                            u32 im_protocols, u32 tm_protocols);
+        void (*stop_poll) (struct nfc_hci_dev *hdev);
         int (*dep_link_up)(struct nfc_hci_dev *hdev, struct nfc_target *target,
                            u8 comm_mode, u8 *gb, size_t gb_len);
         int (*dep_link_down)(struct nfc_hci_dev *hdev);
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index 72240e5ac2c4..e21b9f9653c0 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -136,6 +136,7 @@ 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,
+                                    unsigned char name_assign_type,
                                     const struct rtnl_link_ops *ops,
                                     struct nlattr *tb[]);
 int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm);
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 624f9857c83e..a3cfb8ebeb53 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -231,7 +231,7 @@ struct qdisc_skb_cb {
         unsigned int            pkt_len;
         u16                     slave_dev_queue_mapping;
         u16                     _pad;
-        unsigned char           data[20];
+        unsigned char           data[24];
 };
 
 static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz)
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h
index 4b7cd695e431..f22538e68245 100644
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
@@ -118,6 +118,7 @@ typedef enum {
 #define SCTP_MAX_NUM_COMMANDS 14
 
 typedef union {
+        void *zero_all; /* Set to NULL to clear the entire union */
         __s32 i32;
         __u32 u32;
         __be32 be32;
@@ -154,7 +155,7 @@ typedef union {
 static inline sctp_arg_t        \
 SCTP_## name (type arg)         \
 { sctp_arg_t retval;\
-  memset(&retval, 0, sizeof(sctp_arg_t));\
+  retval.zero_all = NULL;\
   retval.elt = arg;\
   return retval;\
 }
@@ -191,7 +192,7 @@ static inline sctp_arg_t SCTP_NOFORCE(void)
 static inline sctp_arg_t SCTP_NULL(void)
 {
         sctp_arg_t retval;
-        memset(&retval, 0, sizeof(sctp_arg_t));
+        retval.zero_all = NULL;
         return retval;
 }
 
@@ -202,27 +203,49 @@ typedef struct {
 
 typedef struct {
         sctp_cmd_t cmds[SCTP_MAX_NUM_COMMANDS];
-        __u8 next_free_slot;
-        __u8 next_cmd;
+        sctp_cmd_t *last_used_slot;
+        sctp_cmd_t *next_cmd;
 } sctp_cmd_seq_t;
 
 
 /* Initialize a block of memory as a command sequence.
  * Return 0 if the initialization fails.
  */
-int sctp_init_cmd_seq(sctp_cmd_seq_t *seq);
+static inline int sctp_init_cmd_seq(sctp_cmd_seq_t *seq)
+{
+        /* cmds[] is filled backwards to simplify the overflow BUG() check */
+        seq->last_used_slot = seq->cmds + SCTP_MAX_NUM_COMMANDS;
+        seq->next_cmd = seq->last_used_slot;
+        return 1;               /* We always succeed.  */
+}
+
 
 /* Add a command to an sctp_cmd_seq_t.
  *
  * Use the SCTP_* constructors defined by SCTP_ARG_CONSTRUCTOR() above
  * to wrap data which goes in the obj argument.
  */
-void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj);
+static inline void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb,
+                                   sctp_arg_t obj)
+{
+        sctp_cmd_t *cmd = seq->last_used_slot - 1;
+
+        BUG_ON(cmd < seq->cmds);
+
+        cmd->verb = verb;
+        cmd->obj = obj;
+        seq->last_used_slot = cmd;
+}
 
 /* Return the next command structure in an sctp_cmd_seq.
  * Return NULL at the end of the sequence.
  */
-sctp_cmd_t *sctp_next_cmd(sctp_cmd_seq_t *seq);
+static inline sctp_cmd_t *sctp_next_cmd(sctp_cmd_seq_t *seq)
+{
+        if (seq->next_cmd <= seq->last_used_slot)
+                return NULL;
 
-#endif /* __net_sctp_command_h__ */
+        return --seq->next_cmd;
+}
 
+#endif /* __net_sctp_command_h__ */
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index 307728f622ef..8c337cd0e1e4 100644
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -311,7 +311,7 @@ typedef enum {
         SCTP_XMIT_OK,
         SCTP_XMIT_PMTU_FULL,
         SCTP_XMIT_RWND_FULL,
-        SCTP_XMIT_NAGLE_DELAY,
+        SCTP_XMIT_DELAY,
 } sctp_xmit_t;
 
 /* These are the commands for manipulating transports.  */
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 8e4de46c052e..f6e7397e799d 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -109,6 +109,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk,
                     struct sctp_association *asoc);
 extern struct percpu_counter sctp_sockets_allocated;
 int sctp_asconf_mgmt(struct sctp_sock *, struct sctp_sockaddr_entry *);
+struct sk_buff *sctp_skb_recv_datagram(struct sock *, int, int, int *);
 
 /*
  * sctp/primitive.c
@@ -388,27 +389,6 @@ static inline int sctp_list_single_entry(struct list_head *head)
         return (head->next != head) && (head->next == head->prev);
 }
 
-/* Generate a random jitter in the range of -50% ~ +50% of input RTO. */
-static inline __s32 sctp_jitter(__u32 rto)
-{
-        static __u32 sctp_rand;
-        __s32 ret;
-
-        /* Avoid divide by zero. */
-        if (!rto)
-                rto = 1;
-
-        sctp_rand += jiffies;
-        sctp_rand ^= (sctp_rand << 12);
-        sctp_rand ^= (sctp_rand >> 20);
-
-        /* Choose random number from 0 to rto, then move to -50% ~ +50%
-         * of rto.
-         */
-        ret = sctp_rand % rto - (rto >> 1);
-        return ret;
-}
-
 /* Break down data chunks at this point.  */
 static inline int sctp_frag_point(const struct sctp_association *asoc, int pmtu)
 {
@@ -574,6 +554,8 @@ static inline void sctp_v6_map_v4(union sctp_addr *addr)
 static inline void sctp_v4_map_v6(union sctp_addr *addr)
 {
         addr->v6.sin6_family = AF_INET6;
+        addr->v6.sin6_flowinfo = 0;
+        addr->v6.sin6_scope_id = 0;
         addr->v6.sin6_port = addr->v4.sin_port;
         addr->v6.sin6_addr.s6_addr32[3] = addr->v4.sin_addr.s_addr;
         addr->v6.sin6_addr.s6_addr32[0] = 0;
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index f38588bf3462..4ff3f67be62c 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -207,7 +207,9 @@ struct sctp_sock {
         struct sctp_paddrparams paddrparam;
         struct sctp_event_subscribe subscribe;
         struct sctp_assocparams assocparams;
+
         int user_frag;
+
         __u32 autoclose;
         __u8 nodelay;
         __u8 disable_fragments;
@@ -215,6 +217,8 @@ struct sctp_sock {
         __u8 frag_interleave;
         __u32 adaptation_ind;
         __u32 pd_point;
+        __u8 recvrcvinfo;
+        __u8 recvnxtinfo;
 
         atomic_t pd_mode;
         /* Receive to here while partial delivery is in effect. */
@@ -461,10 +465,6 @@ struct sctp_af {
                                          int saddr);
         void            (*from_sk)      (union sctp_addr *,
                                          struct sock *sk);
-        void            (*to_sk_saddr)  (union sctp_addr *,
-                                         struct sock *sk);
-        void            (*to_sk_daddr)  (union sctp_addr *,
-                                         struct sock *sk);
         void            (*from_addr_param) (union sctp_addr *,
                                             union sctp_addr_param *,
                                             __be16 port, int iif);
@@ -505,7 +505,9 @@ struct sctp_pf {
         int  (*supported_addrs)(const struct sctp_sock *, __be16 *);
         struct sock *(*create_accept_sk) (struct sock *sk,
                                           struct sctp_association *asoc);
-        void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
+        int (*addr_to_user)(struct sctp_sock *sk, union sctp_addr *addr);
+        void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
+        void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
         struct sctp_af *af;
 };
 
@@ -1919,7 +1921,8 @@ struct sctp_chunk *sctp_get_ecne_prepend(struct sctp_association *asoc);
 /* A convenience structure to parse out SCTP specific CMSGs. */
 typedef struct sctp_cmsgs {
         struct sctp_initmsg *init;
-        struct sctp_sndrcvinfo *info;
+        struct sctp_sndrcvinfo *srinfo;
+        struct sctp_sndinfo *sinfo;
 } sctp_cmsgs_t;
 
 /* Structure for tracking memory objects */
diff --git a/include/net/sctp/ulpevent.h b/include/net/sctp/ulpevent.h
index daacb32b55b5..cccdcfd14973 100644
--- a/include/net/sctp/ulpevent.h
+++ b/include/net/sctp/ulpevent.h
@@ -129,7 +129,12 @@ struct sctp_ulpevent *sctp_ulpevent_make_sender_dry_event(
         const struct sctp_association *asoc, gfp_t gfp);
 
 void sctp_ulpevent_read_sndrcvinfo(const struct sctp_ulpevent *event,
-        struct msghdr *);
+                                   struct msghdr *);
+void sctp_ulpevent_read_rcvinfo(const struct sctp_ulpevent *event,
+                                struct msghdr *);
+void sctp_ulpevent_read_nxtinfo(const struct sctp_ulpevent *event,
+                                struct msghdr *, struct sock *sk);
+
 __u16 sctp_ulpevent_get_notification_type(const struct sctp_ulpevent *event);
 
 /* Is this event type enabled? */
@@ -155,10 +160,3 @@ static inline int sctp_ulpevent_is_enabled(const struct sctp_ulpevent *event,
 }
 
 #endif /* __sctp_ulpevent_h__ */
-
-
-
-
-
-
-
diff --git a/include/net/sock.h b/include/net/sock.h
index 156350745700..52fe0bc5598a 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -67,6 +67,7 @@
 #include <linux/atomic.h>
 #include <net/dst.h>
 #include <net/checksum.h>
+#include <linux/net_tstamp.h>
 
 struct cgroup;
 struct cgroup_subsys;
@@ -181,7 +182,8 @@ struct sock_common {
         unsigned short          skc_family;
         volatile unsigned char  skc_state;
         unsigned char           skc_reuse:4;
-        unsigned char           skc_reuseport:4;
+        unsigned char           skc_reuseport:1;
+        unsigned char           skc_ipv6only:1;
         int                     skc_bound_dev_if;
         union {
                 struct hlist_node       skc_bind_node;
@@ -272,10 +274,13 @@ struct cg_proto;
   *     @sk_rcvtimeo: %SO_RCVTIMEO setting
   *     @sk_sndtimeo: %SO_SNDTIMEO setting
   *     @sk_rxhash: flow hash received from netif layer
+  *     @sk_txhash: computed flow hash for use on transmit
   *     @sk_filter: socket filtering instructions
   *     @sk_protinfo: private area, net family specific, when not using slab
   *     @sk_timer: sock cleanup timer
   *     @sk_stamp: time stamp of last packet received
+  *     @sk_tsflags: SO_TIMESTAMPING socket options
+  *     @sk_tskey: counter to disambiguate concurrent tstamp requests
   *     @sk_socket: Identd and reporting IO signals
   *     @sk_user_data: RPC layer private data
   *     @sk_frag: cached page frag
@@ -317,6 +322,7 @@ struct sock {
 #define sk_state                __sk_common.skc_state
 #define sk_reuse                __sk_common.skc_reuse
 #define sk_reuseport            __sk_common.skc_reuseport
+#define sk_ipv6only             __sk_common.skc_ipv6only
 #define sk_bound_dev_if         __sk_common.skc_bound_dev_if
 #define sk_bind_node            __sk_common.skc_bind_node
 #define sk_prot                 __sk_common.skc_prot
@@ -345,6 +351,7 @@ struct sock {
 #ifdef CONFIG_RPS
         __u32                   sk_rxhash;
 #endif
+        __u32                   sk_txhash;
 #ifdef CONFIG_NET_RX_BUSY_POLL
         unsigned int            sk_napi_id;
         unsigned int            sk_ll_usec;
@@ -407,6 +414,8 @@ struct sock {
         void                    *sk_protinfo;
         struct timer_list       sk_timer;
         ktime_t                 sk_stamp;
+        u16                     sk_tsflags;
+        u32                     sk_tskey;
         struct socket           *sk_socket;
         void                    *sk_user_data;
         struct page_frag        sk_frag;
@@ -656,6 +665,20 @@ static inline void sk_add_bind_node(struct sock *sk,
 #define sk_for_each_bound(__sk, list) \
         hlist_for_each_entry(__sk, list, sk_bind_node)
 
+/**
+ * sk_nulls_for_each_entry_offset - iterate over a list at a given struct offset
+ * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the &struct hlist_node to use as a loop cursor.
+ * @head:       the head for your list.
+ * @offset:     offset of hlist_node within the struct.
+ *
+ */
+#define sk_nulls_for_each_entry_offset(tpos, pos, head, offset)                \
+        for (pos = (head)->first;                                              \
+             (!is_a_nulls(pos)) &&                                             \
+                ({ tpos = (typeof(*tpos) *)((void *)pos - offset); 1;});       \
+             pos = pos->next)
+
 static inline struct user_namespace *sk_user_ns(struct sock *sk)
 {
         /* Careful only use this in a context where these parameters
@@ -683,13 +706,7 @@ enum sock_flags {
         SOCK_LOCALROUTE, /* route locally only, %SO_DONTROUTE setting */
         SOCK_QUEUE_SHRUNK, /* write queue has been shrunk recently */
         SOCK_MEMALLOC, /* VM depends on this socket for swapping */
-        SOCK_TIMESTAMPING_TX_HARDWARE,  /* %SOF_TIMESTAMPING_TX_HARDWARE */
-        SOCK_TIMESTAMPING_TX_SOFTWARE,  /* %SOF_TIMESTAMPING_TX_SOFTWARE */
-        SOCK_TIMESTAMPING_RX_HARDWARE,  /* %SOF_TIMESTAMPING_RX_HARDWARE */
         SOCK_TIMESTAMPING_RX_SOFTWARE,  /* %SOF_TIMESTAMPING_RX_SOFTWARE */
-        SOCK_TIMESTAMPING_SOFTWARE,     /* %SOF_TIMESTAMPING_SOFTWARE */
-        SOCK_TIMESTAMPING_RAW_HARDWARE, /* %SOF_TIMESTAMPING_RAW_HARDWARE */
-        SOCK_TIMESTAMPING_SYS_HARDWARE, /* %SOF_TIMESTAMPING_SYS_HARDWARE */
         SOCK_FASYNC, /* fasync() active */
         SOCK_RXQ_OVFL,
         SOCK_ZEROCOPY, /* buffers from userspace */
@@ -792,8 +809,7 @@ static inline void __sk_add_backlog(struct sock *sk, struct sk_buff *skb)
  * Do not take into account this skb truesize,
  * to allow even a single big packet to come.
  */
-static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff *skb,
-                                     unsigned int limit)
+static inline bool sk_rcvqueues_full(const struct sock *sk, unsigned int limit)
 {
         unsigned int qsize = sk->sk_backlog.len + atomic_read(&sk->sk_rmem_alloc);
 
@@ -804,7 +820,7 @@ static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff
 static inline __must_check int sk_add_backlog(struct sock *sk, struct sk_buff *skb,
                                               unsigned int limit)
 {
-        if (sk_rcvqueues_full(sk, skb, limit))
+        if (sk_rcvqueues_full(sk, limit))
                 return -ENOBUFS;
 
         __sk_add_backlog(sk, skb);
@@ -1978,6 +1994,14 @@ static inline void sock_poll_wait(struct file *filp,
         }
 }
 
+static inline void skb_set_hash_from_sk(struct sk_buff *skb, struct sock *sk)
+{
+        if (sk->sk_txhash) {
+                skb->l4_hash = 1;
+                skb->hash = sk->sk_txhash;
+        }
+}
+
 /*
  *      Queue a received datagram if it will fit. Stream and sequenced
  *      protocols can't normally use this as they need to fit buffers in
@@ -1992,6 +2016,7 @@ static inline void skb_set_owner_w(struct sk_buff *skb, struct sock *sk)
         skb_orphan(skb);
         skb->sk = sk;
         skb->destructor = sock_wfree;
+        skb_set_hash_from_sk(skb, sk);
         /*
          * We used to take a refcount on sk, but following operation
          * is enough to guarantee sk_free() wont free this sock until
@@ -2135,21 +2160,17 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
 
         /*
          * generate control messages if
-         * - receive time stamping in software requested (SOCK_RCVTSTAMP
-         *   or SOCK_TIMESTAMPING_RX_SOFTWARE)
+         * - receive time stamping in software requested
          * - software time stamp available and wanted
-         *   (SOCK_TIMESTAMPING_SOFTWARE)
          * - hardware time stamps available and wanted
-         *   (SOCK_TIMESTAMPING_SYS_HARDWARE or
-         *   SOCK_TIMESTAMPING_RAW_HARDWARE)
          */
         if (sock_flag(sk, SOCK_RCVTSTAMP) ||
-            sock_flag(sk, SOCK_TIMESTAMPING_RX_SOFTWARE) ||
-            (kt.tv64 && sock_flag(sk, SOCK_TIMESTAMPING_SOFTWARE)) ||
+            (sk->sk_tsflags & SOF_TIMESTAMPING_RX_SOFTWARE) ||
+            (kt.tv64 &&
+             (sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE ||
+              skb_shinfo(skb)->tx_flags & SKBTX_ANY_SW_TSTAMP)) ||
             (hwtstamps->hwtstamp.tv64 &&
-             sock_flag(sk, SOCK_TIMESTAMPING_RAW_HARDWARE)) ||
-            (hwtstamps->syststamp.tv64 &&
-             sock_flag(sk, SOCK_TIMESTAMPING_SYS_HARDWARE)))
+             (sk->sk_tsflags & SOF_TIMESTAMPING_RAW_HARDWARE)))
                 __sock_recv_timestamp(msg, sk, skb);
         else
                 sk->sk_stamp = kt;
@@ -2165,12 +2186,11 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
                                           struct sk_buff *skb)
 {
 #define FLAGS_TS_OR_DROPS ((1UL << SOCK_RXQ_OVFL)                       | \
-                           (1UL << SOCK_RCVTSTAMP)                      | \
-                           (1UL << SOCK_TIMESTAMPING_SOFTWARE)          | \
-                           (1UL << SOCK_TIMESTAMPING_RAW_HARDWARE)      | \
-                           (1UL << SOCK_TIMESTAMPING_SYS_HARDWARE))
+                           (1UL << SOCK_RCVTSTAMP))
+#define TSFLAGS_ANY       (SOF_TIMESTAMPING_SOFTWARE                    | \
+                           SOF_TIMESTAMPING_RAW_HARDWARE)
 
-        if (sk->sk_flags & FLAGS_TS_OR_DROPS)
+        if (sk->sk_flags & FLAGS_TS_OR_DROPS || sk->sk_tsflags & TSFLAGS_ANY)
                 __sock_recv_ts_and_drops(msg, sk, skb);
         else
                 sk->sk_stamp = skb->tstamp;
@@ -2180,8 +2200,6 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
  * sock_tx_timestamp - checks whether the outgoing packet is to be time stamped
  * @sk:         socket sending this packet
  * @tx_flags:   filled with instructions for time stamping
- *
- * Currently only depends on SOCK_TIMESTAMPING* flags.
  */
 void sock_tx_timestamp(struct sock *sk, __u8 *tx_flags);
 
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 7286db80e8b8..dafa1cbc149b 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -411,7 +411,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
                            bool fastopen);
 int tcp_child_process(struct sock *parent, struct sock *child,
                       struct sk_buff *skb);
-void tcp_enter_loss(struct sock *sk, int how);
+void tcp_enter_loss(struct sock *sk);
 void tcp_clear_retrans(struct tcp_sock *tp);
 void tcp_update_metrics(struct sock *sk);
 void tcp_init_metrics(struct sock *sk);
@@ -493,14 +493,8 @@ static inline u32 tcp_cookie_time(void)
 
 u32 __cookie_v4_init_sequence(const struct iphdr *iph, const struct tcphdr *th,
                               u16 *mssp);
-__u32 cookie_v4_init_sequence(struct sock *sk, struct sk_buff *skb, __u16 *mss);
-#else
-static inline __u32 cookie_v4_init_sequence(struct sock *sk,
-                                            struct sk_buff *skb,
-                                            __u16 *mss)
-{
-        return 0;
-}
+__u32 cookie_v4_init_sequence(struct sock *sk, const struct sk_buff *skb,
+                              __u16 *mss);
 #endif
 
 __u32 cookie_init_timestamp(struct request_sock *req);
@@ -516,13 +510,6 @@ u32 __cookie_v6_init_sequence(const struct ipv6hdr *iph,
                               const struct tcphdr *th, u16 *mssp);
 __u32 cookie_v6_init_sequence(struct sock *sk, const struct sk_buff *skb,
                               __u16 *mss);
-#else
-static inline __u32 cookie_v6_init_sequence(struct sock *sk,
-                                            struct sk_buff *skb,
-                                            __u16 *mss)
-{
-        return 0;
-}
 #endif
 /* tcp_output.c */
 
@@ -941,7 +928,7 @@ static inline __u32 tcp_current_ssthresh(const struct sock *sk)
 /* Use define here intentionally to get WARN_ON location shown at the caller */
 #define tcp_verify_left_out(tp) WARN_ON(tcp_left_out(tp) > tp->packets_out)
 
-void tcp_enter_cwr(struct sock *sk, const int set_ssthresh);
+void tcp_enter_cwr(struct sock *sk);
 __u32 tcp_init_cwnd(const struct tcp_sock *tp, const struct dst_entry *dst);
 
 /* The maximum number of MSS of available cwnd for which TSO defers
@@ -1098,7 +1085,7 @@ static inline int tcp_full_space(const struct sock *sk)
 
 static inline void tcp_openreq_init(struct request_sock *req,
                                     struct tcp_options_received *rx_opt,
-                                    struct sk_buff *skb)
+                                    struct sk_buff *skb, struct sock *sk)
 {
         struct inet_request_sock *ireq = inet_rsk(req);
 
@@ -1106,7 +1093,7 @@ static inline void tcp_openreq_init(struct request_sock *req,
         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 = 0;
+        tcp_rsk(req)->snt_synack = tcp_time_stamp;
         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;
@@ -1117,6 +1104,7 @@ static inline void tcp_openreq_init(struct request_sock *req,
         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,
@@ -1585,6 +1573,11 @@ int tcp4_proc_init(void);
 void tcp4_proc_exit(void);
 #endif
 
+int tcp_rtx_synack(struct sock *sk, struct request_sock *req);
+int tcp_conn_request(struct request_sock_ops *rsk_ops,
+                     const struct tcp_request_sock_ops *af_ops,
+                     struct sock *sk, struct sk_buff *skb);
+
 /* TCP af-specific functions */
 struct tcp_sock_af_ops {
 #ifdef CONFIG_TCP_MD5SIG
@@ -1602,6 +1595,7 @@ struct tcp_sock_af_ops {
 };
 
 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);
@@ -1611,8 +1605,39 @@ struct tcp_request_sock_ops {
                                                   const struct request_sock *req,
                                                   const struct sk_buff *skb);
 #endif
+        void (*init_req)(struct request_sock *req, struct sock *sk,
+                         struct sk_buff *skb);
+#ifdef CONFIG_SYN_COOKIES
+        __u32 (*cookie_init_seq)(struct sock *sk, const struct sk_buff *skb,
+                                 __u16 *mss);
+#endif
+        struct dst_entry *(*route_req)(struct sock *sk, struct flowi *fl,
+                                       const struct request_sock *req,
+                                       bool *strict);
+        __u32 (*init_seq)(const struct sk_buff *skb);
+        int (*send_synack)(struct sock *sk, struct dst_entry *dst,
+                           struct flowi *fl, struct request_sock *req,
+                           u16 queue_mapping, struct tcp_fastopen_cookie *foc);
+        void (*queue_hash_add)(struct sock *sk, struct request_sock *req,
+                               const unsigned long timeout);
 };
 
+#ifdef CONFIG_SYN_COOKIES
+static inline __u32 cookie_init_sequence(const struct tcp_request_sock_ops *ops,
+                                         struct sock *sk, struct sk_buff *skb,
+                                         __u16 *mss)
+{
+        return ops->cookie_init_seq(sk, skb, mss);
+}
+#else
+static inline __u32 cookie_init_sequence(const struct tcp_request_sock_ops *ops,
+                                         struct sock *sk, struct sk_buff *skb,
+                                         __u16 *mss)
+{
+        return 0;
+}
+#endif
+
 int tcpv4_offload_init(void);
 
 void tcp_v4_init(void);
diff --git a/include/net/udp.h b/include/net/udp.h
index 68a1fefe3dfe..70f941368ace 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -176,6 +176,35 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,
                      int (*)(const struct sock *, const struct sock *),
                      unsigned int hash2_nulladdr);
 
+static inline __be16 udp_flow_src_port(struct net *net, struct sk_buff *skb,
+                                       int min, int max, bool use_eth)
+{
+        u32 hash;
+
+        if (min >= max) {
+                /* Use default range */
+                inet_get_local_port_range(net, &min, &max);
+        }
+
+        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);
+        }
+
+        /* Since this is being sent on the wire obfuscate hash a bit
+         * to minimize possbility that any useful information to an
+         * attacker is leaked. Only upper 16 bits are relevant in the
+         * computation for 16 bit port value.
+         */
+        hash ^= hash << 16;
+
+        return htons((((u64) hash * (max - min)) >> 32) + min);
+}
+
 /* net/ipv4/udp.c */
 void udp_v4_early_demux(struct sk_buff *skb);
 int udp_get_port(struct sock *sk, unsigned short snum,
diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h
new file mode 100644
index 000000000000..ffd69cbded35
--- /dev/null
+++ b/include/net/udp_tunnel.h
@@ -0,0 +1,32 @@
+#ifndef __NET_UDP_TUNNEL_H
+#define __NET_UDP_TUNNEL_H
+
+struct udp_port_cfg {
+        u8                      family;
+
+        /* Used only for kernel-created sockets */
+        union {
+                struct in_addr          local_ip;
+#if IS_ENABLED(CONFIG_IPV6)
+                struct in6_addr         local_ip6;
+#endif
+        };
+
+        union {
+                struct in_addr          peer_ip;
+#if IS_ENABLED(CONFIG_IPV6)
+                struct in6_addr         peer_ip6;
+#endif
+        };
+
+        __be16                  local_udp_port;
+        __be16                  peer_udp_port;
+        unsigned int            use_udp_checksums:1,
+                                use_udp6_tx_checksums:1,
+                                use_udp6_rx_checksums:1;
+};
+
+int udp_sock_create(struct net *net, struct udp_port_cfg *cfg,
+                    struct socket **sockp);
+
+#endif
diff --git a/include/net/vxlan.h b/include/net/vxlan.h
index 12196ce661d9..d5f59f3fc35d 100644
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
@@ -45,8 +45,6 @@ int vxlan_xmit_skb(struct vxlan_sock *vs,
                    __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df,
                    __be16 src_port, __be16 dst_port, __be32 vni, bool xnet);
 
-__be16 vxlan_src_port(__u16 port_min, __u16 port_max, struct sk_buff *skb);
-
 /* IP header + UDP + VXLAN + Ethernet header */
 #define VXLAN_HEADROOM (20 + 8 + 8 + 14)
 /* IPv6 header + UDP + VXLAN + Ethernet header */
diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index 21cdb0b7b0fb..47da53c27ffa 100644
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -8,6 +8,71 @@
 #include <linux/tracepoint.h>
 #include <linux/edac.h>
 #include <linux/ktime.h>
+#include <linux/aer.h>
+#include <linux/cper.h>
+
+/*
+ * MCE Extended Error Log trace event
+ *
+ * These events are generated when hardware detects a corrected or
+ * uncorrected event.
+ */
+
+/* memory trace event */
+
+#if defined(CONFIG_ACPI_EXTLOG) || defined(CONFIG_ACPI_EXTLOG_MODULE)
+TRACE_EVENT(extlog_mem_event,
+        TP_PROTO(struct cper_sec_mem_err *mem,
+                 u32 err_seq,
+                 const uuid_le *fru_id,
+                 const char *fru_text,
+                 u8 sev),
+
+        TP_ARGS(mem, err_seq, fru_id, fru_text, sev),
+
+        TP_STRUCT__entry(
+                __field(u32, err_seq)
+                __field(u8, etype)
+                __field(u8, sev)
+                __field(u64, pa)
+                __field(u8, pa_mask_lsb)
+                __field_struct(uuid_le, fru_id)
+                __string(fru_text, fru_text)
+                __field_struct(struct cper_mem_err_compact, data)
+        ),
+
+        TP_fast_assign(
+                __entry->err_seq = err_seq;
+                if (mem->validation_bits & CPER_MEM_VALID_ERROR_TYPE)
+                        __entry->etype = mem->error_type;
+                else
+                        __entry->etype = ~0;
+                __entry->sev = sev;
+                if (mem->validation_bits & CPER_MEM_VALID_PA)
+                        __entry->pa = mem->physical_addr;
+                else
+                        __entry->pa = ~0ull;
+
+                if (mem->validation_bits & CPER_MEM_VALID_PA_MASK)
+                        __entry->pa_mask_lsb = (u8)__ffs64(mem->physical_addr_mask);
+                else
+                        __entry->pa_mask_lsb = ~0;
+                __entry->fru_id = *fru_id;
+                __assign_str(fru_text, fru_text);
+                cper_mem_err_pack(mem, &__entry->data);
+        ),
+
+        TP_printk("{%d} %s error: %s physical addr: %016llx (mask lsb: %x) %sFRU: %pUl %.20s",
+                  __entry->err_seq,
+                  cper_severity_str(__entry->sev),
+                  cper_mem_err_type_str(__entry->etype),
+                  __entry->pa,
+                  __entry->pa_mask_lsb,
+                  cper_mem_err_unpack(p, &__entry->data),
+                  &__entry->fru_id,
+                  __get_str(fru_text))
+);
+#endif
 
 /*
  * Hardware Events Report
@@ -94,6 +159,69 @@ TRACE_EVENT(mc_event,
                   __get_str(driver_detail))
 );
 
+/*
+ * PCIe AER Trace event
+ *
+ * These events are generated when hardware detects a corrected or
+ * uncorrected event on a PCIe device. The event report has
+ * the following structure:
+ *
+ * char * dev_name -    The name of the slot where the device resides
+ *                      ([domain:]bus:device.function).
+ * u32 status -         Either the correctable or uncorrectable register
+ *                      indicating what error or errors have been seen
+ * u8 severity -        error severity 0:NONFATAL 1:FATAL 2:CORRECTED
+ */
+
+#define aer_correctable_errors          \
+        {BIT(0),        "Receiver Error"},              \
+        {BIT(6),        "Bad TLP"},                     \
+        {BIT(7),        "Bad DLLP"},                    \
+        {BIT(8),        "RELAY_NUM Rollover"},          \
+        {BIT(12),       "Replay Timer Timeout"},        \
+        {BIT(13),       "Advisory Non-Fatal"}
+
+#define aer_uncorrectable_errors                \
+        {BIT(4),        "Data Link Protocol"},          \
+        {BIT(12),       "Poisoned TLP"},                \
+        {BIT(13),       "Flow Control Protocol"},       \
+        {BIT(14),       "Completion Timeout"},          \
+        {BIT(15),       "Completer Abort"},             \
+        {BIT(16),       "Unexpected Completion"},       \
+        {BIT(17),       "Receiver Overflow"},           \
+        {BIT(18),       "Malformed TLP"},               \
+        {BIT(19),       "ECRC"},                        \
+        {BIT(20),       "Unsupported Request"}
+
+TRACE_EVENT(aer_event,
+        TP_PROTO(const char *dev_name,
+                 const u32 status,
+                 const u8 severity),
+
+        TP_ARGS(dev_name, status, severity),
+
+        TP_STRUCT__entry(
+                __string(       dev_name,       dev_name        )
+                __field(        u32,            status          )
+                __field(        u8,             severity        )
+        ),
+
+        TP_fast_assign(
+                __assign_str(dev_name, dev_name);
+                __entry->status         = status;
+                __entry->severity       = severity;
+        ),
+
+        TP_printk("%s PCIe Bus Error: severity=%s, %s\n",
+                __get_str(dev_name),
+                __entry->severity == AER_CORRECTABLE ? "Corrected" :
+                        __entry->severity == AER_FATAL ?
+                        "Fatal" : "Uncorrected, non-fatal",
+                __entry->severity == AER_CORRECTABLE ?
+                __print_flags(__entry->status, "|", aer_correctable_errors) :
+                __print_flags(__entry->status, "|", aer_uncorrectable_errors))
+);
+
 #endif /* _TRACE_HW_EVENT_MC_H */
 
 /* This part must be outside protection */
diff --git a/include/scsi/libsrp.h b/include/scsi/libsrp.h
deleted file mode 100644
index f4105c91af53..000000000000
--- a/include/scsi/libsrp.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef __LIBSRP_H__
-#define __LIBSRP_H__
-
-#include <linux/list.h>
-#include <linux/kfifo.h>
-#include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_host.h>
-#include <scsi/srp.h>
-
-enum iue_flags {
-        V_DIOVER,
-        V_WRITE,
-        V_LINKED,
-        V_FLYING,
-};
-
-struct srp_buf {
-        dma_addr_t dma;
-        void *buf;
-};
-
-struct srp_queue {
-        void *pool;
-        void *items;
-        struct kfifo queue;
-        spinlock_t lock;
-};
-
-struct srp_target {
-        struct Scsi_Host *shost;
-        struct device *dev;
-
-        spinlock_t lock;
-        struct list_head cmd_queue;
-
-        size_t srp_iu_size;
-        struct srp_queue iu_queue;
-        size_t rx_ring_size;
-        struct srp_buf **rx_ring;
-
-        void *ldata;
-};
-
-struct iu_entry {
-        struct srp_target *target;
-
-        struct list_head ilist;
-        dma_addr_t remote_token;
-        unsigned long flags;
-
-        struct srp_buf *sbuf;
-};
-
-typedef int (srp_rdma_t)(struct scsi_cmnd *, struct scatterlist *, int,
-                         struct srp_direct_buf *, int,
-                         enum dma_data_direction, unsigned int);
-extern int srp_target_alloc(struct srp_target *, struct device *, size_t, size_t);
-extern void srp_target_free(struct srp_target *);
-
-extern struct iu_entry *srp_iu_get(struct srp_target *);
-extern void srp_iu_put(struct iu_entry *);
-
-extern int srp_cmd_queue(struct Scsi_Host *, struct srp_cmd *, void *, u64, u64);
-extern int srp_transfer_data(struct scsi_cmnd *, struct srp_cmd *,
-                             srp_rdma_t, int, int);
-
-
-static inline struct srp_target *host_to_srp_target(struct Scsi_Host *host)
-{
-        return (struct srp_target *) host->hostdata;
-}
-
-static inline int srp_cmd_direction(struct srp_cmd *cmd)
-{
-        return (cmd->buf_fmt >> 4) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
-}
-
-#endif
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 0a4edfe8af51..e6df23cae7be 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -332,6 +332,7 @@ static inline int scsi_status_is_good(int status)
 #define TYPE_ENCLOSURE      0x0d    /* Enclosure Services Device */
 #define TYPE_RBC            0x0e
 #define TYPE_OSD            0x11
+#define TYPE_ZBC            0x14
 #define TYPE_NO_LUN         0x7f
 
 /* SCSI protocols; these are taken from SPC-3 section 7.5 */
@@ -385,7 +386,7 @@ struct scsi_lun {
 #define SCSI_W_LUN_ACCESS_CONTROL (SCSI_W_LUN_BASE + 2)
 #define SCSI_W_LUN_TARGET_LOG_PAGE (SCSI_W_LUN_BASE + 3)
 
-static inline int scsi_is_wlun(unsigned int lun)
+static inline int scsi_is_wlun(u64 lun)
 {
         return (lun & 0xff00) == SCSI_W_LUN_BASE;
 }
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index e0ae71098144..73f349044941 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -150,9 +150,7 @@ static inline struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd)
 }
 
 extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
-extern struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *, gfp_t);
 extern void scsi_put_command(struct scsi_cmnd *);
-extern void __scsi_put_command(struct Scsi_Host *, struct scsi_cmnd *);
 extern void scsi_finish_command(struct scsi_cmnd *cmd);
 
 extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,
@@ -160,7 +158,6 @@ extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,
 extern void scsi_kunmap_atomic_sg(void *virt);
 
 extern int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask);
-extern void scsi_release_buffers(struct scsi_cmnd *cmd);
 
 extern int scsi_dma_map(struct scsi_cmnd *cmd);
 extern void scsi_dma_unmap(struct scsi_cmnd *cmd);
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 27ab31017f09..1a0d1842962e 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -81,9 +81,9 @@ struct scsi_device {
         struct list_head    siblings;   /* list of all devices on this host */
         struct list_head    same_target_siblings; /* just the devices sharing same target id */
 
-        /* this is now protected by the request_queue->queue_lock */
-        unsigned int device_busy;       /* commands actually active on
-                                         * low-level. protected by queue_lock. */
+        atomic_t device_busy;           /* commands actually active on LLDD */
+        atomic_t device_blocked;        /* Device returned QUEUE_FULL. */
+
         spinlock_t list_lock;
         struct list_head cmd_list;      /* queue of in use SCSI Command structures */
         struct list_head starved_entry;
@@ -98,8 +98,8 @@ struct scsi_device {
 
         unsigned long last_queue_ramp_up;       /* last queue ramp up time */
 
-        unsigned int id, lun, channel;
-
+        unsigned int id, channel;
+        u64 lun;
         unsigned int manufacturer;      /* Manufacturer of device, for using 
                                          * vendor-specific cmd's */
         unsigned sector_size;   /* size in bytes */
@@ -127,7 +127,6 @@ struct scsi_device {
                                  * pass settings from slave_alloc to scsi
                                  * core. */
         unsigned int eh_timeout; /* Error handling timeout */
-        unsigned writeable:1;
         unsigned removable:1;
         unsigned changed:1;     /* Data invalid due to media change */
         unsigned busy:1;        /* Used to prevent races */
@@ -155,6 +154,7 @@ struct scsi_device {
         unsigned skip_ms_page_8:1;      /* do not use MODE SENSE page 0x08 */
         unsigned skip_ms_page_3f:1;     /* do not use MODE SENSE page 0x3f */
         unsigned skip_vpd_pages:1;      /* do not read VPD pages */
+        unsigned try_vpd_pages:1;       /* attempt to read VPD pages */
         unsigned use_192_bytes_for_3f:1; /* ask for 192 bytes from page 0x3f */
         unsigned no_start_on_add:1;     /* do not issue start on add */
         unsigned allow_restart:1; /* issue START_UNIT in error handler */
@@ -182,8 +182,6 @@ struct scsi_device {
         struct list_head event_list;    /* asserted events */
         struct work_struct event_work;
 
-        unsigned int device_blocked;    /* Device returned QUEUE_FULL. */
-
         unsigned int max_device_blocked; /* what device_blocked counts down from  */
 #define SCSI_DEFAULT_DEVICE_BLOCKED     3
 
@@ -291,14 +289,15 @@ struct scsi_target {
         unsigned int            expecting_lun_change:1; /* A device has reported
                                                  * a 3F/0E UA, other devices on
                                                  * the same target will also. */
-        /* commands actually active on LLD. protected by host lock. */
-        unsigned int            target_busy;
+        /* commands actually active on LLD. */
+        atomic_t                target_busy;
+        atomic_t                target_blocked;
+
         /*
          * LLDs should set this in the slave_alloc host template callout.
          * If set to zero then there is not limit.
          */
         unsigned int            can_queue;
-        unsigned int            target_blocked;
         unsigned int            max_target_blocked;
 #define SCSI_DEFAULT_TARGET_BLOCKED     3
 
@@ -321,9 +320,9 @@ static inline struct scsi_target *scsi_target(struct scsi_device *sdev)
         dev_printk(prefix, &(starget)->dev, fmt, ##a)
 
 extern struct scsi_device *__scsi_add_device(struct Scsi_Host *,
-                uint, uint, uint, void *hostdata);
+                uint, uint, u64, void *hostdata);
 extern int scsi_add_device(struct Scsi_Host *host, uint channel,
-                           uint target, uint lun);
+                           uint target, u64 lun);
 extern int scsi_register_device_handler(struct scsi_device_handler *scsi_dh);
 extern void scsi_remove_device(struct scsi_device *);
 extern int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh);
@@ -332,13 +331,13 @@ void scsi_attach_vpd(struct scsi_device *sdev);
 extern int scsi_device_get(struct scsi_device *);
 extern void scsi_device_put(struct scsi_device *);
 extern struct scsi_device *scsi_device_lookup(struct Scsi_Host *,
-                                              uint, uint, uint);
+                                              uint, uint, u64);
 extern struct scsi_device *__scsi_device_lookup(struct Scsi_Host *,
-                                                uint, uint, uint);
+                                                uint, uint, u64);
 extern struct scsi_device *scsi_device_lookup_by_target(struct scsi_target *,
-                                                        uint);
+                                                        u64);
 extern struct scsi_device *__scsi_device_lookup_by_target(struct scsi_target *,
-                                                          uint);
+                                                          u64);
 extern void starget_for_each_device(struct scsi_target *, void *,
                      void (*fn)(struct scsi_device *, void *));
 extern void __starget_for_each_device(struct scsi_target *, void *,
@@ -411,13 +410,13 @@ extern void scsi_device_resume(struct scsi_device *sdev);
 extern void scsi_target_quiesce(struct scsi_target *);
 extern void scsi_target_resume(struct scsi_target *);
 extern void scsi_scan_target(struct device *parent, unsigned int channel,
-                             unsigned int id, unsigned int lun, int rescan);
+                             unsigned int id, u64 lun, int rescan);
 extern void scsi_target_reap(struct scsi_target *);
 extern void scsi_target_block(struct device *);
 extern void scsi_target_unblock(struct device *, enum scsi_device_state);
 extern void scsi_remove_target(struct device *);
-extern void int_to_scsilun(unsigned int, struct scsi_lun *);
-extern int scsilun_to_int(struct scsi_lun *);
+extern void int_to_scsilun(u64, struct scsi_lun *);
+extern u64 scsilun_to_int(struct scsi_lun *);
 extern const char *scsi_device_state_name(enum scsi_device_state);
 extern int scsi_is_sdev_device(const struct device *);
 extern int scsi_is_target_device(const struct device *);
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index 447d2d7466fc..183eaab7c380 100644
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@ -32,4 +32,9 @@
 #define BLIST_ATTACH_PQ3        0x1000000 /* Scan: Attach to PQ3 devices */
 #define BLIST_NO_DIF            0x2000000 /* Disable T10 PI (DIF) */
 #define BLIST_SKIP_VPD_PAGES    0x4000000 /* Ignore SBC-3 VPD pages */
+#define BLIST_SCSI3LUN          0x8000000 /* Scan more than 256 LUNs
+                                             for sequential scan */
+#define BLIST_TRY_VPD_PAGES     0x10000000 /* Attempt to read VPD pages */
+#define BLIST_NO_RSOC           0x20000000 /* don't try to issue RSOC */
+
 #endif
diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
index 36c4114ed9bc..c2b759809d8a 100644
--- a/include/scsi/scsi_driver.h
+++ b/include/scsi/scsi_driver.h
@@ -29,7 +29,4 @@ extern int scsi_register_interface(struct class_interface *);
 #define scsi_unregister_interface(intf) \
         class_interface_unregister(intf)
 
-int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req);
-int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req);
-
 #endif /* _SCSI_SCSI_DRIVER_H */
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 94844fc77b97..ba2034779961 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -7,6 +7,7 @@
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
 #include <linux/seq_file.h>
+#include <linux/blk-mq.h>
 #include <scsi/scsi.h>
 
 struct request_queue;
@@ -132,27 +133,6 @@ struct scsi_host_template {
         int (* queuecommand)(struct Scsi_Host *, struct scsi_cmnd *);
 
         /*
-         * The transfer functions are used to queue a scsi command to
-         * the LLD. When the driver is finished processing the command
-         * the done callback is invoked.
-         *
-         * This is called to inform the LLD to transfer
-         * scsi_bufflen(cmd) bytes. scsi_sg_count(cmd) speciefies the
-         * number of scatterlist entried in the command and
-         * scsi_sglist(cmd) returns the scatterlist.
-         *
-         * return values: see queuecommand
-         *
-         * If the LLD accepts the cmd, it should set the result to an
-         * appropriate value when completed before calling the done function.
-         *
-         * STATUS: REQUIRED FOR TARGET DRIVERS
-         */
-        /* TODO: rename */
-        int (* transfer_response)(struct scsi_cmnd *,
-                                  void (*done)(struct scsi_cmnd *));
-
-        /*
          * This is an error handling strategy routine.  You don't need to
          * define one of these if you don't want to - there is a default
          * routine that is present that should work in most cases.  For those
@@ -408,7 +388,7 @@ struct scsi_host_template {
         /*
          * Set this if the host adapter has limitations beside segment count.
          */
-        unsigned short max_sectors;
+        unsigned int max_sectors;
 
         /*
          * DMA scatter gather segment boundary limit. A segment crossing this
@@ -531,6 +511,9 @@ struct scsi_host_template {
          */
         unsigned int cmd_size;
         struct scsi_host_cmd_pool *cmd_pool;
+
+        /* temporary flag to disable blk-mq I/O path */
+        bool disable_blk_mq;
 };
 
 /*
@@ -601,15 +584,16 @@ struct Scsi_Host {
          * Area to keep a shared tag map (if needed, will be
          * NULL if not).
          */
-        struct blk_queue_tag    *bqt;
+        union {
+                struct blk_queue_tag    *bqt;
+                struct blk_mq_tag_set   tag_set;
+        };
 
-        /*
-         * The following two fields are protected with host_lock;
-         * however, eh routines can safely access during eh processing
-         * without acquiring the lock.
-         */
-        unsigned int host_busy;            /* commands actually active on low-level */
-        unsigned int host_failed;          /* commands that failed. */
+        atomic_t host_busy;                /* commands actually active on low-level */
+        atomic_t host_blocked;
+
+        unsigned int host_failed;          /* commands that failed.
+                                              protected by host_lock */
         unsigned int host_eh_scheduled;    /* EH scheduled without command */
     
         unsigned int host_no;  /* Used for IOCTL_GET_IDLUN, /proc/scsi et al. */
@@ -623,11 +607,11 @@ struct Scsi_Host {
          * These three parameters can be used to allow for wide scsi,
          * and for host adapters that support multiple busses
          * The first two should be set to 1 more than the actual max id
-         * or lun (i.e. 8 for normal systems).
+         * or lun (e.g. 8 for SCSI parallel systems).
          */
-        unsigned int max_id;
-        unsigned int max_lun;
         unsigned int max_channel;
+        unsigned int max_id;
+        u64 max_lun;
 
         /*
          * This is a unique identifier that must be assigned so that we
@@ -652,7 +636,7 @@ struct Scsi_Host {
         short cmd_per_lun;
         short unsigned int sg_tablesize;
         short unsigned int sg_prot_tablesize;
-        short unsigned int max_sectors;
+        unsigned int max_sectors;
         unsigned long dma_boundary;
         /* 
          * Used to assign serial numbers to the cmds.
@@ -695,6 +679,8 @@ struct Scsi_Host {
         /* The controller does not support WRITE SAME */
         unsigned no_write_same:1;
 
+        unsigned use_blk_mq:1;
+
         /*
          * Optional work queue to be utilized by the transport
          */
@@ -707,11 +693,6 @@ struct Scsi_Host {
         struct workqueue_struct *tmf_work_q;
 
         /*
-         * Host has rejected a command because it was busy.
-         */
-        unsigned int host_blocked;
-
-        /*
          * Value host_blocked counts down from
          */
         unsigned int max_host_blocked;
@@ -800,6 +781,13 @@ static inline int scsi_host_in_recovery(struct Scsi_Host *shost)
                 shost->tmf_in_progress;
 }
 
+extern bool scsi_use_blk_mq;
+
+static inline bool shost_use_blk_mq(struct Scsi_Host *shost)
+{
+        return shost->use_blk_mq;
+}
+
 extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *);
 extern void scsi_flush_work(struct Scsi_Host *);
 
@@ -816,8 +804,6 @@ extern struct Scsi_Host *scsi_host_lookup(unsigned short);
 extern const char *scsi_host_state_name(enum scsi_host_state);
 extern void scsi_cmd_get_serial(struct Scsi_Host *, struct scsi_cmnd *);
 
-extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *);
-
 static inline int __must_check scsi_add_host(struct Scsi_Host *host,
                                              struct device *dev)
 {
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index 81dd12edc38c..cdcc90b07ecb 100644
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -67,7 +67,8 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth)
         if (!sdev->tagged_supported)
                 return;
 
-        if (!blk_queue_tagged(sdev->request_queue))
+        if (!shost_use_blk_mq(sdev->host) &&
+            blk_queue_tagged(sdev->request_queue))
                 blk_queue_init_tags(sdev->request_queue, depth,
                                     sdev->host->bqt);
 
@@ -80,7 +81,8 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth)
  **/
 static inline void scsi_deactivate_tcq(struct scsi_device *sdev, int depth)
 {
-        if (blk_queue_tagged(sdev->request_queue))
+        if (!shost_use_blk_mq(sdev->host) &&
+            blk_queue_tagged(sdev->request_queue))
                 blk_queue_free_tags(sdev->request_queue);
         scsi_adjust_queue_depth(sdev, 0, depth);
 }
@@ -108,6 +110,15 @@ static inline int scsi_populate_tag_msg(struct scsi_cmnd *cmd, char *msg)
         return 0;
 }
 
+static inline struct scsi_cmnd *scsi_mq_find_tag(struct Scsi_Host *shost,
+                unsigned int hw_ctx, int tag)
+{
+        struct request *req;
+
+        req = blk_mq_tag_to_rq(shost->tag_set.tags[hw_ctx], tag);
+        return req ? (struct scsi_cmnd *)req->special : NULL;
+}
+
 /**
  * scsi_find_tag - find a tagged command by device
  * @SDpnt:      pointer to the ScSI device
@@ -118,10 +129,12 @@ static inline int scsi_populate_tag_msg(struct scsi_cmnd *cmd, char *msg)
  **/
 static inline struct scsi_cmnd *scsi_find_tag(struct scsi_device *sdev, int tag)
 {
-
         struct request *req;
 
         if (tag != SCSI_NO_TAG) {
+                if (shost_use_blk_mq(sdev->host))
+                        return scsi_mq_find_tag(sdev->host, 0, tag);
+
                 req = blk_queue_find_tag(sdev->request_queue, tag);
                 return req ? (struct scsi_cmnd *)req->special : NULL;
         }
@@ -130,6 +143,7 @@ static inline struct scsi_cmnd *scsi_find_tag(struct scsi_device *sdev, int tag)
         return sdev->current_cmnd;
 }
 
+
 /**
  * scsi_init_shared_tag_map - create a shared tag map
  * @shost:      the host to share the tag map among all devices
@@ -138,6 +152,12 @@ static inline struct scsi_cmnd *scsi_find_tag(struct scsi_device *sdev, int tag)
 static inline int scsi_init_shared_tag_map(struct Scsi_Host *shost, int depth)
 {
         /*
+         * We always have a shared tag map around when using blk-mq.
+         */
+        if (shost_use_blk_mq(shost))
+                return 0;
+
+        /*
          * If the shared tag map isn't already initialized, do it now.
          * This saves callers from having to check ->bqt when setting up
          * devices on the shared host (for libata)
@@ -165,6 +185,8 @@ static inline struct scsi_cmnd *scsi_host_find_tag(struct Scsi_Host *shost,
         struct request *req;
 
         if (tag != SCSI_NO_TAG) {
+                if (shost_use_blk_mq(shost))
+                        return scsi_mq_find_tag(shost, 0, tag);
                 req = blk_map_queue_find_tag(shost->bqt, tag);
                 return req ? (struct scsi_cmnd *)req->special : NULL;
         }
diff --git a/include/scsi/scsi_tgt.h b/include/scsi/scsi_tgt.h
deleted file mode 100644
index d0fefb96158f..000000000000
--- a/include/scsi/scsi_tgt.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SCSI target definitions
- */
-
-#include <linux/dma-mapping.h>
-
-struct Scsi_Host;
-struct scsi_cmnd;
-struct scsi_lun;
-
-extern struct Scsi_Host *scsi_tgt_cmd_to_host(struct scsi_cmnd *);
-extern int scsi_tgt_alloc_queue(struct Scsi_Host *);
-extern void scsi_tgt_free_queue(struct Scsi_Host *);
-extern int scsi_tgt_queue_command(struct scsi_cmnd *, u64, struct scsi_lun *, u64);
-extern int scsi_tgt_tsk_mgmt_request(struct Scsi_Host *, u64, int, u64,
-                                     struct scsi_lun *, void *);
-extern struct scsi_cmnd *scsi_host_get_command(struct Scsi_Host *,
-                                               enum dma_data_direction, gfp_t);
-extern void scsi_host_put_command(struct Scsi_Host *, struct scsi_cmnd *);
-extern int scsi_tgt_it_nexus_create(struct Scsi_Host *, u64, char *);
-extern int scsi_tgt_it_nexus_destroy(struct Scsi_Host *, u64);
diff --git a/include/scsi/scsi_tgt_if.h b/include/scsi/scsi_tgt_if.h
deleted file mode 100644
index f2ee7c238a45..000000000000
--- a/include/scsi/scsi_tgt_if.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * SCSI target kernel/user interface
- *
- * Copyright (C) 2005 FUJITA Tomonori <tomof@acm.org>
- * Copyright (C) 2005 Mike Christie <michaelc@cs.wisc.edu>
- *
- * 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.
- *
- * 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 __SCSI_TARGET_IF_H
-#define __SCSI_TARGET_IF_H
-
-/* user -> kernel */
-#define TGT_UEVENT_CMD_RSP              0x0001
-#define TGT_UEVENT_IT_NEXUS_RSP         0x0002
-#define TGT_UEVENT_TSK_MGMT_RSP         0x0003
-
-/* kernel -> user */
-#define TGT_KEVENT_CMD_REQ              0x1001
-#define TGT_KEVENT_CMD_DONE             0x1002
-#define TGT_KEVENT_IT_NEXUS_REQ         0x1003
-#define TGT_KEVENT_TSK_MGMT_REQ         0x1004
-
-struct tgt_event_hdr {
-        uint16_t version;
-        uint16_t status;
-        uint16_t type;
-        uint16_t len;
-} __attribute__ ((aligned (sizeof(uint64_t))));
-
-struct tgt_event {
-        struct tgt_event_hdr hdr;
-
-        union {
-                /* user-> kernel */
-                struct {
-                        int host_no;
-                        int result;
-                        aligned_u64 itn_id;
-                        aligned_u64 tag;
-                        aligned_u64 uaddr;
-                        aligned_u64 sense_uaddr;
-                        uint32_t len;
-                        uint32_t sense_len;
-                        uint8_t rw;
-                } cmd_rsp;
-                struct {
-                        int host_no;
-                        int result;
-                        aligned_u64 itn_id;
-                        aligned_u64 mid;
-                } tsk_mgmt_rsp;
-                struct {
-                        __s32 host_no;
-                        __s32 result;
-                        aligned_u64 itn_id;
-                        __u32 function;
-                } it_nexus_rsp;
-
-                /* kernel -> user */
-                struct {
-                        int host_no;
-                        uint32_t data_len;
-                        aligned_u64 itn_id;
-                        uint8_t scb[16];
-                        uint8_t lun[8];
-                        int attribute;
-                        aligned_u64 tag;
-                } cmd_req;
-                struct {
-                        int host_no;
-                        int result;
-                        aligned_u64 itn_id;
-                        aligned_u64 tag;
-                } cmd_done;
-                struct {
-                        int host_no;
-                        int function;
-                        aligned_u64 itn_id;
-                        aligned_u64 tag;
-                        uint8_t lun[8];
-                        aligned_u64 mid;
-                } tsk_mgmt_req;
-                struct {
-                        __s32 host_no;
-                        __u32 function;
-                        aligned_u64 itn_id;
-                        __u32 max_cmds;
-                        __u8 initiator_id[16];
-                } it_nexus_req;
-        } p;
-} __attribute__ ((aligned (sizeof(uint64_t))));
-
-#define TGT_RING_SIZE (1UL << 16)
-
-#endif
diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index af244f4bba53..81292392adbc 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -35,7 +35,7 @@ struct scsi_transport_template {
         /*
          * If set, called from sysfs and legacy procfs rescanning code.
          */
-        int (*user_scan)(struct Scsi_Host *, uint, uint, uint);
+        int (*user_scan)(struct Scsi_Host *, uint, uint, u64);
 
         /* The size of the specific transport attribute structure (a
          * space of this size will be left at the end of the
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 8c79980dc8f2..007a0bc01b74 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -131,6 +131,10 @@ enum fc_vport_state {
 #define FC_PORTSPEED_8GBIT              0x10
 #define FC_PORTSPEED_16GBIT             0x20
 #define FC_PORTSPEED_32GBIT             0x40
+#define FC_PORTSPEED_20GBIT             0x80
+#define FC_PORTSPEED_40GBIT             0x100
+#define FC_PORTSPEED_50GBIT             0x200
+#define FC_PORTSPEED_100GBIT            0x400
 #define FC_PORTSPEED_NOT_NEGOTIATED     (1 << 15) /* Speed not established */
 
 /*
diff --git a/include/scsi/sg.h b/include/scsi/sg.h
index a9f3c6fc3f57..9859355a7cf9 100644
--- a/include/scsi/sg.h
+++ b/include/scsi/sg.h
@@ -4,77 +4,34 @@
 #include <linux/compiler.h>
 
 /*
-   History:
-    Started: Aug 9 by Lawrence Foard (entropy@world.std.com), to allow user
-     process control of SCSI devices.
-    Development Sponsored by Killy Corp. NY NY
-Original driver (sg.h):
-*       Copyright (C) 1992 Lawrence Foard
-Version 2 and 3 extensions to driver:
-*       Copyright (C) 1998 - 2006 Douglas Gilbert
-
-    Version: 3.5.34 (20060920)
-    This version is for 2.6 series kernels.
-
-    For a full changelog see http://www.torque.net/sg
-
-Map of SG verions to the Linux kernels in which they appear:
-       ----------        ----------------------------------
-       original          all kernels < 2.2.6
-       2.1.40            2.2.20
-       3.0.x             optional version 3 sg driver for 2.2 series
-       3.1.17++          2.4.0++
-       3.5.30++          2.6.0++
-
-Major new features in SG 3.x driver (cf SG 2.x drivers)
-        - SG_IO ioctl() combines function if write() and read()
-        - new interface (sg_io_hdr_t) but still supports old interface
-        - scatter/gather in user space, direct IO, and mmap supported
-
- The normal action of this driver is to use the adapter (HBA) driver to DMA
- data into kernel buffers and then use the CPU to copy the data into the 
- user space (vice versa for writes). That is called "indirect" IO due to 
- the double handling of data. There are two methods offered to remove the
- redundant copy: 1) direct IO and 2) using the mmap() system call to map
- the reserve buffer (this driver has one reserve buffer per fd) into the
- user space. Both have their advantages.
- In terms of absolute speed mmap() is faster. If speed is not a concern, 
- indirect IO should be fine. Read the documentation for more information.
-
- ** N.B. To use direct IO 'echo 1 > /proc/scsi/sg/allow_dio' or
-         'echo 1 > /sys/module/sg/parameters/allow_dio' is needed.
-         That attribute is 0 by default. **
- 
- Historical note: this SCSI pass-through driver has been known as "sg" for 
- a decade. In broader kernel discussions "sg" is used to refer to scatter
- gather techniques. The context should clarify which "sg" is referred to.
-
- Documentation
- =============
- A web site for the SG device driver can be found at:
-        http://www.torque.net/sg  [alternatively check the MAINTAINERS file]
- The documentation for the sg version 3 driver can be found at:
-        http://www.torque.net/sg/p/sg_v3_ho.html
- This is a rendering from DocBook source [change the extension to "sgml"
- or "xml"]. There are renderings in "ps", "pdf", "rtf" and "txt" (soon).
- The SG_IO ioctl is now found in other parts kernel (e.g. the block layer).
- For more information see http://www.torque.net/sg/sg_io.html
-
- The older, version 2 documents discuss the original sg interface in detail:
-        http://www.torque.net/sg/p/scsi-generic.txt
-        http://www.torque.net/sg/p/scsi-generic_long.txt
- Also available: <kernel_source>/Documentation/scsi/scsi-generic.txt
-
- Utility and test programs are available at the sg web site. They are 
- packaged as sg3_utils (for the lk 2.4 and 2.6 series) and sg_utils
- (for the lk 2.2 series).
-*/
+ * History:
+ *  Started: Aug 9 by Lawrence Foard (entropy@world.std.com), to allow user
+ *   process control of SCSI devices.
+ *  Development Sponsored by Killy Corp. NY NY
+ *
+ * Original driver (sg.h):
+ *       Copyright (C) 1992 Lawrence Foard
+ * Version 2 and 3 extensions to driver:
+ *      Copyright (C) 1998 - 2014 Douglas Gilbert
+ *
+ *  Version: 3.5.36 (20140603)
+ *  This version is for 2.6 and 3 series kernels.
+ *
+ * Documentation
+ * =============
+ * A web site for the SG device driver can be found at:
+ *      http://sg.danny.cz/sg  [alternatively check the MAINTAINERS file]
+ * The documentation for the sg version 3 driver can be found at:
+ *      http://sg.danny.cz/sg/p/sg_v3_ho.html
+ * Also see: <kernel_source>/Documentation/scsi/scsi-generic.txt
+ *
+ * For utility and test programs see: http://sg.danny.cz/sg/sg3_utils.html
+ */
 
 #ifdef __KERNEL__
 extern int sg_big_buff; /* for sysctl */
 #endif
 
-/* New interface introduced in the 3.x SG drivers follows */
 
 typedef struct sg_iovec /* same structure as used by readv() Linux system */
 {                       /* call. It defines one scatter-gather element. */
@@ -87,7 +44,7 @@ typedef struct sg_io_hdr
 {
     int interface_id;           /* [i] 'S' for SCSI generic (required) */
     int dxfer_direction;        /* [i] data transfer direction  */
-    unsigned char cmd_len;      /* [i] SCSI command length ( <= 16 bytes) */
+    unsigned char cmd_len;      /* [i] SCSI command length */
     unsigned char mx_sb_len;    /* [i] max length to write to sbp */
     unsigned short iovec_count; /* [i] 0 implies no scatter gather */
     unsigned int dxfer_len;     /* [i] byte count of data transfer */
@@ -129,6 +86,7 @@ typedef struct sg_io_hdr
 #define SG_FLAG_MMAP_IO 4       /* request memory mapped IO */
 #define SG_FLAG_NO_DXFER 0x10000 /* no transfer of kernel buffers to/from */
                                 /* user space (debug indirect IO) */
+#define SG_FLAG_Q_AT_TAIL 0x10  /* default is Q_AT_HEAD */
 
 /* following 'info' values are "or"-ed together */
 #define SG_INFO_OK_MASK 0x1
diff --git a/include/sound/control.h b/include/sound/control.h
index 5358892b1b39..042613938a1d 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -31,10 +31,15 @@ typedef int (snd_kcontrol_info_t) (struct snd_kcontrol * kcontrol, struct snd_ct
 typedef int (snd_kcontrol_get_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
 typedef int (snd_kcontrol_put_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
 typedef int (snd_kcontrol_tlv_rw_t)(struct snd_kcontrol *kcontrol,
-                                    int op_flag, /* 0=read,1=write,-1=command */
+                                    int op_flag, /* SNDRV_CTL_TLV_OP_XXX */
                                     unsigned int size,
                                     unsigned int __user *tlv);
 
+enum {
+        SNDRV_CTL_TLV_OP_READ = 0,
+        SNDRV_CTL_TLV_OP_WRITE = 1,
+        SNDRV_CTL_TLV_OP_CMD = -1,
+};
 
 struct snd_kcontrol_new {
         snd_ctl_elem_iface_t iface;     /* interface identifier */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index d854fb31c000..6f3e10ca0e32 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -931,10 +931,17 @@ void snd_pcm_timer_done(struct snd_pcm_substream *substream);
 static inline void snd_pcm_gettime(struct snd_pcm_runtime *runtime,
                                    struct timespec *tv)
 {
-        if (runtime->tstamp_type == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC)
+        switch (runtime->tstamp_type) {
+        case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC:
                 ktime_get_ts(tv);
-        else
+                break;
+        case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW:
+                getrawmonotonic(tv);
+                break;
+        default:
                 getnstimeofday(tv);
+                break;
+        }
 }
 
 /*
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h
index f4a706f82cb7..d76412b84b48 100644
--- a/include/sound/rcar_snd.h
+++ b/include/sound/rcar_snd.h
@@ -34,6 +34,7 @@
  * B : SSI direction
  */
 #define RSND_SSI_CLK_PIN_SHARE          (1 << 31)
+#define RSND_SSI_NO_BUSIF               (1 << 30) /* SSI+DMA without BUSIF */
 
 #define RSND_SSI(_dma_id, _pio_irq, _flags)             \
 { .dma_id = _dma_id, .pio_irq = _pio_irq, .flags = _flags }
diff --git a/include/sound/rt286.h b/include/sound/rt286.h
new file mode 100644
index 000000000000..eb773d1485f2
--- /dev/null
+++ b/include/sound/rt286.h
@@ -0,0 +1,19 @@
+/*
+ * linux/sound/rt286.h -- Platform data for RT286
+ *
+ * Copyright 2013 Realtek Microelectronics
+ *
+ * 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_SND_RT286_H
+#define __LINUX_SND_RT286_H
+
+struct rt286_platform_data {
+        bool cbj_en; /*combo jack enable*/
+        bool gpio2_en; /*GPIO2 enable*/
+};
+
+#endif
diff --git a/include/sound/rt5670.h b/include/sound/rt5670.h
new file mode 100644
index 000000000000..bd311197a3b5
--- /dev/null
+++ b/include/sound/rt5670.h
@@ -0,0 +1,27 @@
+/*
+ * linux/sound/rt5670.h -- Platform data for RT5670
+ *
+ * Copyright 2014 Realtek Microelectronics
+ *
+ * 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_SND_RT5670_H
+#define __LINUX_SND_RT5670_H
+
+struct rt5670_platform_data {
+        int jd_mode;
+        bool in2_diff;
+
+        bool dmic_en;
+        unsigned int dmic1_data_pin;
+        /* 0 = GPIO6; 1 = IN2P; 3 = GPIO7*/
+        unsigned int dmic2_data_pin;
+        /* 0 = GPIO8; 1 = IN3N; */
+        unsigned int dmic3_data_pin;
+        /* 0 = GPIO9; 1 = GPIO10; 2 = GPIO5*/
+};
+
+#endif
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 688f2ba8009f..e8b3080d196a 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -257,7 +257,6 @@ struct snd_soc_dai {
 
         struct snd_soc_dapm_widget *playback_widget;
         struct snd_soc_dapm_widget *capture_widget;
-        struct snd_soc_dapm_context dapm;
 
         /* DAI DMA data */
         void *playback_dma_data;
@@ -273,6 +272,10 @@ struct snd_soc_dai {
         struct snd_soc_codec *codec;
         struct snd_soc_component *component;
 
+        /* CODEC TDM slot masks and params (for fixup) */
+        unsigned int tx_mask;
+        unsigned int rx_mask;
+
         struct snd_soc_card *card;
 
         struct list_head list;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 6b59471cdf44..aac04ff84eea 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -431,7 +431,7 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,
                                            const char *pin);
 int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
                                 const char *pin);
-void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec);
+void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card);
 
 /* Mostly internal - should not normally be used */
 void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm);
@@ -441,6 +441,8 @@ 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);
 
 /* dapm widget types */
 enum snd_soc_dapm_type {
@@ -524,7 +526,6 @@ struct snd_soc_dapm_widget {
         const char *name;               /* widget name */
         const char *sname;      /* stream name */
         struct snd_soc_codec *codec;
-        struct snd_soc_platform *platform;
         struct list_head list;
         struct snd_soc_dapm_context *dapm;
 
@@ -593,7 +594,6 @@ struct snd_soc_dapm_context {
         struct device *dev; /* from parent - for debug */
         struct snd_soc_component *component; /* parent component */
         struct snd_soc_codec *codec; /* parent codec */
-        struct snd_soc_platform *platform; /* parent platform */
         struct snd_soc_card *card; /* parent card */
 
         /* used during DAPM updates */
@@ -601,6 +601,8 @@ struct snd_soc_dapm_context {
         struct list_head list;
 
         int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
+        int (*set_bias_level)(struct snd_soc_dapm_context *dapm,
+                              enum snd_soc_bias_level level);
 
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_dapm;
diff --git a/include/sound/soc.h b/include/sound/soc.h
index ed9e2d7e5fdc..be6ecae247b0 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -248,6 +248,8 @@
         .info = snd_soc_info_enum_double, \
         .get = xhandler_get, .put = xhandler_put, \
         .private_value = (unsigned long)&xenum }
+#define SOC_VALUE_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put) \
+        SOC_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put)
 
 #define SND_SOC_BYTES(xname, xbase, xregs)                    \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,   \
@@ -270,7 +272,14 @@
         .get = xhandler_get, .put = xhandler_put, \
         .private_value = (unsigned long)&(struct soc_bytes_ext) \
                 {.max = xcount} }
-
+#define SND_SOC_BYTES_TLV(xname, xcount, xhandler_get, xhandler_put) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | \
+                  SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \
+        .tlv.c = (snd_soc_bytes_tlv_callback), \
+        .info = snd_soc_info_bytes_ext, \
+        .private_value = (unsigned long)&(struct soc_bytes_ext) \
+                {.max = xcount, .get = xhandler_get, .put = xhandler_put, } }
 #define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \
                 xmin, xmax, xinvert) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
@@ -436,6 +445,10 @@ int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
 int snd_soc_platform_trigger(struct snd_pcm_substream *substream,
                 int cmd, struct snd_soc_platform *platform);
 
+int soc_dai_hw_params(struct snd_pcm_substream *substream,
+                      struct snd_pcm_hw_params *params,
+                      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);
@@ -503,10 +516,12 @@ struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,
                                   const char *prefix);
 struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,
                                                const char *name);
+int snd_soc_add_component_controls(struct snd_soc_component *component,
+        const struct snd_kcontrol_new *controls, unsigned int num_controls);
 int snd_soc_add_codec_controls(struct snd_soc_codec *codec,
-        const struct snd_kcontrol_new *controls, int num_controls);
+        const struct snd_kcontrol_new *controls, unsigned int num_controls);
 int snd_soc_add_platform_controls(struct snd_soc_platform *platform,
-        const struct snd_kcontrol_new *controls, int num_controls);
+        const struct snd_kcontrol_new *controls, unsigned int num_controls);
 int snd_soc_add_card_controls(struct snd_soc_card *soc_card,
         const struct snd_kcontrol_new *controls, int num_controls);
 int snd_soc_add_dai_controls(struct snd_soc_dai *dai,
@@ -552,6 +567,8 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol);
 int snd_soc_bytes_info_ext(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *ucontrol);
+int snd_soc_bytes_tlv_callback(struct snd_kcontrol *kcontrol, int op_flag,
+        unsigned int size, unsigned int __user *tlv);
 int snd_soc_info_xr_sx(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
 int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol,
@@ -677,12 +694,17 @@ struct snd_soc_component_driver {
         int (*of_xlate_dai_name)(struct snd_soc_component *component,
                                  struct of_phandle_args *args,
                                  const char **dai_name);
+        void (*seq_notifier)(struct snd_soc_component *, enum snd_soc_dapm_type,
+                int subseq);
+        int (*stream_event)(struct snd_soc_component *, int event);
 };
 
 struct snd_soc_component {
         const char *name;
         int id;
+        const char *name_prefix;
         struct device *dev;
+        struct snd_soc_card *card;
 
         unsigned int active;
 
@@ -705,18 +727,18 @@ struct snd_soc_component {
         int val_bytes;
 
         struct mutex io_mutex;
+
+        /* Don't use these, use snd_soc_component_get_dapm() */
+        struct snd_soc_dapm_context dapm;
+        struct snd_soc_dapm_context *dapm_ptr;
 };
 
 /* SoC Audio Codec device */
 struct snd_soc_codec {
-        const char *name;
-        const char *name_prefix;
-        int id;
         struct device *dev;
         const struct snd_soc_codec_driver *driver;
 
         struct mutex mutex;
-        struct snd_soc_card *card;
         struct list_head list;
         struct list_head card_list;
 
@@ -790,9 +812,6 @@ struct snd_soc_codec_driver {
         void (*seq_notifier)(struct snd_soc_dapm_context *,
                              enum snd_soc_dapm_type, int);
 
-        /* codec stream completion event */
-        int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
-
         bool ignore_pmdown_time;  /* Doesn't benefit from pmdown delay */
 
         /* probe ordering - for components with runtime dependencies */
@@ -834,9 +853,6 @@ struct snd_soc_platform_driver {
         /* platform stream compress ops */
         const struct snd_compr_ops *compr_ops;
 
-        /* platform stream completion event */
-        int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
-
         /* probe ordering - for components with runtime dependencies */
         int probe_order;
         int remove_order;
@@ -847,23 +863,23 @@ struct snd_soc_platform_driver {
         int (*bespoke_trigger)(struct snd_pcm_substream *, int);
 };
 
-struct snd_soc_platform {
+struct snd_soc_dai_link_component {
         const char *name;
-        int id;
+        const struct device_node *of_node;
+        const char *dai_name;
+};
+
+struct snd_soc_platform {
         struct device *dev;
         const struct snd_soc_platform_driver *driver;
 
         unsigned int suspended:1; /* platform is suspended */
         unsigned int probed:1;
 
-        struct snd_soc_card *card;
         struct list_head list;
-        struct list_head card_list;
 
         struct snd_soc_component component;
 
-        struct snd_soc_dapm_context dapm;
-
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_platform_root;
 #endif
@@ -896,6 +912,10 @@ struct snd_soc_dai_link {
         const struct device_node *codec_of_node;
         /* You MUST specify the DAI name within the codec */
         const char *codec_dai_name;
+
+        struct snd_soc_dai_link_component *codecs;
+        unsigned int num_codecs;
+
         /*
          * You MAY specify the link's platform/PCM/DMA driver, either by
          * device name, or by DT/OF node, but not both. Some forms of link
@@ -1047,7 +1067,6 @@ struct snd_soc_card {
 
         /* lists of probed devices belonging to this card */
         struct list_head codec_dev_list;
-        struct list_head platform_dev_list;
 
         struct list_head widgets;
         struct list_head paths;
@@ -1094,6 +1113,9 @@ struct snd_soc_pcm_runtime {
         struct snd_soc_dai *codec_dai;
         struct snd_soc_dai *cpu_dai;
 
+        struct snd_soc_dai **codec_dais;
+        unsigned int num_codecs;
+
         struct delayed_work delayed_work;
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_dpcm_root;
@@ -1119,6 +1141,9 @@ struct soc_bytes {
 
 struct soc_bytes_ext {
         int max;
+        /* used for TLV byte control */
+        int (*get)(unsigned int __user *bytes, unsigned int size);
+        int (*put)(const unsigned int __user *bytes, unsigned int size);
 };
 
 /* multi register control */
@@ -1165,6 +1190,21 @@ static inline struct snd_soc_platform *snd_soc_component_to_platform(
 }
 
 /**
+ * snd_soc_dapm_to_component() - Casts a DAPM context to the component it is
+ *  embedded in
+ * @dapm: The DAPM context to cast to the component
+ *
+ * This function must only be used on DAPM contexts that are known to be part of
+ * a component (e.g. in a component driver). Otherwise the behavior is
+ * undefined.
+ */
+static inline struct snd_soc_component *snd_soc_dapm_to_component(
+        struct snd_soc_dapm_context *dapm)
+{
+        return container_of(dapm, struct snd_soc_component, dapm);
+}
+
+/**
  * snd_soc_dapm_to_codec() - Casts a DAPM context to the CODEC it is embedded in
  * @dapm: The DAPM context to cast to the CODEC
  *
@@ -1188,7 +1228,18 @@ static inline struct snd_soc_codec *snd_soc_dapm_to_codec(
 static inline struct snd_soc_platform *snd_soc_dapm_to_platform(
         struct snd_soc_dapm_context *dapm)
 {
-        return container_of(dapm, struct snd_soc_platform, dapm);
+        return snd_soc_component_to_platform(snd_soc_dapm_to_component(dapm));
+}
+
+/**
+ * snd_soc_component_get_dapm() - Returns the DAPM context associated with a
+ *  component
+ * @component: The component for which to get the DAPM context
+ */
+static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(
+        struct snd_soc_component *component)
+{
+        return component->dapm_ptr;
 }
 
 /* codec IO */
@@ -1261,7 +1312,6 @@ static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)
 static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
 {
         INIT_LIST_HEAD(&card->codec_dev_list);
-        INIT_LIST_HEAD(&card->platform_dev_list);
         INIT_LIST_HEAD(&card->widgets);
         INIT_LIST_HEAD(&card->paths);
         INIT_LIST_HEAD(&card->dapm_list);
diff --git a/include/sound/tas2552-plat.h b/include/sound/tas2552-plat.h
new file mode 100644
index 000000000000..65e7627ba38e
--- /dev/null
+++ b/include/sound/tas2552-plat.h
@@ -0,0 +1,25 @@
+/*
+ * TAS2552 driver platform header
+ *
+ * Copyright (C) 2014 Texas Instruments Inc.
+ *
+ * Author: Dan Murphy <dmurphy@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.
+ *
+ * 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 TAS2552_PLAT_H
+#define TAS2552_PLAT_H
+
+struct tas2552_platform_data {
+        int enable_gpio;
+};
+
+#endif
diff --git a/include/sound/wm8962.h b/include/sound/wm8962.h
index 79e6d427b858..0af7c1674cbf 100644
--- a/include/sound/wm8962.h
+++ b/include/sound/wm8962.h
@@ -37,6 +37,7 @@
 #define WM8962_GPIO_FN_MICSCD          22
 
 struct wm8962_pdata {
+        struct clk *mclk;
         int gpio_base;
         u32 gpio_init[WM8962_MAX_GPIO];
 
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index c75c795a377b..0194a641e4e2 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -296,17 +296,17 @@ TRACE_EVENT(snd_soc_cache_sync,
         TP_ARGS(codec, type, status),
 
         TP_STRUCT__entry(
-                __string(       name,           codec->name     )
+                __string(       name,           codec->component.name)
                 __string(       status,         status          )
                 __string(       type,           type            )
                 __field(        int,            id              )
         ),
 
         TP_fast_assign(
-                __assign_str(name, codec->name);
+                __assign_str(name, codec->component.name);
                 __assign_str(status, status);
                 __assign_str(type, type);
-                __entry->id = codec->id;
+                __entry->id = codec->component.id;
         ),
 
         TP_printk("codec=%s.%d type=%s status=%s", __get_str(name),
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index b983990b4a9f..d06d44363fea 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -587,6 +587,69 @@ TRACE_EVENT(f2fs_fallocate,
                 __entry->ret)
 );
 
+TRACE_EVENT(f2fs_direct_IO_enter,
+
+        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len, int rw),
+
+        TP_ARGS(inode, offset, len, rw),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(loff_t, pos)
+                __field(unsigned long,  len)
+                __field(int,    rw)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->pos    = offset;
+                __entry->len    = len;
+                __entry->rw     = rw;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu rw = %d",
+                show_dev_ino(__entry),
+                __entry->pos,
+                __entry->len,
+                __entry->rw)
+);
+
+TRACE_EVENT(f2fs_direct_IO_exit,
+
+        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len,
+                 int rw, int ret),
+
+        TP_ARGS(inode, offset, len, rw, ret),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(loff_t, pos)
+                __field(unsigned long,  len)
+                __field(int,    rw)
+                __field(int,    ret)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->pos    = offset;
+                __entry->len    = len;
+                __entry->rw     = rw;
+                __entry->ret    = ret;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu "
+                "rw = %d ret = %d",
+                show_dev_ino(__entry),
+                __entry->pos,
+                __entry->len,
+                __entry->rw,
+                __entry->ret)
+);
+
 TRACE_EVENT(f2fs_reserve_new_block,
 
         TP_PROTO(struct inode *inode, nid_t nid, unsigned int ofs_in_node),
@@ -926,6 +989,30 @@ TRACE_EVENT(f2fs_issue_discard,
                 (unsigned long long)__entry->blkstart,
                 (unsigned long long)__entry->blklen)
 );
+
+TRACE_EVENT(f2fs_issue_flush,
+
+        TP_PROTO(struct super_block *sb, bool nobarrier, bool flush_merge),
+
+        TP_ARGS(sb, nobarrier, flush_merge),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(bool, nobarrier)
+                __field(bool, flush_merge)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = sb->s_dev;
+                __entry->nobarrier = nobarrier;
+                __entry->flush_merge = flush_merge;
+        ),
+
+        TP_printk("dev = (%d,%d), %s %s",
+                show_dev(__entry),
+                __entry->nobarrier ? "skip (nobarrier)" : "issue",
+                __entry->flush_merge ? " with flush_merge" : "")
+);
 #endif /* _TRACE_F2FS_H */
 
  /* This part must be outside protection */
diff --git a/include/trace/events/fence.h b/include/trace/events/fence.h
new file mode 100644
index 000000000000..98feb1b82896
--- /dev/null
+++ b/include/trace/events/fence.h
@@ -0,0 +1,128 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM fence
+
+#if !defined(_TRACE_FENCE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_FENCE_H
+
+#include <linux/tracepoint.h>
+
+struct fence;
+
+TRACE_EVENT(fence_annotate_wait_on,
+
+        /* fence: the fence waiting on f1, f1: the fence to be waited on. */
+        TP_PROTO(struct fence *fence, struct fence *f1),
+
+        TP_ARGS(fence, f1),
+
+        TP_STRUCT__entry(
+                __string(driver, fence->ops->get_driver_name(fence))
+                __string(timeline, fence->ops->get_driver_name(fence))
+                __field(unsigned int, context)
+                __field(unsigned int, seqno)
+
+                __string(waiting_driver, f1->ops->get_driver_name(f1))
+                __string(waiting_timeline, f1->ops->get_timeline_name(f1))
+                __field(unsigned int, waiting_context)
+                __field(unsigned int, waiting_seqno)
+        ),
+
+        TP_fast_assign(
+                __assign_str(driver, fence->ops->get_driver_name(fence))
+                __assign_str(timeline, fence->ops->get_timeline_name(fence))
+                __entry->context = fence->context;
+                __entry->seqno = fence->seqno;
+
+                __assign_str(waiting_driver, f1->ops->get_driver_name(f1))
+                __assign_str(waiting_timeline, f1->ops->get_timeline_name(f1))
+                __entry->waiting_context = f1->context;
+                __entry->waiting_seqno = f1->seqno;
+
+        ),
+
+        TP_printk("driver=%s timeline=%s context=%u seqno=%u "  \
+                  "waits on driver=%s timeline=%s context=%u seqno=%u",
+                  __get_str(driver), __get_str(timeline), __entry->context,
+                  __entry->seqno,
+                  __get_str(waiting_driver), __get_str(waiting_timeline),
+                  __entry->waiting_context, __entry->waiting_seqno)
+);
+
+DECLARE_EVENT_CLASS(fence,
+
+        TP_PROTO(struct fence *fence),
+
+        TP_ARGS(fence),
+
+        TP_STRUCT__entry(
+                __string(driver, fence->ops->get_driver_name(fence))
+                __string(timeline, fence->ops->get_timeline_name(fence))
+                __field(unsigned int, context)
+                __field(unsigned int, seqno)
+        ),
+
+        TP_fast_assign(
+                __assign_str(driver, fence->ops->get_driver_name(fence))
+                __assign_str(timeline, fence->ops->get_timeline_name(fence))
+                __entry->context = fence->context;
+                __entry->seqno = fence->seqno;
+        ),
+
+        TP_printk("driver=%s timeline=%s context=%u seqno=%u",
+                  __get_str(driver), __get_str(timeline), __entry->context,
+                  __entry->seqno)
+);
+
+DEFINE_EVENT(fence, fence_emit,
+
+        TP_PROTO(struct fence *fence),
+
+        TP_ARGS(fence)
+);
+
+DEFINE_EVENT(fence, fence_init,
+
+        TP_PROTO(struct fence *fence),
+
+        TP_ARGS(fence)
+);
+
+DEFINE_EVENT(fence, fence_destroy,
+
+        TP_PROTO(struct fence *fence),
+
+        TP_ARGS(fence)
+);
+
+DEFINE_EVENT(fence, fence_enable_signal,
+
+        TP_PROTO(struct fence *fence),
+
+        TP_ARGS(fence)
+);
+
+DEFINE_EVENT(fence, fence_signaled,
+
+        TP_PROTO(struct fence *fence),
+
+        TP_ARGS(fence)
+);
+
+DEFINE_EVENT(fence, fence_wait_start,
+
+        TP_PROTO(struct fence *fence),
+
+        TP_ARGS(fence)
+);
+
+DEFINE_EVENT(fence, fence_wait_end,
+
+        TP_PROTO(struct fence *fence),
+
+        TP_ARGS(fence)
+);
+
+#endif /*  _TRACE_FENCE_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/ras.h b/include/trace/events/ras.h
deleted file mode 100644
index 1c875ad1ee5f..000000000000
--- a/include/trace/events/ras.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM ras
-
-#if !defined(_TRACE_AER_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_AER_H
-
-#include <linux/tracepoint.h>
-#include <linux/aer.h>
-
-
-/*
- * PCIe AER Trace event
- *
- * These events are generated when hardware detects a corrected or
- * uncorrected event on a PCIe device. The event report has
- * the following structure:
- *
- * char * dev_name -    The name of the slot where the device resides
- *                      ([domain:]bus:device.function).
- * u32 status -         Either the correctable or uncorrectable register
- *                      indicating what error or errors have been seen
- * u8 severity -        error severity 0:NONFATAL 1:FATAL 2:CORRECTED
- */
-
-#define aer_correctable_errors          \
-        {BIT(0),        "Receiver Error"},              \
-        {BIT(6),        "Bad TLP"},                     \
-        {BIT(7),        "Bad DLLP"},                    \
-        {BIT(8),        "RELAY_NUM Rollover"},          \
-        {BIT(12),       "Replay Timer Timeout"},        \
-        {BIT(13),       "Advisory Non-Fatal"}
-
-#define aer_uncorrectable_errors                \
-        {BIT(4),        "Data Link Protocol"},          \
-        {BIT(12),       "Poisoned TLP"},                \
-        {BIT(13),       "Flow Control Protocol"},       \
-        {BIT(14),       "Completion Timeout"},          \
-        {BIT(15),       "Completer Abort"},             \
-        {BIT(16),       "Unexpected Completion"},       \
-        {BIT(17),       "Receiver Overflow"},           \
-        {BIT(18),       "Malformed TLP"},               \
-        {BIT(19),       "ECRC"},                        \
-        {BIT(20),       "Unsupported Request"}
-
-TRACE_EVENT(aer_event,
-        TP_PROTO(const char *dev_name,
-                 const u32 status,
-                 const u8 severity),
-
-        TP_ARGS(dev_name, status, severity),
-
-        TP_STRUCT__entry(
-                __string(       dev_name,       dev_name        )
-                __field(        u32,            status          )
-                __field(        u8,             severity        )
-        ),
-
-        TP_fast_assign(
-                __assign_str(dev_name, dev_name);
-                __entry->status         = status;
-                __entry->severity       = severity;
-        ),
-
-        TP_printk("%s PCIe Bus Error: severity=%s, %s\n",
-                __get_str(dev_name),
-                __entry->severity == AER_CORRECTABLE ? "Corrected" :
-                        __entry->severity == AER_FATAL ?
-                        "Fatal" : "Uncorrected, non-fatal",
-                __entry->severity == AER_CORRECTABLE ?
-                __print_flags(__entry->status, "|", aer_correctable_errors) :
-                __print_flags(__entry->status, "|", aer_uncorrectable_errors))
-);
-
-#endif /* _TRACE_AER_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>
diff --git a/include/trace/events/tlb.h b/include/trace/events/tlb.h
new file mode 100644
index 000000000000..13391d288107
--- /dev/null
+++ b/include/trace/events/tlb.h
@@ -0,0 +1,40 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM tlb
+
+#if !defined(_TRACE_TLB_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_TLB_H
+
+#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" }
+
+TRACE_EVENT(tlb_flush,
+
+        TP_PROTO(int reason, unsigned long pages),
+        TP_ARGS(reason, pages),
+
+        TP_STRUCT__entry(
+                __field(          int, reason)
+                __field(unsigned long,  pages)
+        ),
+
+        TP_fast_assign(
+                __entry->reason = reason;
+                __entry->pages  = pages;
+        ),
+
+        TP_printk("pages:%ld reason:%s (%d)",
+                __entry->pages,
+                __print_symbolic(__entry->reason, TLB_FLUSH_REASON),
+                __entry->reason)
+);
+
+#endif /* _TRACE_TLB_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index 333640608087..f1afd607f043 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -699,9 +699,13 @@ __SYSCALL(__NR_sched_setattr, sys_sched_setattr)
 __SYSCALL(__NR_sched_getattr, sys_sched_getattr)
 #define __NR_renameat2 276
 __SYSCALL(__NR_renameat2, sys_renameat2)
+#define __NR_seccomp 277
+__SYSCALL(__NR_seccomp, sys_seccomp)
+#define __NR_getrandom 278
+__SYSCALL(__NR_getrandom, sys_getrandom)
 
 #undef __NR_syscalls
-#define __NR_syscalls 277
+#define __NR_syscalls 279
 
 /*
  * All syscalls below here should go away really,
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index cf6714752b69..3b9ff33e1768 100644
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -342,6 +342,7 @@ enum {
 #define __AUDIT_ARCH_64BIT 0x80000000
 #define __AUDIT_ARCH_LE    0x40000000
 
+#define AUDIT_ARCH_AARCH64      (EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_ALPHA        (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_ARM          (EM_ARM|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_ARMEB        (EM_ARM)
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h
index 813d11f54977..3e4323a3918d 100644
--- a/include/uapi/linux/can/netlink.h
+++ b/include/uapi/linux/can/netlink.h
@@ -92,11 +92,12 @@ struct can_ctrlmode {
 };
 
 #define CAN_CTRLMODE_LOOPBACK           0x01    /* Loopback mode */
-#define CAN_CTRLMODE_LISTENONLY         0x02    /* Listen-only mode */
+#define CAN_CTRLMODE_LISTENONLY         0x02    /* Listen-only mode */
 #define CAN_CTRLMODE_3_SAMPLES          0x04    /* Triple sampling mode */
 #define CAN_CTRLMODE_ONE_SHOT           0x08    /* One-Shot mode */
 #define CAN_CTRLMODE_BERR_REPORTING     0x10    /* Bus-error reporting */
 #define CAN_CTRLMODE_FD                 0x20    /* CAN FD mode */
+#define CAN_CTRLMODE_PRESUME_ACK        0x40    /* Ignore missing CAN ACKs */
 
 /*
  * CAN device statistics
diff --git a/include/uapi/linux/dcbnl.h b/include/uapi/linux/dcbnl.h
index 6bb43382f3f3..e711f20dc522 100644
--- a/include/uapi/linux/dcbnl.h
+++ b/include/uapi/linux/dcbnl.h
@@ -148,7 +148,8 @@ struct cee_pfc {
  *
  * @selector: protocol identifier type
  * @protocol: protocol of type indicated
- * @priority: 3-bit unsigned integer indicating priority
+ * @priority: 3-bit unsigned integer indicating priority for IEEE
+ *            8-bit 802.1p user priority bitmap for CEE
  *
  * ----
  *  Selector field values
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h
index aacd4fb7102a..07bdce1f444a 100644
--- a/include/uapi/linux/errqueue.h
+++ b/include/uapi/linux/errqueue.h
@@ -22,5 +22,25 @@ struct sock_extended_err {
 
 #define SO_EE_OFFENDER(ee)      ((struct sockaddr*)((ee)+1))
 
+/**
+ *      struct scm_timestamping - timestamps exposed through cmsg
+ *
+ *      The timestamping interfaces SO_TIMESTAMPING, MSG_TSTAMP_*
+ *      communicate network timestamps by passing this struct in a cmsg with
+ *      recvmsg(). See Documentation/networking/timestamping.txt for details.
+ */
+struct scm_timestamping {
+        struct timespec ts[3];
+};
+
+/* The type of scm_timestamping, passed in sock_extended_err ee_info.
+ * This defines the type of ts[0]. For SCM_TSTAMP_SND only, if ts[0]
+ * is zero, then this is a hardware timestamp and recorded in ts[2].
+ */
+enum {
+        SCM_TSTAMP_SND,         /* driver passed skb to NIC, or HW */
+        SCM_TSTAMP_SCHED,       /* data entered the packet scheduler */
+        SCM_TSTAMP_ACK,         /* data acknowledged by peer */
+};
 
 #endif /* _UAPI_LINUX_ERRQUEUE_H */
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
index 40b5ca8a1b1f..25084a052a1e 100644
--- a/include/uapi/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
@@ -101,6 +101,7 @@
  *  - add FATTR_CTIME
  *  - add ctime and ctimensec to fuse_setattr_in
  *  - add FUSE_RENAME2 request
+ *  - add FUSE_NO_OPEN_SUPPORT flag
  */
 
 #ifndef _LINUX_FUSE_H
@@ -229,6 +230,7 @@ struct fuse_file_lock {
  * FUSE_READDIRPLUS_AUTO: adaptive readdirplus
  * FUSE_ASYNC_DIO: asynchronous direct I/O submission
  * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes
+ * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens
  */
 #define FUSE_ASYNC_READ         (1 << 0)
 #define FUSE_POSIX_LOCKS        (1 << 1)
@@ -247,6 +249,7 @@ struct fuse_file_lock {
 #define FUSE_READDIRPLUS_AUTO   (1 << 14)
 #define FUSE_ASYNC_DIO          (1 << 15)
 #define FUSE_WRITEBACK_CACHE    (1 << 16)
+#define FUSE_NO_OPEN_SUPPORT    (1 << 17)
 
 /**
  * CUSE INIT request/reply flags
diff --git a/include/uapi/linux/genwqe/genwqe_card.h b/include/uapi/linux/genwqe/genwqe_card.h
index 795e957bb840..4fc065f29255 100644
--- a/include/uapi/linux/genwqe/genwqe_card.h
+++ b/include/uapi/linux/genwqe/genwqe_card.h
@@ -328,6 +328,7 @@ enum genwqe_card_state {
         GENWQE_CARD_UNUSED = 0,
         GENWQE_CARD_USED = 1,
         GENWQE_CARD_FATAL_ERROR = 2,
+        GENWQE_CARD_RELOAD_BITSTREAM = 3,
         GENWQE_CARD_STATE_MAX,
 };
 
diff --git a/include/uapi/linux/i8k.h b/include/uapi/linux/i8k.h
index 1c45ba505115..133d02f03c25 100644
--- a/include/uapi/linux/i8k.h
+++ b/include/uapi/linux/i8k.h
@@ -34,7 +34,8 @@
 #define I8K_FAN_OFF             0
 #define I8K_FAN_LOW             1
 #define I8K_FAN_HIGH            2
-#define I8K_FAN_MAX             I8K_FAN_HIGH
+#define I8K_FAN_TURBO           3
+#define I8K_FAN_MAX             I8K_FAN_TURBO
 
 #define I8K_VOL_UP              1
 #define I8K_VOL_DOWN            2
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index b38534895db5..ff957604a721 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -204,11 +204,17 @@ enum {
         IFLA_INET6_CACHEINFO,   /* time values and max reasm size */
         IFLA_INET6_ICMP6STATS,  /* statistics (icmpv6)          */
         IFLA_INET6_TOKEN,       /* device token                 */
+        IFLA_INET6_ADDR_GEN_MODE, /* implicit address generator mode */
         __IFLA_INET6_MAX
 };
 
 #define IFLA_INET6_MAX  (__IFLA_INET6_MAX - 1)
 
+enum in6_addr_gen_mode {
+        IN6_ADDR_GEN_MODE_EUI64,
+        IN6_ADDR_GEN_MODE_NONE,
+};
+
 enum {
         BRIDGE_MODE_UNSPEC,
         BRIDGE_MODE_HAIRPIN,
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h
index bac27fa05f5b..da2d668b8cf1 100644
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
@@ -108,7 +108,7 @@ struct tpacket_auxdata {
 
 /* Rx and Tx ring - header status */
 #define TP_STATUS_TS_SOFTWARE           (1 << 29)
-#define TP_STATUS_TS_SYS_HARDWARE       (1 << 30)
+#define TP_STATUS_TS_SYS_HARDWARE       (1 << 30) /* deprecated, never set */
 #define TP_STATUS_TS_RAW_HARDWARE       (1 << 31)
 
 /* Rx ring - feature request bits */
diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h
index 0d8e0f0342dc..22b7a69619d8 100644
--- a/include/uapi/linux/in6.h
+++ b/include/uapi/linux/in6.h
@@ -233,6 +233,7 @@ struct in6_flowlabel_req {
 #if 0   /* not yet */
 #define IPV6_USE_MIN_MTU        63
 #endif
+#define IPV6_AUTOFLOWLABEL      64
 
 /*
  * Netfilter (1)
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 593b0e32d956..efa2666f4b8a 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -163,6 +163,7 @@ enum {
         DEVCONF_MLDV1_UNSOLICITED_REPORT_INTERVAL,
         DEVCONF_MLDV2_UNSOLICITED_REPORT_INTERVAL,
         DEVCONF_SUPPRESS_FRAG_NDISC,
+        DEVCONF_ACCEPT_RA_FROM_LOCAL,
         DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index e11d8f170a62..9b744af871d7 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -399,13 +399,18 @@ struct kvm_vapic_addr {
         __u64 vapic_addr;
 };
 
-/* for KVM_SET_MPSTATE */
+/* for KVM_SET_MP_STATE */
 
+/* not all states are valid on all architectures */
 #define KVM_MP_STATE_RUNNABLE          0
 #define KVM_MP_STATE_UNINITIALIZED     1
 #define KVM_MP_STATE_INIT_RECEIVED     2
 #define KVM_MP_STATE_HALTED            3
 #define KVM_MP_STATE_SIPI_RECEIVED     4
+#define KVM_MP_STATE_STOPPED           5
+#define KVM_MP_STATE_CHECK_STOP        6
+#define KVM_MP_STATE_OPERATING         7
+#define KVM_MP_STATE_LOAD              8
 
 struct kvm_mp_state {
         __u32 mp_state;
diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h
index f53879c0f590..ff354021bb69 100644
--- a/include/uapi/linux/net_tstamp.h
+++ b/include/uapi/linux/net_tstamp.h
@@ -20,9 +20,13 @@ enum {
         SOF_TIMESTAMPING_SOFTWARE = (1<<4),
         SOF_TIMESTAMPING_SYS_HARDWARE = (1<<5),
         SOF_TIMESTAMPING_RAW_HARDWARE = (1<<6),
-        SOF_TIMESTAMPING_MASK =
-        (SOF_TIMESTAMPING_RAW_HARDWARE - 1) |
-        SOF_TIMESTAMPING_RAW_HARDWARE
+        SOF_TIMESTAMPING_OPT_ID = (1<<7),
+        SOF_TIMESTAMPING_TX_SCHED = (1<<8),
+        SOF_TIMESTAMPING_TX_ACK = (1<<9),
+
+        SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_TX_ACK,
+        SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) |
+                                 SOF_TIMESTAMPING_LAST
 };
 
 /**
diff --git a/include/uapi/linux/netdevice.h b/include/uapi/linux/netdevice.h
index fdfbd1c17065..55818543342d 100644
--- a/include/uapi/linux/netdevice.h
+++ b/include/uapi/linux/netdevice.h
@@ -37,6 +37,12 @@
 #define INIT_NETDEV_GROUP       0
 
 
+/* interface name assignment types (sysfs name_assign_type attribute) */
+#define NET_NAME_UNKNOWN        0       /* unknown origin (not exposed to userspace) */
+#define NET_NAME_ENUM           1       /* enumerated by kernel */
+#define NET_NAME_PREDICTABLE    2       /* predictably named by the kernel */
+#define NET_NAME_USER           3       /* provided by user-space */
+#define NET_NAME_RENAMED        4       /* renamed by user-space */
 
 /* Media selection options. */
 enum {
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index 2a88f645a5d8..801bdd1e56e3 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -697,6 +697,8 @@ enum nft_counter_attributes {
  * @NFTA_LOG_PREFIX: prefix to prepend to log messages (NLA_STRING)
  * @NFTA_LOG_SNAPLEN: length of payload to include in netlink message (NLA_U32)
  * @NFTA_LOG_QTHRESHOLD: queue threshold (NLA_U32)
+ * @NFTA_LOG_LEVEL: log level (NLA_U32)
+ * @NFTA_LOG_FLAGS: logging flags (NLA_U32)
  */
 enum nft_log_attributes {
         NFTA_LOG_UNSPEC,
@@ -704,6 +706,8 @@ enum nft_log_attributes {
         NFTA_LOG_PREFIX,
         NFTA_LOG_SNAPLEN,
         NFTA_LOG_QTHRESHOLD,
+        NFTA_LOG_LEVEL,
+        NFTA_LOG_FLAGS,
         __NFTA_LOG_MAX
 };
 #define NFTA_LOG_MAX            (__NFTA_LOG_MAX - 1)
diff --git a/include/uapi/linux/netfilter/xt_bpf.h b/include/uapi/linux/netfilter/xt_bpf.h
index 5dda450eb55b..1fad2c27ac32 100644
--- a/include/uapi/linux/netfilter/xt_bpf.h
+++ b/include/uapi/linux/netfilter/xt_bpf.h
@@ -6,12 +6,14 @@
 
 #define XT_BPF_MAX_NUM_INSTR    64
 
+struct bpf_prog;
+
 struct xt_bpf_info {
         __u16 bpf_program_num_elem;
         struct sock_filter bpf_program[XT_BPF_MAX_NUM_INSTR];
 
         /* only used in the kernel */
-        struct sk_filter *filter __attribute__((aligned(8)));
+        struct bpf_prog *filter __attribute__((aligned(8)));
 };
 
 #endif /*_XT_BPF_H */
diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild
index 348717c3a22f..0fbad8ef96de 100644
--- a/include/uapi/linux/netfilter_bridge/Kbuild
+++ b/include/uapi/linux/netfilter_bridge/Kbuild
@@ -14,6 +14,5 @@ header-y += ebt_nflog.h
 header-y += ebt_pkttype.h
 header-y += ebt_redirect.h
 header-y += ebt_stp.h
-header-y += ebt_ulog.h
 header-y += ebt_vlan.h
 header-y += ebtables.h
diff --git a/include/uapi/linux/netfilter_bridge/ebt_ulog.h b/include/uapi/linux/netfilter_bridge/ebt_ulog.h
deleted file mode 100644
index 89a6becb5269..000000000000
--- a/include/uapi/linux/netfilter_bridge/ebt_ulog.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _EBT_ULOG_H
-#define _EBT_ULOG_H
-
-#include <linux/types.h>
-
-#define EBT_ULOG_DEFAULT_NLGROUP 0
-#define EBT_ULOG_DEFAULT_QTHRESHOLD 1
-#define EBT_ULOG_MAXNLGROUPS 32 /* hardcoded netlink max */
-#define EBT_ULOG_PREFIX_LEN 32
-#define EBT_ULOG_MAX_QLEN 50
-#define EBT_ULOG_WATCHER "ulog"
-#define EBT_ULOG_VERSION 1
-
-struct ebt_ulog_info {
-        __u32 nlgroup;
-        unsigned int cprange;
-        unsigned int qthreshold;
-        char prefix[EBT_ULOG_PREFIX_LEN];
-};
-
-typedef struct ebt_ulog_packet_msg {
-        int version;
-        char indev[IFNAMSIZ];
-        char outdev[IFNAMSIZ];
-        char physindev[IFNAMSIZ];
-        char physoutdev[IFNAMSIZ];
-        char prefix[EBT_ULOG_PREFIX_LEN];
-        struct timeval stamp;
-        unsigned long mark;
-        unsigned int hook;
-        size_t data_len;
-        /* The complete packet, including Ethernet header and perhaps
-         * the VLAN header is appended */
-        unsigned char data[0] __attribute__
-                              ((aligned (__alignof__(struct ebt_ulog_info))));
-} ebt_ulog_packet_msg_t;
-
-#endif /* _EBT_ULOG_H */
diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild
index fb008437dde1..ecb291df390e 100644
--- a/include/uapi/linux/netfilter_ipv4/Kbuild
+++ b/include/uapi/linux/netfilter_ipv4/Kbuild
@@ -5,7 +5,6 @@ header-y += ipt_ECN.h
 header-y += ipt_LOG.h
 header-y += ipt_REJECT.h
 header-y += ipt_TTL.h
-header-y += ipt_ULOG.h
 header-y += ipt_ah.h
 header-y += ipt_ecn.h
 header-y += ipt_ttl.h
diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ULOG.h b/include/uapi/linux/netfilter_ipv4/ipt_ULOG.h
deleted file mode 100644
index 417aad280bcc..000000000000
--- a/include/uapi/linux/netfilter_ipv4/ipt_ULOG.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Header file for IP tables userspace logging, Version 1.8
- *
- * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
- * 
- * Distributed under the terms of GNU GPL */
-
-#ifndef _IPT_ULOG_H
-#define _IPT_ULOG_H
-
-#ifndef NETLINK_NFLOG
-#define NETLINK_NFLOG   5
-#endif
-
-#define ULOG_DEFAULT_NLGROUP    1
-#define ULOG_DEFAULT_QTHRESHOLD 1
-
-#define ULOG_MAC_LEN    80
-#define ULOG_PREFIX_LEN 32
-
-#define ULOG_MAX_QLEN   50
-/* Why 50? Well... there is a limit imposed by the slab cache 131000
- * bytes. So the multipart netlink-message has to be < 131000 bytes.
- * Assuming a standard ethernet-mtu of 1500, we could define this up
- * to 80... but even 50 seems to be big enough. */
-
-/* private data structure for each rule with a ULOG target */
-struct ipt_ulog_info {
-        unsigned int nl_group;
-        size_t copy_range;
-        size_t qthreshold;
-        char prefix[ULOG_PREFIX_LEN];
-};
-
-/* Format of the ULOG packets passed through netlink */
-typedef struct ulog_packet_msg {
-        unsigned long mark;
-        long timestamp_sec;
-        long timestamp_usec;
-        unsigned int hook;
-        char indev_name[IFNAMSIZ];
-        char outdev_name[IFNAMSIZ];
-        size_t data_len;
-        char prefix[ULOG_PREFIX_LEN];
-        unsigned char mac_len;
-        unsigned char mac[ULOG_MAC_LEN];
-        unsigned char payload[0];
-} ulog_packet_msg_t;
-
-#endif /*_IPT_ULOG_H*/
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index be9519b52bb1..f1db15b9c041 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -1591,6 +1591,9 @@ enum nl80211_commands {
  *      creation then the new interface will be owned by the netlink socket
  *      that created it and will be destroyed when the socket is closed
  *
+ * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
+ *      the TDLS link initiator.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -1931,6 +1934,8 @@ enum nl80211_attrs {
         NL80211_ATTR_CSA_C_OFFSETS_TX,
         NL80211_ATTR_MAX_CSA_COUNTERS,
 
+        NL80211_ATTR_TDLS_INITIATOR,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index 0b979ee4bfc0..a794d1dd7b40 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -118,6 +118,9 @@ struct ovs_vport_stats {
 /* Allow last Netlink attribute to be unaligned */
 #define OVS_DP_F_UNALIGNED      (1 << 0)
 
+/* Allow datapath to associate multiple Netlink PIDs to each vport */
+#define OVS_DP_F_VPORT_PIDS     (1 << 1)
+
 /* Fixed logical ports. */
 #define OVSP_LOCAL      ((__u32)0)
 
@@ -203,9 +206,10 @@ enum ovs_vport_type {
  * this is the name of the network device.  Maximum length %IFNAMSIZ-1 bytes
  * plus a null terminator.
  * @OVS_VPORT_ATTR_OPTIONS: Vport-specific configuration information.
- * @OVS_VPORT_ATTR_UPCALL_PID: The Netlink socket in userspace that
- * OVS_PACKET_CMD_MISS upcalls will be directed to for packets received on
- * this port.  A value of zero indicates that upcalls should not be sent.
+ * @OVS_VPORT_ATTR_UPCALL_PID: The array of Netlink socket pids in userspace
+ * among which OVS_PACKET_CMD_MISS upcalls will be distributed for packets
+ * received on this port.  If this is a single-element array of value 0,
+ * upcalls should not be sent.
  * @OVS_VPORT_ATTR_STATS: A &struct ovs_vport_stats giving statistics for
  * packets sent or received through the vport.
  *
@@ -228,7 +232,8 @@ enum ovs_vport_attr {
         OVS_VPORT_ATTR_TYPE,    /* u32 OVS_VPORT_TYPE_* constant. */
         OVS_VPORT_ATTR_NAME,    /* string name, up to IFNAMSIZ bytes long */
         OVS_VPORT_ATTR_OPTIONS, /* nested attributes, varies by vport type */
-        OVS_VPORT_ATTR_UPCALL_PID, /* u32 Netlink PID to receive upcalls */
+        OVS_VPORT_ATTR_UPCALL_PID, /* array of u32 Netlink socket PIDs for */
+                                /* receiving upcalls */
         OVS_VPORT_ATTR_STATS,   /* struct ovs_vport_stats */
         __OVS_VPORT_ATTR_MAX
 };
diff --git a/include/uapi/linux/random.h b/include/uapi/linux/random.h
index fff3528a078f..3f93d1695e7f 100644
--- a/include/uapi/linux/random.h
+++ b/include/uapi/linux/random.h
@@ -40,4 +40,13 @@ struct rand_pool_info {
         __u32   buf[0];
 };
 
+/*
+ * Flags for getrandom(2)
+ *
+ * GRND_NONBLOCK        Don't block and return EAGAIN instead
+ * GRND_RANDOM          Use the /dev/random pool instead of /dev/urandom
+ */
+#define GRND_NONBLOCK   0x0001
+#define GRND_RANDOM     0x0002
+
 #endif /* _UAPI_LINUX_RANDOM_H */
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index 266022a2be4a..ce70fe6b45df 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -95,6 +95,9 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_GET_ASSOC_ID_LIST  29      /* Read only */
 #define SCTP_AUTO_ASCONF       30
 #define SCTP_PEER_ADDR_THLDS    31
+#define SCTP_RECVRCVINFO        32
+#define SCTP_RECVNXTINFO        33
+#define SCTP_DEFAULT_SNDINFO    34
 
 /* Internal Socket Options. Some of the sctp library functions are
  * implemented using these socket options.
@@ -110,8 +113,14 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_SOCKOPT_CONNECTX3  111     /* CONNECTX requests (updated) */
 #define SCTP_GET_ASSOC_STATS    112     /* Read only */
 
-/*
- * 5.2.1 SCTP Initiation Structure (SCTP_INIT)
+/* These are bit fields for msghdr->msg_flags.  See section 5.1.  */
+/* On user space Linux, these live in <bits/socket.h> as an enum.  */
+enum sctp_msg_flags {
+        MSG_NOTIFICATION = 0x8000,
+#define MSG_NOTIFICATION MSG_NOTIFICATION
+};
+
+/* 5.3.1 SCTP Initiation Structure (SCTP_INIT)
  *
  *   This cmsghdr structure provides information for initializing new
  *   SCTP associations with sendmsg().  The SCTP_INITMSG socket option
@@ -121,7 +130,6 @@ typedef __s32 sctp_assoc_t;
  *   cmsg_level    cmsg_type      cmsg_data[]
  *   ------------  ------------   ----------------------
  *   IPPROTO_SCTP  SCTP_INIT      struct sctp_initmsg
- *
  */
 struct sctp_initmsg {
         __u16 sinit_num_ostreams;
@@ -130,8 +138,7 @@ struct sctp_initmsg {
         __u16 sinit_max_init_timeo;
 };
 
-/*
- * 5.2.2 SCTP Header Information Structure (SCTP_SNDRCV)
+/* 5.3.2 SCTP Header Information Structure (SCTP_SNDRCV)
  *
  *   This cmsghdr structure specifies SCTP options for sendmsg() and
  *   describes SCTP header information about a received message through
@@ -140,7 +147,6 @@ struct sctp_initmsg {
  *   cmsg_level    cmsg_type      cmsg_data[]
  *   ------------  ------------   ----------------------
  *   IPPROTO_SCTP  SCTP_SNDRCV    struct sctp_sndrcvinfo
- *
  */
 struct sctp_sndrcvinfo {
         __u16 sinfo_stream;
@@ -154,19 +160,74 @@ struct sctp_sndrcvinfo {
         sctp_assoc_t sinfo_assoc_id;
 };
 
+/* 5.3.4 SCTP Send Information Structure (SCTP_SNDINFO)
+ *
+ *   This cmsghdr structure specifies SCTP options for sendmsg().
+ *
+ *   cmsg_level    cmsg_type      cmsg_data[]
+ *   ------------  ------------   -------------------
+ *   IPPROTO_SCTP  SCTP_SNDINFO   struct sctp_sndinfo
+ */
+struct sctp_sndinfo {
+        __u16 snd_sid;
+        __u16 snd_flags;
+        __u32 snd_ppid;
+        __u32 snd_context;
+        sctp_assoc_t snd_assoc_id;
+};
+
+/* 5.3.5 SCTP Receive Information Structure (SCTP_RCVINFO)
+ *
+ *   This cmsghdr structure describes SCTP receive information
+ *   about a received message through recvmsg().
+ *
+ *   cmsg_level    cmsg_type      cmsg_data[]
+ *   ------------  ------------   -------------------
+ *   IPPROTO_SCTP  SCTP_RCVINFO   struct sctp_rcvinfo
+ */
+struct sctp_rcvinfo {
+        __u16 rcv_sid;
+        __u16 rcv_ssn;
+        __u16 rcv_flags;
+        __u32 rcv_ppid;
+        __u32 rcv_tsn;
+        __u32 rcv_cumtsn;
+        __u32 rcv_context;
+        sctp_assoc_t rcv_assoc_id;
+};
+
+/* 5.3.6 SCTP Next Receive Information Structure (SCTP_NXTINFO)
+ *
+ *   This cmsghdr structure describes SCTP receive information
+ *   of the next message that will be delivered through recvmsg()
+ *   if this information is already available when delivering
+ *   the current message.
+ *
+ *   cmsg_level    cmsg_type      cmsg_data[]
+ *   ------------  ------------   -------------------
+ *   IPPROTO_SCTP  SCTP_NXTINFO   struct sctp_nxtinfo
+ */
+struct sctp_nxtinfo {
+        __u16 nxt_sid;
+        __u16 nxt_flags;
+        __u32 nxt_ppid;
+        __u32 nxt_length;
+        sctp_assoc_t nxt_assoc_id;
+};
+
 /*
  *  sinfo_flags: 16 bits (unsigned integer)
  *
  *   This field may contain any of the following flags and is composed of
  *   a bitwise OR of these values.
  */
-
 enum sctp_sinfo_flags {
-        SCTP_UNORDERED = 1,  /* Send/receive message unordered. */
-        SCTP_ADDR_OVER = 2,  /* Override the primary destination. */
-        SCTP_ABORT=4,        /* Send an ABORT message to the peer. */
-        SCTP_SACK_IMMEDIATELY = 8,      /* SACK should be sent without delay */
-        SCTP_EOF=MSG_FIN,    /* Initiate graceful shutdown process. */
+        SCTP_UNORDERED          = (1 << 0), /* Send/receive message unordered. */
+        SCTP_ADDR_OVER          = (1 << 1), /* Override the primary destination. */
+        SCTP_ABORT              = (1 << 2), /* Send an ABORT message to the peer. */
+        SCTP_SACK_IMMEDIATELY   = (1 << 3), /* SACK should be sent without delay. */
+        SCTP_NOTIFICATION       = MSG_NOTIFICATION, /* Next message is not user msg but notification. */
+        SCTP_EOF                = MSG_FIN,  /* Initiate graceful shutdown process. */
 };
 
 typedef union {
@@ -177,10 +238,16 @@ typedef union {
 
 /* These are cmsg_types.  */
 typedef enum sctp_cmsg_type {
-        SCTP_INIT,              /* 5.2.1 SCTP Initiation Structure */
+        SCTP_INIT,              /* 5.2.1 SCTP Initiation Structure */
 #define SCTP_INIT       SCTP_INIT
-        SCTP_SNDRCV,            /* 5.2.2 SCTP Header Information Structure */
+        SCTP_SNDRCV,            /* 5.2.2 SCTP Header Information Structure */
 #define SCTP_SNDRCV     SCTP_SNDRCV
+        SCTP_SNDINFO,           /* 5.3.4 SCTP Send Information Structure */
+#define SCTP_SNDINFO    SCTP_SNDINFO
+        SCTP_RCVINFO,           /* 5.3.5 SCTP Receive Information Structure */
+#define SCTP_RCVINFO    SCTP_RCVINFO
+        SCTP_NXTINFO,           /* 5.3.6 SCTP Next Receive Information Structure */
+#define SCTP_NXTINFO    SCTP_NXTINFO
 } sctp_cmsg_t;
 
 /*
@@ -808,13 +875,6 @@ struct sctp_assoc_stats {
         __u64           sas_ictrlchunks; /* Control chunks received */
 };
 
-/* These are bit fields for msghdr->msg_flags.  See section 5.1.  */
-/* On user space Linux, these live in <bits/socket.h> as an enum.  */
-enum sctp_msg_flags {
-        MSG_NOTIFICATION = 0x8000,
-#define MSG_NOTIFICATION MSG_NOTIFICATION
-};
-
 /*
  * 8.1 sctp_bindx()
  *
diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h
index ac2dc9f72973..0f238a43ff1e 100644
--- a/include/uapi/linux/seccomp.h
+++ b/include/uapi/linux/seccomp.h
@@ -10,6 +10,13 @@
 #define SECCOMP_MODE_STRICT     1 /* uses hard-coded filter. */
 #define SECCOMP_MODE_FILTER     2 /* uses user-supplied filter. */
 
+/* Valid operations for seccomp syscall. */
+#define SECCOMP_SET_MODE_STRICT 0
+#define SECCOMP_SET_MODE_FILTER 1
+
+/* Valid flags for SECCOMP_SET_MODE_FILTER */
+#define SECCOMP_FILTER_FLAG_TSYNC       1
+
 /*
  * All BPF programs must return a 32-bit value.
  * The bottom 16-bits are for optional return data.
diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h
index 99b47058816a..df6c9ab6b0cd 100644
--- a/include/uapi/linux/serial_reg.h
+++ b/include/uapi/linux/serial_reg.h
@@ -88,6 +88,11 @@
 #define UART_FCR6_T_TRIGGER_30  0x30 /* Mask for transmit trigger set at 30 */
 #define UART_FCR7_64BYTE        0x20 /* Go into 64 byte mode (TI16C750) */
 
+#define UART_FCR_R_TRIG_SHIFT           6
+#define UART_FCR_R_TRIG_BITS(x)         \
+        (((x) & UART_FCR_TRIGGER_MASK) >> UART_FCR_R_TRIG_SHIFT)
+#define UART_FCR_R_TRIG_MAX_STATE       4
+
 #define UART_LCR        3       /* Out: Line Control Register */
 /*
  * Note: if the word length is 5 bits (UART_LCR_WLEN5), then setting 
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
index 6d6721341f49..43aaba1cc037 100644
--- a/include/uapi/linux/sysctl.h
+++ b/include/uapi/linux/sysctl.h
@@ -568,6 +568,7 @@ enum {
         NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
         NET_IPV6_PROXY_NDP=23,
         NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
+        NET_IPV6_ACCEPT_RA_FROM_LOCAL=26,
         __NET_IPV6_MAX
 };
 
diff --git a/include/uapi/linux/tipc_config.h b/include/uapi/linux/tipc_config.h
index 41a76acbb305..876d0a14863c 100644
--- a/include/uapi/linux/tipc_config.h
+++ b/include/uapi/linux/tipc_config.h
@@ -182,7 +182,7 @@
 
 #define TIPC_MIN_LINK_WIN 16
 #define TIPC_DEF_LINK_WIN 50
-#define TIPC_MAX_LINK_WIN 150
+#define TIPC_MAX_LINK_WIN 8191
 
 
 struct tipc_node_info {
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h
index 24b68c59dcf8..0154b2859fd7 100644
--- a/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@ -18,10 +18,9 @@ enum functionfs_flags {
         FUNCTIONFS_HAS_FS_DESC = 1,
         FUNCTIONFS_HAS_HS_DESC = 2,
         FUNCTIONFS_HAS_SS_DESC = 4,
+        FUNCTIONFS_HAS_MS_OS_DESC = 8,
 };
 
-#ifndef __KERNEL__
-
 /* Descriptor of an non-audio endpoint */
 struct usb_endpoint_descriptor_no_audio {
         __u8  bLength;
@@ -41,6 +40,37 @@ struct usb_functionfs_descs_head {
         __le32 hs_count;
 } __attribute__((packed, deprecated));
 
+/* MS OS Descriptor header */
+struct usb_os_desc_header {
+        __u8    interface;
+        __le32  dwLength;
+        __le16  bcdVersion;
+        __le16  wIndex;
+        union {
+                struct {
+                        __u8    bCount;
+                        __u8    Reserved;
+                };
+                __le16  wCount;
+        };
+} __attribute__((packed));
+
+struct usb_ext_compat_desc {
+        __u8    bFirstInterfaceNumber;
+        __u8    Reserved1;
+        __u8    CompatibleID[8];
+        __u8    SubCompatibleID[8];
+        __u8    Reserved2[6];
+};
+
+struct usb_ext_prop_desc {
+        __le32  dwSize;
+        __le32  dwPropertyDataType;
+        __le16  wPropertyNameLength;
+} __attribute__((packed));
+
+#ifndef __KERNEL__
+
 /*
  * Descriptors format:
  *
@@ -52,9 +82,11 @@ struct usb_functionfs_descs_head {
  * |     | fs_count  | LE32         | number of full-speed descriptors     |
  * |     | hs_count  | LE32         | number of high-speed descriptors     |
  * |     | ss_count  | LE32         | number of super-speed descriptors    |
+ * |     | os_count  | LE32         | number of MS OS descriptors          |
  * |     | fs_descrs | Descriptor[] | list of full-speed descriptors       |
  * |     | hs_descrs | Descriptor[] | list of high-speed descriptors       |
  * |     | ss_descrs | Descriptor[] | list of super-speed descriptors      |
+ * |     | os_descrs | OSDesc[]     | list of MS OS descriptors            |
  *
  * Depending on which flags are set, various fields may be missing in the
  * structure.  Any flags that are not recognised cause the whole block to be
@@ -81,6 +113,52 @@ struct usb_functionfs_descs_head {
  * |   0 | bLength         | U8   | length of the descriptor |
  * |   1 | bDescriptorType | U8   | descriptor type          |
  * |   2 | payload         |      | descriptor's payload     |
+ *
+ * OSDesc[] is an array of valid MS OS Feature Descriptors which have one of
+ * the following formats:
+ *
+ * | off | name            | type | description              |
+ * |-----+-----------------+------+--------------------------|
+ * |   0 | inteface        | U8   | related interface number |
+ * |   1 | dwLength        | U32  | length of the descriptor |
+ * |   5 | bcdVersion      | U16  | currently supported: 1   |
+ * |   7 | wIndex          | U16  | currently supported: 4   |
+ * |   9 | bCount          | U8   | number of ext. compat.   |
+ * |  10 | Reserved        | U8   | 0                        |
+ * |  11 | ExtCompat[]     |      | list of ext. compat. d.  |
+ *
+ * | off | name            | type | description              |
+ * |-----+-----------------+------+--------------------------|
+ * |   0 | inteface        | U8   | related interface number |
+ * |   1 | dwLength        | U32  | length of the descriptor |
+ * |   5 | bcdVersion      | U16  | currently supported: 1   |
+ * |   7 | wIndex          | U16  | currently supported: 5   |
+ * |   9 | wCount          | U16  | number of ext. compat.   |
+ * |  11 | ExtProp[]       |      | list of ext. prop. d.    |
+ *
+ * ExtCompat[] is an array of valid Extended Compatiblity descriptors
+ * which have the following format:
+ *
+ * | off | name                  | type | description                         |
+ * |-----+-----------------------+------+-------------------------------------|
+ * |   0 | bFirstInterfaceNumber | U8   | index of the interface or of the 1st|
+ * |     |                       |      | interface in an IAD group           |
+ * |   1 | Reserved              | U8   | 0                                   |
+ * |   2 | CompatibleID          | U8[8]| compatible ID string                |
+ * |  10 | SubCompatibleID       | U8[8]| subcompatible ID string             |
+ * |  18 | Reserved              | U8[6]| 0                                   |
+ *
+ * ExtProp[] is an array of valid Extended Properties descriptors
+ * which have the following format:
+ *
+ * | off | name                  | type | description                         |
+ * |-----+-----------------------+------+-------------------------------------|
+ * |   0 | dwSize                | U32  | length of the descriptor            |
+ * |   4 | dwPropertyDataType    | U32  | 1..7                                |
+ * |   8 | wPropertyNameLength   | U16  | bPropertyName length (NL)           |
+ * |  10 | bPropertyName         |U8[NL]| name of this property               |
+ * |10+NL| dwPropertyDataLength  | U32  | bPropertyData length (DL)           |
+ * |14+NL| bProperty             |U8[DL]| payload of this property            |
  */
 
 struct usb_functionfs_strings_head {
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 2ac5597f3ee1..e946e43fb8d5 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -61,6 +61,7 @@
 #define V4L2_CTRL_CLASS_DV              0x00a00000      /* Digital Video controls */
 #define V4L2_CTRL_CLASS_FM_RX           0x00a10000      /* FM Receiver controls */
 #define V4L2_CTRL_CLASS_RF_TUNER        0x00a20000      /* RF tuner controls */
+#define V4L2_CTRL_CLASS_DETECT          0x00a30000      /* Detection controls */
 
 /* User-class control IDs */
 
@@ -756,6 +757,15 @@ enum v4l2_auto_focus_range {
 #define V4L2_CID_RDS_TX_PTY                     (V4L2_CID_FM_TX_CLASS_BASE + 3)
 #define V4L2_CID_RDS_TX_PS_NAME                 (V4L2_CID_FM_TX_CLASS_BASE + 5)
 #define V4L2_CID_RDS_TX_RADIO_TEXT              (V4L2_CID_FM_TX_CLASS_BASE + 6)
+#define V4L2_CID_RDS_TX_MONO_STEREO             (V4L2_CID_FM_TX_CLASS_BASE + 7)
+#define V4L2_CID_RDS_TX_ARTIFICIAL_HEAD         (V4L2_CID_FM_TX_CLASS_BASE + 8)
+#define V4L2_CID_RDS_TX_COMPRESSED              (V4L2_CID_FM_TX_CLASS_BASE + 9)
+#define V4L2_CID_RDS_TX_DYNAMIC_PTY             (V4L2_CID_FM_TX_CLASS_BASE + 10)
+#define V4L2_CID_RDS_TX_TRAFFIC_ANNOUNCEMENT    (V4L2_CID_FM_TX_CLASS_BASE + 11)
+#define V4L2_CID_RDS_TX_TRAFFIC_PROGRAM         (V4L2_CID_FM_TX_CLASS_BASE + 12)
+#define V4L2_CID_RDS_TX_MUSIC_SPEECH            (V4L2_CID_FM_TX_CLASS_BASE + 13)
+#define V4L2_CID_RDS_TX_ALT_FREQS_ENABLE        (V4L2_CID_FM_TX_CLASS_BASE + 14)
+#define V4L2_CID_RDS_TX_ALT_FREQS               (V4L2_CID_FM_TX_CLASS_BASE + 15)
 
 #define V4L2_CID_AUDIO_LIMITER_ENABLED          (V4L2_CID_FM_TX_CLASS_BASE + 64)
 #define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME     (V4L2_CID_FM_TX_CLASS_BASE + 65)
@@ -900,6 +910,12 @@ enum v4l2_deemphasis {
 };
 
 #define V4L2_CID_RDS_RECEPTION                  (V4L2_CID_FM_RX_CLASS_BASE + 2)
+#define V4L2_CID_RDS_RX_PTY                     (V4L2_CID_FM_RX_CLASS_BASE + 3)
+#define V4L2_CID_RDS_RX_PS_NAME                 (V4L2_CID_FM_RX_CLASS_BASE + 4)
+#define V4L2_CID_RDS_RX_RADIO_TEXT              (V4L2_CID_FM_RX_CLASS_BASE + 5)
+#define V4L2_CID_RDS_RX_TRAFFIC_ANNOUNCEMENT    (V4L2_CID_FM_RX_CLASS_BASE + 6)
+#define V4L2_CID_RDS_RX_TRAFFIC_PROGRAM         (V4L2_CID_FM_RX_CLASS_BASE + 7)
+#define V4L2_CID_RDS_RX_MUSIC_SPEECH            (V4L2_CID_FM_RX_CLASS_BASE + 8)
 
 #define V4L2_CID_RF_TUNER_CLASS_BASE            (V4L2_CTRL_CLASS_RF_TUNER | 0x900)
 #define V4L2_CID_RF_TUNER_CLASS                 (V4L2_CTRL_CLASS_RF_TUNER | 1)
@@ -914,4 +930,20 @@ enum v4l2_deemphasis {
 #define V4L2_CID_RF_TUNER_IF_GAIN               (V4L2_CID_RF_TUNER_CLASS_BASE + 62)
 #define V4L2_CID_RF_TUNER_PLL_LOCK                      (V4L2_CID_RF_TUNER_CLASS_BASE + 91)
 
+
+/*  Detection-class control IDs defined by V4L2 */
+#define V4L2_CID_DETECT_CLASS_BASE              (V4L2_CTRL_CLASS_DETECT | 0x900)
+#define V4L2_CID_DETECT_CLASS                   (V4L2_CTRL_CLASS_DETECT | 1)
+
+#define V4L2_CID_DETECT_MD_MODE                 (V4L2_CID_DETECT_CLASS_BASE + 1)
+enum v4l2_detect_md_mode {
+        V4L2_DETECT_MD_MODE_DISABLED            = 0,
+        V4L2_DETECT_MD_MODE_GLOBAL              = 1,
+        V4L2_DETECT_MD_MODE_THRESHOLD_GRID      = 2,
+        V4L2_DETECT_MD_MODE_REGION_GRID         = 3,
+};
+#define V4L2_CID_DETECT_MD_GLOBAL_THRESHOLD     (V4L2_CID_DETECT_CLASS_BASE + 2)
+#define V4L2_CID_DETECT_MD_THRESHOLD_GRID       (V4L2_CID_DETECT_CLASS_BASE + 3)
+#define V4L2_CID_DETECT_MD_REGION_GRID          (V4L2_CID_DETECT_CLASS_BASE + 4)
+
 #endif
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 168ff507bf75..778a3298fb34 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -124,6 +124,10 @@ enum v4l2_field {
          (field) == V4L2_FIELD_INTERLACED_BT ||\
          (field) == V4L2_FIELD_SEQ_TB ||\
          (field) == V4L2_FIELD_SEQ_BT)
+#define V4L2_FIELD_HAS_T_OR_B(field)    \
+        ((field) == V4L2_FIELD_BOTTOM ||\
+         (field) == V4L2_FIELD_TOP ||\
+         (field) == V4L2_FIELD_ALTERNATE)
 
 enum v4l2_buf_type {
         V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
@@ -268,6 +272,7 @@ struct v4l2_capability {
 #define V4L2_CAP_MODULATOR              0x00080000  /* has a modulator */
 
 #define V4L2_CAP_SDR_CAPTURE            0x00100000  /* Is a SDR capture device */
+#define V4L2_CAP_EXT_PIX_FORMAT         0x00200000  /* Supports the extended pixel format */
 
 #define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
 #define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
@@ -287,6 +292,7 @@ struct v4l2_pix_format {
         __u32                   sizeimage;
         __u32                   colorspace;     /* enum v4l2_colorspace */
         __u32                   priv;           /* private data, depends on pixelformat */
+        __u32                   flags;          /* format flags (V4L2_PIX_FMT_FLAG_*) */
 };
 
 /*      Pixel format         FOURCC                          depth  Description  */
@@ -294,7 +300,11 @@ struct v4l2_pix_format {
 /* RGB formats */
 #define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
 #define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
+#define V4L2_PIX_FMT_ARGB444 v4l2_fourcc('A', 'R', '1', '2') /* 16  aaaarrrr ggggbbbb */
+#define V4L2_PIX_FMT_XRGB444 v4l2_fourcc('X', 'R', '1', '2') /* 16  xxxxrrrr ggggbbbb */
 #define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
+#define V4L2_PIX_FMT_ARGB555 v4l2_fourcc('A', 'R', '1', '5') /* 16  ARGB-1-5-5-5  */
+#define V4L2_PIX_FMT_XRGB555 v4l2_fourcc('X', 'R', '1', '5') /* 16  XRGB-1-5-5-5  */
 #define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
 #define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
 #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
@@ -302,7 +312,11 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
 #define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
 #define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
+#define V4L2_PIX_FMT_ABGR32  v4l2_fourcc('A', 'R', '2', '4') /* 32  BGRA-8-8-8-8  */
+#define V4L2_PIX_FMT_XBGR32  v4l2_fourcc('X', 'R', '2', '4') /* 32  BGRX-8-8-8-8  */
 #define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
+#define V4L2_PIX_FMT_ARGB32  v4l2_fourcc('B', 'A', '2', '4') /* 32  ARGB-8-8-8-8  */
+#define V4L2_PIX_FMT_XRGB32  v4l2_fourcc('B', 'X', '2', '4') /* 32  XRGB-8-8-8-8  */
 
 /* Grey formats */
 #define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
@@ -439,6 +453,15 @@ struct v4l2_pix_format {
 /* SDR formats - used only for Software Defined Radio devices */
 #define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
 #define V4L2_SDR_FMT_CU16LE       v4l2_fourcc('C', 'U', '1', '6') /* IQ u16le */
+#define V4L2_SDR_FMT_CS8          v4l2_fourcc('C', 'S', '0', '8') /* complex s8 */
+#define V4L2_SDR_FMT_CS14LE       v4l2_fourcc('C', 'S', '1', '4') /* complex s14le */
+#define V4L2_SDR_FMT_RU12LE       v4l2_fourcc('R', 'U', '1', '2') /* real u12le */
+
+/* priv field value to indicates that subsequent fields are valid. */
+#define V4L2_PIX_FMT_PRIV_MAGIC         0xfeedcafe
+
+/* Flags */
+#define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA  0x00000001
 
 /*
  *      F O R M A T   E N U M E R A T I O N
@@ -744,7 +767,16 @@ struct v4l2_framebuffer {
 /* FIXME: in theory we should pass something like PCI device + memory
  * region + offset instead of some physical address */
         void                    *base;
-        struct v4l2_pix_format  fmt;
+        struct {
+                __u32           width;
+                __u32           height;
+                __u32           pixelformat;
+                __u32           field;          /* enum v4l2_field */
+                __u32           bytesperline;   /* for padding, zero if unused */
+                __u32           sizeimage;
+                __u32           colorspace;     /* enum v4l2_colorspace */
+                __u32           priv;           /* reserved field, set to 0 */
+        } fmt;
 };
 /*  Flags for the 'capability' field. Read only */
 #define V4L2_FBUF_CAP_EXTERNOVERLAY     0x0001
@@ -1254,6 +1286,10 @@ struct v4l2_ext_control {
                 __s32 value;
                 __s64 value64;
                 char *string;
+                __u8 *p_u8;
+                __u16 *p_u16;
+                __u32 *p_u32;
+                void *ptr;
         };
 } __attribute__ ((packed));
 
@@ -1268,6 +1304,7 @@ struct v4l2_ext_controls {
 #define V4L2_CTRL_ID_MASK         (0x0fffffff)
 #define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
 #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
+#define V4L2_CTRL_MAX_DIMS        (4)
 
 enum v4l2_ctrl_type {
         V4L2_CTRL_TYPE_INTEGER       = 1,
@@ -1278,7 +1315,13 @@ enum v4l2_ctrl_type {
         V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
         V4L2_CTRL_TYPE_STRING        = 7,
         V4L2_CTRL_TYPE_BITMASK       = 8,
-        V4L2_CTRL_TYPE_INTEGER_MENU = 9,
+        V4L2_CTRL_TYPE_INTEGER_MENU  = 9,
+
+        /* Compound types are >= 0x0100 */
+        V4L2_CTRL_COMPOUND_TYPES     = 0x0100,
+        V4L2_CTRL_TYPE_U8            = 0x0100,
+        V4L2_CTRL_TYPE_U16           = 0x0101,
+        V4L2_CTRL_TYPE_U32           = 0x0102,
 };
 
 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
@@ -1294,6 +1337,23 @@ struct v4l2_queryctrl {
         __u32                reserved[2];
 };
 
+/*  Used in the VIDIOC_QUERY_EXT_CTRL ioctl for querying extended controls */
+struct v4l2_query_ext_ctrl {
+        __u32                id;
+        __u32                type;
+        char                 name[32];
+        __s64                minimum;
+        __s64                maximum;
+        __u64                step;
+        __s64                default_value;
+        __u32                flags;
+        __u32                elem_size;
+        __u32                elems;
+        __u32                nr_of_dims;
+        __u32                dims[V4L2_CTRL_MAX_DIMS];
+        __u32                reserved[32];
+};
+
 /*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
 struct v4l2_querymenu {
         __u32           id;
@@ -1314,9 +1374,11 @@ struct v4l2_querymenu {
 #define V4L2_CTRL_FLAG_SLIDER           0x0020
 #define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
 #define V4L2_CTRL_FLAG_VOLATILE         0x0080
+#define V4L2_CTRL_FLAG_HAS_PAYLOAD      0x0100
 
-/*  Query flag, to be ORed with the control ID */
+/*  Query flags, to be ORed with the control ID */
 #define V4L2_CTRL_FLAG_NEXT_CTRL        0x80000000
+#define V4L2_CTRL_FLAG_NEXT_COMPOUND    0x40000000
 
 /*  User-class control IDs defined by V4L2 */
 #define V4L2_CID_MAX_CTRLS              1024
@@ -1582,6 +1644,12 @@ struct v4l2_vbi_format {
 #define V4L2_VBI_UNSYNC         (1 << 0)
 #define V4L2_VBI_INTERLACED     (1 << 1)
 
+/* ITU-R start lines for each field */
+#define V4L2_VBI_ITU_525_F1_START (1)
+#define V4L2_VBI_ITU_525_F2_START (264)
+#define V4L2_VBI_ITU_625_F1_START (1)
+#define V4L2_VBI_ITU_625_F2_START (314)
+
 /* Sliced VBI
  *
  *    This implements is a proposal V4L2 API to allow SLICED VBI
@@ -1705,6 +1773,7 @@ struct v4l2_plane_pix_format {
  * @colorspace:         enum v4l2_colorspace; supplemental to pixelformat
  * @plane_fmt:          per-plane information
  * @num_planes:         number of planes for this format
+ * @flags:              format flags (V4L2_PIX_FMT_FLAG_*)
  */
 struct v4l2_pix_format_mplane {
         __u32                           width;
@@ -1715,16 +1784,19 @@ struct v4l2_pix_format_mplane {
 
         struct v4l2_plane_pix_format    plane_fmt[VIDEO_MAX_PLANES];
         __u8                            num_planes;
-        __u8                            reserved[11];
+        __u8                            flags;
+        __u8                            reserved[10];
 } __attribute__ ((packed));
 
 /**
  * struct v4l2_sdr_format - SDR format definition
  * @pixelformat:        little endian four character code (fourcc)
+ * @buffersize:         maximum size in bytes required for data
  */
 struct v4l2_sdr_format {
         __u32                           pixelformat;
-        __u8                            reserved[28];
+        __u32                           buffersize;
+        __u8                            reserved[24];
 } __attribute__ ((packed));
 
 /**
@@ -1771,6 +1843,7 @@ struct v4l2_streamparm {
 #define V4L2_EVENT_CTRL                         3
 #define V4L2_EVENT_FRAME_SYNC                   4
 #define V4L2_EVENT_SOURCE_CHANGE                5
+#define V4L2_EVENT_MOTION_DET                   6
 #define V4L2_EVENT_PRIVATE_START                0x08000000
 
 /* Payload for V4L2_EVENT_VSYNC */
@@ -1808,6 +1881,21 @@ struct v4l2_event_src_change {
         __u32 changes;
 };
 
+#define V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ (1 << 0)
+
+/**
+ * struct v4l2_event_motion_det - motion detection event
+ * @flags:             if V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ is set, then the
+ *                     frame_sequence field is valid.
+ * @frame_sequence:    the frame sequence number associated with this event.
+ * @region_mask:       which regions detected motion.
+ */
+struct v4l2_event_motion_det {
+        __u32 flags;
+        __u32 frame_sequence;
+        __u32 region_mask;
+};
+
 struct v4l2_event {
         __u32                           type;
         union {
@@ -1815,6 +1903,7 @@ struct v4l2_event {
                 struct v4l2_event_ctrl          ctrl;
                 struct v4l2_event_frame_sync    frame_sync;
                 struct v4l2_event_src_change    src_change;
+                struct v4l2_event_motion_det    motion_det;
                 __u8                            data[64];
         } u;
         __u32                           pending;
@@ -2005,6 +2094,8 @@ struct v4l2_create_buffers {
    Never use these in applications! */
 #define VIDIOC_DBG_G_CHIP_INFO  _IOWR('V', 102, struct v4l2_dbg_chip_info)
 
+#define VIDIOC_QUERY_EXT_CTRL   _IOWR('V', 103, struct v4l2_query_ext_ctrl)
+
 /* Reminder: when adding new ioctls please add support for them to
    drivers/media/video/v4l2-compat-ioctl32.c as well! */
 
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
index 224948342f14..32168f7ffce3 100644
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
@@ -139,7 +139,7 @@ struct snd_hwdep_dsp_image {
  *                                                                           *
  *****************************************************************************/
 
-#define SNDRV_PCM_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 11)
+#define SNDRV_PCM_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 12)
 
 typedef unsigned long snd_pcm_uframes_t;
 typedef signed long snd_pcm_sframes_t;
@@ -391,7 +391,9 @@ struct snd_pcm_sw_params {
         snd_pcm_uframes_t silence_threshold;    /* min distance from noise for silence filling */
         snd_pcm_uframes_t silence_size;         /* silence block size */
         snd_pcm_uframes_t boundary;             /* pointers wrap point */
-        unsigned char reserved[64];             /* reserved for future */
+        unsigned int proto;                     /* protocol version */
+        unsigned int tstamp_type;               /* timestamp type (req. proto >= 2.0.12) */
+        unsigned char reserved[56];             /* reserved for future */
 };
 
 struct snd_pcm_channel_info {
@@ -462,7 +464,8 @@ struct snd_xfern {
 enum {
         SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0, /* gettimeofday equivalent */
         SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,        /* posix_clock_monotonic equivalent */
-        SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,
+        SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW,    /* monotonic_raw (no NTP) */
+        SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW,
 };
 
 /* channel positions */
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index a5af2a26d94f..5c1aba154b64 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -170,6 +170,7 @@ gnttab_set_unmap_op(struct gnttab_unmap_grant_ref *unmap, phys_addr_t addr,
         unmap->dev_bus_addr = 0;
 }
 
+int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status);
 int arch_gnttab_map_shared(xen_pfn_t *frames, unsigned long nr_gframes,
                            unsigned long max_nr_gframes,
                            void **__shared);
diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h
index f1331e3e7271..5cc49ea8d840 100644
--- a/include/xen/interface/platform.h
+++ b/include/xen/interface/platform.h
@@ -108,11 +108,113 @@ struct xenpf_platform_quirk {
 };
 DEFINE_GUEST_HANDLE_STRUCT(xenpf_platform_quirk_t);
 
+#define XENPF_efi_runtime_call    49
+#define XEN_EFI_get_time                      1
+#define XEN_EFI_set_time                      2
+#define XEN_EFI_get_wakeup_time               3
+#define XEN_EFI_set_wakeup_time               4
+#define XEN_EFI_get_next_high_monotonic_count 5
+#define XEN_EFI_get_variable                  6
+#define XEN_EFI_set_variable                  7
+#define XEN_EFI_get_next_variable_name        8
+#define XEN_EFI_query_variable_info           9
+#define XEN_EFI_query_capsule_capabilities   10
+#define XEN_EFI_update_capsule               11
+
+struct xenpf_efi_runtime_call {
+        uint32_t function;
+        /*
+         * This field is generally used for per sub-function flags (defined
+         * below), except for the XEN_EFI_get_next_high_monotonic_count case,
+         * where it holds the single returned value.
+         */
+        uint32_t misc;
+        xen_ulong_t status;
+        union {
+#define XEN_EFI_GET_TIME_SET_CLEARS_NS 0x00000001
+                struct {
+                        struct xenpf_efi_time {
+                                uint16_t year;
+                                uint8_t month;
+                                uint8_t day;
+                                uint8_t hour;
+                                uint8_t min;
+                                uint8_t sec;
+                                uint32_t ns;
+                                int16_t tz;
+                                uint8_t daylight;
+                        } time;
+                        uint32_t resolution;
+                        uint32_t accuracy;
+                } get_time;
+
+                struct xenpf_efi_time set_time;
+
+#define XEN_EFI_GET_WAKEUP_TIME_ENABLED 0x00000001
+#define XEN_EFI_GET_WAKEUP_TIME_PENDING 0x00000002
+                struct xenpf_efi_time get_wakeup_time;
+
+#define XEN_EFI_SET_WAKEUP_TIME_ENABLE      0x00000001
+#define XEN_EFI_SET_WAKEUP_TIME_ENABLE_ONLY 0x00000002
+                struct xenpf_efi_time set_wakeup_time;
+
+#define XEN_EFI_VARIABLE_NON_VOLATILE       0x00000001
+#define XEN_EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002
+#define XEN_EFI_VARIABLE_RUNTIME_ACCESS     0x00000004
+                struct {
+                        GUEST_HANDLE(void) name;  /* UCS-2/UTF-16 string */
+                        xen_ulong_t size;
+                        GUEST_HANDLE(void) data;
+                        struct xenpf_efi_guid {
+                                uint32_t data1;
+                                uint16_t data2;
+                                uint16_t data3;
+                                uint8_t data4[8];
+                        } vendor_guid;
+                } get_variable, set_variable;
+
+                struct {
+                        xen_ulong_t size;
+                        GUEST_HANDLE(void) name;  /* UCS-2/UTF-16 string */
+                        struct xenpf_efi_guid vendor_guid;
+                } get_next_variable_name;
+
+                struct {
+                        uint32_t attr;
+                        uint64_t max_store_size;
+                        uint64_t remain_store_size;
+                        uint64_t max_size;
+                } query_variable_info;
+
+                struct {
+                        GUEST_HANDLE(void) capsule_header_array;
+                        xen_ulong_t capsule_count;
+                        uint64_t max_capsule_size;
+                        uint32_t reset_type;
+                } query_capsule_capabilities;
+
+                struct {
+                        GUEST_HANDLE(void) capsule_header_array;
+                        xen_ulong_t capsule_count;
+                        uint64_t sg_list; /* machine address */
+                } update_capsule;
+        } u;
+};
+DEFINE_GUEST_HANDLE_STRUCT(xenpf_efi_runtime_call);
+
+#define  XEN_FW_EFI_VERSION        0
+#define  XEN_FW_EFI_CONFIG_TABLE   1
+#define  XEN_FW_EFI_VENDOR         2
+#define  XEN_FW_EFI_MEM_INFO       3
+#define  XEN_FW_EFI_RT_VERSION     4
+
 #define XENPF_firmware_info       50
 #define XEN_FW_DISK_INFO          1 /* from int 13 AH=08/41/48 */
 #define XEN_FW_DISK_MBR_SIGNATURE 2 /* from MBR offset 0x1b8 */
 #define XEN_FW_VBEDDC_INFO        3 /* from int 10 AX=4f15 */
+#define XEN_FW_EFI_INFO           4 /* from EFI */
 #define XEN_FW_KBD_SHIFT_FLAGS    5 /* Int16, Fn02: Get keyboard shift flags. */
+
 struct xenpf_firmware_info {
         /* IN variables. */
         uint32_t type;
@@ -144,6 +246,26 @@ struct xenpf_firmware_info {
                         GUEST_HANDLE(uchar) edid;
                 } vbeddc_info; /* XEN_FW_VBEDDC_INFO */
 
+                union xenpf_efi_info {
+                        uint32_t version;
+                        struct {
+                                uint64_t addr;   /* EFI_CONFIGURATION_TABLE */
+                                uint32_t nent;
+                        } cfg;
+                        struct {
+                                uint32_t revision;
+                                uint32_t bufsz;  /* input, in bytes */
+                                GUEST_HANDLE(void) name;
+                                /* UCS-2/UTF-16 string */
+                        } vendor;
+                        struct {
+                                uint64_t addr;
+                                uint64_t size;
+                                uint64_t attr;
+                                uint32_t type;
+                        } mem;
+                } efi_info; /* XEN_FW_EFI_INFO */
+
                 uint8_t kbd_shift_flags; /* XEN_FW_KBD_SHIFT_FLAGS */
         } u;
 };
@@ -362,6 +484,7 @@ struct xen_platform_op {
                 struct xenpf_read_memtype      read_memtype;
                 struct xenpf_microcode_update  microcode;
                 struct xenpf_platform_quirk    platform_quirk;
+                struct xenpf_efi_runtime_call  efi_runtime_call;
                 struct xenpf_firmware_info     firmware_info;
                 struct xenpf_enter_acpi_sleep  enter_acpi_sleep;
                 struct xenpf_change_freq       change_freq;
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 0b3149ed7eaa..7491ee5d8164 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -3,6 +3,7 @@
 
 #include <linux/percpu.h>
 #include <linux/notifier.h>
+#include <linux/efi.h>
 #include <asm/xen/interface.h>
 
 DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu);
@@ -35,4 +36,14 @@ int xen_unmap_domain_mfn_range(struct vm_area_struct *vma,
                                int numpgs, struct page **pages);
 
 bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);
+
+#ifdef CONFIG_XEN_EFI
+extern efi_system_table_t *xen_efi_probe(void);
+#else
+static inline efi_system_table_t __init *xen_efi_probe(void)
+{
+        return NULL;
+}
+#endif
+
 #endif /* INCLUDE_XEN_OPS_H */