111 files changed, 1858 insertions, 1023 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 3994d7790b23..bcbdd7484e58 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -74,9 +74,10 @@ enum acpi_address_range_id {
 /* Table Handlers */
-typedef int (*acpi_table_handler) (struct acpi_table_header *table);
+typedef int (*acpi_tbl_table_handler)(struct acpi_table_header *table);
-typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);
+typedef int (*acpi_tbl_entry_handler)(struct acpi_subtable_header *header,
+                                      const unsigned long end);
 #ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
 void acpi_initrd_override(void *data, size_t size);
@@ -95,10 +96,14 @@ int acpi_mps_check (void);
 int acpi_numa_init (void);
 int acpi_table_init (void);
-int acpi_table_parse (char *id, acpi_table_handler handler);
+int acpi_table_parse(char *id, acpi_tbl_table_handler handler);
 int __init acpi_table_parse_entries(char *id, unsigned long table_size,
-        int entry_id, acpi_table_entry_handler handler, unsigned int max_entries);
+                                    int entry_id,
-int acpi_table_parse_madt (enum acpi_madt_type id, acpi_table_entry_handler handler, unsigned int max_entries);
+                                    acpi_tbl_entry_handler handler,
+                                    unsigned int max_entries);
+int acpi_table_parse_madt(enum acpi_madt_type id,
+                          acpi_tbl_entry_handler handler,
+                          unsigned int max_entries);
 int acpi_parse_mcfg (struct acpi_table_header *header);
 void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
@@ -358,8 +363,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
 #if defined(CONFIG_ACPI_HOTPLUG_CPU) &&                 \
        (defined(CONFIG_ACPI_HOTPLUG_MEMORY) ||         \
         defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \
-        (defined(CONFIG_ACPI_CONTAINER) ||              \
+        defined(CONFIG_ACPI_CONTAINER)
-         defined(CONFIG_ACPI_CONTAINER_MODULE))
 #define ACPI_HOTPLUG_OST
 #endif
@@ -511,7 +515,7 @@ static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; }
 static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }
 #endif
-#ifdef CONFIG_ACPI_SLEEP
+#if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
 int acpi_dev_suspend_late(struct device *dev);
 int acpi_dev_resume_early(struct device *dev);
 int acpi_subsys_prepare(struct device *dev);
@@ -526,9 +530,14 @@ static inline int acpi_subsys_resume_early(struct device *dev) { return 0; }
 #endif
 #if defined(CONFIG_ACPI) && defined(CONFIG_PM)
+struct acpi_device *acpi_dev_pm_get_node(struct device *dev);
 int acpi_dev_pm_attach(struct device *dev, bool power_on);
 void acpi_dev_pm_detach(struct device *dev, bool power_off);
 #else
+static inline struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
+{
+        return NULL;
+}
 static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
 {
        return -ENODEV;
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 544abdb2238c..ec10e1b24c1c 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -49,8 +49,8 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
 }
 #endif
-extern void cper_print_aer(const char *prefix, int cper_severity,
+extern void cper_print_aer(const char *prefix, struct pci_dev *dev,
-                           struct aer_capability_regs *aer);
+                           int cper_severity, struct aer_capability_regs *aer);
 extern int cper_severity_to_aer(int cper_severity);
 extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
                              int severity);
diff --git a/include/linux/async.h b/include/linux/async.h
index 7a24fe9b44b4..a2e3f18b2ad6 100644
--- a/include/linux/async.h
+++ b/include/linux/async.h
@@ -19,8 +19,7 @@ typedef u64 async_cookie_t;
 typedef void (async_func_ptr) (void *data, async_cookie_t cookie);
 struct async_domain {
        struct list_head node;
-        struct list_head domain;
+        struct list_head pending;
-        int count;
        unsigned registered:1;
 };
@@ -29,8 +28,7 @@ struct async_domain {
 */
 #define ASYNC_DOMAIN(_name) \
        struct async_domain _name = { .node = LIST_HEAD_INIT(_name.node), \
-                                      .domain = LIST_HEAD_INIT(_name.domain), \
+                                      .pending = LIST_HEAD_INIT(_name.pending), \
-                                      .count = 0, \
                                      .registered = 1 }
 /*
@@ -39,8 +37,7 @@ struct async_domain {
 */
 #define ASYNC_DOMAIN_EXCLUSIVE(_name) \
        struct async_domain _name = { .node = LIST_HEAD_INIT(_name.node), \
-                                      .domain = LIST_HEAD_INIT(_name.domain), \
+                                      .pending = LIST_HEAD_INIT(_name.pending), \
-                                      .count = 0, \
                                      .registered = 0 }
 extern async_cookie_t async_schedule(async_func_ptr *ptr, void *data);
@@ -52,4 +49,5 @@ extern void async_synchronize_full_domain(struct async_domain *domain);
 extern void async_synchronize_cookie(async_cookie_t cookie);
 extern void async_synchronize_cookie_domain(async_cookie_t cookie,
                                            struct async_domain *domain);
+extern bool current_is_async(void);
 #endif
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 9a0e3fa3ca95..1d002b58b60b 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -27,7 +27,7 @@
 #define   BCMA_CC_FLASHT_NONE           0x00000000      /* No flash */
 #define   BCMA_CC_FLASHT_STSER          0x00000100      /* ST serial flash */
 #define   BCMA_CC_FLASHT_ATSER          0x00000200      /* Atmel serial flash */
-#define   BCMA_CC_FLASHT_NFLASH         0x00000200      /* NAND flash */
+#define   BCMA_CC_FLASHT_NAND           0x00000300      /* NAND flash */
 #define   BCMA_CC_FLASHT_PARA           0x00000700      /* Parallel flash */
 #define  BCMA_CC_CAP_PLLT               0x00038000      /* PLL Type */
 #define   BCMA_PLLTYPE_NONE             0x00000000
@@ -634,4 +634,6 @@ extern void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc,
                                       u32 offset, u32 mask, u32 set);
 extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid);
+extern u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc);
 #endif /* LINUX_BCMA_DRIVER_CC_H_ */
diff --git a/include/linux/bcma/bcma_driver_mips.h b/include/linux/bcma/bcma_driver_mips.h
index 0baf8a56b794..fb61f3fb4ddb 100644
--- a/include/linux/bcma/bcma_driver_mips.h
+++ b/include/linux/bcma/bcma_driver_mips.h
@@ -28,6 +28,7 @@
 #define BCMA_MIPS_MIPS74K_GPIOEN        0x0048
 #define BCMA_MIPS_MIPS74K_CLKCTLST      0x01E0
+#define BCMA_MIPS_OOBSELINA74           0x004
 #define BCMA_MIPS_OOBSELOUTA30          0x100
 struct bcma_device;
@@ -36,19 +37,23 @@ struct bcma_drv_mips {
        struct bcma_device *core;
        u8 setup_done:1;
        u8 early_setup_done:1;
-        unsigned int assigned_irqs;
 };
 #ifdef CONFIG_BCMA_DRIVER_MIPS
 extern void bcma_core_mips_init(struct bcma_drv_mips *mcore);
 extern void bcma_core_mips_early_init(struct bcma_drv_mips *mcore);
+extern unsigned int bcma_core_irq(struct bcma_device *core);
 #else
 static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore) { }
 static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }
+static inline unsigned int bcma_core_irq(struct bcma_device *core)
+{
+        return 0;
+}
 #endif
 extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);
-extern unsigned int bcma_core_mips_irq(struct bcma_device *dev);
 #endif /* LINUX_BCMA_DRIVER_MIPS_H_ */
diff --git a/include/linux/bcma/bcma_driver_pci.h b/include/linux/bcma/bcma_driver_pci.h
index c48d98d27b77..424760f01b9d 100644
--- a/include/linux/bcma/bcma_driver_pci.h
+++ b/include/linux/bcma/bcma_driver_pci.h
@@ -179,6 +179,8 @@ struct pci_dev;
 #define BCMA_CORE_PCI_CFG_FUN_MASK              7       /* Function mask */
 #define BCMA_CORE_PCI_CFG_OFF_MASK              0xfff   /* Register mask */
+#define BCMA_CORE_PCI_CFG_DEVCTRL               0xd8
 /* PCIE Root Capability Register bits (Host mode only) */
 #define BCMA_CORE_PCI_RC_CRS_VISIBILITY         0x0001
diff --git a/include/linux/bma150.h b/include/linux/bma150.h
index 7911fda23bb4..97ade7cdc870 100644
--- a/include/linux/bma150.h
+++ b/include/linux/bma150.h
@@ -22,6 +22,18 @@
 #define BMA150_DRIVER           "bma150"
+#define BMA150_RANGE_2G         0
+#define BMA150_RANGE_4G         1
+#define BMA150_RANGE_8G         2
+#define BMA150_BW_25HZ          0
+#define BMA150_BW_50HZ          1
+#define BMA150_BW_100HZ         2
+#define BMA150_BW_190HZ         3
+#define BMA150_BW_375HZ         4
+#define BMA150_BW_750HZ         5
+#define BMA150_BW_1500HZ        6
 struct bma150_cfg {
        bool any_motion_int;            /* Set to enable any-motion interrupt */
        bool hg_int;                    /* Set to enable high-G interrupt */
@@ -34,8 +46,8 @@ struct bma150_cfg {
        unsigned char lg_hyst;          /* Low-G hysterisis */
        unsigned char lg_dur;           /* Low-G duration */
        unsigned char lg_thres;         /* Low-G threshold */
-        unsigned char range;            /* BMA0150_RANGE_xxx (in G) */
+        unsigned char range;            /* one of BMA0150_RANGE_xxx */
-        unsigned char bandwidth;        /* BMA0150_BW_xxx (in Hz) */
+        unsigned char bandwidth;        /* one of BMA0150_BW_xxx */
 };
 struct bma150_platform_data {
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 2b2fc345afca..fb0ab651a041 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -16,6 +16,7 @@
 #include <linux/can.h>
 #include <linux/can/netlink.h>
 #include <linux/can/error.h>
+#include <linux/can/led.h>
 /*
 * CAN mode
@@ -52,6 +53,13 @@ struct can_priv {
        unsigned int echo_skb_max;
        struct sk_buff **echo_skb;
+#ifdef CONFIG_CAN_LEDS
+        struct led_trigger *tx_led_trig;
+        char tx_led_trig_name[CAN_LED_NAME_SZ];
+        struct led_trigger *rx_led_trig;
+        char rx_led_trig_name[CAN_LED_NAME_SZ];
+#endif
 };
 /*
@@ -98,6 +106,9 @@ u8 can_len2dlc(u8 len);
 struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);
 void free_candev(struct net_device *dev);
+/* a candev safe wrapper around netdev_priv */
+struct can_priv *safe_candev_priv(struct net_device *dev);
 int open_candev(struct net_device *dev);
 void close_candev(struct net_device *dev);
diff --git a/include/linux/can/led.h b/include/linux/can/led.h
new file mode 100644
index 000000000000..9c1167baf273
--- /dev/null
+++ b/include/linux/can/led.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2012, Fabio Baltieri <fabio.baltieri@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef CAN_LED_H
+#define CAN_LED_H
+#include <linux/if.h>
+#include <linux/leds.h>
+enum can_led_event {
+        CAN_LED_EVENT_OPEN,
+        CAN_LED_EVENT_STOP,
+        CAN_LED_EVENT_TX,
+        CAN_LED_EVENT_RX,
+};
+#ifdef CONFIG_CAN_LEDS
+/* keep space for interface name + "-tx"/"-rx" suffix and null terminator */
+#define CAN_LED_NAME_SZ (IFNAMSIZ + 4)
+void can_led_event(struct net_device *netdev, enum can_led_event event);
+void devm_can_led_init(struct net_device *netdev);
+int __init can_led_notifier_init(void);
+void __exit can_led_notifier_exit(void);
+#else
+static inline void can_led_event(struct net_device *netdev,
+                                 enum can_led_event event)
+{
+}
+static inline void devm_can_led_init(struct net_device *netdev)
+{
+}
+static inline int can_led_notifier_init(void)
+{
+        return 0;
+}
+static inline void can_led_notifier_exit(void)
+{
+}
+#endif
+#endif
diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h
new file mode 100644
index 000000000000..2f0543f7510c
--- /dev/null
+++ b/include/linux/can/skb.h
@@ -0,0 +1,45 @@
+/*
+ * linux/can/skb.h
+ *
+ * Definitions for the CAN network socket buffer
+ *
+ * Copyright (C) 2012 Oliver Hartkopp <socketcan@hartkopp.net>
+ *
+ */
+#ifndef CAN_SKB_H
+#define CAN_SKB_H
+#include <linux/types.h>
+#include <linux/can.h>
+/*
+ * The struct can_skb_priv is used to transport additional information along
+ * with the stored struct can(fd)_frame that can not be contained in existing
+ * struct sk_buff elements.
+ * N.B. that this information must not be modified in cloned CAN sk_buffs.
+ * To modify the CAN frame content or the struct can_skb_priv content
+ * skb_copy() needs to be used instead of skb_clone().
+ */
+/**
+ * struct can_skb_priv - private additional data inside CAN sk_buffs
+ * @ifindex:    ifindex of the first interface the CAN frame appeared on
+ * @cf:         align to the following CAN frame at skb->data
+ */
+struct can_skb_priv {
+        int ifindex;
+        struct can_frame cf[0];
+};
+static inline struct can_skb_priv *can_skb_prv(struct sk_buff *skb)
+{
+        return (struct can_skb_priv *)(skb->head);
+}
+static inline void can_skb_reserve(struct sk_buff *skb)
+{
+        skb_reserve(skb, sizeof(struct can_skb_priv));
+}
+#endif /* CAN_SKB_H */
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 7d73905dcba2..900af5964f55 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -203,6 +203,7 @@ struct cgroup {
        /* For RCU-protected deletion */
        struct rcu_head rcu_head;
+        struct work_struct free_work;
        /* List of events which userspace want to receive */
        struct list_head event_list;
@@ -558,6 +559,7 @@ static inline struct cgroup* task_cgroup(struct task_struct *task,
 struct cgroup *cgroup_next_descendant_pre(struct cgroup *pos,
                                          struct cgroup *cgroup);
+struct cgroup *cgroup_rightmost_descendant(struct cgroup *pos);
 /**
 * cgroup_for_each_descendant_pre - pre-order walk of a cgroup's descendants
@@ -706,7 +708,6 @@ struct cgroup_subsys_state *cgroup_css_from_dir(struct file *f, int id);
 static inline int cgroup_init_early(void) { return 0; }
 static inline int cgroup_init(void) { return 0; }
 static inline void cgroup_fork(struct task_struct *p) {}
-static inline void cgroup_fork_callbacks(struct task_struct *p) {}
 static inline void cgroup_post_fork(struct task_struct *p) {}
 static inline void cgroup_exit(struct task_struct *p, int callbacks) {}
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 4989b8a7bed1..7f197d7addb0 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -379,7 +379,13 @@ struct clk_onecell_data {
 };
 struct clk *of_clk_src_onecell_get(struct of_phandle_args *clkspec, void *data);
 const char *of_clk_get_parent_name(struct device_node *np, int index);
 void of_clk_init(const struct of_device_id *matches);
+#define CLK_OF_DECLARE(name, compat, fn)                        \
+        static const struct of_device_id __clk_of_table_##name  \
+                __used __section(__clk_of_table)                \
+                = { .compatible = compat, .data = fn };
 #endif /* CONFIG_COMMON_CLK */
 #endif /* CLK_PROVIDER_H */
diff --git a/include/linux/clk/sunxi.h b/include/linux/clk/sunxi.h
deleted file mode 100644
index e074fdd5a236..000000000000
--- a/include/linux/clk/sunxi.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2012 Maxime Ripard
- *
- * Maxime Ripard <maxime.ripard@free-electrons.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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_CLK_SUNXI_H_
-#define __LINUX_CLK_SUNXI_H_
-void __init sunxi_init_clocks(void);
-#endif
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 8a7096fcb01e..66346521cb65 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -161,6 +161,15 @@ clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec)
 extern void clockevents_suspend(void);
 extern void clockevents_resume(void);
+#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
+#ifdef CONFIG_ARCH_HAS_TICK_BROADCAST
+extern void tick_broadcast(const struct cpumask *mask);
+#else
+#define tick_broadcast  NULL
+#endif
+extern int tick_receive_broadcast(void);
+#endif
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
 extern void clockevents_notify(unsigned long reason, void *arg);
 #else
diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index e24339ccb7f0..b28d161c1091 100644
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -3,12 +3,40 @@
 #ifdef CONFIG_CONTEXT_TRACKING
 #include <linux/sched.h>
+#include <linux/percpu.h>
+struct context_tracking {
+        /*
+         * When active is false, probes are unset in order
+         * to minimize overhead: TIF flags are cleared
+         * and calls to user_enter/exit are ignored. This
+         * may be further optimized using static keys.
+         */
+        bool active;
+        enum {
+                IN_KERNEL = 0,
+                IN_USER,
+        } state;
+};
+DECLARE_PER_CPU(struct context_tracking, context_tracking);
+static inline bool context_tracking_in_user(void)
+{
+        return __this_cpu_read(context_tracking.state) == IN_USER;
+}
+static inline bool context_tracking_active(void)
+{
+        return __this_cpu_read(context_tracking.active);
+}
 extern void user_enter(void);
 extern void user_exit(void);
 extern void context_tracking_task_switch(struct task_struct *prev,
                                         struct task_struct *next);
 #else
+static inline bool context_tracking_in_user(void) { return false; }
 static inline void user_enter(void) { }
 static inline void user_exit(void) { }
 static inline void context_tracking_task_switch(struct task_struct *prev,
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index a55b88eaf96a..a22944ca0526 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -89,11 +89,15 @@ struct cpufreq_real_policy {
 };
 struct cpufreq_policy {
-        cpumask_var_t           cpus;   /* CPUs requiring sw coordination */
+        /* CPUs sharing clock, require sw coordination */
-        cpumask_var_t           related_cpus; /* CPUs with any coordination */
+        cpumask_var_t           cpus;   /* Online CPUs only */
-        unsigned int            shared_type; /* ANY or ALL affected CPUs
+        cpumask_var_t           related_cpus; /* Online + Offline CPUs */
+        unsigned int            shared_type; /* ACPI: ANY or ALL affected CPUs
                                                should set cpufreq */
-        unsigned int            cpu;    /* cpu nr of registered CPU */
+        unsigned int            cpu;    /* cpu nr of CPU managing this policy */
+        unsigned int            last_cpu; /* cpu nr of previous CPU that managed
+                                           * this policy */
        struct cpufreq_cpuinfo  cpuinfo;/* see above */
        unsigned int            min;    /* in kHz */
@@ -112,16 +116,23 @@ struct cpufreq_policy {
        struct completion       kobj_unregister;
 };
-#define CPUFREQ_ADJUST          (0)
+#define CPUFREQ_ADJUST                  (0)
-#define CPUFREQ_INCOMPATIBLE    (1)
+#define CPUFREQ_INCOMPATIBLE            (1)
-#define CPUFREQ_NOTIFY          (2)
+#define CPUFREQ_NOTIFY                  (2)
-#define CPUFREQ_START           (3)
+#define CPUFREQ_START                   (3)
+#define CPUFREQ_UPDATE_POLICY_CPU       (4)
+/* Only for ACPI */
 #define CPUFREQ_SHARED_TYPE_NONE (0) /* None */
 #define CPUFREQ_SHARED_TYPE_HW   (1) /* HW does needed coordination */
 #define CPUFREQ_SHARED_TYPE_ALL  (2) /* All dependent CPUs should set freq */
 #define CPUFREQ_SHARED_TYPE_ANY  (3) /* Freq can be set from any dependent CPU*/
+static inline bool policy_is_shared(struct cpufreq_policy *policy)
+{
+        return cpumask_weight(policy->cpus) > 1;
+}
 /******************** cpufreq transition notifiers *******************/
 #define CPUFREQ_PRECHANGE       (0)
@@ -173,6 +184,7 @@ static inline unsigned long cpufreq_scale(unsigned long old, u_int div, u_int mu
 struct cpufreq_governor {
        char    name[CPUFREQ_NAME_LEN];
+        int     initialized;
        int     (*governor)     (struct cpufreq_policy *policy,
                                 unsigned int event);
        ssize_t (*show_setspeed)        (struct cpufreq_policy *policy,
@@ -308,6 +320,9 @@ __ATTR(_name, 0444, show_##_name, NULL)
 static struct global_attr _name =               \
 __ATTR(_name, 0644, show_##_name, store_##_name)
+struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu);
+void cpufreq_cpu_put(struct cpufreq_policy *data);
+const char *cpufreq_get_current_driver(void);
 /*********************************************************************
 *                        CPUFREQ 2.6. INTERFACE                     *
@@ -397,14 +412,13 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
 /* the following 3 funtions are for cpufreq core use only */
 struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu);
-struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu);
-void   cpufreq_cpu_put(struct cpufreq_policy *data);
 /* the following are really really optional */
 extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;
 void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table,
                                      unsigned int cpu);
+void cpufreq_frequency_table_update_policy_cpu(struct cpufreq_policy *policy);
 void cpufreq_frequency_table_put_attr(unsigned int cpu);
 #endif /* _LINUX_CPUFREQ_H */
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 24cd1037b6d6..480c14dc1ddd 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -32,8 +32,6 @@ struct cpuidle_driver;
 ****************************/
 struct cpuidle_state_usage {
-        void            *driver_data;
        unsigned long long      disable;
        unsigned long long      usage;
        unsigned long long      time; /* in US */
@@ -62,26 +60,6 @@ struct cpuidle_state {
 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
-/**
- * cpuidle_get_statedata - retrieves private driver state data
- * @st_usage: the state usage statistics
- */
-static inline void *cpuidle_get_statedata(struct cpuidle_state_usage *st_usage)
-{
-        return st_usage->driver_data;
-}
-/**
- * cpuidle_set_statedata - stores private driver state data
- * @st_usage: the state usage statistics
- * @data: the private data
- */
-static inline void
-cpuidle_set_statedata(struct cpuidle_state_usage *st_usage, void *data)
-{
-        st_usage->driver_data = data;
-}
 struct cpuidle_device {
        unsigned int            registered:1;
        unsigned int            enabled:1;
diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h
deleted file mode 100644
index b88f7f428e58..000000000000
--- a/include/linux/cyclomx.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef _CYCLOMX_H
-#define _CYCLOMX_H
-/*
-* cyclomx.h     Cyclom 2X WAN Link Driver.
-*               User-level API definitions.
-*
-* Author:       Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-*
-* Copyright:    (c) 1998-2003 Arnaldo Carvalho de Melo
-*
-* Based on wanpipe.h by Gene Kozin <genek@compuserve.com>
-*
-*               This program is free software; you can redistribute it and/or
-*               modify it under the terms of the GNU General Public License
-*               as published by the Free Software Foundation; either version
-*               2 of the License, or (at your option) any later version.
-* ============================================================================
-* 2000/07/13    acme            remove crap #if KERNEL_VERSION > blah
-* 2000/01/21    acme            rename cyclomx_open to cyclomx_mod_inc_use_count
-*                               and cyclomx_close to cyclomx_mod_dec_use_count
-* 1999/05/19    acme            wait_queue_head_t wait_stats(support for 2.3.*)
-* 1999/01/03    acme            judicious use of data types
-* 1998/12/27    acme            cleanup: PACKED not needed
-* 1998/08/08    acme            Version 0.0.1
-*/
-#include <linux/wanrouter.h>
-#include <linux/spinlock.h>
-#ifdef  __KERNEL__
-/* Kernel Interface */
-#include <linux/cycx_drv.h>     /* Cyclom 2X support module API definitions */
-#include <linux/cycx_cfm.h>     /* Cyclom 2X firmware module definitions */
-#ifdef CONFIG_CYCLOMX_X25
-#include <linux/cycx_x25.h>
-#endif
-/* Adapter Data Space.
- * This structure is needed because we handle multiple cards, otherwise
- * static data would do it.
- */
-struct cycx_device {
-        char devname[WAN_DRVNAME_SZ + 1];/* card name */
-        struct cycx_hw hw;              /* hardware configuration */
-        struct wan_device wandev;       /* WAN device data space */
-        u32 state_tick;                 /* link state timestamp */
-        spinlock_t lock;
-        char in_isr;                    /* interrupt-in-service flag */
-        char buff_int_mode_unbusy;      /* flag for carrying out dev_tint */
-        wait_queue_head_t wait_stats;  /* to wait for the STATS indication */
-        void __iomem *mbox;                     /* -> mailbox */
-        void (*isr)(struct cycx_device* card);  /* interrupt service routine */
-        int (*exec)(struct cycx_device* card, void* u_cmd, void* u_data);
-        union {
-#ifdef CONFIG_CYCLOMX_X25
-                struct { /* X.25 specific data */
-                        u32 lo_pvc;
-                        u32 hi_pvc;
-                        u32 lo_svc;
-                        u32 hi_svc;
-                        struct cycx_x25_stats stats;
-                        spinlock_t lock;
-                        u32 connection_keys;
-                } x;
-#endif
-        } u;
-};
-/* Public Functions */
-void cycx_set_state(struct cycx_device *card, int state);
-#ifdef CONFIG_CYCLOMX_X25
-int cycx_x25_wan_init(struct cycx_device *card, wandev_conf_t *conf);
-#endif
-#endif  /* __KERNEL__ */
-#endif  /* _CYCLOMX_H */
diff --git a/include/linux/cycx_drv.h b/include/linux/cycx_drv.h
deleted file mode 100644
index 12fe6b0bfcff..000000000000
--- a/include/linux/cycx_drv.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* cycx_drv.h    CYCX Support Module.  Kernel API Definitions.
-*
-* Author:       Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-*
-* Copyright:    (c) 1998-2003 Arnaldo Carvalho de Melo
-*
-* Based on sdladrv.h by Gene Kozin <genek@compuserve.com>
-*
-*               This program is free software; you can redistribute it and/or
-*               modify it under the terms of the GNU General Public License
-*               as published by the Free Software Foundation; either version
-*               2 of the License, or (at your option) any later version.
-* ============================================================================
-* 1999/10/23    acme            cycxhw_t cleanup
-* 1999/01/03    acme            more judicious use of data types...
-*                               uclong, ucchar, etc deleted, the u8, u16, u32
-*                               types are the portable way to go.
-* 1999/01/03    acme            judicious use of data types... u16, u32, etc
-* 1998/12/26    acme            FIXED_BUFFERS, CONF_OFFSET,
-*                               removal of cy_read{bwl}
-* 1998/08/08    acme            Initial version.
-*/
-#ifndef _CYCX_DRV_H
-#define _CYCX_DRV_H
-#define CYCX_WINDOWSIZE 0x4000  /* default dual-port memory window size */
-#define GEN_CYCX_INTR   0x02
-#define RST_ENABLE      0x04
-#define START_CPU       0x06
-#define RST_DISABLE     0x08
-#define FIXED_BUFFERS   0x08
-#define TEST_PATTERN    0xaa55
-#define CMD_OFFSET      0x20
-#define CONF_OFFSET     0x0380
-#define RESET_OFFSET    0x3c00  /* For reset file load */
-#define DATA_OFFSET     0x0100  /* For code and data files load */
-#define START_OFFSET    0x3ff0  /* 80186 starts here */
-/**
- *      struct cycx_hw - Adapter hardware configuration
- *      @fwid - firmware ID
- *      @irq - interrupt request level
- *      @dpmbase - dual-port memory base
- *      @dpmsize - dual-port memory size
- *      @reserved - reserved for future use
- */
-struct cycx_hw {
-        u32 fwid;
-        int irq;
-        void __iomem *dpmbase;
-        u32 dpmsize;
-        u32 reserved[5];
-};
-/* Function Prototypes */
-extern int cycx_setup(struct cycx_hw *hw, void *sfm, u32 len, unsigned long base);
-extern int cycx_down(struct cycx_hw *hw);
-extern int cycx_peek(struct cycx_hw *hw, u32 addr, void *buf, u32 len);
-extern int cycx_poke(struct cycx_hw *hw, u32 addr, void *buf, u32 len);
-extern int cycx_exec(void __iomem *addr);
-extern void cycx_intr(struct cycx_hw *hw);
-#endif  /* _CYCX_DRV_H */
diff --git a/include/linux/device.h b/include/linux/device.h
index 43dcda937ddf..001f6637aa47 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -21,6 +21,7 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
+#include <linux/pinctrl/devinfo.h>
 #include <linux/pm.h>
 #include <linux/atomic.h>
 #include <linux/ratelimit.h>
@@ -620,6 +621,8 @@ struct acpi_dev_node {
 * @pm_domain:  Provide callbacks that are executed during system suspend,
 *              hibernation, system resume and during runtime PM transitions
 *              along with subsystem-level and driver-level callbacks.
+ * @pins:       For device pin management.
+ *              See Documentation/pinctrl.txt for details.
 * @numa_node:  NUMA node this device is close to.
 * @dma_mask:   Dma mask (if dma'ble device).
 * @coherent_dma_mask: Like dma_mask, but for alloc_coherent mapping as not all
@@ -672,6 +675,10 @@ struct device {
        struct dev_pm_info      power;
        struct dev_pm_domain    *pm_domain;
+#ifdef CONFIG_PINCTRL
+        struct dev_pin_info     *pins;
+#endif
 #ifdef CONFIG_NUMA
        int             numa_node;      /* NUMA node this device is close to */
 #endif
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index c03af7687bb4..186620631750 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -138,6 +138,7 @@ extern void elv_drain_elevator(struct request_queue *);
 /*
 * io scheduler registration
 */
+extern void __init load_default_elevator_module(void);
 extern int elv_register(struct elevator_type *);
 extern void elv_unregister(struct elevator_type *);
@@ -206,5 +207,9 @@ enum {
        INIT_LIST_HEAD(&(rq)->csd.list);        \
        } while (0)
+#else /* CONFIG_BLOCK */
+static inline void load_default_elevator_module(void) { }
 #endif /* CONFIG_BLOCK */
 #endif
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 243eea1e33d8..c623861964e4 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -40,6 +40,8 @@ extern int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh,
 extern void eth_header_cache_update(struct hh_cache *hh,
                                    const struct net_device *dev,
                                    const unsigned char *haddr);
+extern int eth_prepare_mac_addr_change(struct net_device *dev, void *p);
+extern void eth_commit_mac_addr_change(struct net_device *dev, void *p);
 extern int eth_mac_addr(struct net_device *dev, void *p);
 extern int eth_change_mtu(struct net_device *dev, int new_mtu);
 extern int eth_validate_addr(struct net_device *dev);
@@ -192,7 +194,7 @@ static inline void eth_zero_addr(u8 *addr)
 */
 static inline void eth_hw_addr_random(struct net_device *dev)
 {
-        dev->addr_assign_type |= NET_ADDR_RANDOM;
+        dev->addr_assign_type = NET_ADDR_RANDOM;
        eth_random_addr(dev->dev_addr);
 }
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index e4238ceaa4d6..e70df40d84f6 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -13,6 +13,11 @@ extern bool pm_freezing;		/* PM freezing in effect */
 extern bool pm_nosig_freezing;          /* PM nosig freezing in effect */
 /*
+ * Timeout for stopping processes
+ */
+extern unsigned int freeze_timeout_msecs;
+/*
 * Check if a process has been frozen
 */
 static inline bool frozen(struct task_struct *p)
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 92691d85c320..e5ca8ef50e9b 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -74,7 +74,7 @@ typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip,
 * SAVE_REGS - The ftrace_ops wants regs saved at each function called
 *            and passed to the callback. If this flag is set, but the
 *            architecture does not support passing regs
- *            (ARCH_SUPPORTS_FTRACE_SAVE_REGS is not defined), then the
+ *            (CONFIG_DYNAMIC_FTRACE_WITH_REGS is not defined), then the
 *            ftrace_ops will fail to register, unless the next flag
 *            is set.
 * SAVE_REGS_IF_SUPPORTED - This is the same as SAVE_REGS, but if the
@@ -418,7 +418,7 @@ void ftrace_modify_all_code(int command);
 #endif
 #ifndef FTRACE_REGS_ADDR
-#ifdef ARCH_SUPPORTS_FTRACE_SAVE_REGS
+#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
 # define FTRACE_REGS_ADDR ((unsigned long)ftrace_regs_caller)
 #else
 # define FTRACE_REGS_ADDR FTRACE_ADDR
@@ -480,7 +480,7 @@ extern int ftrace_make_nop(struct module *mod,
 */
 extern int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr);
-#ifdef ARCH_SUPPORTS_FTRACE_SAVE_REGS
+#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
 /**
 * ftrace_modify_call - convert from one addr to another (no nop)
 * @rec: the mcount call site record
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index a3d489531d83..13a54d0bdfa8 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -49,7 +49,6 @@ struct trace_entry {
        unsigned char           flags;
        unsigned char           preempt_count;
        int                     pid;
-        int                     padding;
 };
 #define FTRACE_MAX_EVENT                                                \
@@ -84,6 +83,9 @@ struct trace_iterator {
        long                    idx;
        cpumask_var_t           started;
+        /* it's true when current open file is snapshot */
+        bool                    snapshot;
 };
 enum trace_iter_flags {
@@ -272,7 +274,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
 extern int trace_add_event_call(struct ftrace_event_call *call);
 extern void trace_remove_event_call(struct ftrace_event_call *call);
-#define is_signed_type(type)    (((type)(-1)) < 0)
+#define is_signed_type(type)    (((type)(-1)) < (type)0)
 int trace_set_clr_event(const char *system, const char *event, int set);
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 624ef3f45c8e..29eb805ea4a6 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -153,7 +153,7 @@ extern void rcu_nmi_exit(void);
 */
 #define __irq_enter()                                   \
        do {                                            \
-                vtime_account_irq_enter(current);       \
+                account_irq_enter_time(current);        \
                add_preempt_count(HARDIRQ_OFFSET);      \
                trace_hardirq_enter();                  \
        } while (0)
@@ -169,7 +169,7 @@ extern void irq_enter(void);
 #define __irq_exit()                                    \
        do {                                            \
                trace_hardirq_exit();                   \
-                vtime_account_irq_exit(current);        \
+                account_irq_exit_time(current);         \
                sub_preempt_count(HARDIRQ_OFFSET);      \
        } while (0)
@@ -180,10 +180,10 @@ extern void irq_exit(void);
 #define nmi_enter()                                             \
        do {                                                    \
+                lockdep_off();                                  \
                ftrace_nmi_enter();                             \
                BUG_ON(in_nmi());                               \
                add_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \
-                lockdep_off();                                  \
                rcu_nmi_enter();                                \
                trace_hardirq_enter();                          \
        } while (0)
@@ -192,10 +192,10 @@ extern void irq_exit(void);
        do {                                                    \
                trace_hardirq_exit();                           \
                rcu_nmi_exit();                                 \
-                lockdep_on();                                   \
                BUG_ON(!in_nmi());                              \
                sub_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \
                ftrace_nmi_exit();                              \
+                lockdep_on();                                   \
        } while (0)
 #endif /* LINUX_HARDIRQ_H */
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index 82b29ae6ebb0..b2514f70d591 100644
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -20,16 +20,4 @@ struct device *hwmon_device_register(struct device *dev);
 void hwmon_device_unregister(struct device *dev);
-/* Scale user input to sensible values */
-static inline int SENSORS_LIMIT(long value, long low, long high)
-{
-        if (value < low)
-                return low;
-        else if (value > high)
-                return high;
-        else
-                return value;
-}
 #endif
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index f0859cc73861..7e24fe0cfbcd 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -151,6 +151,11 @@
 /* Mesh Control 802.11s */
 #define IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT  0x0100
+/* Mesh Power Save Level */
+#define IEEE80211_QOS_CTL_MESH_PS_LEVEL         0x0200
+/* Mesh Receiver Service Period Initiated */
+#define IEEE80211_QOS_CTL_RSPI                  0x0400
 /* U-APSD queue for WMM IEs sent by AP */
 #define IEEE80211_WMM_IE_AP_QOSINFO_UAPSD       (1<<7)
 #define IEEE80211_WMM_IE_AP_QOSINFO_PARAM_SET_CNT_MASK  0x0f
@@ -180,7 +185,7 @@ struct ieee80211_hdr {
        u8 addr3[6];
        __le16 seq_ctrl;
        u8 addr4[6];
-} __attribute__ ((packed));
+} __packed;
 struct ieee80211_hdr_3addr {
        __le16 frame_control;
@@ -189,7 +194,7 @@ struct ieee80211_hdr_3addr {
        u8 addr2[6];
        u8 addr3[6];
        __le16 seq_ctrl;
-} __attribute__ ((packed));
+} __packed;
 struct ieee80211_qos_hdr {
        __le16 frame_control;
@@ -199,7 +204,7 @@ struct ieee80211_qos_hdr {
        u8 addr3[6];
        __le16 seq_ctrl;
        __le16 qos_ctrl;
-} __attribute__ ((packed));
+} __packed;
 /**
 * ieee80211_has_tods - check if IEEE80211_FCTL_TODS is set
@@ -576,7 +581,7 @@ struct ieee80211s_hdr {
        __le32 seqnum;
        u8 eaddr1[6];
        u8 eaddr2[6];
-} __attribute__ ((packed));
+} __packed;
 /* Mesh flags */
 #define MESH_FLAGS_AE_A4        0x1
@@ -614,7 +619,7 @@ struct ieee80211_quiet_ie {
        u8 period;
        __le16 duration;
        __le16 offset;
-} __attribute__ ((packed));
+} __packed;
 /**
 * struct ieee80211_msrment_ie
@@ -626,7 +631,7 @@ struct ieee80211_msrment_ie {
        u8 mode;
        u8 type;
        u8 request[0];
-} __attribute__ ((packed));
+} __packed;
 /**
 * struct ieee80211_channel_sw_ie
@@ -637,7 +642,7 @@ struct ieee80211_channel_sw_ie {
        u8 mode;
        u8 new_ch_num;
        u8 count;
-} __attribute__ ((packed));
+} __packed;
 /**
 * struct ieee80211_tim
@@ -650,7 +655,7 @@ struct ieee80211_tim_ie {
        u8 bitmap_ctrl;
        /* variable size: 1 - 251 bytes */
        u8 virtual_map[1];
-} __attribute__ ((packed));
+} __packed;
 /**
 * struct ieee80211_meshconf_ie
@@ -665,7 +670,7 @@ struct ieee80211_meshconf_ie {
        u8 meshconf_auth;
        u8 meshconf_form;
        u8 meshconf_cap;
-} __attribute__ ((packed));
+} __packed;
 /**
 * enum mesh_config_capab_flags - Mesh Configuration IE capability field flags
@@ -675,11 +680,14 @@ struct ieee80211_meshconf_ie {
 * @IEEE80211_MESHCONF_CAPAB_FORWARDING: the STA forwards MSDUs
 * @IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING: TBTT adjustment procedure
 *      is ongoing
+ * @IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL: STA is in deep sleep mode or has
+ *      neighbors in deep sleep mode
 */
 enum mesh_config_capab_flags {
        IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS          = 0x01,
        IEEE80211_MESHCONF_CAPAB_FORWARDING             = 0x08,
        IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING         = 0x20,
+        IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL       = 0x40,
 };
 /**
@@ -695,12 +703,41 @@ struct ieee80211_rann_ie {
        __le32 rann_seq;
        __le32 rann_interval;
        __le32 rann_metric;
-} __attribute__ ((packed));
+} __packed;
 enum ieee80211_rann_flags {
        RANN_FLAG_IS_GATE = 1 << 0,
 };
+enum ieee80211_ht_chanwidth_values {
+        IEEE80211_HT_CHANWIDTH_20MHZ = 0,
+        IEEE80211_HT_CHANWIDTH_ANY = 1,
+};
+/**
+ * enum ieee80211_opmode_bits - VHT operating mode field bits
+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK: channel width mask
+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ: 20 MHz channel width
+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_40MHZ: 40 MHz channel width
+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_80MHZ: 80 MHz channel width
+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_160MHZ: 160 MHz or 80+80 MHz channel width
+ * @IEEE80211_OPMODE_NOTIF_RX_NSS_MASK: number of spatial streams mask
+ *      (the NSS value is the value of this field + 1)
+ * @IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT: number of spatial streams shift
+ * @IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF: indicates streams in SU-MIMO PPDU
+ *      using a beamforming steering matrix
+ */
+enum ieee80211_vht_opmode_bits {
+        IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK   = 3,
+        IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ  = 0,
+        IEEE80211_OPMODE_NOTIF_CHANWIDTH_40MHZ  = 1,
+        IEEE80211_OPMODE_NOTIF_CHANWIDTH_80MHZ  = 2,
+        IEEE80211_OPMODE_NOTIF_CHANWIDTH_160MHZ = 3,
+        IEEE80211_OPMODE_NOTIF_RX_NSS_MASK      = 0x70,
+        IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT     = 4,
+        IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF   = 0x80,
+};
 #define WLAN_SA_QUERY_TR_ID_LEN 2
 struct ieee80211_mgmt {
@@ -717,33 +754,33 @@ struct ieee80211_mgmt {
                        __le16 status_code;
                        /* possibly followed by Challenge text */
                        u8 variable[0];
-                } __attribute__ ((packed)) auth;
+                } __packed auth;
                struct {
                        __le16 reason_code;
-                } __attribute__ ((packed)) deauth;
+                } __packed deauth;
                struct {
                        __le16 capab_info;
                        __le16 listen_interval;
                        /* followed by SSID and Supported rates */
                        u8 variable[0];
-                } __attribute__ ((packed)) assoc_req;
+                } __packed assoc_req;
                struct {
                        __le16 capab_info;
                        __le16 status_code;
                        __le16 aid;
                        /* followed by Supported rates */
                        u8 variable[0];
-                } __attribute__ ((packed)) assoc_resp, reassoc_resp;
+                } __packed assoc_resp, reassoc_resp;
                struct {
                        __le16 capab_info;
                        __le16 listen_interval;
                        u8 current_ap[6];
                        /* followed by SSID and Supported rates */
                        u8 variable[0];
-                } __attribute__ ((packed)) reassoc_req;
+                } __packed reassoc_req;
                struct {
                        __le16 reason_code;
-                } __attribute__ ((packed)) disassoc;
+                } __packed disassoc;
                struct {
                        __le64 timestamp;
                        __le16 beacon_int;
@@ -751,11 +788,11 @@ struct ieee80211_mgmt {
                        /* followed by some of SSID, Supported rates,
                         * FH Params, DS Params, CF Params, IBSS Params, TIM */
                        u8 variable[0];
-                } __attribute__ ((packed)) beacon;
+                } __packed beacon;
                struct {
                        /* only variable items: SSID, Supported rates */
                        u8 variable[0];
-                } __attribute__ ((packed)) probe_req;
+                } __packed probe_req;
                struct {
                        __le64 timestamp;
                        __le16 beacon_int;
@@ -763,7 +800,7 @@ struct ieee80211_mgmt {
                        /* followed by some of SSID, Supported rates,
                         * FH Params, DS Params, CF Params, IBSS Params */
                        u8 variable[0];
-                } __attribute__ ((packed)) probe_resp;
+                } __packed probe_resp;
                struct {
                        u8 category;
                        union {
@@ -772,65 +809,73 @@ struct ieee80211_mgmt {
                                        u8 dialog_token;
                                        u8 status_code;
                                        u8 variable[0];
-                                } __attribute__ ((packed)) wme_action;
+                                } __packed wme_action;
                                struct{
                                        u8 action_code;
                                        u8 element_id;
                                        u8 length;
                                        struct ieee80211_channel_sw_ie sw_elem;
-                                } __attribute__((packed)) chan_switch;
+                                } __packed chan_switch;
                                struct{
                                        u8 action_code;
                                        u8 dialog_token;
                                        u8 element_id;
                                        u8 length;
                                        struct ieee80211_msrment_ie msr_elem;
-                                } __attribute__((packed)) measurement;
+                                } __packed measurement;
                                struct{
                                        u8 action_code;
                                        u8 dialog_token;
                                        __le16 capab;
                                        __le16 timeout;
                                        __le16 start_seq_num;
-                                } __attribute__((packed)) addba_req;
+                                } __packed addba_req;
                                struct{
                                        u8 action_code;
                                        u8 dialog_token;
                                        __le16 status;
                                        __le16 capab;
                                        __le16 timeout;
-                                } __attribute__((packed)) addba_resp;
+                                } __packed addba_resp;
                                struct{
                                        u8 action_code;
                                        __le16 params;
                                        __le16 reason_code;
-                                } __attribute__((packed)) delba;
+                                } __packed delba;
                                struct {
                                        u8 action_code;
                                        u8 variable[0];
-                                } __attribute__((packed)) self_prot;
+                                } __packed self_prot;
                                struct{
                                        u8 action_code;
                                        u8 variable[0];
-                                } __attribute__((packed)) mesh_action;
+                                } __packed mesh_action;
                                struct {
                                        u8 action;
                                        u8 trans_id[WLAN_SA_QUERY_TR_ID_LEN];
-                                } __attribute__ ((packed)) sa_query;
+                                } __packed sa_query;
                                struct {
                                        u8 action;
                                        u8 smps_control;
-                                } __attribute__ ((packed)) ht_smps;
+                                } __packed ht_smps;
+                                struct {
+                                        u8 action_code;
+                                        u8 chanwidth;
+                                } __packed ht_notify_cw;
                                struct {
                                        u8 action_code;
                                        u8 dialog_token;
                                        __le16 capability;
                                        u8 variable[0];
                                } __packed tdls_discover_resp;
+                                struct {
+                                        u8 action_code;
+                                        u8 operating_mode;
+                                } __packed vht_opmode_notif;
                        } u;
-                } __attribute__ ((packed)) action;
+                } __packed action;
        } u;
-} __attribute__ ((packed));
+} __packed;
 /* Supported Rates value encodings in 802.11n-2009 7.3.2.2 */
 #define BSS_MEMBERSHIP_SELECTOR_HT_PHY  127
@@ -846,7 +891,7 @@ struct ieee80211_mmie {
        __le16 key_id;
        u8 sequence_number[6];
        u8 mic[8];
-} __attribute__ ((packed));
+} __packed;
 struct ieee80211_vendor_ie {
        u8 element_id;
@@ -861,20 +906,20 @@ struct ieee80211_rts {
        __le16 duration;
        u8 ra[6];
        u8 ta[6];
-} __attribute__ ((packed));
+} __packed;
 struct ieee80211_cts {
        __le16 frame_control;
        __le16 duration;
        u8 ra[6];
-} __attribute__ ((packed));
+} __packed;
 struct ieee80211_pspoll {
        __le16 frame_control;
        __le16 aid;
        u8 bssid[6];
        u8 ta[6];
-} __attribute__ ((packed));
+} __packed;
 /* TDLS */
@@ -967,7 +1012,7 @@ struct ieee80211_bar {
        __u8 ta[6];
        __le16 control;
        __le16 start_seq_num;
-} __attribute__((packed));
+} __packed;
 /* 802.11 BAR control masks */
 #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL    0x0000
@@ -992,7 +1037,7 @@ struct ieee80211_mcs_info {
        __le16 rx_highest;
        u8 tx_params;
        u8 reserved[3];
-} __attribute__((packed));
+} __packed;
 /* 802.11n HT capability MSC set */
 #define IEEE80211_HT_MCS_RX_HIGHEST_MASK        0x3ff
@@ -1031,7 +1076,7 @@ struct ieee80211_ht_cap {
        __le16 extended_ht_cap_info;
        __le32 tx_BF_cap_info;
        u8 antenna_selection_info;
-} __attribute__ ((packed));
+} __packed;
 /* 802.11n HT capabilities masks (for cap_info) */
 #define IEEE80211_HT_CAP_LDPC_CODING            0x0001
@@ -1102,7 +1147,7 @@ struct ieee80211_ht_operation {
        __le16 operation_mode;
        __le16 stbc_param;
        u8 basic_set[16];
-} __attribute__ ((packed));
+} __packed;
 /* for ht_param */
 #define IEEE80211_HT_PARAM_CHA_SEC_OFFSET               0x03
@@ -1256,6 +1301,7 @@ struct ieee80211_vht_operation {
 #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454                 0x00000002
 #define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ                0x00000004
 #define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ       0x00000008
+#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK                  0x0000000C
 #define IEEE80211_VHT_CAP_RXLDPC                                0x00000010
 #define IEEE80211_VHT_CAP_SHORT_GI_80                           0x00000020
 #define IEEE80211_VHT_CAP_SHORT_GI_160                          0x00000040
@@ -1311,16 +1357,21 @@ struct ieee80211_vht_operation {
 #define WLAN_CAPABILITY_SPECTRUM_MGMT   (1<<8)
 #define WLAN_CAPABILITY_QOS             (1<<9)
 #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
+#define WLAN_CAPABILITY_APSD            (1<<11)
+#define WLAN_CAPABILITY_RADIO_MEASURE   (1<<12)
 #define WLAN_CAPABILITY_DSSS_OFDM       (1<<13)
+#define WLAN_CAPABILITY_DEL_BACK        (1<<14)
+#define WLAN_CAPABILITY_IMM_BACK        (1<<15)
 /* DMG (60gHz) 802.11ad */
 /* type - bits 0..1 */
+#define WLAN_CAPABILITY_DMG_TYPE_MASK           (3<<0)
 #define WLAN_CAPABILITY_DMG_TYPE_IBSS           (1<<0) /* Tx by: STA */
 #define WLAN_CAPABILITY_DMG_TYPE_PBSS           (2<<0) /* Tx by: PCP */
 #define WLAN_CAPABILITY_DMG_TYPE_AP             (3<<0) /* Tx by: AP */
 #define WLAN_CAPABILITY_DMG_CBAP_ONLY           (1<<2)
-#define WLAN_CAPABILITY_DMG_CBAP_SOURCE (1<<3)
+#define WLAN_CAPABILITY_DMG_CBAP_SOURCE         (1<<3)
 #define WLAN_CAPABILITY_DMG_PRIVACY             (1<<4)
 #define WLAN_CAPABILITY_DMG_ECPAC               (1<<5)
@@ -1576,6 +1627,7 @@ enum ieee80211_eid {
        WLAN_EID_VHT_CAPABILITY = 191,
        WLAN_EID_VHT_OPERATION = 192,
+        WLAN_EID_OPMODE_NOTIF = 199,
        /* 802.11ad */
        WLAN_EID_NON_TX_BSSID_CAP =  83,
@@ -1630,6 +1682,7 @@ enum ieee80211_category {
        WLAN_CATEGORY_WMM = 17,
        WLAN_CATEGORY_FST = 18,
        WLAN_CATEGORY_UNPROT_DMG = 20,
+        WLAN_CATEGORY_VHT = 21,
        WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126,
        WLAN_CATEGORY_VENDOR_SPECIFIC = 127,
 };
@@ -1655,6 +1708,13 @@ enum ieee80211_ht_actioncode {
        WLAN_HT_ACTION_ASEL_IDX_FEEDBACK = 7,
 };
+/* VHT action codes */
+enum ieee80211_vht_actioncode {
+        WLAN_VHT_ACTION_COMPRESSED_BF = 0,
+        WLAN_VHT_ACTION_GROUPID_MGMT = 1,
+        WLAN_VHT_ACTION_OPMODE_NOTIF = 2,
+};
 /* Self Protected Action codes */
 enum ieee80211_self_protected_actioncode {
        WLAN_SP_RESERVED = 0,
@@ -1716,6 +1776,8 @@ enum ieee80211_tdls_actioncode {
 #define WLAN_EXT_CAPA5_TDLS_ENABLED     BIT(5)
 #define WLAN_EXT_CAPA5_TDLS_PROHIBITED  BIT(6)
+#define WLAN_EXT_CAPA8_OPMODE_NOTIF     BIT(6)
 /* TDLS specific payload type in the LLC/SNAP header */
 #define WLAN_TDLS_SNAP_RFTYPE   0x2
@@ -1834,14 +1896,14 @@ struct ieee80211_country_ie_triplet {
                        u8 first_channel;
                        u8 num_channels;
                        s8 max_power;
-                } __attribute__ ((packed)) chans;
+                } __packed chans;
                struct {
                        u8 reg_extension_id;
                        u8 reg_class;
                        u8 coverage_class;
-                } __attribute__ ((packed)) ext;
+                } __packed ext;
        };
-} __attribute__ ((packed));
+} __packed;
 enum ieee80211_timeout_interval_type {
        WLAN_TIMEOUT_REASSOC_DEADLINE = 1 /* 802.11r */,
@@ -1884,7 +1946,10 @@ enum ieee80211_sa_query_action {
 /* AKM suite selectors */
 #define WLAN_AKM_SUITE_8021X            0x000FAC01
 #define WLAN_AKM_SUITE_PSK              0x000FAC02
-#define WLAN_AKM_SUITE_SAE                      0x000FAC08
+#define WLAN_AKM_SUITE_8021X_SHA256     0x000FAC05
+#define WLAN_AKM_SUITE_PSK_SHA256       0x000FAC06
+#define WLAN_AKM_SUITE_TDLS             0x000FAC07
+#define WLAN_AKM_SUITE_SAE              0x000FAC08
 #define WLAN_AKM_SUITE_FT_OVER_SAE      0x000FAC09
 #define WLAN_MAX_KEY_LEN                32
@@ -2089,7 +2154,7 @@ static inline unsigned long ieee80211_tu_to_usec(unsigned long tu)
 * @tim_len: length of the TIM IE
 * @aid: the AID to look for
 */
-static inline bool ieee80211_check_tim(struct ieee80211_tim_ie *tim,
+static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,
                                       u8 tim_len, u16 aid)
 {
        u8 mask;
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index f65e8d250f7e..84dde1dd1da4 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -52,6 +52,9 @@ struct macvlan_pcpu_stats {
 */
 #define MAX_MACVTAP_QUEUES      (NR_CPUS < 16 ? NR_CPUS : 16)
+#define MACVLAN_MC_FILTER_BITS  8
+#define MACVLAN_MC_FILTER_SZ    (1 << MACVLAN_MC_FILTER_BITS)
 struct macvlan_dev {
        struct net_device       *dev;
        struct list_head        list;
@@ -59,6 +62,9 @@ struct macvlan_dev {
        struct macvlan_port     *port;
        struct net_device       *lowerdev;
        struct macvlan_pcpu_stats __percpu *pcpu_stats;
+        DECLARE_BITMAP(mc_filter, MACVLAN_MC_FILTER_SZ);
        enum macvlan_mode       mode;
        u16                     flags;
        int (*receive)(struct sk_buff *skb);
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 0245def2aa93..4648d8021244 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -186,6 +186,7 @@ struct team {
        const struct team_mode *mode;
        struct team_mode_ops ops;
+        bool user_carrier_enabled;
        bool queue_override_enabled;
        struct list_head *qom_lists; /* array of queue override mapping lists */
        long mode_priv[TEAM_MODE_PRIV_LONGS];
diff --git a/include/linux/in6.h b/include/linux/in6.h
index 9e2ae26fb598..34edf1f6c9a3 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -22,6 +22,10 @@
 #include <uapi/linux/in6.h>
+/* IPv6 Wildcard Address (::) and Loopback Address (::1) defined in RFC2553
+ * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined
+ * in network byte order, not in host byte order as are the IPv4 equivalents
+ */
 extern const struct in6_addr in6addr_any;
 #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
 extern const struct in6_addr in6addr_loopback;
@@ -32,4 +36,13 @@ extern const struct in6_addr in6addr_linklocal_allnodes;
 extern const struct in6_addr in6addr_linklocal_allrouters;
 #define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \
                { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }
+extern const struct in6_addr in6addr_interfacelocal_allnodes;
+#define IN6ADDR_INTERFACELOCAL_ALLNODES_INIT \
+                { { { 0xff,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
+extern const struct in6_addr in6addr_interfacelocal_allrouters;
+#define IN6ADDR_INTERFACELOCAL_ALLROUTERS_INIT \
+                { { { 0xff,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }
+extern const struct in6_addr in6addr_sitelocal_allrouters;
+#define IN6ADDR_SITELOCAL_ALLROUTERS_INIT \
+                { { { 0xff,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }
 #endif
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index a9d828976a77..ea1e3b863890 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -166,6 +166,12 @@ struct in_ifaddr {
        unsigned char           ifa_flags;
        unsigned char           ifa_prefixlen;
        char                    ifa_label[IFNAMSIZ];
+        /* In seconds, relative to tstamp. Expiry is at tstamp + HZ * lft. */
+        __u32                   ifa_valid_lft;
+        __u32                   ifa_preferred_lft;
+        unsigned long           ifa_cstamp; /* created timestamp */
+        unsigned long           ifa_tstamp; /* updated timestamp */
 };
 extern int register_inetaddr_notifier(struct notifier_block *nb);
diff --git a/include/linux/init.h b/include/linux/init.h
index 10ed4f436458..861814710d52 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -153,6 +153,7 @@ extern unsigned int reset_devices;
 /* used by init/main.c */
 void setup_arch(char **);
 void prepare_namespace(void);
+void __init load_default_modules(void);
 extern void (*late_time_init)(void);
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 6d087c5f57f7..5cd0f0949927 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -10,7 +10,9 @@
 #include <linux/pid_namespace.h>
 #include <linux/user_namespace.h>
 #include <linux/securebits.h>
+#include <linux/seqlock.h>
 #include <net/net_namespace.h>
+#include <linux/sched/rt.h>
 #ifdef CONFIG_SMP
 # define INIT_PUSHABLE_TASKS(tsk)                                       \
@@ -141,6 +143,15 @@ extern struct task_group root_task_group;
 # define INIT_PERF_EVENTS(tsk)
 #endif
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
+# define INIT_VTIME(tsk)                                                \
+        .vtime_seqlock = __SEQLOCK_UNLOCKED(tsk.vtime_seqlock), \
+        .vtime_snap = 0,                                \
+        .vtime_snap_whence = VTIME_SYS,
+#else
+# define INIT_VTIME(tsk)
+#endif
 #define INIT_TASK_COMM "swapper"
 /*
@@ -210,6 +221,7 @@ extern struct task_group root_task_group;
        INIT_TRACE_RECURSION                                            \
        INIT_TASK_RCU_PREEMPT(tsk)                                      \
        INIT_CPUSET_SEQ                                                 \
+        INIT_VTIME(tsk)                                                 \
 }
diff --git a/include/linux/input/adxl34x.h b/include/linux/input/adxl34x.h
index 57e01a7cb006..010d98175efa 100644
--- a/include/linux/input/adxl34x.h
+++ b/include/linux/input/adxl34x.h
@@ -13,6 +13,8 @@
 #ifndef __LINUX_INPUT_ADXL34X_H__
 #define __LINUX_INPUT_ADXL34X_H__
+#include <linux/input.h>
 struct adxl34x_platform_data {
        /*
diff --git a/include/linux/input/tegra_kbc.h b/include/linux/input/tegra_kbc.h
deleted file mode 100644
index a13025612939..000000000000
--- a/include/linux/input/tegra_kbc.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Platform definitions for tegra-kbc keyboard input driver
- *
- * Copyright (c) 2010-2011, NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-#ifndef ASMARM_ARCH_TEGRA_KBC_H
-#define ASMARM_ARCH_TEGRA_KBC_H
-#include <linux/types.h>
-#include <linux/input/matrix_keypad.h>
-#define KBC_MAX_GPIO    24
-#define KBC_MAX_KPENT   8
-#define KBC_MAX_ROW     16
-#define KBC_MAX_COL     8
-#define KBC_MAX_KEY     (KBC_MAX_ROW * KBC_MAX_COL)
-enum tegra_pin_type {
-        PIN_CFG_IGNORE,
-        PIN_CFG_COL,
-        PIN_CFG_ROW,
-};
-struct tegra_kbc_pin_cfg {
-        enum tegra_pin_type type;
-        unsigned char num;
-};
-struct tegra_kbc_wake_key {
-        u8 row:4;
-        u8 col:4;
-};
-struct tegra_kbc_platform_data {
-        unsigned int debounce_cnt;
-        unsigned int repeat_cnt;
-        struct tegra_kbc_pin_cfg pin_cfg[KBC_MAX_GPIO];
-        const struct matrix_keymap_data *keymap_data;
-        u32 wakeup_key;
-        bool wakeup;
-        bool use_fn_map;
-        bool use_ghost_filter;
-};
-#endif
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index faed1e357dd6..850e95bc766c 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -77,11 +77,6 @@ static inline struct ipv6hdr *ipipv6_hdr(const struct sk_buff *skb)
        return (struct ipv6hdr *)skb_transport_header(skb);
 }
-static inline __u8 ipv6_tclass(const struct ipv6hdr *iph)
-{
-        return (ntohl(*(__be32 *)iph) >> 20) & 0xff;
-}
 /* 
   This structure contains results of exthdrs parsing
   as offsets from skb->nh.
@@ -89,7 +84,7 @@ static inline __u8 ipv6_tclass(const struct ipv6hdr *iph)
 struct inet6_skb_parm {
        int                     iif;
-        __u16                   ra;
+        __be16                  ra;
        __u16                   hop;
        __u16                   dst0;
        __u16                   srcrt;
@@ -105,6 +100,7 @@ struct inet6_skb_parm {
 #define IP6SKB_XFRM_TRANSFORMED 1
 #define IP6SKB_FORWARDED        2
 #define IP6SKB_REROUTED         4
+#define IP6SKB_ROUTERALERT      8
 };
 #define IP6CB(skb)      ((struct inet6_skb_parm*)((skb)->cb))
@@ -218,7 +214,7 @@ struct ipv6_pinfo {
        struct ipv6_mc_socklist __rcu *ipv6_mc_list;
        struct ipv6_ac_socklist *ipv6_ac_list;
-        struct ipv6_fl_socklist *ipv6_fl_list;
+        struct ipv6_fl_socklist __rcu *ipv6_fl_list;
        struct ipv6_txoptions   *opt;
        struct sk_buff          *pktoptions;
diff --git a/include/linux/irq.h b/include/linux/irq.h
index fdf2c4a238cc..bc4e06611958 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -509,8 +509,11 @@ static inline void irq_set_percpu_devid_flags(unsigned int irq)
 /* Handle dynamic irq creation and destruction */
 extern unsigned int create_irq_nr(unsigned int irq_want, int node);
+extern unsigned int __create_irqs(unsigned int from, unsigned int count,
+                                  int node);
 extern int create_irq(void);
 extern void destroy_irq(unsigned int irq);
+extern void destroy_irqs(unsigned int irq, unsigned int count);
 /*
 * Dynamic irq helper functions. Obsolete. Use irq_alloc_desc* and
@@ -528,6 +531,8 @@ extern int irq_set_handler_data(unsigned int irq, void *data);
 extern int irq_set_chip_data(unsigned int irq, void *data);
 extern int irq_set_irq_type(unsigned int irq, unsigned int type);
 extern int irq_set_msi_desc(unsigned int irq, struct msi_desc *entry);
+extern int irq_set_msi_desc_off(unsigned int irq_base, unsigned int irq_offset,
+                                struct msi_desc *entry);
 extern struct irq_data *irq_get_irq_data(unsigned int irq);
 static inline struct irq_chip *irq_get_chip(unsigned int irq)
@@ -590,6 +595,9 @@ int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
 #define irq_alloc_desc_from(from, node)         \
        irq_alloc_descs(-1, from, 1, node)
+#define irq_alloc_descs_from(from, cnt, node)   \
+        irq_alloc_descs(-1, from, cnt, node)
 void irq_free_descs(unsigned int irq, unsigned int cnt);
 int irq_reserve_irqs(unsigned int from, unsigned int cnt);
diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
index 6a9e8f5399e2..f5dbce50466e 100644
--- a/include/linux/irq_work.h
+++ b/include/linux/irq_work.h
@@ -3,6 +3,20 @@
 #include <linux/llist.h>
+/*
+ * An entry can be in one of four states:
+ *
+ * free      NULL, 0 -> {claimed}       : free to be used
+ * claimed   NULL, 3 -> {pending}       : claimed to be enqueued
+ * pending   next, 3 -> {busy}          : queued, pending callback
+ * busy      NULL, 2 -> {free, claimed} : callback in progress, can be claimed
+ */
+#define IRQ_WORK_PENDING        1UL
+#define IRQ_WORK_BUSY           2UL
+#define IRQ_WORK_FLAGS          3UL
+#define IRQ_WORK_LAZY           4UL /* Doesn't want IPI, wait for tick */
 struct irq_work {
        unsigned long flags;
        struct llist_node llnode;
@@ -16,8 +30,14 @@ void init_irq_work(struct irq_work *work, void (*func)(struct irq_work *))
        work->func = func;
 }
-bool irq_work_queue(struct irq_work *work);
+void irq_work_queue(struct irq_work *work);
 void irq_work_run(void);
 void irq_work_sync(struct irq_work *work);
+#ifdef CONFIG_IRQ_WORK
+bool irq_work_needs_cpu(void);
+#else
+static bool irq_work_needs_cpu(void) { return false; }
+#endif
 #endif /* _LINUX_IRQ_WORK_H */
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 66b70780e910..ed5f6ed6eb77 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -127,7 +127,7 @@ extern void account_system_time(struct task_struct *, int, cputime_t, cputime_t)
 extern void account_steal_time(cputime_t);
 extern void account_idle_time(cputime_t);
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
 static inline void account_process_tick(struct task_struct *tsk, int user)
 {
        vtime_account_user(tsk);
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 23755ba42abc..4b6ef4d33cc2 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -49,16 +49,6 @@
 #define KPROBE_REENTER          0x00000004
 #define KPROBE_HIT_SSDONE       0x00000008
-/*
- * If function tracer is enabled and the arch supports full
- * passing of pt_regs to function tracing, then kprobes can
- * optimize on top of function tracing.
- */
-#if defined(CONFIG_FUNCTION_TRACER) && defined(ARCH_SUPPORTS_FTRACE_SAVE_REGS) \
-        && defined(ARCH_SUPPORTS_KPROBES_ON_FTRACE)
-# define KPROBES_CAN_USE_FTRACE
-#endif
 /* Attach to insert probes on any functions which should be ignored*/
 #define __kprobes       __attribute__((__section__(".kprobes.text")))
@@ -316,7 +306,7 @@ extern int proc_kprobes_optimization_handler(struct ctl_table *table,
 #endif
 #endif /* CONFIG_OPTPROBES */
-#ifdef KPROBES_CAN_USE_FTRACE
+#ifdef CONFIG_KPROBES_ON_FTRACE
 extern void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
                                  struct ftrace_ops *ops, struct pt_regs *regs);
 extern int arch_prepare_kprobe_ftrace(struct kprobe *p);
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 2c497ab0d03d..b7996a768eb2 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -22,6 +22,7 @@
 #include <linux/rcupdate.h>
 #include <linux/ratelimit.h>
 #include <linux/err.h>
+#include <linux/irqflags.h>
 #include <asm/signal.h>
 #include <linux/kvm.h>
@@ -740,15 +741,52 @@ static inline int kvm_deassign_device(struct kvm *kvm,
 }
 #endif /* CONFIG_IOMMU_API */
-static inline void kvm_guest_enter(void)
+static inline void __guest_enter(void)
 {
-        BUG_ON(preemptible());
        /*
         * This is running in ioctl context so we can avoid
         * the call to vtime_account() with its unnecessary idle check.
         */
-        vtime_account_system_irqsafe(current);
+        vtime_account_system(current);
        current->flags |= PF_VCPU;
+}
+static inline void __guest_exit(void)
+{
+        /*
+         * This is running in ioctl context so we can avoid
+         * the call to vtime_account() with its unnecessary idle check.
+         */
+        vtime_account_system(current);
+        current->flags &= ~PF_VCPU;
+}
+#ifdef CONFIG_CONTEXT_TRACKING
+extern void guest_enter(void);
+extern void guest_exit(void);
+#else /* !CONFIG_CONTEXT_TRACKING */
+static inline void guest_enter(void)
+{
+        __guest_enter();
+}
+static inline void guest_exit(void)
+{
+        __guest_exit();
+}
+#endif /* !CONFIG_CONTEXT_TRACKING */
+static inline void kvm_guest_enter(void)
+{
+        unsigned long flags;
+        BUG_ON(preemptible());
+        local_irq_save(flags);
+        guest_enter();
+        local_irq_restore(flags);
        /* KVM does not hold any references to rcu protected data when it
         * switches CPU into a guest mode. In fact switching to a guest mode
         * is very similar to exiting to userspase from rcu point of view. In
@@ -761,12 +799,11 @@ static inline void kvm_guest_enter(void)
 static inline void kvm_guest_exit(void)
 {
-        /*
+        unsigned long flags;
-         * This is running in ioctl context so we can avoid
-         * the call to vtime_account() with its unnecessary idle check.
+        local_irq_save(flags);
-         */
+        guest_exit();
-        vtime_account_system_irqsafe(current);
+        local_irq_restore(flags);
-        current->flags &= ~PF_VCPU;
 }
 /*
diff --git a/include/linux/libps2.h b/include/linux/libps2.h
index 79603a6c356f..4ad06e824f76 100644
--- a/include/linux/libps2.h
+++ b/include/linux/libps2.h
@@ -36,7 +36,7 @@ struct ps2dev {
        wait_queue_head_t wait;
        unsigned long flags;
-        unsigned char cmdbuf[6];
+        unsigned char cmdbuf[8];
        unsigned char cmdcnt;
        unsigned char nak;
 };
diff --git a/include/linux/mailbox.h b/include/linux/mailbox.h
new file mode 100644
index 000000000000..5161f63ec1c8
--- /dev/null
+++ b/include/linux/mailbox.h
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+int pl320_ipc_transmit(u32 *data);
+int pl320_ipc_register_notifier(struct notifier_block *nb);
+int pl320_ipc_unregister_notifier(struct notifier_block *nb);
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index e53dcfeaee69..80e3b8683a84 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -131,7 +131,7 @@ struct abx500_maxim_parameters {
 * @nominal_voltage:            Nominal voltage of the battery in mV
 * @termination_vol:            max voltage upto which battery can be charged
 * @termination_curr            battery charging termination current in mA
- * @recharge_vol                battery voltage limit that will trigger a new
+ * @recharge_cap                battery capacity limit that will trigger a new
 *                              full charging cycle in the case where maintenan-
 *                              -ce charging has been disabled
 * @normal_cur_lvl:             charger current in normal state in mA
@@ -160,7 +160,7 @@ struct abx500_battery_type {
        int nominal_voltage;
        int termination_vol;
        int termination_curr;
-        int recharge_vol;
+        int recharge_cap;
        int normal_cur_lvl;
        int normal_vol_lvl;
        int maint_a_cur_lvl;
@@ -224,6 +224,7 @@ struct abx500_bm_charger_parameters {
 * @bkup_bat_v          voltage which we charge the backup battery with
 * @bkup_bat_i          current which we charge the backup battery with
 * @no_maintenance      indicates that maintenance charging is disabled
+ * @capacity_scaling    indicates whether capacity scaling is to be used
 * @abx500_adc_therm    placement of thermistor, batctrl or battemp adc
 * @chg_unknown_bat     flag to enable charging of unknown batteries
 * @enable_overshoot    flag to enable VBAT overshoot control
@@ -253,7 +254,11 @@ struct abx500_bm_data {
        int usb_safety_tmr_h;
        int bkup_bat_v;
        int bkup_bat_i;
+        bool autopower_cfg;
+        bool ac_enabled;
+        bool usb_enabled;
        bool no_maintenance;
+        bool capacity_scaling;
        bool chg_unknown_bat;
        bool enable_overshoot;
        bool auto_trig;
@@ -277,9 +282,9 @@ enum {
        NTC_INTERNAL,
 };
-int bmdevs_of_probe(struct device *dev,
+int ab8500_bm_of_probe(struct device *dev,
-                struct device_node *np,
+                       struct device_node *np,
-                struct abx500_bm_data **battery);
+                       struct abx500_bm_data *bm);
 int abx500_set_register_interruptible(struct device *dev, u8 bank, u8 reg,
        u8 value);
diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h
index 9bd037df97d9..8d35bfe164c8 100644
--- a/include/linux/mfd/abx500/ab8500-bm.h
+++ b/include/linux/mfd/abx500/ab8500-bm.h
@@ -23,6 +23,7 @@
 * Bank : 0x5
 */
 #define AB8500_USB_LINE_STAT_REG        0x80
+#define AB8500_USB_LINK1_STAT_REG       0x94
 /*
 * Charger / status register offfsets
@@ -225,6 +226,8 @@
 /* BatCtrl Current Source Constants */
 #define BAT_CTRL_7U_ENA                 0x01
 #define BAT_CTRL_20U_ENA                0x02
+#define BAT_CTRL_18U_ENA                0x01
+#define BAT_CTRL_16U_ENA                0x02
 #define BAT_CTRL_CMP_ENA                0x04
 #define FORCE_BAT_CTRL_CMP_HIGH         0x08
 #define BAT_CTRL_PULL_UP_ENA            0x10
@@ -355,6 +358,7 @@ struct ab8500_bm_charger_parameters {
 * @bkup_bat_v          voltage which we charge the backup battery with
 * @bkup_bat_i          current which we charge the backup battery with
 * @no_maintenance      indicates that maintenance charging is disabled
+ * @capacity_scaling    indicates whether capacity scaling is to be used
 * @adc_therm           placement of thermistor, batctrl or battemp adc
 * @chg_unknown_bat     flag to enable charging of unknown batteries
 * @enable_overshoot    flag to enable VBAT overshoot control
@@ -383,6 +387,7 @@ struct ab8500_bm_data {
        int bkup_bat_v;
        int bkup_bat_i;
        bool no_maintenance;
+        bool capacity_scaling;
        bool chg_unknown_bat;
        bool enable_overshoot;
        enum abx500_adc_therm adc_therm;
@@ -399,26 +404,6 @@ struct ab8500_bm_data {
        const struct ab8500_fg_parameters *fg_params;
 };
-struct ab8500_charger_platform_data {
-        char **supplied_to;
-        size_t num_supplicants;
-        bool autopower_cfg;
-};
-struct ab8500_btemp_platform_data {
-        char **supplied_to;
-        size_t num_supplicants;
-};
-struct ab8500_fg_platform_data {
-        char **supplied_to;
-        size_t num_supplicants;
-};
-struct ab8500_chargalg_platform_data {
-        char **supplied_to;
-        size_t num_supplicants;
-};
 struct ab8500_btemp;
 struct ab8500_gpadc;
 struct ab8500_fg;
@@ -434,20 +419,10 @@ struct ab8500_fg *ab8500_fg_get(void);
 int ab8500_fg_inst_curr_blocking(struct ab8500_fg *dev);
 int ab8500_fg_inst_curr_start(struct ab8500_fg *di);
 int ab8500_fg_inst_curr_finalize(struct ab8500_fg *di, int *res);
+int ab8500_fg_inst_curr_started(struct ab8500_fg *di);
 int ab8500_fg_inst_curr_done(struct ab8500_fg *di);
 #else
 static struct abx500_bm_data ab8500_bm_data;
-static inline int ab8500_fg_inst_curr_start(struct ab8500_fg *di)
-{
-        return -ENODEV;
-}
-static inline int ab8500_fg_inst_curr_finalize(struct ab8500_fg *di, int *res)
-{
-        return -ENODEV;
-}
 #endif
 #endif /* _AB8500_BM_H */
diff --git a/include/linux/mfd/abx500/ab8500-gpio.h b/include/linux/mfd/abx500/ab8500-gpio.h
index 2387c207ea86..172b2f201ae0 100644
--- a/include/linux/mfd/abx500/ab8500-gpio.h
+++ b/include/linux/mfd/abx500/ab8500-gpio.h
@@ -14,10 +14,20 @@
 * registers.
 */
-struct ab8500_gpio_platform_data {
+struct abx500_gpio_platform_data {
        int gpio_base;
-        u32 irq_base;
+};
-        u8  config_reg[8];
+enum abx500_gpio_pull_updown {
+        ABX500_GPIO_PULL_DOWN = 0x0,
+        ABX500_GPIO_PULL_NONE = 0x1,
+        ABX500_GPIO_PULL_UP = 0x3,
+};
+enum abx500_gpio_vinsel {
+        ABX500_GPIO_VINSEL_VBAT = 0x0,
+        ABX500_GPIO_VINSEL_VIN_1V8 = 0x1,
+        ABX500_GPIO_VINSEL_VDD_BIF = 0x2,
 };
 #endif /* _AB8500_GPIO_H */
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 1cb5698b4d76..fc0534483c72 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -24,7 +24,7 @@ enum ab8500_version {
        AB8500_VERSION_AB8500 = 0x0,
        AB8500_VERSION_AB8505 = 0x1,
        AB8500_VERSION_AB9540 = 0x2,
-        AB8500_VERSION_AB8540 = 0x3,
+        AB8500_VERSION_AB8540 = 0x4,
        AB8500_VERSION_UNDEFINED,
 };
@@ -32,6 +32,7 @@ enum ab8500_version {
 #define AB8500_CUTEARLY 0x00
 #define AB8500_CUT1P0   0x10
 #define AB8500_CUT1P1   0x11
+#define AB8500_CUT1P2   0x12 /* Only valid for AB8540 */
 #define AB8500_CUT2P0   0x20
 #define AB8500_CUT3P0   0x30
 #define AB8500_CUT3P3   0x33
@@ -39,6 +40,7 @@ enum ab8500_version {
 /*
 * AB8500 bank addresses
 */
+#define AB8500_M_FSM_RANK       0x0
 #define AB8500_SYS_CTRL1_BLOCK  0x1
 #define AB8500_SYS_CTRL2_BLOCK  0x2
 #define AB8500_REGU_CTRL1       0x3
@@ -58,6 +60,7 @@ enum ab8500_version {
 #define AB8500_DEVELOPMENT      0x11
 #define AB8500_DEBUG            0x12
 #define AB8500_PROD_TEST        0x13
+#define AB8500_STE_TEST         0x14
 #define AB8500_OTP_EMUL         0x15
 /*
@@ -65,11 +68,11 @@ enum ab8500_version {
 * Values used to index into array ab8500_irq_regoffset[] defined in
 * drivers/mdf/ab8500-core.c
 */
-/* Definitions for AB8500 and AB9540 */
+/* Definitions for AB8500, AB9540 and AB8540 */
 /* ab8500_irq_regoffset[0] -> IT[Source|Latch|Mask]1 */
 #define AB8500_INT_MAIN_EXT_CH_NOT_OK   0 /* not 8505/9540 */
-#define AB8500_INT_UN_PLUG_TV_DET       1 /* not 8505/9540 */
+#define AB8500_INT_UN_PLUG_TV_DET       1 /* not 8505/9540/8540 */
-#define AB8500_INT_PLUG_TV_DET          2 /* not 8505/9540 */
+#define AB8500_INT_PLUG_TV_DET          2 /* not 8505/9540/8540 */
 #define AB8500_INT_TEMP_WARM            3
 #define AB8500_INT_PON_KEY2DB_F         4
 #define AB8500_INT_PON_KEY2DB_R         5
@@ -77,18 +80,19 @@ enum ab8500_version {
 #define AB8500_INT_PON_KEY1DB_R         7
 /* ab8500_irq_regoffset[1] -> IT[Source|Latch|Mask]2 */
 #define AB8500_INT_BATT_OVV             8
-#define AB8500_INT_MAIN_CH_UNPLUG_DET   10 /* not 8505 */
+#define AB8500_INT_MAIN_CH_UNPLUG_DET   10 /* not 8505/8540 */
-#define AB8500_INT_MAIN_CH_PLUG_DET     11 /* not 8505 */
+#define AB8500_INT_MAIN_CH_PLUG_DET     11 /* not 8505/8540 */
 #define AB8500_INT_VBUS_DET_F           14
 #define AB8500_INT_VBUS_DET_R           15
 /* ab8500_irq_regoffset[2] -> IT[Source|Latch|Mask]3 */
 #define AB8500_INT_VBUS_CH_DROP_END     16
 #define AB8500_INT_RTC_60S              17
 #define AB8500_INT_RTC_ALARM            18
+#define AB8540_INT_BIF_INT              19
 #define AB8500_INT_BAT_CTRL_INDB        20
 #define AB8500_INT_CH_WD_EXP            21
 #define AB8500_INT_VBUS_OVV             22
-#define AB8500_INT_MAIN_CH_DROP_END     23 /* not 8505/9540 */
+#define AB8500_INT_MAIN_CH_DROP_END     23 /* not 8505/9540/8540 */
 /* ab8500_irq_regoffset[3] -> IT[Source|Latch|Mask]4 */
 #define AB8500_INT_CCN_CONV_ACC         24
 #define AB8500_INT_INT_AUD              25
@@ -99,7 +103,7 @@ enum ab8500_version {
 #define AB8500_INT_BUP_CHG_NOT_OK       30
 #define AB8500_INT_BUP_CHG_OK           31
 /* ab8500_irq_regoffset[4] -> IT[Source|Latch|Mask]5 */
-#define AB8500_INT_GP_HW_ADC_CONV_END   32 /* not 8505 */
+#define AB8500_INT_GP_HW_ADC_CONV_END   32 /* not 8505/8540 */
 #define AB8500_INT_ACC_DETECT_1DB_F     33
 #define AB8500_INT_ACC_DETECT_1DB_R     34
 #define AB8500_INT_ACC_DETECT_22DB_F    35
@@ -108,23 +112,23 @@ enum ab8500_version {
 #define AB8500_INT_ACC_DETECT_21DB_R    38
 #define AB8500_INT_GP_SW_ADC_CONV_END   39
 /* ab8500_irq_regoffset[5] -> IT[Source|Latch|Mask]7 */
-#define AB8500_INT_GPIO6R               40 /* not 8505/9540 */
+#define AB8500_INT_GPIO6R               40 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO7R               41 /* not 8505/9540 */
+#define AB8500_INT_GPIO7R               41 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO8R               42 /* not 8505/9540 */
+#define AB8500_INT_GPIO8R               42 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO9R               43 /* not 8505/9540 */
+#define AB8500_INT_GPIO9R               43 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO10R              44
+#define AB8500_INT_GPIO10R              44 /* not 8540 */
-#define AB8500_INT_GPIO11R              45
+#define AB8500_INT_GPIO11R              45 /* not 8540 */
-#define AB8500_INT_GPIO12R              46 /* not 8505 */
+#define AB8500_INT_GPIO12R              46 /* not 8505/8540 */
-#define AB8500_INT_GPIO13R              47
+#define AB8500_INT_GPIO13R              47 /* not 8540 */
 /* ab8500_irq_regoffset[6] -> IT[Source|Latch|Mask]8 */
-#define AB8500_INT_GPIO24R              48 /* not 8505 */
+#define AB8500_INT_GPIO24R              48 /* not 8505/8540 */
-#define AB8500_INT_GPIO25R              49 /* not 8505 */
+#define AB8500_INT_GPIO25R              49 /* not 8505/8540 */
-#define AB8500_INT_GPIO36R              50 /* not 8505/9540 */
+#define AB8500_INT_GPIO36R              50 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO37R              51 /* not 8505/9540 */
+#define AB8500_INT_GPIO37R              51 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO38R              52 /* not 8505/9540 */
+#define AB8500_INT_GPIO38R              52 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO39R              53 /* not 8505/9540 */
+#define AB8500_INT_GPIO39R              53 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO40R              54
+#define AB8500_INT_GPIO40R              54 /* not 8540 */
-#define AB8500_INT_GPIO41R              55
+#define AB8500_INT_GPIO41R              55 /* not 8540 */
 /* ab8500_irq_regoffset[7] -> IT[Source|Latch|Mask]9 */
 #define AB8500_INT_GPIO6F               56 /* not 8505/9540 */
 #define AB8500_INT_GPIO7F               57 /* not 8505/9540 */
@@ -135,14 +139,14 @@ enum ab8500_version {
 #define AB8500_INT_GPIO12F              62 /* not 8505 */
 #define AB8500_INT_GPIO13F              63
 /* ab8500_irq_regoffset[8] -> IT[Source|Latch|Mask]10 */
-#define AB8500_INT_GPIO24F              64 /* not 8505 */
+#define AB8500_INT_GPIO24F              64 /* not 8505/8540 */
-#define AB8500_INT_GPIO25F              65 /* not 8505 */
+#define AB8500_INT_GPIO25F              65 /* not 8505/8540 */
-#define AB8500_INT_GPIO36F              66 /* not 8505/9540 */
+#define AB8500_INT_GPIO36F              66 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO37F              67 /* not 8505/9540 */
+#define AB8500_INT_GPIO37F              67 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO38F              68 /* not 8505/9540 */
+#define AB8500_INT_GPIO38F              68 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO39F              69 /* not 8505/9540 */
+#define AB8500_INT_GPIO39F              69 /* not 8505/9540/8540 */
-#define AB8500_INT_GPIO40F              70
+#define AB8500_INT_GPIO40F              70 /* not 8540 */
-#define AB8500_INT_GPIO41F              71
+#define AB8500_INT_GPIO41F              71 /* not 8540 */
 /* ab8500_irq_regoffset[9] -> IT[Source|Latch|Mask]12 */
 #define AB8500_INT_ADP_SOURCE_ERROR     72
 #define AB8500_INT_ADP_SINK_ERROR       73
@@ -160,42 +164,44 @@ enum ab8500_version {
 #define AB8500_INT_SRP_DETECT           88
 #define AB8500_INT_USB_CHARGER_NOT_OKR  89
 #define AB8500_INT_ID_WAKEUP_R          90
+#define AB8500_INT_ID_DET_PLUGR         91 /* 8505/9540 cut2.0 */
 #define AB8500_INT_ID_DET_R1R           92
 #define AB8500_INT_ID_DET_R2R           93
 #define AB8500_INT_ID_DET_R3R           94
 #define AB8500_INT_ID_DET_R4R           95
 /* ab8500_irq_regoffset[12] -> IT[Source|Latch|Mask]21 */
-#define AB8500_INT_ID_WAKEUP_F          96
+#define AB8500_INT_ID_WAKEUP_F          96 /* not 8505/9540 */
-#define AB8500_INT_ID_DET_R1F           98
+#define AB8500_INT_ID_DET_PLUGF         97 /* 8505/9540 cut2.0 */
-#define AB8500_INT_ID_DET_R2F           99
+#define AB8500_INT_ID_DET_R1F           98 /* not 8505/9540 */
-#define AB8500_INT_ID_DET_R3F           100
+#define AB8500_INT_ID_DET_R2F           99 /* not 8505/9540 */
-#define AB8500_INT_ID_DET_R4F           101
+#define AB8500_INT_ID_DET_R3F           100 /* not 8505/9540 */
-#define AB8500_INT_CHAUTORESTARTAFTSEC  102
+#define AB8500_INT_ID_DET_R4F           101 /* not 8505/9540 */
+#define AB8500_INT_CHAUTORESTARTAFTSEC  102 /* not 8505/9540 */
 #define AB8500_INT_CHSTOPBYSEC          103
 /* ab8500_irq_regoffset[13] -> IT[Source|Latch|Mask]22 */
 #define AB8500_INT_USB_CH_TH_PROT_F     104
-#define AB8500_INT_USB_CH_TH_PROT_R    105
+#define AB8500_INT_USB_CH_TH_PROT_R     105
 #define AB8500_INT_MAIN_CH_TH_PROT_F    106 /* not 8505/9540 */
 #define AB8500_INT_MAIN_CH_TH_PROT_R    107 /* not 8505/9540 */
 #define AB8500_INT_CHCURLIMNOHSCHIRP    109
 #define AB8500_INT_CHCURLIMHSCHIRP      110
 #define AB8500_INT_XTAL32K_KO           111
-/* Definitions for AB9540 */
+/* Definitions for AB9540 / AB8505 */
 /* ab8500_irq_regoffset[14] -> IT[Source|Latch|Mask]13 */
-#define AB9540_INT_GPIO50R              113
+#define AB9540_INT_GPIO50R              113 /* not 8540 */
-#define AB9540_INT_GPIO51R              114 /* not 8505 */
+#define AB9540_INT_GPIO51R              114 /* not 8505/8540 */
-#define AB9540_INT_GPIO52R              115
+#define AB9540_INT_GPIO52R              115 /* not 8540 */
-#define AB9540_INT_GPIO53R              116
+#define AB9540_INT_GPIO53R              116 /* not 8540 */
-#define AB9540_INT_GPIO54R              117 /* not 8505 */
+#define AB9540_INT_GPIO54R              117 /* not 8505/8540 */
 #define AB9540_INT_IEXT_CH_RF_BFN_R     118
-#define AB9540_INT_IEXT_CH_RF_BFN_F     119
 /* ab8500_irq_regoffset[15] -> IT[Source|Latch|Mask]14 */
-#define AB9540_INT_GPIO50F              121
+#define AB9540_INT_GPIO50F              121 /* not 8540 */
-#define AB9540_INT_GPIO51F              122 /* not 8505 */
+#define AB9540_INT_GPIO51F              122 /* not 8505/8540 */
-#define AB9540_INT_GPIO52F              123
+#define AB9540_INT_GPIO52F              123 /* not 8540 */
-#define AB9540_INT_GPIO53F              124
+#define AB9540_INT_GPIO53F              124 /* not 8540 */
-#define AB9540_INT_GPIO54F              125 /* not 8505 */
+#define AB9540_INT_GPIO54F              125 /* not 8505/8540 */
+#define AB9540_INT_IEXT_CH_RF_BFN_F     126
 /* ab8500_irq_regoffset[16] -> IT[Source|Latch|Mask]25 */
 #define AB8505_INT_KEYSTUCK             128
 #define AB8505_INT_IKR                  129
@@ -204,6 +210,87 @@ enum ab8500_version {
 #define AB8505_INT_KEYDEGLITCH          132
 #define AB8505_INT_MODPWRSTATUSF        134
 #define AB8505_INT_MODPWRSTATUSR        135
+/* ab8500_irq_regoffset[17] -> IT[Source|Latch|Mask]6 */
+#define AB8500_INT_HOOK_DET_NEG_F       138
+#define AB8500_INT_HOOK_DET_NEG_R       139
+#define AB8500_INT_HOOK_DET_POS_F       140
+#define AB8500_INT_HOOK_DET_POS_R       141
+#define AB8500_INT_PLUG_DET_COMP_F      142
+#define AB8500_INT_PLUG_DET_COMP_R      143
+/* ab8500_irq_regoffset[18] -> IT[Source|Latch|Mask]23 */
+#define AB8505_INT_COLL                 144
+#define AB8505_INT_RESERR               145
+#define AB8505_INT_FRAERR               146
+#define AB8505_INT_COMERR               147
+#define AB8505_INT_SPDSET               148
+#define AB8505_INT_DSENT                149
+#define AB8505_INT_DREC                 150
+#define AB8505_INT_ACC_INT              151
+/* ab8500_irq_regoffset[19] -> IT[Source|Latch|Mask]24 */
+#define AB8505_INT_NOPINT               152
+/* ab8540_irq_regoffset[20] -> IT[Source|Latch|Mask]26 */
+#define AB8540_INT_IDPLUGDETCOMPF       160
+#define AB8540_INT_IDPLUGDETCOMPR       161
+#define AB8540_INT_FMDETCOMPLOF         162
+#define AB8540_INT_FMDETCOMPLOR         163
+#define AB8540_INT_FMDETCOMPHIF         164
+#define AB8540_INT_FMDETCOMPHIR         165
+#define AB8540_INT_ID5VDETCOMPF         166
+#define AB8540_INT_ID5VDETCOMPR         167
+/* ab8540_irq_regoffset[21] -> IT[Source|Latch|Mask]27 */
+#define AB8540_INT_GPIO43F              168
+#define AB8540_INT_GPIO43R              169
+#define AB8540_INT_GPIO44F              170
+#define AB8540_INT_GPIO44R              171
+#define AB8540_INT_KEYPOSDETCOMPF       172
+#define AB8540_INT_KEYPOSDETCOMPR       173
+#define AB8540_INT_KEYNEGDETCOMPF       174
+#define AB8540_INT_KEYNEGDETCOMPR       175
+/* ab8540_irq_regoffset[22] -> IT[Source|Latch|Mask]28 */
+#define AB8540_INT_GPIO1VBATF           176
+#define AB8540_INT_GPIO1VBATR           177
+#define AB8540_INT_GPIO2VBATF           178
+#define AB8540_INT_GPIO2VBATR           179
+#define AB8540_INT_GPIO3VBATF           180
+#define AB8540_INT_GPIO3VBATR           181
+#define AB8540_INT_GPIO4VBATF           182
+#define AB8540_INT_GPIO4VBATR           183
+/* ab8540_irq_regoffset[23] -> IT[Source|Latch|Mask]29 */
+#define AB8540_INT_SYSCLKREQ2F          184
+#define AB8540_INT_SYSCLKREQ2R          185
+#define AB8540_INT_SYSCLKREQ3F          186
+#define AB8540_INT_SYSCLKREQ3R          187
+#define AB8540_INT_SYSCLKREQ4F          188
+#define AB8540_INT_SYSCLKREQ4R          189
+#define AB8540_INT_SYSCLKREQ5F          190
+#define AB8540_INT_SYSCLKREQ5R          191
+/* ab8540_irq_regoffset[24] -> IT[Source|Latch|Mask]30 */
+#define AB8540_INT_PWMOUT1F             192
+#define AB8540_INT_PWMOUT1R             193
+#define AB8540_INT_PWMCTRL0F            194
+#define AB8540_INT_PWMCTRL0R            195
+#define AB8540_INT_PWMCTRL1F            196
+#define AB8540_INT_PWMCTRL1R            197
+#define AB8540_INT_SYSCLKREQ6F          198
+#define AB8540_INT_SYSCLKREQ6R          199
+/* ab8540_irq_regoffset[25] -> IT[Source|Latch|Mask]31 */
+#define AB8540_INT_PWMEXTVIBRA1F        200
+#define AB8540_INT_PWMEXTVIBRA1R        201
+#define AB8540_INT_PWMEXTVIBRA2F        202
+#define AB8540_INT_PWMEXTVIBRA2R        203
+#define AB8540_INT_PWMOUT2F             204
+#define AB8540_INT_PWMOUT2R             205
+#define AB8540_INT_PWMOUT3F             206
+#define AB8540_INT_PWMOUT3R             207
+/* ab8540_irq_regoffset[26] -> IT[Source|Latch|Mask]32 */
+#define AB8540_INT_ADDATA2F             208
+#define AB8540_INT_ADDATA2R             209
+#define AB8540_INT_DADATA2F             210
+#define AB8540_INT_DADATA2R             211
+#define AB8540_INT_FSYNC2F              212
+#define AB8540_INT_FSYNC2R              213
+#define AB8540_INT_BITCLK2F             214
+#define AB8540_INT_BITCLK2R             215
 /*
 * AB8500_AB9540_NR_IRQS is used when configuring the IRQ numbers for the
@@ -213,13 +300,24 @@ enum ab8500_version {
 * which is larger.
 */
 #define AB8500_NR_IRQS                  112
-#define AB8505_NR_IRQS                  136
+#define AB8505_NR_IRQS                  153
-#define AB9540_NR_IRQS                  136
+#define AB9540_NR_IRQS                  153
+#define AB8540_NR_IRQS                  216
 /* This is set to the roof of any AB8500 chip variant IRQ counts */
-#define AB8500_MAX_NR_IRQS              AB9540_NR_IRQS
+#define AB8500_MAX_NR_IRQS              AB8540_NR_IRQS
 #define AB8500_NUM_IRQ_REGS             14
-#define AB9540_NUM_IRQ_REGS             17
+#define AB9540_NUM_IRQ_REGS             20
+#define AB8540_NUM_IRQ_REGS             27
+/* Turn On Status Event */
+#define AB8500_POR_ON_VBAT              0x01
+#define AB8500_POW_KEY_1_ON             0x02
+#define AB8500_POW_KEY_2_ON             0x04
+#define AB8500_RTC_ALARM                0x08
+#define AB8500_MAIN_CH_DET              0x10
+#define AB8500_VBUS_DET                 0x20
+#define AB8500_USB_ID_DET               0x40
 /**
 * struct ab8500 - ab8500 internal structure
@@ -287,7 +385,7 @@ struct ab8500_platform_data {
        struct ab8500_regulator_reg_init *regulator_reg_init;
        int num_regulator;
        struct regulator_init_data *regulator;
-        struct ab8500_gpio_platform_data *gpio;
+        struct abx500_gpio_platform_data *gpio;
        struct ab8500_codec_platform_data *codec;
 };
@@ -335,10 +433,79 @@ static inline int is_ab8500_2p0_or_earlier(struct ab8500 *ab)
        return (is_ab8500(ab) && (ab->chip_id <= AB8500_CUT2P0));
 }
+static inline int is_ab8500_3p3_or_earlier(struct ab8500 *ab)
+{
+        return (is_ab8500(ab) && (ab->chip_id <= AB8500_CUT3P3));
+}
 /* exclude also ab8505, ab9540... */
 static inline int is_ab8500_2p0(struct ab8500 *ab)
 {
        return (is_ab8500(ab) && (ab->chip_id == AB8500_CUT2P0));
 }
+static inline int is_ab8505_1p0_or_earlier(struct ab8500 *ab)
+{
+        return (is_ab8505(ab) && (ab->chip_id <= AB8500_CUT1P0));
+}
+static inline int is_ab8505_2p0(struct ab8500 *ab)
+{
+        return (is_ab8505(ab) && (ab->chip_id == AB8500_CUT2P0));
+}
+static inline int is_ab9540_1p0_or_earlier(struct ab8500 *ab)
+{
+        return (is_ab9540(ab) && (ab->chip_id <= AB8500_CUT1P0));
+}
+static inline int is_ab9540_2p0(struct ab8500 *ab)
+{
+        return (is_ab9540(ab) && (ab->chip_id == AB8500_CUT2P0));
+}
+/*
+ * Be careful, the marketing name for this chip is 2.1
+ * but the value read from the chip is 3.0 (0x30)
+ */
+static inline int is_ab9540_3p0(struct ab8500 *ab)
+{
+        return (is_ab9540(ab) && (ab->chip_id == AB8500_CUT3P0));
+}
+static inline int is_ab8540_1p0_or_earlier(struct ab8500 *ab)
+{
+        return is_ab8540(ab) && (ab->chip_id <= AB8500_CUT1P0);
+}
+static inline int is_ab8540_1p1_or_earlier(struct ab8500 *ab)
+{
+        return is_ab8540(ab) && (ab->chip_id <= AB8500_CUT1P1);
+}
+static inline int is_ab8540_1p2_or_earlier(struct ab8500 *ab)
+{
+        return is_ab8540(ab) && (ab->chip_id <= AB8500_CUT1P2);
+}
+static inline int is_ab8540_2p0_or_earlier(struct ab8500 *ab)
+{
+        return is_ab8540(ab) && (ab->chip_id <= AB8500_CUT2P0);
+}
+static inline int is_ab8540_2p0(struct ab8500 *ab)
+{
+        return is_ab8540(ab) && (ab->chip_id == AB8500_CUT2P0);
+}
+static inline int is_ab8505_2p0_earlier(struct ab8500 *ab)
+{
+        return (is_ab8505(ab) && (ab->chip_id < AB8500_CUT2P0));
+}
+static inline int is_ab9540_2p0_or_earlier(struct ab8500 *ab)
+{
+        return (is_ab9540(ab) && (ab->chip_id < AB8500_CUT2P0));
+}
 #endif /* MFD_AB8500_H */
diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h
index 9b07725750c9..d43ac0f35526 100644
--- a/include/linux/mfd/abx500/ux500_chargalg.h
+++ b/include/linux/mfd/abx500/ux500_chargalg.h
@@ -27,12 +27,17 @@ struct ux500_charger_ops {
 * @ops                 ux500 charger operations
 * @max_out_volt        maximum output charger voltage in mV
 * @max_out_curr        maximum output charger current in mA
+ * @enabled             indicates if this charger is used or not
+ * @external            external charger unit (pm2xxx)
 */
 struct ux500_charger {
        struct power_supply psy;
        struct ux500_charger_ops ops;
        int max_out_volt;
        int max_out_curr;
+        int wdt_refresh;
+        bool enabled;
+        bool external;
 };
 #endif
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index b50c38f8bc48..f0f4de3b4ccc 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -26,6 +26,7 @@ enum sec_device_type {
 /**
 * struct sec_pmic_dev - s5m87xx master device for sub-drivers
 * @dev: master device of the chip (can be used to access platform data)
+ * @pdata: pointer to private data used to pass platform data to child
 * @i2c: i2c client private data for regulator
 * @rtc: i2c client private data for rtc
 * @iolock: mutex for serializing io access
@@ -39,6 +40,7 @@ enum sec_device_type {
 */
 struct sec_pmic_dev {
        struct device *dev;
+        struct sec_platform_data *pdata;
        struct regmap *regmap;
        struct i2c_client *i2c;
        struct i2c_client *rtc;
@@ -82,11 +84,11 @@ struct sec_platform_data {
        int                             buck_gpios[3];
        int                             buck_ds[3];
-        int                             buck2_voltage[8];
+        unsigned int                    buck2_voltage[8];
        bool                            buck2_gpiodvs;
-        int                             buck3_voltage[8];
+        unsigned int                    buck3_voltage[8];
        bool                            buck3_gpiodvs;
-        int                             buck4_voltage[8];
+        unsigned int                    buck4_voltage[8];
        bool                            buck4_gpiodvs;
        int                             buck_set1;
@@ -127,6 +129,7 @@ struct sec_platform_data {
 struct sec_regulator_data {
        int                             id;
        struct regulator_init_data      *initdata;
+        struct device_node *reg_node;
 };
 /*
@@ -136,7 +139,7 @@ struct sec_regulator_data {
 */
 struct sec_opmode_data {
        int id;
-        int mode;
+        unsigned int mode;
 };
 /*
diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h
index adfe8c058f29..9dbb41a4e250 100644
--- a/include/linux/micrel_phy.h
+++ b/include/linux/micrel_phy.h
@@ -21,8 +21,15 @@
 #define PHY_ID_KSZ8021          0x00221555
 #define PHY_ID_KSZ8041          0x00221510
 #define PHY_ID_KSZ8051          0x00221550
-/* both for ks8001 Rev. A/B, and for ks8721 Rev 3. */
+/* same id: ks8001 Rev. A/B, and ks8721 Rev 3. */
 #define PHY_ID_KSZ8001          0x0022161A
+/* same id: KS8081, KS8091 */
+#define PHY_ID_KSZ8081          0x00221560
+#define PHY_ID_KSZ8061          0x00221570
+#define PHY_ID_KSZ9031          0x00221620
+#define PHY_ID_KSZ886X          0x00221430
+#define PHY_ID_KSZ8863          0x00221435
 /* struct phy_device dev_flags definitions */
 #define MICREL_PHY_50MHZ_CLK    0x00000001
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 20ea939c22a6..6d48fce06b4a 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -150,7 +150,8 @@ enum {
        MLX4_DEV_CAP_FLAG2_RSS                  = 1LL <<  0,
        MLX4_DEV_CAP_FLAG2_RSS_TOP              = 1LL <<  1,
        MLX4_DEV_CAP_FLAG2_RSS_XOR              = 1LL <<  2,
-        MLX4_DEV_CAP_FLAG2_FS_EN                = 1LL <<  3
+        MLX4_DEV_CAP_FLAG2_FS_EN                = 1LL <<  3,
+        MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN     = 1LL <<  4
 };
 enum {
@@ -955,9 +956,8 @@ int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mo
 int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac);
 void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac);
-int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac);
+int mlx4_get_base_qpn(struct mlx4_dev *dev, u8 port);
-int mlx4_get_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn);
+int __mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac);
-void mlx4_put_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int qpn);
 void mlx4_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap);
 int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
                          u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx);
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index ea00d9162ee5..79aaa9fc1a15 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -9,7 +9,7 @@
 #ifdef CONFIG_IP_MROUTE
 static inline int ip_mroute_opt(int opt)
 {
-        return (opt >= MRT_BASE) && (opt <= MRT_BASE + 10);
+        return (opt >= MRT_BASE) && (opt <= MRT_MAX);
 }
 #else
 static inline int ip_mroute_opt(int opt)
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index a223561ba12e..66982e764051 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -10,7 +10,7 @@
 #ifdef CONFIG_IPV6_MROUTE
 static inline int ip6_mroute_opt(int opt)
 {
-        return (opt >= MRT6_BASE) && (opt <= MRT6_BASE + 10);
+        return (opt >= MRT6_BASE) && (opt <= MRT6_MAX);
 }
 #else
 static inline int ip6_mroute_opt(int opt)
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index 5ac32123035a..3dd39340430e 100644
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -41,7 +41,7 @@ enum {
        NETIF_F_TSO_ECN_BIT,            /* ... TCP ECN support */
        NETIF_F_TSO6_BIT,               /* ... TCPv6 segmentation */
        NETIF_F_FSO_BIT,                /* ... FCoE segmentation */
-        NETIF_F_GSO_RESERVED1,          /* ... free (fill GSO_MASK to 8 bits) */
+        NETIF_F_GSO_GRE_BIT,            /* ... GRE with TSO */
        /**/NETIF_F_GSO_LAST,           /* [can't be last bit, see GSO_MASK] */
        NETIF_F_GSO_RESERVED2           /* ... free (fill GSO_MASK to 8 bits) */
                = NETIF_F_GSO_LAST,
@@ -102,6 +102,7 @@ enum {
 #define NETIF_F_VLAN_CHALLENGED __NETIF_F(VLAN_CHALLENGED)
 #define NETIF_F_RXFCS           __NETIF_F(RXFCS)
 #define NETIF_F_RXALL           __NETIF_F(RXALL)
+#define NETIF_F_GRE_GSO         __NETIF_F(GSO_GRE)
 /* Features valid for ethtool to change */
 /* = all defined minus driver/device-class-related */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 9ef07d0868b6..b3d00fa4b314 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -67,6 +67,8 @@ extern void netdev_set_default_ethtool_ops(struct net_device *dev,
 #define NET_ADDR_PERM           0       /* address is permanent (default) */
 #define NET_ADDR_RANDOM         1       /* address is generated randomly */
 #define NET_ADDR_STOLEN         2       /* address is stolen from other device */
+#define NET_ADDR_SET            3       /* address is set using
+                                         * dev_set_mac_address() */
 /* Backlog congestion levels */
 #define NET_RX_SUCCESS          0       /* keep 'em coming, baby */
@@ -859,8 +861,7 @@ struct netdev_fcoe_hbainfo {
 *      flow_id is a flow ID to be passed to rps_may_expire_flow() later.
 *      Return the filter ID on success, or a negative error code.
 *
- *      Slave management functions (for bridge, bonding, etc). User should
+ *      Slave management functions (for bridge, bonding, etc).
- *      call netdev_set_master() to set dev->master properly.
 * int (*ndo_add_slave)(struct net_device *dev, struct net_device *slave_dev);
 *      Called to make another netdev an underling.
 *
@@ -883,7 +884,8 @@ struct netdev_fcoe_hbainfo {
 *                    struct net_device *dev,
 *                    const unsigned char *addr, u16 flags)
 *      Adds an FDB entry to dev for addr.
- * int (*ndo_fdb_del)(struct ndmsg *ndm, struct net_device *dev,
+ * int (*ndo_fdb_del)(struct ndmsg *ndm, struct nlattr *tb[],
+ *                    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,
@@ -894,6 +896,14 @@ struct netdev_fcoe_hbainfo {
 * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh)
 * int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq,
 *                           struct net_device *dev)
+ *
+ * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier);
+ *      Called to change device carrier. Soft-devices (like dummy, team, etc)
+ *      which do not represent real hardware may define this to allow their
+ *      userspace components to manage their virtual carrier state. Devices
+ *      that determine carrier state from physical hardware properties (eg
+ *      network cables) or protocol-dependent mechanisms (eg
+ *      USB_CDC_NOTIFY_NETWORK_CONNECTION) should NOT implement this function.
 */
 struct net_device_ops {
        int                     (*ndo_init)(struct net_device *dev);
@@ -999,6 +1009,7 @@ struct net_device_ops {
                                               const unsigned char *addr,
                                               u16 flags);
        int                     (*ndo_fdb_del)(struct ndmsg *ndm,
+                                               struct nlattr *tb[],
                                               struct net_device *dev,
                                               const unsigned char *addr);
        int                     (*ndo_fdb_dump)(struct sk_buff *skb,
@@ -1010,7 +1021,12 @@ struct net_device_ops {
                                                      struct nlmsghdr *nlh);
        int                     (*ndo_bridge_getlink)(struct sk_buff *skb,
                                                      u32 pid, u32 seq,
-                                                      struct net_device *dev);
+                                                      struct net_device *dev,
+                                                      u32 filter_mask);
+        int                     (*ndo_bridge_dellink)(struct net_device *dev,
+                                                      struct nlmsghdr *nlh);
+        int                     (*ndo_change_carrier)(struct net_device *dev,
+                                                      bool new_carrier);
 };
 /*
@@ -1161,9 +1177,7 @@ struct net_device {
                                                 * avoid dirtying this cache line.
                                                 */
-        struct net_device       *master; /* Pointer to master device of a group,
+        struct list_head        upper_dev_list; /* List of upper devices */
-                                          * which this device is member of.
-                                          */
        /* Interface address info used in eth_type_trans() */
        unsigned char           *dev_addr;      /* hw address, (before bcast
@@ -1263,7 +1277,7 @@ struct net_device {
        void (*destructor)(struct net_device *dev);
 #ifdef CONFIG_NETPOLL
-        struct netpoll_info     *npinfo;
+        struct netpoll_info __rcu       *npinfo;
 #endif
 #ifdef CONFIG_NET_NS
@@ -1277,9 +1291,12 @@ struct net_device {
                struct pcpu_lstats __percpu     *lstats; /* loopback stats */
                struct pcpu_tstats __percpu     *tstats; /* tunnel stats */
                struct pcpu_dstats __percpu     *dstats; /* dummy stats */
+                struct pcpu_vstats __percpu     *vstats; /* veth stats */
        };
        /* GARP */
        struct garp_port __rcu  *garp_port;
+        /* MRP */
+        struct mrp_port __rcu   *mrp_port;
        /* class/net/name entry */
        struct device           dev;
@@ -1396,6 +1413,7 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev,
 extern struct netdev_queue *netdev_pick_tx(struct net_device *dev,
                                           struct sk_buff *skb);
+extern u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb);
 /*
 * Net namespace inlines
@@ -2095,6 +2113,18 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
                __netif_schedule(txq->qdisc);
 }
+#ifdef CONFIG_XPS
+extern int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask,
+                               u16 index);
+#else
+static inline int netif_set_xps_queue(struct net_device *dev,
+                                      struct cpumask *mask,
+                                      u16 index)
+{
+        return 0;
+}
+#endif
 /*
 * Returns a Tx hash for the given packet when dev->real_num_tx_queues is used
 * as a distribution range limit for the returned value.
@@ -2197,6 +2227,8 @@ extern int		dev_set_mtu(struct net_device *, int);
 extern void             dev_set_group(struct net_device *, int);
 extern int              dev_set_mac_address(struct net_device *,
                                            struct sockaddr *);
+extern int              dev_change_carrier(struct net_device *,
+                                           bool new_carrier);
 extern int              dev_hard_start_xmit(struct sk_buff *skb,
                                            struct net_device *dev,
                                            struct netdev_queue *txq);
@@ -2614,7 +2646,6 @@ extern void		netdev_notify_peers(struct net_device *dev);
 extern void             netdev_features_change(struct net_device *dev);
 /* Load a device via the kmod */
 extern void             dev_load(struct net *net, const char *name);
-extern void             dev_mcast_init(void);
 extern struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
                                               struct rtnl_link_stats64 *storage);
 extern void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64,
@@ -2624,12 +2655,30 @@ extern int		netdev_max_backlog;
 extern int              netdev_tstamp_prequeue;
 extern int              weight_p;
 extern int              bpf_jit_enable;
-extern int              netdev_set_master(struct net_device *dev, struct net_device *master);
-extern int netdev_set_bond_master(struct net_device *dev,
+extern bool netdev_has_upper_dev(struct net_device *dev,
-                                  struct net_device *master);
+                                 struct net_device *upper_dev);
+extern bool netdev_has_any_upper_dev(struct net_device *dev);
+extern struct net_device *netdev_master_upper_dev_get(struct net_device *dev);
+extern struct net_device *netdev_master_upper_dev_get_rcu(struct net_device *dev);
+extern int netdev_upper_dev_link(struct net_device *dev,
+                                 struct net_device *upper_dev);
+extern int netdev_master_upper_dev_link(struct net_device *dev,
+                                        struct net_device *upper_dev);
+extern void netdev_upper_dev_unlink(struct net_device *dev,
+                                    struct net_device *upper_dev);
 extern int skb_checksum_help(struct sk_buff *skb);
-extern struct sk_buff *skb_gso_segment(struct sk_buff *skb,
+extern struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
-        netdev_features_t features);
+        netdev_features_t features, bool tx_path);
+extern struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
+                                          netdev_features_t features);
+static inline
+struct sk_buff *skb_gso_segment(struct sk_buff *skb, netdev_features_t features)
+{
+        return __skb_gso_segment(skb, features, true);
+}
 #ifdef CONFIG_BUG
 extern void netdev_rx_csum_fault(struct net_device *dev);
 #else
@@ -2642,9 +2691,9 @@ extern void		net_enable_timestamp(void);
 extern void             net_disable_timestamp(void);
 #ifdef CONFIG_PROC_FS
-extern void *dev_seq_start(struct seq_file *seq, loff_t *pos);
+extern int __init dev_proc_init(void);
-extern void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos);
+#else
-extern void dev_seq_stop(struct seq_file *seq, void *v);
+#define dev_proc_init() 0
 #endif
 extern int netdev_class_create_file(struct class_attribute *class_attr);
@@ -2846,4 +2895,34 @@ do {								\
 })
 #endif
+/*
+ *      The list of packet types we will receive (as opposed to discard)
+ *      and the routines to invoke.
+ *
+ *      Why 16. Because with 16 the only overlap we get on a hash of the
+ *      low nibble of the protocol value is RARP/SNAP/X.25.
+ *
+ *      NOTE:  That is no longer true with the addition of VLAN tags.  Not
+ *             sure which should go first, but I bet it won't make much
+ *             difference if we are running VLANs.  The good news is that
+ *             this protocol won't be in the list unless compiled in, so
+ *             the average user (w/out VLANs) will not be adversely affected.
+ *             --BLG
+ *
+ *              0800    IP
+ *              8100    802.1Q VLAN
+ *              0001    802.3
+ *              0002    AX.25
+ *              0004    802.2
+ *              8035    RARP
+ *              0005    SNAP
+ *              0805    X.25
+ *              0806    ARP
+ *              8137    IPX
+ *              0009    Localtalk
+ *              86DD    IPv6
+ */
+#define PTYPE_HASH_SIZE (16)
+#define PTYPE_HASH_MASK (PTYPE_HASH_SIZE - 1)
 #endif  /* _LINUX_NETDEVICE_H */
diff --git a/include/linux/netfilter/nf_conntrack_sip.h b/include/linux/netfilter/nf_conntrack_sip.h
index 387bdd02945d..ba7f571a2b1c 100644
--- a/include/linux/netfilter/nf_conntrack_sip.h
+++ b/include/linux/netfilter/nf_conntrack_sip.h
@@ -4,12 +4,15 @@
 #include <net/netfilter/nf_conntrack_expect.h>
+#include <linux/types.h>
 #define SIP_PORT        5060
 #define SIP_TIMEOUT     3600
 struct nf_ct_sip_master {
        unsigned int    register_cseq;
        unsigned int    invite_cseq;
+        __be16          forced_dport;
 };
 enum sip_expectation_classes {
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 4966ddec039b..ecbb8e495912 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -34,8 +34,8 @@ extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigne
 extern int nfnetlink_set_err(struct net *net, u32 pid, u32 group, int error);
 extern int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u_int32_t pid, int flags);
-extern void nfnl_lock(void);
+extern void nfnl_lock(__u8 subsys_id);
-extern void nfnl_unlock(void);
+extern void nfnl_unlock(__u8 subsys_id);
 #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
        MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 66d5379c305e..9d7d8c64f7c8 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -12,28 +12,38 @@
 #include <linux/rcupdate.h>
 #include <linux/list.h>
+union inet_addr {
+        __u32           all[4];
+        __be32          ip;
+        __be32          ip6[4];
+        struct in_addr  in;
+        struct in6_addr in6;
+};
 struct netpoll {
        struct net_device *dev;
        char dev_name[IFNAMSIZ];
        const char *name;
        void (*rx_hook)(struct netpoll *, int, char *, int);
-        __be32 local_ip, remote_ip;
+        union inet_addr local_ip, remote_ip;
+        bool ipv6;
        u16 local_port, remote_port;
        u8 remote_mac[ETH_ALEN];
        struct list_head rx; /* rx_np list element */
-        struct rcu_head rcu;
+        struct work_struct cleanup_work;
 };
 struct netpoll_info {
        atomic_t refcnt;
-        int rx_flags;
+        unsigned long rx_flags;
        spinlock_t rx_lock;
+        struct mutex dev_lock;
        struct list_head rx_np; /* netpolls that registered an rx_hook */
-        struct sk_buff_head arp_tx; /* list of arp requests to reply to */
+        struct sk_buff_head neigh_tx; /* list of neigh requests to reply to */
        struct sk_buff_head txq;
        struct delayed_work tx_work;
@@ -42,6 +52,14 @@ struct netpoll_info {
        struct rcu_head rcu;
 };
+#ifdef CONFIG_NETPOLL
+extern int netpoll_rx_disable(struct net_device *dev);
+extern void netpoll_rx_enable(struct net_device *dev);
+#else
+static inline int netpoll_rx_disable(struct net_device *dev) { return 0; }
+static inline void netpoll_rx_enable(struct net_device *dev) { return; }
+#endif
 void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
 void netpoll_print_options(struct netpoll *np);
 int netpoll_parse_options(struct netpoll *np, char *opt);
@@ -50,7 +68,7 @@ int netpoll_setup(struct netpoll *np);
 int netpoll_trap(void);
 void netpoll_set_trap(int trap);
 void __netpoll_cleanup(struct netpoll *np);
-void __netpoll_free_rcu(struct netpoll *np);
+void __netpoll_free_async(struct netpoll *np);
 void netpoll_cleanup(struct netpoll *np);
 int __netpoll_rx(struct sk_buff *skb, struct netpoll_info *npinfo);
 void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
diff --git a/include/linux/of.h b/include/linux/of.h
index 5ebcc5c8e423..a0f129284948 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -92,7 +92,7 @@ static inline void of_node_put(struct device_node *node) { }
 extern struct device_node *of_allnodes;
 extern struct device_node *of_chosen;
 extern struct device_node *of_aliases;
-extern rwlock_t devtree_lock;
+extern raw_spinlock_t devtree_lock;
 static inline bool of_have_populated_dt(void)
 {
@@ -160,7 +160,7 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
 #define OF_BAD_ADDR     ((u64)-1)
-static inline const char* of_node_full_name(struct device_node *np)
+static inline const char *of_node_full_name(const struct device_node *np)
 {
        return np ? np->full_name : "<no-node>";
 }
@@ -277,6 +277,8 @@ extern struct device_node *of_parse_phandle(const struct device_node *np,
 extern int of_parse_phandle_with_args(const struct device_node *np,
        const char *list_name, const char *cells_name, int index,
        struct of_phandle_args *out_args);
+extern int of_count_phandle_with_args(const struct device_node *np,
+        const char *list_name, const char *cells_name);
 extern void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align));
 extern int of_alias_get_id(struct device_node *np, const char *stem);
@@ -467,6 +469,13 @@ static inline int of_parse_phandle_with_args(struct device_node *np,
        return -ENOSYS;
 }
+static inline int of_count_phandle_with_args(struct device_node *np,
+                                             const char *list_name,
+                                             const char *cells_name)
+{
+        return -ENOSYS;
+}
 static inline int of_alias_get_id(struct device_node *np, const char *stem)
 {
        return -ENOSYS;
diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h
index c454f5796747..a83dc6f5008e 100644
--- a/include/linux/of_gpio.h
+++ b/include/linux/of_gpio.h
@@ -50,9 +50,6 @@ static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc)
 extern int of_get_named_gpio_flags(struct device_node *np,
                const char *list_name, int index, enum of_gpio_flags *flags);
-extern unsigned int of_gpio_named_count(struct device_node *np,
-                                        const char* propname);
 extern int of_mm_gpiochip_add(struct device_node *np,
                              struct of_mm_gpio_chip *mm_gc);
@@ -71,12 +68,6 @@ static inline int of_get_named_gpio_flags(struct device_node *np,
        return -ENOSYS;
 }
-static inline unsigned int of_gpio_named_count(struct device_node *np,
-                                        const char* propname)
-{
-        return 0;
-}
 static inline int of_gpio_simple_xlate(struct gpio_chip *gc,
                                       const struct of_phandle_args *gpiospec,
                                       u32 *flags)
@@ -90,22 +81,37 @@ static inline void of_gpiochip_remove(struct gpio_chip *gc) { }
 #endif /* CONFIG_OF_GPIO */
 /**
- * of_gpio_count - Count GPIOs for a device
+ * of_gpio_named_count() - Count GPIOs for a device
 * @np:         device node to count GPIOs for
+ * @propname:   property name containing gpio specifier(s)
 *
 * The function returns the count of GPIOs specified for a node.
+ * Note that the empty GPIO specifiers count too. Returns either
+ *   Number of gpios defined in property,
+ *   -EINVAL for an incorrectly formed gpios property, or
+ *   -ENOENT for a missing gpios property
 *
- * Note that the empty GPIO specifiers counts too. For example,
+ * Example:
- *
 * gpios = <0
- *          &pio1 1 2
+ *          &gpio1 1 2
 *          0
- *          &pio2 3 4>;
+ *          &gpio2 3 4>;
+ *
+ * The above example defines four GPIOs, two of which are not specified.
+ * This function will return '4'
+ */
+static inline int of_gpio_named_count(struct device_node *np, const char* propname)
+{
+        return of_count_phandle_with_args(np, propname, "#gpio-cells");
+}
+/**
+ * of_gpio_count() - Count GPIOs for a device
+ * @np:         device node to count GPIOs for
 *
- * defines four GPIOs (so this function will return 4), two of which
+ * Same as of_gpio_named_count, but hard coded to use the 'gpios' property
- * are not specified.
 */
-static inline unsigned int of_gpio_count(struct device_node *np)
+static inline int of_gpio_count(struct device_node *np)
 {
        return of_gpio_named_count(np, "gpios");
 }
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 15472d691ee6..6fa4dd2a3b9e 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1101,6 +1101,12 @@ static inline int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
        return -1;
 }
+static inline int
+pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec)
+{
+        return -1;
+}
 static inline void pci_msi_shutdown(struct pci_dev *dev)
 { }
 static inline void pci_disable_msi(struct pci_dev *dev)
@@ -1132,6 +1138,7 @@ static inline int pci_msi_enabled(void)
 }
 #else
 extern int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);
+extern int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec);
 extern void pci_msi_shutdown(struct pci_dev *dev);
 extern void pci_disable_msi(struct pci_dev *dev);
 extern int pci_msix_table_size(struct pci_dev *dev);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 0eb65796bcb9..907e7e56fa4b 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2127,6 +2127,7 @@
 #define PCI_DEVICE_ID_TIGON3_5754M      0x1672
 #define PCI_DEVICE_ID_TIGON3_5755M      0x1673
 #define PCI_DEVICE_ID_TIGON3_5756       0x1674
+#define PCI_DEVICE_ID_TIGON3_5750       0x1676
 #define PCI_DEVICE_ID_TIGON3_5751       0x1677
 #define PCI_DEVICE_ID_TIGON3_5715       0x1678
 #define PCI_DEVICE_ID_TIGON3_5715S      0x1679
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 6bfb2faa0b19..e47ee462c2f2 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -135,16 +135,21 @@ struct hw_perf_event {
                struct { /* software */
                        struct hrtimer  hrtimer;
                };
+                struct { /* tracepoint */
+                        struct task_struct      *tp_target;
+                        /* for tp_event->class */
+                        struct list_head        tp_list;
+                };
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
                struct { /* breakpoint */
-                        struct arch_hw_breakpoint       info;
-                        struct list_head                bp_list;
                        /*
                         * Crufty hack to avoid the chicken and egg
                         * problem hw_breakpoint has with context
                         * creation and event initalization.
                         */
                        struct task_struct              *bp_target;
+                        struct arch_hw_breakpoint       info;
+                        struct list_head                bp_list;
                };
 #endif
        };
@@ -817,6 +822,17 @@ do {									\
 } while (0)
+struct perf_pmu_events_attr {
+        struct device_attribute attr;
+        u64 id;
+};
+#define PMU_EVENT_ATTR(_name, _var, _id, _show)                         \
+static struct perf_pmu_events_attr _var = {                             \
+        .attr = __ATTR(_name, 0444, _show, NULL),                       \
+        .id   =  _id,                                                   \
+};
 #define PMU_FORMAT_ATTR(_name, _format)                                 \
 static ssize_t                                                          \
 _name##_show(struct device *dev,                                        \
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 93b3cf77f564..33999adbf8c8 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -506,13 +506,13 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);
 int phy_device_register(struct phy_device *phy);
 int phy_init_hw(struct phy_device *phydev);
 struct phy_device * phy_attach(struct net_device *dev,
-                const char *bus_id, u32 flags, phy_interface_t interface);
+                const char *bus_id, phy_interface_t interface);
 struct phy_device *phy_find_first(struct mii_bus *bus);
 int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
-                void (*handler)(struct net_device *), u32 flags,
+                void (*handler)(struct net_device *),
                phy_interface_t interface);
 struct phy_device * phy_connect(struct net_device *dev, const char *bus_id,
-                void (*handler)(struct net_device *), u32 flags,
+                void (*handler)(struct net_device *),
                phy_interface_t interface);
 void phy_disconnect(struct phy_device *phydev);
 void phy_detach(struct phy_device *phydev);
diff --git a/include/linux/pinctrl/devinfo.h b/include/linux/pinctrl/devinfo.h
new file mode 100644
index 000000000000..6e5f8a985ea7
--- /dev/null
+++ b/include/linux/pinctrl/devinfo.h
@@ -0,0 +1,45 @@
+/*
+ * Per-device information from the pin control system.
+ * This is the stuff that get included into the device
+ * core.
+ *
+ * Copyright (C) 2012 ST-Ericsson SA
+ * Written on behalf of Linaro for ST-Ericsson
+ * This interface is used in the core to keep track of pins.
+ *
+ * Author: Linus Walleij <linus.walleij@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+#ifndef PINCTRL_DEVINFO_H
+#define PINCTRL_DEVINFO_H
+#ifdef CONFIG_PINCTRL
+/* The device core acts as a consumer toward pinctrl */
+#include <linux/pinctrl/consumer.h>
+/**
+ * struct dev_pin_info - pin state container for devices
+ * @p: pinctrl handle for the containing device
+ * @default_state: the default state for the handle, if found
+ */
+struct dev_pin_info {
+        struct pinctrl *p;
+        struct pinctrl_state *default_state;
+};
+extern int pinctrl_bind_pins(struct device *dev);
+#else
+/* Stubs if we're not using pinctrl */
+static inline int pinctrl_bind_pins(struct device *dev)
+{
+        return 0;
+}
+#endif /* CONFIG_PINCTRL */
+#endif /* PINCTRL_DEVINFO_H */
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
index 47a1bdd88878..72474e18f1e0 100644
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@ -46,7 +46,11 @@
 * @PIN_CONFIG_DRIVE_OPEN_SOURCE: the pin will be driven with open source
 *      (open emitter). Sending this config will enabale open drain mode, the
 *      argument is ignored.
- * @PIN_CONFIG_INPUT_SCHMITT_DISABLE: disable schmitt-trigger mode on the pin.
+ * @PIN_CONFIG_DRIVE_STRENGTH: the pin will output the current passed as
+ *      argument. The argument is in mA.
+ * @PIN_CONFIG_INPUT_SCHMITT_ENABLE: control schmitt-trigger mode on the pin.
+ *      If the argument != 0, schmitt-trigger mode is enabled. If it's 0,
+ *      schmitt-trigger mode is disabled.
 * @PIN_CONFIG_INPUT_SCHMITT: this will configure an input pin to run in
 *      schmitt-trigger mode. If the schmitt-trigger has adjustable hysteresis,
 *      the threshold value is given on a custom format as argument when
@@ -58,10 +62,15 @@
 * @PIN_CONFIG_POWER_SOURCE: if the pin can select between different power
 *      supplies, the argument to this parameter (on a custom format) tells
 *      the driver which alternative power source to use.
+ * @PIN_CONFIG_SLEW_RATE: if the pin can select slew rate, the argument to
+ *      this parameter (on a custom format) tells the driver which alternative
+ *      slew rate to use.
 * @PIN_CONFIG_LOW_POWER_MODE: this will configure the pin for low power
 *      operation, if several modes of operation are supported these can be
 *      passed in the argument on a custom form, else just use argument 1
 *      to indicate low power mode, argument 0 turns low power mode off.
+ * @PIN_CONFIG_OUTPUT: this will configure the pin in output, use argument
+ *      1 to indicate high level, argument 0 to indicate low level.
 * @PIN_CONFIG_END: this is the last enumerator for pin configurations, if
 *      you need to pass in custom configurations to the pin controller, use
 *      PIN_CONFIG_END+1 as the base offset.
@@ -74,11 +83,14 @@ enum pin_config_param {
        PIN_CONFIG_DRIVE_PUSH_PULL,
        PIN_CONFIG_DRIVE_OPEN_DRAIN,
        PIN_CONFIG_DRIVE_OPEN_SOURCE,
-        PIN_CONFIG_INPUT_SCHMITT_DISABLE,
+        PIN_CONFIG_DRIVE_STRENGTH,
+        PIN_CONFIG_INPUT_SCHMITT_ENABLE,
        PIN_CONFIG_INPUT_SCHMITT,
        PIN_CONFIG_INPUT_DEBOUNCE,
        PIN_CONFIG_POWER_SOURCE,
+        PIN_CONFIG_SLEW_RATE,
        PIN_CONFIG_LOW_POWER_MODE,
+        PIN_CONFIG_OUTPUT,
        PIN_CONFIG_END = 0x7FFF,
 };
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 04d6700d99af..778804df293f 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -154,6 +154,7 @@ struct pinctrl_dev *of_pinctrl_get(struct device_node *np)
 #endif /* CONFIG_OF */
 extern const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev);
+extern const char *pinctrl_dev_get_devname(struct pinctrl_dev *pctldev);
 extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev);
 #else
diff --git a/include/linux/platform_data/cpsw.h b/include/linux/platform_data/cpsw.h
index 24368a2e8b87..798fb80b024b 100644
--- a/include/linux/platform_data/cpsw.h
+++ b/include/linux/platform_data/cpsw.h
@@ -21,6 +21,8 @@ struct cpsw_slave_data {
        char            phy_id[MII_BUS_ID_SIZE];
        int             phy_if;
        u8              mac_addr[ETH_ALEN];
+        u16             dual_emac_res_vlan;     /* Reserved VLAN for DualEMAC */
 };
 struct cpsw_platform_data {
@@ -35,6 +37,8 @@ struct cpsw_platform_data {
        u32     bd_ram_size;  /*buffer descriptor ram size */
        u32     rx_descs;       /* Number of Rx Descriptios */
        u32     mac_control;    /* Mac control register */
+        u16     default_vlan;   /* Def VLAN for ALE lookup in VLAN aware mode*/
+        bool    dual_emac;      /* Enable Dual EMAC mode */
 };
 #endif /* __CPSW_H__ */
diff --git a/include/linux/platform_data/lp8755.h b/include/linux/platform_data/lp8755.h
new file mode 100644
index 000000000000..a7fd0776c9bf
--- /dev/null
+++ b/include/linux/platform_data/lp8755.h
@@ -0,0 +1,71 @@
+/*
+ * LP8755 High Performance Power Management Unit Driver:System Interface Driver
+ *
+ *                      Copyright (C) 2012 Texas Instruments
+ *
+ * Author: Daniel(Geon Si) Jeong <daniel.jeong@ti.com>
+ *             G.Shark Jeong <gshark.jeong@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#ifndef _LP8755_H
+#define _LP8755_H
+#include <linux/regulator/consumer.h>
+#define LP8755_NAME "lp8755-regulator"
+/*
+ *PWR FAULT : power fault detected
+ *OCP : over current protect activated
+ *OVP : over voltage protect activated
+ *TEMP_WARN : thermal warning
+ *TEMP_SHDN : thermal shutdonw detected
+ *I_LOAD : current measured
+ */
+#define LP8755_EVENT_PWR_FAULT REGULATOR_EVENT_FAIL
+#define LP8755_EVENT_OCP REGULATOR_EVENT_OVER_CURRENT
+#define LP8755_EVENT_OVP 0x10000
+#define LP8755_EVENT_TEMP_WARN 0x2000
+#define LP8755_EVENT_TEMP_SHDN REGULATOR_EVENT_OVER_TEMP
+#define LP8755_EVENT_I_LOAD     0x40000
+enum lp8755_bucks {
+        LP8755_BUCK0 = 0,
+        LP8755_BUCK1,
+        LP8755_BUCK2,
+        LP8755_BUCK3,
+        LP8755_BUCK4,
+        LP8755_BUCK5,
+        LP8755_BUCK_MAX,
+};
+/**
+ * multiphase configuration options
+ */
+enum lp8755_mphase_config {
+        MPHASE_CONF0,
+        MPHASE_CONF1,
+        MPHASE_CONF2,
+        MPHASE_CONF3,
+        MPHASE_CONF4,
+        MPHASE_CONF5,
+        MPHASE_CONF6,
+        MPHASE_CONF7,
+        MPHASE_CONF8,
+        MPHASE_CONF_MAX
+};
+/**
+ * struct lp8755_platform_data
+ * @mphase_type : Multiphase Switcher Configurations.
+ * @buck_data   : buck0~6 init voltage in uV
+ */
+struct lp8755_platform_data {
+        int mphase;
+        struct regulator_init_data *buck_data[LP8755_BUCK_MAX];
+};
+#endif
diff --git a/include/linux/platform_data/max6697.h b/include/linux/platform_data/max6697.h
new file mode 100644
index 000000000000..ed9d3b3daf02
--- /dev/null
+++ b/include/linux/platform_data/max6697.h
@@ -0,0 +1,36 @@
+/*
+ * max6697.h
+ *     Copyright (c) 2012 Guenter Roeck <linux@roeck-us.net>
+ *
+ * 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 MAX6697_H
+#define MAX6697_H
+#include <linux/types.h>
+/*
+ * For all bit masks:
+ * bit 0:    local temperature
+ * bit 1..7: remote temperatures
+ */
+struct max6697_platform_data {
+        bool smbus_timeout_disable;     /* set to disable SMBus timeouts */
+        bool extended_range_enable;     /* set to enable extended temp range */
+        bool beta_compensation;         /* set to enable beta compensation */
+        u8 alert_mask;                  /* set bit to 1 to disable alert */
+        u8 over_temperature_mask;       /* set bit to 1 to disable */
+        u8 resistance_cancellation;     /* set bit to 0 to disable
+                                         * bit mask for MAX6581,
+                                         * boolean for other chips
+                                         */
+        u8 ideality_mask;               /* set bit to 0 to disable */
+        u8 ideality_value;              /* transistor ideality as per
+                                         * MAX6581 datasheet
+                                         */
+};
+#endif /* MAX6697_H */
diff --git a/include/linux/platform_data/microread.h b/include/linux/platform_data/microread.h
new file mode 100644
index 000000000000..cfda59b226ee
--- /dev/null
+++ b/include/linux/platform_data/microread.h
@@ -0,0 +1,35 @@
+/*
+ * Driver include for the PN544 NFC chip.
+ *
+ * Copyright (C) 2011 Tieto Poland
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _MICROREAD_H
+#define _MICROREAD_H
+#include <linux/i2c.h>
+#define MICROREAD_DRIVER_NAME   "microread"
+/* board config platform data for microread */
+struct microread_nfc_platform_data {
+        unsigned int rst_gpio;
+        unsigned int irq_gpio;
+        unsigned int ioh_gpio;
+};
+#endif /* _MICROREAD_H */
diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h
index a65572d53211..c100456eab17 100644
--- a/include/linux/platform_data/spi-omap2-mcspi.h
+++ b/include/linux/platform_data/spi-omap2-mcspi.h
@@ -22,6 +22,9 @@ struct omap2_mcspi_dev_attr {
 struct omap2_mcspi_device_config {
        unsigned turbo_mode:1;
+        /* toggle chip select after every word */
+        unsigned cs_per_word:1;
 };
 #endif
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 03d7bb145311..97bcf23e045a 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -31,7 +31,6 @@
 /*
 * Callbacks for platform drivers to implement.
 */
-extern void (*pm_idle)(void);
 extern void (*pm_power_off)(void);
 extern void (*pm_power_off_prepare)(void);
diff --git a/include/linux/pm2301_charger.h b/include/linux/pm2301_charger.h
new file mode 100644
index 000000000000..fc3f026922ae
--- /dev/null
+++ b/include/linux/pm2301_charger.h
@@ -0,0 +1,61 @@
+/*
+ * PM2301 charger driver.
+ *
+ * Copyright (C) 2012 ST Ericsson Corporation
+ *
+ * Contact: Olivier LAUNAY (olivier.launay@stericsson.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#ifndef __LINUX_PM2301_H
+#define __LINUX_PM2301_H
+/**
+ * struct pm2xxx_bm_charger_parameters - Charger specific parameters
+ * @ac_volt_max:        maximum allowed AC charger voltage in mV
+ * @ac_curr_max:        maximum allowed AC charger current in mA
+ */
+struct pm2xxx_bm_charger_parameters {
+        int ac_volt_max;
+        int ac_curr_max;
+};
+/**
+ * struct pm2xxx_bm_data - pm2xxx battery management data
+ * @enable_overshoot    flag to enable VBAT overshoot control
+ * @chg_params    charger parameters
+ */
+struct pm2xxx_bm_data {
+        bool enable_overshoot;
+        const struct pm2xxx_bm_charger_parameters *chg_params;
+};
+struct pm2xxx_charger_platform_data {
+        char **supplied_to;
+        size_t num_supplicants;
+        int i2c_bus;
+        const char *label;
+        int irq_number;
+        unsigned int lpn_gpio;
+        int irq_type;
+};
+struct pm2xxx_platform_data {
+        struct pm2xxx_charger_platform_data *wall_charger;
+        struct pm2xxx_bm_data *battery;
+};
+#endif /* __LINUX_PM2301_H */
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index f271860c78d5..c785c215abfc 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -80,6 +80,12 @@ static inline bool pm_runtime_suspended(struct device *dev)
                && !dev->power.disable_depth;
 }
+static inline bool pm_runtime_active(struct device *dev)
+{
+        return dev->power.runtime_status == RPM_ACTIVE
+                || dev->power.disable_depth;
+}
 static inline bool pm_runtime_status_suspended(struct device *dev)
 {
        return dev->power.runtime_status == RPM_SUSPENDED;
@@ -132,6 +138,7 @@ static inline void pm_runtime_put_noidle(struct device *dev) {}
 static inline bool device_run_wake(struct device *dev) { return false; }
 static inline void device_set_run_wake(struct device *dev, bool enable) {}
 static inline bool pm_runtime_suspended(struct device *dev) { return false; }
+static inline bool pm_runtime_active(struct device *dev) { return true; }
 static inline bool pm_runtime_status_suspended(struct device *dev) { return false; }
 static inline bool pm_runtime_enabled(struct device *dev) { return false; }
diff --git a/include/linux/power/bq2415x_charger.h b/include/linux/power/bq2415x_charger.h
index 97a1665eaeaf..8dcc0f46fc0a 100644
--- a/include/linux/power/bq2415x_charger.h
+++ b/include/linux/power/bq2415x_charger.h
@@ -75,7 +75,8 @@
 /* Supported modes with maximal current limit */
 enum bq2415x_mode {
-        BQ2415X_MODE_NONE,              /* unknown or no charger (100mA) */
+        BQ2415X_MODE_OFF,               /* offline mode (charger disabled) */
+        BQ2415X_MODE_NONE,              /* unknown charger (100mA) */
        BQ2415X_MODE_HOST_CHARGER,      /* usb host/hub charger (500mA) */
        BQ2415X_MODE_DEDICATED_CHARGER, /* dedicated charger (unlimited) */
        BQ2415X_MODE_BOOST,             /* boost mode (charging disabled) */
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 1f0ab90aff00..25c0982eb9b1 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -54,6 +54,8 @@ enum {
        POWER_SUPPLY_HEALTH_OVERVOLTAGE,
        POWER_SUPPLY_HEALTH_UNSPEC_FAILURE,
        POWER_SUPPLY_HEALTH_COLD,
+        POWER_SUPPLY_HEALTH_WATCHDOG_TIMER_EXPIRE,
+        POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE,
 };
 enum {
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 9afc01e5a0a6..86c4b6294713 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -98,9 +98,6 @@ int no_printk(const char *fmt, ...)
 extern asmlinkage __printf(1, 2)
 void early_printk(const char *fmt, ...);
-extern int printk_needs_cpu(int cpu);
-extern void printk_tick(void);
 #ifdef CONFIG_PRINTK
 asmlinkage __printf(5, 0)
 int vprintk_emit(int facility, int level,
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 32676b35d2f5..d0a1f2ca1c3f 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -171,9 +171,6 @@ static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
        return res;
 }
 
-extern struct proc_dir_entry *proc_net_fops_create(struct net *net,
-        const char *name, umode_t mode, const struct file_operations *fops);
-extern void proc_net_remove(struct net *net, const char *name);
 extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,
        struct proc_dir_entry *parent);
@@ -184,21 +181,15 @@ extern int proc_alloc_inum(unsigned int *pino);
 extern void proc_free_inum(unsigned int inum);
 #else
-#define proc_net_fops_create(net, name, mode, fops)  ({ (void)(mode), NULL; })
-static inline void proc_net_remove(struct net *net, const char *name) {}
 static inline void proc_flush_task(struct task_struct *task)
 {
 }
 static inline struct proc_dir_entry *create_proc_entry(const char *name,
        umode_t mode, struct proc_dir_entry *parent) { return NULL; }
-static inline struct proc_dir_entry *proc_create(const char *name,
-        umode_t mode, struct proc_dir_entry *parent,
+#define proc_create(name, mode, parent, fops)  ({ (void)(mode), NULL; })
-        const struct file_operations *proc_fops)
-{
-        return NULL;
-}
 static inline struct proc_dir_entry *proc_create_data(const char *name,
        umode_t mode, struct proc_dir_entry *parent,
        const struct file_operations *proc_fops, void *data)
diff --git a/include/linux/profile.h b/include/linux/profile.h
index a0fc32279fc0..21123902366d 100644
--- a/include/linux/profile.h
+++ b/include/linux/profile.h
@@ -82,9 +82,6 @@ int task_handoff_unregister(struct notifier_block * n);
 int profile_event_register(enum profile_type, struct notifier_block * n);
 int profile_event_unregister(enum profile_type, struct notifier_block * n);
-int register_timer_hook(int (*hook)(struct pt_regs *));
-void unregister_timer_hook(int (*hook)(struct pt_regs *));
 struct pt_regs;
 #else
@@ -135,16 +132,6 @@ static inline int profile_event_unregister(enum profile_type t, struct notifier_
 #define profile_handoff_task(a) (0)
 #define profile_munmap(a) do { } while (0)
-static inline int register_timer_hook(int (*hook)(struct pt_regs *))
-{
-        return -ENOSYS;
-}
-static inline void unregister_timer_hook(int (*hook)(struct pt_regs *))
-{
-        return;
-}
 #endif /* CONFIG_PROFILING */
 #endif /* _LINUX_PROFILE_H */
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h
index f36632061c66..467cc6307b62 100644
--- a/include/linux/pxa2xx_ssp.h
+++ b/include/linux/pxa2xx_ssp.h
@@ -155,6 +155,14 @@
 #define SSACD_ACDS(x)           ((x) << 0)      /* Audio clock divider select */
 #define SSACD_SCDX8             (1 << 7)        /* SYSCLK division ratio select */
+/* LPSS SSP */
+#define SSITF                   0x44            /* TX FIFO trigger level */
+#define SSITF_TxLoThresh(x)     (((x) - 1) << 8)
+#define SSITF_TxHiThresh(x)     ((x) - 1)
+#define SSIRF                   0x48            /* RX FIFO trigger level */
+#define SSIRF_RxThresh(x)       ((x) - 1)
 enum pxa_ssp_type {
        SSP_UNDEFINED = 0,
        PXA25x_SSP,  /* pxa 210, 250, 255, 26x */
@@ -164,6 +172,7 @@ enum pxa_ssp_type {
        PXA168_SSP,
        PXA910_SSP,
        CE4100_SSP,
+        LPSS_SSP,
 };
 struct ssp_device {
@@ -206,6 +215,15 @@ static inline u32 pxa_ssp_read_reg(struct ssp_device *dev, u32 reg)
        return __raw_readl(dev->mmio_base + reg);
 }
+#ifdef CONFIG_ARCH_PXA
 struct ssp_device *pxa_ssp_request(int port, const char *label);
 void pxa_ssp_free(struct ssp_device *);
+#else
+static inline struct ssp_device *pxa_ssp_request(int port, const char *label)
+{
+        return NULL;
+}
+static inline void pxa_ssp_free(struct ssp_device *ssp) {}
+#endif
 #endif
diff --git a/include/linux/random.h b/include/linux/random.h
index d9846088c2c5..347ce553a306 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -74,4 +74,10 @@ static inline int arch_get_random_int(unsigned int *v)
 }
 #endif
+/* Pseudo random number generator from numerical recipes. */
+static inline u32 next_pseudo_random32(u32 seed)
+{
+        return seed * 1664525 + 1013904223;
+}
 #endif /* _LINUX_RANDOM_H */
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 275aa3f1062d..b758ce17b309 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -53,7 +53,10 @@ extern int rcutorture_runnable; /* for sysctl */
 extern void rcutorture_record_test_transition(void);
 extern void rcutorture_record_progress(unsigned long vernum);
 extern void do_trace_rcu_torture_read(char *rcutorturename,
-                                      struct rcu_head *rhp);
+                                      struct rcu_head *rhp,
+                                      unsigned long secs,
+                                      unsigned long c_old,
+                                      unsigned long c);
 #else
 static inline void rcutorture_record_test_transition(void)
 {
@@ -63,9 +66,13 @@ static inline void rcutorture_record_progress(unsigned long vernum)
 }
 #ifdef CONFIG_RCU_TRACE
 extern void do_trace_rcu_torture_read(char *rcutorturename,
-                                      struct rcu_head *rhp);
+                                      struct rcu_head *rhp,
+                                      unsigned long secs,
+                                      unsigned long c_old,
+                                      unsigned long c);
 #else
-#define do_trace_rcu_torture_read(rcutorturename, rhp) do { } while (0)
+#define do_trace_rcu_torture_read(rcutorturename, rhp, secs, c_old, c) \
+        do { } while (0)
 #endif
 #endif
@@ -749,7 +756,7 @@ static inline void rcu_preempt_sleep_check(void)
 * 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 (CONFIG_PREEMPT_RT) kernel builds,
+ * 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.
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index b7e95bf942c9..bf77dfdabef9 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -28,7 +28,8 @@ struct regmap_range_cfg;
 enum regcache_type {
        REGCACHE_NONE,
        REGCACHE_RBTREE,
-        REGCACHE_COMPRESSED
+        REGCACHE_COMPRESSED,
+        REGCACHE_FLAT,
 };
 /**
@@ -127,7 +128,18 @@ typedef void (*regmap_unlock)(void *);
 * @lock_arg:     this field is passed as the only argument of lock/unlock
 *                functions (ignored in case regular lock/unlock functions
 *                are not overridden).
- *
+ * @reg_read:     Optional callback that if filled will be used to perform
+ *                all the reads from the registers. Should only be provided for
+ *                devices whos read operation cannot be represented as a simple read
+ *                operation on a bus such as SPI, I2C, etc. Most of the devices do
+ *                not need this.
+ * @reg_write:    Same as above for writing.
+ * @fast_io:      Register IO is fast. Use a spinlock instead of a mutex
+ *                to perform locking. This field is ignored if custom lock/unlock
+ *                functions are used (see fields lock/unlock of struct regmap_config).
+ *                This field is a duplicate of a similar file in
+ *                'struct regmap_bus' and serves exact same purpose.
+ *                 Use it only for "no-bus" cases.
 * @max_register: Optional, specifies the maximum valid register index.
 * @wr_table:     Optional, points to a struct regmap_access_table specifying
 *                valid ranges for write access.
@@ -177,6 +189,11 @@ struct regmap_config {
        regmap_unlock unlock;
        void *lock_arg;
+        int (*reg_read)(void *context, unsigned int reg, unsigned int *val);
+        int (*reg_write)(void *context, unsigned int reg, unsigned int val);
+        bool fast_io;
        unsigned int max_register;
        const struct regmap_access_table *wr_table;
        const struct regmap_access_table *rd_table;
@@ -235,14 +252,21 @@ struct regmap_range_cfg {
        unsigned int window_len;
 };
+struct regmap_async;
 typedef int (*regmap_hw_write)(void *context, const void *data,
                               size_t count);
 typedef int (*regmap_hw_gather_write)(void *context,
                                      const void *reg, size_t reg_len,
                                      const void *val, size_t val_len);
+typedef int (*regmap_hw_async_write)(void *context,
+                                     const void *reg, size_t reg_len,
+                                     const void *val, size_t val_len,
+                                     struct regmap_async *async);
 typedef int (*regmap_hw_read)(void *context,
                              const void *reg_buf, size_t reg_size,
                              void *val_buf, size_t val_size);
+typedef struct regmap_async *(*regmap_hw_async_alloc)(void);
 typedef void (*regmap_hw_free_context)(void *context);
 /**
@@ -255,8 +279,11 @@ typedef void (*regmap_hw_free_context)(void *context);
 * @write: Write operation.
 * @gather_write: Write operation with split register/value, return -ENOTSUPP
 *                if not implemented  on a given device.
+ * @async_write: Write operation which completes asynchronously, optional and
+ *               must serialise with respect to non-async I/O.
 * @read: Read operation.  Data is returned in the buffer used to transmit
 *         data.
+ * @async_alloc: Allocate a regmap_async() structure.
 * @read_flag_mask: Mask to be set in the top byte of the register when doing
 *                  a read.
 * @reg_format_endian_default: Default endianness for formatted register
@@ -265,13 +292,16 @@ typedef void (*regmap_hw_free_context)(void *context);
 * @val_format_endian_default: Default endianness for formatted register
 *     values. Used when the regmap_config specifies DEFAULT. If this is
 *     DEFAULT, BIG is assumed.
+ * @async_size: Size of struct used for async work.
 */
 struct regmap_bus {
        bool fast_io;
        regmap_hw_write write;
        regmap_hw_gather_write gather_write;
+        regmap_hw_async_write async_write;
        regmap_hw_read read;
        regmap_hw_free_context free_context;
+        regmap_hw_async_alloc async_alloc;
        u8 read_flag_mask;
        enum regmap_endian reg_format_endian_default;
        enum regmap_endian val_format_endian_default;
@@ -285,9 +315,9 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c,
                               const struct regmap_config *config);
 struct regmap *regmap_init_spi(struct spi_device *dev,
                               const struct regmap_config *config);
-struct regmap *regmap_init_mmio(struct device *dev,
+struct regmap *regmap_init_mmio_clk(struct device *dev, const char *clk_id,
-                                void __iomem *regs,
+                                    void __iomem *regs,
-                                const struct regmap_config *config);
+                                    const struct regmap_config *config);
 struct regmap *devm_regmap_init(struct device *dev,
                                const struct regmap_bus *bus,
@@ -297,9 +327,44 @@ struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c,
                                    const struct regmap_config *config);
 struct regmap *devm_regmap_init_spi(struct spi_device *dev,
                                    const struct regmap_config *config);
-struct regmap *devm_regmap_init_mmio(struct device *dev,
+struct regmap *devm_regmap_init_mmio_clk(struct device *dev, const char *clk_id,
-                                     void __iomem *regs,
+                                         void __iomem *regs,
-                                     const struct regmap_config *config);
+                                         const struct regmap_config *config);
+/**
+ * regmap_init_mmio(): Initialise register map
+ *
+ * @dev: Device that will be interacted with
+ * @regs: Pointer to memory-mapped IO region
+ * @config: Configuration for register map
+ *
+ * The return value will be an ERR_PTR() on error or a valid pointer to
+ * a struct regmap.
+ */
+static inline struct regmap *regmap_init_mmio(struct device *dev,
+                                        void __iomem *regs,
+                                        const struct regmap_config *config)
+{
+        return regmap_init_mmio_clk(dev, NULL, regs, config);
+}
+/**
+ * devm_regmap_init_mmio(): Initialise managed register map
+ *
+ * @dev: Device that will be interacted with
+ * @regs: Pointer to memory-mapped IO region
+ * @config: Configuration for register map
+ *
+ * The return value will be an ERR_PTR() on error or a valid pointer
+ * to a struct regmap.  The regmap will be automatically freed by the
+ * device management code.
+ */
+static inline struct regmap *devm_regmap_init_mmio(struct device *dev,
+                                        void __iomem *regs,
+                                        const struct regmap_config *config)
+{
+        return devm_regmap_init_mmio_clk(dev, NULL, regs, config);
+}
 void regmap_exit(struct regmap *map);
 int regmap_reinit_cache(struct regmap *map,
@@ -310,6 +375,8 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,
                     const void *val, size_t val_len);
 int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
                        size_t val_count);
+int regmap_raw_write_async(struct regmap *map, unsigned int reg,
+                           const void *val, size_t val_len);
 int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val);
 int regmap_raw_read(struct regmap *map, unsigned int reg,
                    void *val, size_t val_len);
@@ -321,6 +388,7 @@ int regmap_update_bits_check(struct regmap *map, unsigned int reg,
                             unsigned int mask, unsigned int val,
                             bool *change);
 int regmap_get_val_bytes(struct regmap *map);
+int regmap_async_complete(struct regmap *map);
 int regcache_sync(struct regmap *map);
 int regcache_sync_region(struct regmap *map, unsigned int min,
@@ -381,6 +449,7 @@ struct regmap_irq_chip {
        unsigned int wake_base;
        unsigned int irq_reg_stride;
        unsigned int mask_invert;
+        unsigned int wake_invert;
        bool runtime_pm;
        int num_regs;
@@ -422,6 +491,13 @@ static inline int regmap_raw_write(struct regmap *map, unsigned int reg,
        return -EINVAL;
 }
+static inline int regmap_raw_write_async(struct regmap *map, unsigned int reg,
+                                         const void *val, size_t val_len)
+{
+        WARN_ONCE(1, "regmap API is disabled");
+        return -EINVAL;
+}
 static inline int regmap_bulk_write(struct regmap *map, unsigned int reg,
                                    const void *val, size_t val_count)
 {
@@ -500,6 +576,11 @@ static inline void regcache_mark_dirty(struct regmap *map)
        WARN_ONCE(1, "regmap API is disabled");
 }
+static inline void regmap_async_complete(struct regmap *map)
+{
+        WARN_ONCE(1, "regmap API is disabled");
+}
 static inline int regmap_register_patch(struct regmap *map,
                                        const struct reg_default *regs,
                                        int num_regs)
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index d10bb0f39c5e..23070fd83872 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -193,6 +193,10 @@ enum regulator_type {
 *
 * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_
 * @vsel_mask: Mask for register bitfield used for selector
+ * @apply_reg: Register for initiate voltage change on the output when
+ *                using regulator_set_voltage_sel_regmap
+ * @apply_bit: Register bitfield used for initiate voltage change on the
+ *                output when using regulator_set_voltage_sel_regmap
 * @enable_reg: Register for control when using regmap enable/disable ops
 * @enable_mask: Mask for control when using regmap enable/disable ops
 *
@@ -218,6 +222,8 @@ struct regulator_desc {
        unsigned int vsel_reg;
        unsigned int vsel_mask;
+        unsigned int apply_reg;
+        unsigned int apply_bit;
        unsigned int enable_reg;
        unsigned int enable_mask;
        unsigned int bypass_reg;
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
index 519777e3fa01..1342e69542f3 100644
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@ -167,6 +167,7 @@ unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu);
 unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu);
 unsigned long ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu);
 unsigned long ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu);
+unsigned long ring_buffer_read_events_cpu(struct ring_buffer *buffer, int cpu);
 u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu);
 void ring_buffer_normalize_time_stamp(struct ring_buffer *buffer,
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 9531845c419f..11d05f9fe8b6 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -138,6 +138,7 @@ extern void rtc_device_unregister(struct rtc_device *rtc);
 extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm);
 extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm);
 extern int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs);
+extern int rtc_set_ntp_time(struct timespec now);
 int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm);
 extern int rtc_read_alarm(struct rtc_device *rtc,
                        struct rtc_wkalrm *alrm);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index d2112477ff5e..e4112aad2964 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -304,19 +304,6 @@ static inline void lockup_detector_init(void)
 }
 #endif
-#ifdef CONFIG_DETECT_HUNG_TASK
-extern unsigned int  sysctl_hung_task_panic;
-extern unsigned long sysctl_hung_task_check_count;
-extern unsigned long sysctl_hung_task_timeout_secs;
-extern unsigned long sysctl_hung_task_warnings;
-extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
-                                         void __user *buffer,
-                                         size_t *lenp, loff_t *ppos);
-#else
-/* Avoid need for ifdefs elsewhere in the code */
-enum { sysctl_hung_task_timeout_secs = 0 };
-#endif
 /* Attach to any functions which should be ignored in wchan output. */
 #define __sched         __attribute__((__section__(".sched.text")))
@@ -338,23 +325,6 @@ extern int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner);
 struct nsproxy;
 struct user_namespace;
-/*
- * Default maximum number of active map areas, this limits the number of vmas
- * per mm struct. Users can overwrite this number by sysctl but there is a
- * problem.
- *
- * When a program's coredump is generated as ELF format, a section is created
- * per a vma. In ELF, the number of sections is represented in unsigned short.
- * This means the number of sections should be smaller than 65535 at coredump.
- * Because the kernel adds some informative sections to a image of program at
- * generating coredump, we need some margin. The number of extra sections is
- * 1-3 now and depends on arch. We use "5" as safe margin, here.
- */
-#define MAPCOUNT_ELF_CORE_MARGIN        (5)
-#define DEFAULT_MAX_MAP_COUNT   (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
-extern int sysctl_max_map_count;
 #include <linux/aio.h>
 #ifdef CONFIG_MMU
@@ -1194,6 +1164,7 @@ struct sched_entity {
        /* rq "owned" by this entity/group: */
        struct cfs_rq           *my_q;
 #endif
 /*
 * Load-tracking only depends on SMP, FAIR_GROUP_SCHED dependency below may be
 * removed when useful for applications beyond shares distribution (e.g.
@@ -1208,6 +1179,7 @@ struct sched_entity {
 struct sched_rt_entity {
        struct list_head run_list;
        unsigned long timeout;
+        unsigned long watchdog_stamp;
        unsigned int time_slice;
        struct sched_rt_entity *back;
@@ -1220,11 +1192,6 @@ struct sched_rt_entity {
 #endif
 };
-/*
- * default timeslice is 100 msecs (used only for SCHED_RR tasks).
- * Timeslices get refilled after they expire.
- */
-#define RR_TIMESLICE            (100 * HZ / 1000)
 struct rcu_node;
@@ -1368,6 +1335,15 @@ struct task_struct {
 #ifndef CONFIG_VIRT_CPU_ACCOUNTING
        struct cputime prev_cputime;
 #endif
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
+        seqlock_t vtime_seqlock;
+        unsigned long long vtime_snap;
+        enum {
+                VTIME_SLEEPING = 0,
+                VTIME_USER,
+                VTIME_SYS,
+        } 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 */
@@ -1622,37 +1598,6 @@ static inline void set_numabalancing_state(bool enabled)
 }
 #endif
-/*
- * Priority of a process goes from 0..MAX_PRIO-1, valid RT
- * priority is 0..MAX_RT_PRIO-1, and SCHED_NORMAL/SCHED_BATCH
- * tasks are in the range MAX_RT_PRIO..MAX_PRIO-1. Priority
- * values are inverted: lower p->prio value means higher priority.
- *
- * The MAX_USER_RT_PRIO value allows the actual maximum
- * RT priority to be separate from the value exported to
- * user-space.  This allows kernel threads to set their
- * priority to a value higher than any user task. Note:
- * MAX_RT_PRIO must not be smaller than MAX_USER_RT_PRIO.
- */
-#define MAX_USER_RT_PRIO        100
-#define MAX_RT_PRIO             MAX_USER_RT_PRIO
-#define MAX_PRIO                (MAX_RT_PRIO + 40)
-#define DEFAULT_PRIO            (MAX_RT_PRIO + 20)
-static inline int rt_prio(int prio)
-{
-        if (unlikely(prio < MAX_RT_PRIO))
-                return 1;
-        return 0;
-}
-static inline int rt_task(struct task_struct *p)
-{
-        return rt_prio(p->prio);
-}
 static inline struct pid *task_pid(struct task_struct *task)
 {
        return task->pids[PIDTYPE_PID].pid;
@@ -1792,6 +1737,37 @@ static inline void put_task_struct(struct task_struct *t)
                __put_task_struct(t);
 }
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
+extern void task_cputime(struct task_struct *t,
+                         cputime_t *utime, cputime_t *stime);
+extern void task_cputime_scaled(struct task_struct *t,
+                                cputime_t *utimescaled, cputime_t *stimescaled);
+extern cputime_t task_gtime(struct task_struct *t);
+#else
+static inline void task_cputime(struct task_struct *t,
+                                cputime_t *utime, cputime_t *stime)
+{
+        if (utime)
+                *utime = t->utime;
+        if (stime)
+                *stime = t->stime;
+}
+static inline void task_cputime_scaled(struct task_struct *t,
+                                       cputime_t *utimescaled,
+                                       cputime_t *stimescaled)
+{
+        if (utimescaled)
+                *utimescaled = t->utimescaled;
+        if (stimescaled)
+                *stimescaled = t->stimescaled;
+}
+static inline cputime_t task_gtime(struct task_struct *t)
+{
+        return t->gtime;
+}
+#endif
 extern void task_cputime_adjusted(struct task_struct *p, cputime_t *ut, cputime_t *st);
 extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut, cputime_t *st);
@@ -2033,58 +2009,7 @@ extern void wake_up_idle_cpu(int cpu);
 static inline void wake_up_idle_cpu(int cpu) { }
 #endif
-extern unsigned int sysctl_sched_latency;
-extern unsigned int sysctl_sched_min_granularity;
-extern unsigned int sysctl_sched_wakeup_granularity;
-extern unsigned int sysctl_sched_child_runs_first;
-enum sched_tunable_scaling {
-        SCHED_TUNABLESCALING_NONE,
-        SCHED_TUNABLESCALING_LOG,
-        SCHED_TUNABLESCALING_LINEAR,
-        SCHED_TUNABLESCALING_END,
-};
-extern enum sched_tunable_scaling sysctl_sched_tunable_scaling;
-extern unsigned int sysctl_numa_balancing_scan_delay;
-extern unsigned int sysctl_numa_balancing_scan_period_min;
-extern unsigned int sysctl_numa_balancing_scan_period_max;
-extern unsigned int sysctl_numa_balancing_scan_period_reset;
-extern unsigned int sysctl_numa_balancing_scan_size;
-extern unsigned int sysctl_numa_balancing_settle_count;
-#ifdef CONFIG_SCHED_DEBUG
-extern unsigned int sysctl_sched_migration_cost;
-extern unsigned int sysctl_sched_nr_migrate;
-extern unsigned int sysctl_sched_time_avg;
-extern unsigned int sysctl_timer_migration;
-extern unsigned int sysctl_sched_shares_window;
-int sched_proc_update_handler(struct ctl_table *table, int write,
-                void __user *buffer, size_t *length,
-                loff_t *ppos);
-#endif
-#ifdef CONFIG_SCHED_DEBUG
-static inline unsigned int get_sysctl_timer_migration(void)
-{
-        return sysctl_timer_migration;
-}
-#else
-static inline unsigned int get_sysctl_timer_migration(void)
-{
-        return 1;
-}
-#endif
-extern unsigned int sysctl_sched_rt_period;
-extern int sysctl_sched_rt_runtime;
-int sched_rt_handler(struct ctl_table *table, int write,
-                void __user *buffer, size_t *lenp,
-                loff_t *ppos);
 #ifdef CONFIG_SCHED_AUTOGROUP
-extern unsigned int sysctl_sched_autogroup_enabled;
 extern void sched_autogroup_create_attach(struct task_struct *p);
 extern void sched_autogroup_detach(struct task_struct *p);
 extern void sched_autogroup_fork(struct signal_struct *sig);
@@ -2100,30 +2025,6 @@ static inline void sched_autogroup_fork(struct signal_struct *sig) { }
 static inline void sched_autogroup_exit(struct signal_struct *sig) { }
 #endif
-#ifdef CONFIG_CFS_BANDWIDTH
-extern unsigned int sysctl_sched_cfs_bandwidth_slice;
-#endif
-#ifdef CONFIG_RT_MUTEXES
-extern int rt_mutex_getprio(struct task_struct *p);
-extern void rt_mutex_setprio(struct task_struct *p, int prio);
-extern void rt_mutex_adjust_pi(struct task_struct *p);
-static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
-{
-        return tsk->pi_blocked_on != NULL;
-}
-#else
-static inline int rt_mutex_getprio(struct task_struct *p)
-{
-        return p->normal_prio;
-}
-# define rt_mutex_adjust_pi(p)          do { } while (0)
-static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
-{
-        return false;
-}
-#endif
 extern bool yield_to(struct task_struct *p, bool preempt);
 extern void set_user_nice(struct task_struct *p, long nice);
 extern int task_prio(const struct task_struct *p);
@@ -2753,14 +2654,15 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
 extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
 extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
-extern void normalize_rt_tasks(void);
 #ifdef CONFIG_CGROUP_SCHED
 extern struct task_group root_task_group;
 extern struct task_group *sched_create_group(struct task_group *parent);
+extern void sched_online_group(struct task_group *tg,
+                               struct task_group *parent);
 extern void sched_destroy_group(struct task_group *tg);
+extern void sched_offline_group(struct task_group *tg);
 extern void sched_move_task(struct task_struct *tsk);
 #ifdef CONFIG_FAIR_GROUP_SCHED
 extern int sched_group_set_shares(struct task_group *tg, unsigned long shares);
diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h
new file mode 100644
index 000000000000..94e19ea28fc3
--- /dev/null
+++ b/include/linux/sched/rt.h
@@ -0,0 +1,58 @@
+#ifndef _SCHED_RT_H
+#define _SCHED_RT_H
+/*
+ * Priority of a process goes from 0..MAX_PRIO-1, valid RT
+ * priority is 0..MAX_RT_PRIO-1, and SCHED_NORMAL/SCHED_BATCH
+ * tasks are in the range MAX_RT_PRIO..MAX_PRIO-1. Priority
+ * values are inverted: lower p->prio value means higher priority.
+ *
+ * The MAX_USER_RT_PRIO value allows the actual maximum
+ * RT priority to be separate from the value exported to
+ * user-space.  This allows kernel threads to set their
+ * priority to a value higher than any user task. Note:
+ * MAX_RT_PRIO must not be smaller than MAX_USER_RT_PRIO.
+ */
+#define MAX_USER_RT_PRIO        100
+#define MAX_RT_PRIO             MAX_USER_RT_PRIO
+#define MAX_PRIO                (MAX_RT_PRIO + 40)
+#define DEFAULT_PRIO            (MAX_RT_PRIO + 20)
+static inline int rt_prio(int prio)
+{
+        if (unlikely(prio < MAX_RT_PRIO))
+                return 1;
+        return 0;
+}
+static inline int rt_task(struct task_struct *p)
+{
+        return rt_prio(p->prio);
+}
+#ifdef CONFIG_RT_MUTEXES
+extern int rt_mutex_getprio(struct task_struct *p);
+extern void rt_mutex_setprio(struct task_struct *p, int prio);
+extern void rt_mutex_adjust_pi(struct task_struct *p);
+static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
+{
+        return tsk->pi_blocked_on != NULL;
+}
+#else
+static inline int rt_mutex_getprio(struct task_struct *p)
+{
+        return p->normal_prio;
+}
+# define rt_mutex_adjust_pi(p)          do { } while (0)
+static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
+{
+        return false;
+}
+#endif
+extern void normalize_rt_tasks(void);
+#endif /* _SCHED_RT_H */
diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
new file mode 100644
index 000000000000..d2bb0ae979d0
--- /dev/null
+++ b/include/linux/sched/sysctl.h
@@ -0,0 +1,110 @@
+#ifndef _SCHED_SYSCTL_H
+#define _SCHED_SYSCTL_H
+#ifdef CONFIG_DETECT_HUNG_TASK
+extern unsigned int  sysctl_hung_task_panic;
+extern unsigned long sysctl_hung_task_check_count;
+extern unsigned long sysctl_hung_task_timeout_secs;
+extern unsigned long sysctl_hung_task_warnings;
+extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
+                                         void __user *buffer,
+                                         size_t *lenp, loff_t *ppos);
+#else
+/* Avoid need for ifdefs elsewhere in the code */
+enum { sysctl_hung_task_timeout_secs = 0 };
+#endif
+/*
+ * Default maximum number of active map areas, this limits the number of vmas
+ * per mm struct. Users can overwrite this number by sysctl but there is a
+ * problem.
+ *
+ * When a program's coredump is generated as ELF format, a section is created
+ * per a vma. In ELF, the number of sections is represented in unsigned short.
+ * This means the number of sections should be smaller than 65535 at coredump.
+ * Because the kernel adds some informative sections to a image of program at
+ * generating coredump, we need some margin. The number of extra sections is
+ * 1-3 now and depends on arch. We use "5" as safe margin, here.
+ */
+#define MAPCOUNT_ELF_CORE_MARGIN        (5)
+#define DEFAULT_MAX_MAP_COUNT   (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
+extern int sysctl_max_map_count;
+extern unsigned int sysctl_sched_latency;
+extern unsigned int sysctl_sched_min_granularity;
+extern unsigned int sysctl_sched_wakeup_granularity;
+extern unsigned int sysctl_sched_child_runs_first;
+enum sched_tunable_scaling {
+        SCHED_TUNABLESCALING_NONE,
+        SCHED_TUNABLESCALING_LOG,
+        SCHED_TUNABLESCALING_LINEAR,
+        SCHED_TUNABLESCALING_END,
+};
+extern enum sched_tunable_scaling sysctl_sched_tunable_scaling;
+extern unsigned int sysctl_numa_balancing_scan_delay;
+extern unsigned int sysctl_numa_balancing_scan_period_min;
+extern unsigned int sysctl_numa_balancing_scan_period_max;
+extern unsigned int sysctl_numa_balancing_scan_period_reset;
+extern unsigned int sysctl_numa_balancing_scan_size;
+extern unsigned int sysctl_numa_balancing_settle_count;
+#ifdef CONFIG_SCHED_DEBUG
+extern unsigned int sysctl_sched_migration_cost;
+extern unsigned int sysctl_sched_nr_migrate;
+extern unsigned int sysctl_sched_time_avg;
+extern unsigned int sysctl_timer_migration;
+extern unsigned int sysctl_sched_shares_window;
+int sched_proc_update_handler(struct ctl_table *table, int write,
+                void __user *buffer, size_t *length,
+                loff_t *ppos);
+#endif
+#ifdef CONFIG_SCHED_DEBUG
+static inline unsigned int get_sysctl_timer_migration(void)
+{
+        return sysctl_timer_migration;
+}
+#else
+static inline unsigned int get_sysctl_timer_migration(void)
+{
+        return 1;
+}
+#endif
+/*
+ *  control realtime throttling:
+ *
+ *  /proc/sys/kernel/sched_rt_period_us
+ *  /proc/sys/kernel/sched_rt_runtime_us
+ */
+extern unsigned int sysctl_sched_rt_period;
+extern int sysctl_sched_rt_runtime;
+#ifdef CONFIG_CFS_BANDWIDTH
+extern unsigned int sysctl_sched_cfs_bandwidth_slice;
+#endif
+#ifdef CONFIG_SCHED_AUTOGROUP
+extern unsigned int sysctl_sched_autogroup_enabled;
+#endif
+/*
+ * default timeslice is 100 msecs (used only for SCHED_RR tasks).
+ * Timeslices get refilled after they expire.
+ */
+#define RR_TIMESLICE            (100 * HZ / 1000)
+extern int sched_rr_timeslice;
+extern int sched_rr_handler(struct ctl_table *table, int write,
+                void __user *buffer, size_t *lenp,
+                loff_t *ppos);
+extern int sched_rt_handler(struct ctl_table *table, int write,
+                void __user *buffer, size_t *lenp,
+                loff_t *ppos);
+#endif /* _SCHED_SYSCTL_H */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 320e976d5ab8..821c7f45d2a7 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -230,6 +230,13 @@ enum {
        /* generate wifi status information (where possible) */
        SKBTX_WIFI_STATUS = 1 << 4,
+        /* This indicates at least one fragment might be overwritten
+         * (as in vmsplice(), sendfile() ...)
+         * If we need to compute a TX checksum, we'll need to copy
+         * all frags to avoid possible bad checksum
+         */
+        SKBTX_SHARED_FRAG = 1 << 5,
 };
 /*
@@ -307,6 +314,8 @@ enum {
        SKB_GSO_TCPV6 = 1 << 4,
        SKB_GSO_FCOE = 1 << 5,
+        SKB_GSO_GRE = 1 << 6,
 };
 #if BITS_PER_LONG > 32
@@ -797,6 +806,16 @@ static inline int skb_cloned(const struct sk_buff *skb)
               (atomic_read(&skb_shinfo(skb)->dataref) & SKB_DATAREF_MASK) != 1;
 }
+static inline int skb_unclone(struct sk_buff *skb, gfp_t pri)
+{
+        might_sleep_if(pri & __GFP_WAIT);
+        if (skb_cloned(skb))
+                return pskb_expand_head(skb, 0, 0, pri);
+        return 0;
+}
 /**
 *      skb_header_cloned - is the header a clone
 *      @skb: buffer to check
@@ -1492,6 +1511,11 @@ static inline void skb_set_inner_network_header(struct sk_buff *skb,
        skb->inner_network_header += offset;
 }
+static inline bool skb_transport_header_was_set(const struct sk_buff *skb)
+{
+        return skb->transport_header != ~0U;
+}
 static inline unsigned char *skb_transport_header(const struct sk_buff *skb)
 {
        return skb->head + skb->transport_header;
@@ -1580,6 +1604,11 @@ static inline void skb_set_inner_network_header(struct sk_buff *skb,
        skb->inner_network_header = skb->data + offset;
 }
+static inline bool skb_transport_header_was_set(const struct sk_buff *skb)
+{
+        return skb->transport_header != NULL;
+}
 static inline unsigned char *skb_transport_header(const struct sk_buff *skb)
 {
        return skb->transport_header;
@@ -1815,6 +1844,10 @@ static inline void __skb_queue_purge(struct sk_buff_head *list)
                kfree_skb(skb);
 }
+#define NETDEV_FRAG_PAGE_MAX_ORDER get_order(32768)
+#define NETDEV_FRAG_PAGE_MAX_SIZE  (PAGE_SIZE << NETDEV_FRAG_PAGE_MAX_ORDER)
+#define NETDEV_PAGECNT_MAX_BIAS    NETDEV_FRAG_PAGE_MAX_SIZE
 extern void *netdev_alloc_frag(unsigned int fragsz);
 extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
@@ -2191,6 +2224,19 @@ static inline int skb_linearize(struct sk_buff *skb)
 }
 /**
+ * skb_has_shared_frag - can any frag be overwritten
+ * @skb: buffer to test
+ *
+ * Return true if the skb has at least one frag that might be modified
+ * by an external entity (as in vmsplice()/sendfile())
+ */
+static inline bool skb_has_shared_frag(const struct sk_buff *skb)
+{
+        return skb_is_nonlinear(skb) &&
+               skb_shinfo(skb)->tx_flags & SKBTX_SHARED_FRAG;
+}
+/**
 *      skb_linearize_cow - make sure skb is linear and writable
 *      @skb: buffer to process
 *
@@ -2688,6 +2734,21 @@ static inline struct sec_path *skb_sec_path(struct sk_buff *skb)
 }
 #endif
+/* Keeps track of mac header offset relative to skb->head.
+ * It is useful for TSO of Tunneling protocol. e.g. GRE.
+ * For non-tunnel skb it points to skb_mac_header() and for
+ * tunnel skb it points to outer mac header. */
+struct skb_gso_cb {
+        int mac_offset;
+};
+#define SKB_GSO_CB(skb) ((struct skb_gso_cb *)(skb)->cb)
+static inline int skb_tnl_header_len(const struct sk_buff *inner_skb)
+{
+        return (skb_mac_header(inner_skb) - inner_skb->head) -
+                SKB_GSO_CB(inner_skb)->mac_offset;
+}
 static inline bool skb_is_gso(const struct sk_buff *skb)
 {
        return skb_shinfo(skb)->gso_size;
diff --git a/include/linux/smpboot.h b/include/linux/smpboot.h
index e0106d8581d3..c65dee059913 100644
--- a/include/linux/smpboot.h
+++ b/include/linux/smpboot.h
@@ -14,6 +14,8 @@ struct smpboot_thread_data;
 * @thread_should_run:  Check whether the thread should run or not. Called with
 *                      preemption disabled.
 * @thread_fn:          The associated thread function
+ * @create:             Optional setup function, called when the thread gets
+ *                      created (Not called from the thread context)
 * @setup:              Optional setup function, called when the thread gets
 *                      operational the first time
 * @cleanup:            Optional cleanup function, called when the thread
@@ -22,6 +24,7 @@ struct smpboot_thread_data;
 *                      parked (cpu offline)
 * @unpark:             Optional unpark function, called when the thread is
 *                      unparked (cpu online)
+ * @selfparking:        Thread is not parked by the park function.
 * @thread_comm:        The base name of the thread
 */
 struct smp_hotplug_thread {
@@ -29,10 +32,12 @@ struct smp_hotplug_thread {
        struct list_head                list;
        int                             (*thread_should_run)(unsigned int cpu);
        void                            (*thread_fn)(unsigned int cpu);
+        void                            (*create)(unsigned int cpu);
        void                            (*setup)(unsigned int cpu);
        void                            (*cleanup)(unsigned int cpu, bool online);
        void                            (*park)(unsigned int cpu);
        void                            (*unpark)(unsigned int cpu);
+        bool                            selfparking;
        const char                      *thread_comm;
 };
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 9a546ff853dc..2b9f74b0ffea 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -178,7 +178,8 @@ struct ucred {
 #define AF_CAIF         37      /* CAIF sockets                 */
 #define AF_ALG          38      /* Algorithm sockets            */
 #define AF_NFC          39      /* NFC sockets                  */
-#define AF_MAX          40      /* For now.. */
+#define AF_VSOCK        40      /* vSockets                     */
+#define AF_MAX          41      /* For now.. */
 /* Protocol families, same as address families. */
 #define PF_UNSPEC       AF_UNSPEC
@@ -221,6 +222,7 @@ struct ucred {
 #define PF_CAIF         AF_CAIF
 #define PF_ALG          AF_ALG
 #define PF_NFC          AF_NFC
+#define PF_VSOCK        AF_VSOCK
 #define PF_MAX          AF_MAX
 /* Maximum queue length specifiable by listen.  */
diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h
index c73d1445c77e..82d5111cd0c2 100644
--- a/include/linux/spi/pxa2xx_spi.h
+++ b/include/linux/spi/pxa2xx_spi.h
@@ -28,6 +28,15 @@ struct pxa2xx_spi_master {
        u32 clock_enable;
        u16 num_chipselect;
        u8 enable_dma;
+        /* DMA engine specific config */
+        int rx_chan_id;
+        int tx_chan_id;
+        int rx_slave_id;
+        int tx_slave_id;
+        /* For non-PXA arches */
+        struct ssp_device ssp;
 };
 /* spi_board_info.controller_data for SPI slave devices,
@@ -35,6 +44,7 @@ struct pxa2xx_spi_master {
 */
 struct pxa2xx_spi_chip {
        u8 tx_threshold;
+        u8 tx_hi_threshold;
        u8 rx_threshold;
        u8 dma_burst_size;
        u32 timeout;
@@ -50,103 +60,5 @@ struct pxa2xx_spi_chip {
 extern void pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info);
-#else
-/*
- * This is the implemtation for CE4100 on x86. ARM defines them in mach/ or
- * plat/ include path.
- * The CE4100 does not provide DMA support. This bits are here to let the driver
- * compile and will never be used. Maybe we get DMA support at a later point in
- * time.
- */
-#define DCSR(n)         (n)
-#define DSADR(n)        (n)
-#define DTADR(n)        (n)
-#define DCMD(n)         (n)
-#define DRCMR(n)        (n)
-#define DCSR_RUN        (1 << 31)       /* Run Bit */
-#define DCSR_NODESC     (1 << 30)       /* No-Descriptor Fetch */
-#define DCSR_STOPIRQEN  (1 << 29)       /* Stop Interrupt Enable */
-#define DCSR_REQPEND    (1 << 8)        /* Request Pending (read-only) */
-#define DCSR_STOPSTATE  (1 << 3)        /* Stop State (read-only) */
-#define DCSR_ENDINTR    (1 << 2)        /* End Interrupt */
-#define DCSR_STARTINTR  (1 << 1)        /* Start Interrupt */
-#define DCSR_BUSERR     (1 << 0)        /* Bus Error Interrupt */
-#define DCSR_EORIRQEN   (1 << 28)       /* End of Receive Interrupt Enable */
-#define DCSR_EORJMPEN   (1 << 27)       /* Jump to next descriptor on EOR */
-#define DCSR_EORSTOPEN  (1 << 26)       /* STOP on an EOR */
-#define DCSR_SETCMPST   (1 << 25)       /* Set Descriptor Compare Status */
-#define DCSR_CLRCMPST   (1 << 24)       /* Clear Descriptor Compare Status */
-#define DCSR_CMPST      (1 << 10)       /* The Descriptor Compare Status */
-#define DCSR_EORINTR    (1 << 9)        /* The end of Receive */
-#define DRCMR_MAPVLD    (1 << 7)        /* Map Valid */
-#define DRCMR_CHLNUM    0x1f            /* mask for Channel Number */
-#define DDADR_DESCADDR  0xfffffff0      /* Address of next descriptor */
-#define DDADR_STOP      (1 << 0)        /* Stop */
-#define DCMD_INCSRCADDR (1 << 31)       /* Source Address Increment Setting. */
-#define DCMD_INCTRGADDR (1 << 30)       /* Target Address Increment Setting. */
-#define DCMD_FLOWSRC    (1 << 29)       /* Flow Control by the source. */
-#define DCMD_FLOWTRG    (1 << 28)       /* Flow Control by the target. */
-#define DCMD_STARTIRQEN (1 << 22)       /* Start Interrupt Enable */
-#define DCMD_ENDIRQEN   (1 << 21)       /* End Interrupt Enable */
-#define DCMD_ENDIAN     (1 << 18)       /* Device Endian-ness. */
-#define DCMD_BURST8     (1 << 16)       /* 8 byte burst */
-#define DCMD_BURST16    (2 << 16)       /* 16 byte burst */
-#define DCMD_BURST32    (3 << 16)       /* 32 byte burst */
-#define DCMD_WIDTH1     (1 << 14)       /* 1 byte width */
-#define DCMD_WIDTH2     (2 << 14)       /* 2 byte width (HalfWord) */
-#define DCMD_WIDTH4     (3 << 14)       /* 4 byte width (Word) */
-#define DCMD_LENGTH     0x01fff         /* length mask (max = 8K - 1) */
-/*
- * Descriptor structure for PXA's DMA engine
- * Note: this structure must always be aligned to a 16-byte boundary.
- */
-typedef enum {
-        DMA_PRIO_HIGH = 0,
-        DMA_PRIO_MEDIUM = 1,
-        DMA_PRIO_LOW = 2
-} pxa_dma_prio;
-/*
- * DMA registration
- */
-static inline int pxa_request_dma(char *name,
-                pxa_dma_prio prio,
-                void (*irq_handler)(int, void *),
-                void *data)
-{
-        return -ENODEV;
-}
-static inline void pxa_free_dma(int dma_ch)
-{
-}
-/*
- * The CE4100 does not have the clk framework implemented and SPI clock can
- * not be switched on/off or the divider changed.
- */
-static inline void clk_disable(struct clk *clk)
-{
-}
-static inline int clk_enable(struct clk *clk)
-{
-        return 0;
-}
-static inline unsigned long clk_get_rate(struct clk *clk)
-{
-        return 3686400;
-}
 #endif
 #endif
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index f62918946d86..30e9c50a5e20 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -57,6 +57,8 @@ extern struct bus_type spi_bus_type;
 * @modalias: Name of the driver to use with this device, or an alias
 *      for that name.  This appears in the sysfs "modalias" attribute
 *      for driver coldplugging, and in uevents used for hotplugging
+ * @cs_gpio: gpio number of the chipselect line (optional, -EINVAL when
+ *      when not using a GPIO line)
 *
 * A @spi_device is used to interchange data between an SPI slave
 * (usually a discrete chip) and CPU memory.
@@ -258,6 +260,9 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
 * @unprepare_transfer_hardware: there are currently no more messages on the
 *      queue so the subsystem notifies the driver that it may relax the
 *      hardware by issuing this call
+ * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS
+ *      number. Any individual value may be -EINVAL for CS lines that
+ *      are not GPIOs (driven by the SPI controller itself).
 *
 * Each SPI master controller can communicate with one or more @spi_device
 * children.  These make a small bus, sharing MOSI, MISO and SCK signals
diff --git a/include/linux/spi/spi_gpio.h b/include/linux/spi/spi_gpio.h
index 369b3d7d5b95..1634ce31c06d 100644
--- a/include/linux/spi/spi_gpio.h
+++ b/include/linux/spi/spi_gpio.h
@@ -62,8 +62,8 @@
 */
 struct spi_gpio_platform_data {
        unsigned        sck;
-        unsigned        mosi;
+        unsigned long   mosi;
-        unsigned        miso;
+        unsigned long   miso;
        u16             num_chipselect;
 };
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index 6eb691b08358..04f4121a23ae 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -151,30 +151,14 @@ void srcu_barrier(struct srcu_struct *sp);
 * Checks debug_lockdep_rcu_enabled() to prevent false positives during boot
 * and while lockdep is disabled.
 *
- * Note that if the CPU is in the idle loop from an RCU point of view
+ * Note that SRCU is based on its own statemachine and it doesn't
- * (ie: that we are in the section between rcu_idle_enter() and
+ * relies on normal RCU, it can be called from the CPU which
- * rcu_idle_exit()) then srcu_read_lock_held() returns false even if
+ * is in the idle loop from an RCU point of view or offline.
- * the CPU did an srcu_read_lock().  The reason for this is that RCU
- * ignores CPUs that are in such a section, considering these as in
- * extended quiescent state, so such a CPU is effectively never in an
- * RCU read-side critical section regardless of what RCU primitives it
- * invokes.  This state of affairs is required --- we need to keep an
- * RCU-free window in idle where the CPU may possibly enter into low
- * power mode. This way we can notice an extended quiescent state to
- * other CPUs that started a grace period. Otherwise we would delay any
- * grace period as long as we run in the idle task.
- *
- * Similarly, we avoid claiming an SRCU read lock held if the current
- * CPU is offline.
 */
 static inline int srcu_read_lock_held(struct srcu_struct *sp)
 {
        if (!debug_lockdep_rcu_enabled())
                return 1;
-        if (rcu_is_cpu_idle())
-                return 0;
-        if (!rcu_lockdep_current_cpu_online())
-                return 0;
        return lock_is_held(&sp->dep_map);
 }
@@ -236,8 +220,6 @@ static inline int srcu_read_lock(struct srcu_struct *sp) __acquires(sp)
        int retval = __srcu_read_lock(sp);
        rcu_lock_acquire(&(sp)->dep_map);
-        rcu_lockdep_assert(!rcu_is_cpu_idle(),
-                           "srcu_read_lock() used illegally while idle");
        return retval;
 }
@@ -251,8 +233,6 @@ static inline int srcu_read_lock(struct srcu_struct *sp) __acquires(sp)
 static inline void srcu_read_unlock(struct srcu_struct *sp, int idx)
        __releases(sp)
 {
-        rcu_lockdep_assert(!rcu_is_cpu_idle(),
-                           "srcu_read_unlock() used illegally while idle");
        rcu_lock_release(&(sp)->dep_map);
        __srcu_read_unlock(sp, idx);
 }
diff --git a/include/linux/ssb/ssb_driver_gige.h b/include/linux/ssb/ssb_driver_gige.h
index 6d92a92573df..86a12b0cb239 100644
--- a/include/linux/ssb/ssb_driver_gige.h
+++ b/include/linux/ssb/ssb_driver_gige.h
@@ -97,21 +97,16 @@ static inline bool ssb_gige_must_flush_posted_writes(struct pci_dev *pdev)
        return 0;
 }
-#ifdef CONFIG_BCM47XX
-#include <bcm47xx_nvram.h>
 /* Get the device MAC address */
-static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
+static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
-{
-        char buf[20];
-        if (bcm47xx_nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0)
-                return;
-        bcm47xx_nvram_parse_macaddr(buf, macaddr);
-}
-#else
-static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
 {
+        struct ssb_gige *dev = pdev_to_ssb_gige(pdev);
+        if (!dev)
+                return -ENODEV;
+        memcpy(macaddr, dev->dev->bus->sprom.et0mac, 6);
+        return 0;
 }
-#endif
 extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev,
                                          struct pci_dev *pdev);
@@ -175,6 +170,10 @@ static inline bool ssb_gige_must_flush_posted_writes(struct pci_dev *pdev)
 {
        return 0;
 }
+static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
+{
+        return -ENODEV;
+}
 #endif /* CONFIG_SSB_DRIVER_GIGE */
 #endif /* LINUX_SSB_DRIVER_GIGE_H_ */
diff --git a/include/linux/ssb/ssb_driver_mips.h b/include/linux/ssb/ssb_driver_mips.h
index 07a9c7a2e088..afe79d40a99e 100644
--- a/include/linux/ssb/ssb_driver_mips.h
+++ b/include/linux/ssb/ssb_driver_mips.h
@@ -45,6 +45,11 @@ void ssb_mipscore_init(struct ssb_mipscore *mcore)
 {
 }
+static inline unsigned int ssb_mips_irq(struct ssb_device *dev)
+{
+        return 0;
+}
 #endif /* CONFIG_SSB_DRIVER_MIPS */
 #endif /* LINUX_SSB_MIPSCORE_H_ */
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 0c808d7fa579..d4e3f16d5e89 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -34,8 +34,10 @@ static inline void pm_restore_console(void)
 typedef int __bitwise suspend_state_t;
 #define PM_SUSPEND_ON           ((__force suspend_state_t) 0)
-#define PM_SUSPEND_STANDBY      ((__force suspend_state_t) 1)
+#define PM_SUSPEND_FREEZE       ((__force suspend_state_t) 1)
+#define PM_SUSPEND_STANDBY      ((__force suspend_state_t) 2)
 #define PM_SUSPEND_MEM          ((__force suspend_state_t) 3)
+#define PM_SUSPEND_MIN          PM_SUSPEND_FREEZE
 #define PM_SUSPEND_MAX          ((__force suspend_state_t) 4)
 enum suspend_stat_step {
@@ -192,6 +194,7 @@ struct platform_suspend_ops {
 */
 extern void suspend_set_ops(const struct platform_suspend_ops *ops);
 extern int suspend_valid_only_mem(suspend_state_t state);
+extern void freeze_wake(void);
 /**
 * arch_suspend_disable_irqs - disable IRQs for suspend
@@ -217,6 +220,7 @@ extern int pm_suspend(suspend_state_t state);
 static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}
 static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
+static inline void freeze_wake(void) {}
 #endif /* !CONFIG_SUSPEND */
 /* struct pbe is used for creating lists of pages that should be restored
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 381f06db2fe5..e2cee22f578a 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -181,6 +181,10 @@ int sysfs_merge_group(struct kobject *kobj,
                       const struct attribute_group *grp);
 void sysfs_unmerge_group(struct kobject *kobj,
                       const struct attribute_group *grp);
+int sysfs_add_link_to_group(struct kobject *kobj, const char *group_name,
+                            struct kobject *target, const char *link_name);
+void sysfs_remove_link_from_group(struct kobject *kobj, const char *group_name,
+                                  const char *link_name);
 void sysfs_notify(struct kobject *kobj, const char *dir, const char *attr);
 void sysfs_notify_dirent(struct sysfs_dirent *sd);
@@ -326,6 +330,18 @@ static inline void sysfs_unmerge_group(struct kobject *kobj,
 {
 }
+static inline int sysfs_add_link_to_group(struct kobject *kobj,
+                const char *group_name, struct kobject *target,
+                const char *link_name)
+{
+        return 0;
+}
+static inline void sysfs_remove_link_from_group(struct kobject *kobj,
+                const char *group_name, const char *link_name)
+{
+}
 static inline void sysfs_notify(struct kobject *kobj, const char *dir,
                                const char *attr)
 {
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 4e1d2283e3cc..f28408c07dc2 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -162,6 +162,8 @@ struct tcp_sock {
        u32     rcv_tstamp;     /* timestamp of last received ACK (for keepalives) */
        u32     lsndtime;       /* timestamp of last sent data packet (for restart window) */
+        u32     tsoffset;       /* timestamp offset */
        struct list_head tsq_node; /* anchor in tsq_tasklet.head list */
        unsigned long   tsq_flags;
@@ -246,7 +248,6 @@ struct tcp_sock {
        u32     sacked_out;     /* SACK'd packets                       */
        u32     fackets_out;    /* FACK'd packets                       */
        u32     tso_deferred;
-        u32     bytes_acked;    /* Appropriate Byte Counting - RFC3465 */
        /* from STCP, retrans queue hinting */
        struct sk_buff* lost_skb_hint;
@@ -354,6 +355,7 @@ struct tcp_timewait_sock {
        u32                       tw_rcv_nxt;
        u32                       tw_snd_nxt;
        u32                       tw_rcv_wnd;
+        u32                       tw_ts_offset;
        u32                       tw_ts_recent;
        long                      tw_ts_recent_stamp;
 #ifdef CONFIG_TCP_MD5SIG
diff --git a/include/linux/tick.h b/include/linux/tick.h
index 1a6567b48492..553272e6af55 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -8,6 +8,8 @@
 #include <linux/clockchips.h>
 #include <linux/irqflags.h>
+#include <linux/percpu.h>
+#include <linux/hrtimer.h>
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
@@ -122,13 +124,26 @@ static inline int tick_oneshot_mode_active(void) { return 0; }
 #endif /* !CONFIG_GENERIC_CLOCKEVENTS */
 # ifdef CONFIG_NO_HZ
+DECLARE_PER_CPU(struct tick_sched, tick_cpu_sched);
+static inline int tick_nohz_tick_stopped(void)
+{
+        return __this_cpu_read(tick_cpu_sched.tick_stopped);
+}
 extern void tick_nohz_idle_enter(void);
 extern void tick_nohz_idle_exit(void);
 extern void tick_nohz_irq_exit(void);
 extern ktime_t tick_nohz_get_sleep_length(void);
 extern u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time);
 extern u64 get_cpu_iowait_time_us(int cpu, u64 *last_update_time);
-# else
+# else /* !CONFIG_NO_HZ */
+static inline int tick_nohz_tick_stopped(void)
+{
+        return 0;
+}
 static inline void tick_nohz_idle_enter(void) { }
 static inline void tick_nohz_idle_exit(void) { }
diff --git a/include/linux/time.h b/include/linux/time.h
index 4d358e9d10f1..a3ab6a814a9c 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -115,8 +115,20 @@ static inline bool timespec_valid_strict(const struct timespec *ts)
        return true;
 }
+extern bool persistent_clock_exist;
+#ifdef ALWAYS_USE_PERSISTENT_CLOCK
+#define has_persistent_clock()  true
+#else
+static inline bool has_persistent_clock(void)
+{
+        return persistent_clock_exist;
+}
+#endif
 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;
@@ -158,6 +170,7 @@ 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,
diff --git a/include/linux/tsacct_kern.h b/include/linux/tsacct_kern.h
index 44893e5ec8f7..3251965bf4cc 100644
--- a/include/linux/tsacct_kern.h
+++ b/include/linux/tsacct_kern.h
@@ -23,12 +23,15 @@ static inline void bacct_add_tsk(struct user_namespace *user_ns,
 #ifdef CONFIG_TASK_XACCT
 extern void xacct_add_tsk(struct taskstats *stats, struct task_struct *p);
 extern void acct_update_integrals(struct task_struct *tsk);
+extern void acct_account_cputime(struct task_struct *tsk);
 extern void acct_clear_integrals(struct task_struct *tsk);
 #else
 static inline void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
 {}
 static inline void acct_update_integrals(struct task_struct *tsk)
 {}
+static inline void acct_account_cputime(struct task_struct *tsk)
+{}
 static inline void acct_clear_integrals(struct task_struct *tsk)
 {}
 #endif /* CONFIG_TASK_XACCT */
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
index 4f628a6fc5b4..02b83db8e2c5 100644
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
@@ -35,13 +35,20 @@ struct inode;
 # include <asm/uprobes.h>
 #endif
+#define UPROBE_HANDLER_REMOVE           1
+#define UPROBE_HANDLER_MASK             1
+enum uprobe_filter_ctx {
+        UPROBE_FILTER_REGISTER,
+        UPROBE_FILTER_UNREGISTER,
+        UPROBE_FILTER_MMAP,
+};
 struct uprobe_consumer {
        int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);
-        /*
+        bool (*filter)(struct uprobe_consumer *self,
-         * filter is optional; If a filter exists, handler is run
+                                enum uprobe_filter_ctx ctx,
-         * if and only if filter returns true.
+                                struct mm_struct *mm);
-         */
-        bool (*filter)(struct uprobe_consumer *self, struct task_struct *task);
        struct uprobe_consumer *next;
 };
@@ -94,6 +101,7 @@ extern int __weak set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsign
 extern int __weak set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);
 extern bool __weak is_swbp_insn(uprobe_opcode_t *insn);
 extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
+extern int uprobe_apply(struct inode *inode, loff_t offset, struct uprobe_consumer *uc, bool);
 extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
 extern int uprobe_mmap(struct vm_area_struct *vma);
 extern void uprobe_munmap(struct vm_area_struct *vma, unsigned long start, unsigned long end);
@@ -117,6 +125,11 @@ uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
 {
        return -ENOSYS;
 }
+static inline int
+uprobe_apply(struct inode *inode, loff_t offset, struct uprobe_consumer *uc, bool add)
+{
+        return -ENOSYS;
+}
 static inline void
 uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
 {
diff --git a/include/linux/vtime.h b/include/linux/vtime.h
index ae30ab58431a..71a5782d8c59 100644
--- a/include/linux/vtime.h
+++ b/include/linux/vtime.h
@@ -6,15 +6,46 @@ struct task_struct;
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
 extern void vtime_task_switch(struct task_struct *prev);
 extern void vtime_account_system(struct task_struct *tsk);
-extern void vtime_account_system_irqsafe(struct task_struct *tsk);
 extern void vtime_account_idle(struct task_struct *tsk);
 extern void vtime_account_user(struct task_struct *tsk);
-extern void vtime_account(struct task_struct *tsk);
+extern void vtime_account_irq_enter(struct task_struct *tsk);
-#else
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
+static inline bool vtime_accounting_enabled(void) { return true; }
+#endif
+#else /* !CONFIG_VIRT_CPU_ACCOUNTING */
 static inline void vtime_task_switch(struct task_struct *prev) { }
 static inline void vtime_account_system(struct task_struct *tsk) { }
-static inline void vtime_account_system_irqsafe(struct task_struct *tsk) { }
+static inline void vtime_account_user(struct task_struct *tsk) { }
-static inline void vtime_account(struct task_struct *tsk) { }
+static inline void vtime_account_irq_enter(struct task_struct *tsk) { }
+static inline bool vtime_accounting_enabled(void) { return false; }
+#endif
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
+extern void arch_vtime_task_switch(struct task_struct *tsk);
+extern void vtime_account_irq_exit(struct task_struct *tsk);
+extern bool vtime_accounting_enabled(void);
+extern void vtime_user_enter(struct task_struct *tsk);
+static inline void vtime_user_exit(struct task_struct *tsk)
+{
+        vtime_account_user(tsk);
+}
+extern void vtime_guest_enter(struct task_struct *tsk);
+extern void vtime_guest_exit(struct task_struct *tsk);
+extern void vtime_init_idle(struct task_struct *tsk);
+#else
+static inline void vtime_account_irq_exit(struct task_struct *tsk)
+{
+        /* On hard|softirq exit we always account to hard|softirq cputime */
+        vtime_account_system(tsk);
+}
+static inline void vtime_user_enter(struct task_struct *tsk) { }
+static inline void vtime_user_exit(struct task_struct *tsk) { }
+static inline void vtime_guest_enter(struct task_struct *tsk) { }
+static inline void vtime_guest_exit(struct task_struct *tsk) { }
+static inline void vtime_init_idle(struct task_struct *tsk) { }
 #endif
 #ifdef CONFIG_IRQ_TIME_ACCOUNTING
@@ -23,25 +54,15 @@ extern void irqtime_account_irq(struct task_struct *tsk);
 static inline void irqtime_account_irq(struct task_struct *tsk) { }
 #endif
-static inline void vtime_account_irq_enter(struct task_struct *tsk)
+static inline void account_irq_enter_time(struct task_struct *tsk)
 {
-        /*
+        vtime_account_irq_enter(tsk);
-         * Hardirq can interrupt idle task anytime. So we need vtime_account()
-         * that performs the idle check in CONFIG_VIRT_CPU_ACCOUNTING.
-         * Softirq can also interrupt idle task directly if it calls
-         * local_bh_enable(). Such case probably don't exist but we never know.
-         * Ksoftirqd is not concerned because idle time is flushed on context
-         * switch. Softirqs in the end of hardirqs are also not a problem because
-         * the idle time is flushed on hardirq time already.
-         */
-        vtime_account(tsk);
        irqtime_account_irq(tsk);
 }
-static inline void vtime_account_irq_exit(struct task_struct *tsk)
+static inline void account_irq_exit_time(struct task_struct *tsk)
 {
-        /* On hard|softirq exit we always account to hard|softirq cputime */
+        vtime_account_irq_exit(tsk);
-        vtime_account_system(tsk);
        irqtime_account_irq(tsk);
 }
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h
index cec4b4159767..8198a63cf459 100644
--- a/include/linux/wanrouter.h
+++ b/include/linux/wanrouter.h
@@ -1,129 +1,10 @@
-/*****************************************************************************
+/*
-* wanrouter.h   Definitions for the WAN Multiprotocol Router Module.
+ * wanrouter.h  Legacy declarations kept around until X25 is removed
-*               This module provides API and common services for WAN Link
+ */
-*               Drivers and is completely hardware-independent.
-*
-* Author:       Nenad Corbic <ncorbic@sangoma.com>
-*               Gideon Hack     
-* Additions:    Arnaldo Melo
-*
-* Copyright:    (c) 1995-2000 Sangoma Technologies Inc.
-*
-*               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.
-* ============================================================================
-* Jul 21, 2000  Nenad Corbic    Added WAN_FT1_READY State
-* Feb 24, 2000  Nenad Corbic    Added support for socket based x25api
-* Jan 28, 2000  Nenad Corbic    Added support for the ASYNC protocol.
-* Oct 04, 1999  Nenad Corbic    Updated for 2.1.0 release
-* Jun 02, 1999  Gideon Hack     Added support for the S514 adapter.
-* May 23, 1999  Arnaldo Melo    Added local_addr to wanif_conf_t
-*                               WAN_DISCONNECTING state added
-* Jul 20, 1998  David Fong      Added Inverse ARP options to 'wanif_conf_t'
-* Jun 12, 1998  David Fong      Added Cisco HDLC support.
-* Dec 16, 1997  Jaspreet Singh  Moved 'enable_IPX' and 'network_number' to
-*                               'wanif_conf_t'
-* Dec 05, 1997  Jaspreet Singh  Added 'pap', 'chap' to 'wanif_conf_t'
-*                               Added 'authenticator' to 'wan_ppp_conf_t'
-* Nov 06, 1997  Jaspreet Singh  Changed Router Driver version to 1.1 from 1.0
-* Oct 20, 1997  Jaspreet Singh  Added 'cir','bc','be' and 'mc' to 'wanif_conf_t'
-*                               Added 'enable_IPX' and 'network_number' to 
-*                               'wan_device_t'.  Also added defines for
-*                               UDP PACKET TYPE, Interrupt test, critical values
-*                               for RACE conditions.
-* Oct 05, 1997  Jaspreet Singh  Added 'dlci_num' and 'dlci[100]' to 
-*                               'wan_fr_conf_t' to configure a list of dlci(s)
-*                               for a NODE 
-* Jul 07, 1997  Jaspreet Singh  Added 'ttl' to 'wandev_conf_t' & 'wan_device_t'
-* May 29, 1997  Jaspreet Singh  Added 'tx_int_enabled' to 'wan_device_t'
-* May 21, 1997  Jaspreet Singh  Added 'udp_port' to 'wan_device_t'
-* Apr 25, 1997  Farhan Thawar   Added 'udp_port' to 'wandev_conf_t'
-* Jan 16, 1997  Gene Kozin      router_devlist made public
-* Jan 02, 1997  Gene Kozin      Initial version (based on wanpipe.h).
-*****************************************************************************/
 #ifndef _ROUTER_H
 #define _ROUTER_H
 #include <uapi/linux/wanrouter.h>
-/****** Kernel Interface ****************************************************/
-#include <linux/fs.h>           /* support for device drivers */
-#include <linux/proc_fs.h>      /* proc filesystem pragmatics */
-#include <linux/netdevice.h>    /* support for network drivers */
-#include <linux/spinlock.h>     /* Support for SMP Locking */
-/*----------------------------------------------------------------------------
- * WAN device data space.
- */
-struct wan_device {
-        unsigned magic;                 /* magic number */
-        char* name;                     /* -> WAN device name (ASCIIZ) */
-        void* private;                  /* -> driver private data */
-        unsigned config_id;             /* Configuration ID */
-                                        /****** hardware configuration ******/
-        unsigned ioport;                /* adapter I/O port base #1 */
-        char S514_cpu_no[1];            /* PCI CPU Number */
-        unsigned char S514_slot_no;     /* PCI Slot Number */
-        unsigned long maddr;            /* dual-port memory address */
-        unsigned msize;                 /* dual-port memory size */
-        int irq;                        /* interrupt request level */
-        int dma;                        /* DMA request level */
-        unsigned bps;                   /* data transfer rate */
-        unsigned mtu;                   /* max physical transmit unit size */
-        unsigned udp_port;              /* UDP port for management */
-        unsigned char ttl;              /* Time To Live for UDP security */
-        unsigned enable_tx_int;         /* Transmit Interrupt enabled or not */
-        char interface;                 /* RS-232/V.35, etc. */
-        char clocking;                  /* external/internal */
-        char line_coding;               /* NRZ/NRZI/FM0/FM1, etc. */
-        char station;                   /* DTE/DCE, primary/secondary, etc. */
-        char connection;                /* permanent/switched/on-demand */
-        char signalling;                /* Signalling RS232 or V35 */
-        char read_mode;                 /* read mode: Polling or interrupt */
-        char new_if_cnt;                /* Number of interfaces per wanpipe */ 
-        char del_if_cnt;                /* Number of times del_if() gets called */
-        unsigned char piggyback;        /* Piggibacking a port */
-        unsigned hw_opt[4];             /* other hardware options */
-                                        /****** status and statistics *******/
-        char state;                     /* device state */
-        char api_status;                /* device api status */
-        struct net_device_stats stats;  /* interface statistics */
-        unsigned reserved[16];          /* reserved for future use */
-        unsigned long critical;         /* critical section flag */
-        spinlock_t lock;                /* Support for SMP Locking */
-                                        /****** device management methods ***/
-        int (*setup) (struct wan_device *wandev, wandev_conf_t *conf);
-        int (*shutdown) (struct wan_device *wandev);
-        int (*update) (struct wan_device *wandev);
-        int (*ioctl) (struct wan_device *wandev, unsigned cmd,
-                unsigned long arg);
-        int (*new_if)(struct wan_device *wandev, struct net_device *dev,
-                      wanif_conf_t *conf);
-        int (*del_if)(struct wan_device *wandev, struct net_device *dev);
-                                        /****** maintained by the router ****/
-        struct wan_device* next;        /* -> next device */
-        struct net_device* dev;         /* list of network interfaces */
-        unsigned ndev;                  /* number of interfaces */
-        struct proc_dir_entry *dent;    /* proc filesystem entry */
-};
-/* Public functions available for device drivers */
-extern int register_wan_device(struct wan_device *wandev);
-extern int unregister_wan_device(char *name);
-/* Proc interface functions. These must not be called by the drivers! */
-extern int wanrouter_proc_init(void);
-extern void wanrouter_proc_cleanup(void);
-extern int wanrouter_proc_add(struct wan_device *wandev);
-extern int wanrouter_proc_delete(struct wan_device *wandev);
-extern long wanrouter_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
-/* Public Data */
-/* list of registered devices */
-extern struct wan_device *wanrouter_router_devlist;
 #endif  /* _ROUTER_H */
diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
index 0d6373195d32..a54fe82e704b 100644
--- a/include/linux/wl12xx.h
+++ b/include/linux/wl12xx.h
@@ -24,6 +24,8 @@
 #ifndef _LINUX_WL12XX_H
 #define _LINUX_WL12XX_H
+#include <linux/err.h>
 /* Reference clock values */
 enum {
        WL12XX_REFCLOCK_19      = 0, /* 19.2 MHz */
@@ -55,17 +57,17 @@ struct wl12xx_platform_data {
        int board_tcxo_clock;
        unsigned long platform_quirks;
        bool pwr_in_suspend;
-        struct wl1271_if_operations *ops;
 };
 /* Platform does not support level trigger interrupts */
 #define WL12XX_PLATFORM_QUIRK_EDGE_IRQ  BIT(0)
-#ifdef CONFIG_WL12XX_PLATFORM_DATA
+#ifdef CONFIG_WILINK_PLATFORM_DATA
 int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
+struct wl12xx_platform_data *wl12xx_get_platform_data(void);
 #else
 static inline
@@ -74,8 +76,12 @@ int wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
        return -ENOSYS;
 }
-#endif
+static inline
+struct wl12xx_platform_data *wl12xx_get_platform_data(void)
+{
+        return ERR_PTR(-ENODATA);
+}
-struct wl12xx_platform_data *wl12xx_get_platform_data(void);
+#endif
 #endif
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 2b58905d3504..8afab27cdbc2 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -27,7 +27,7 @@ void delayed_work_timer_fn(unsigned long __data);
 enum {
        WORK_STRUCT_PENDING_BIT = 0,    /* work item is pending execution */
        WORK_STRUCT_DELAYED_BIT = 1,    /* work item is delayed */
-        WORK_STRUCT_CWQ_BIT     = 2,    /* data points to cwq */
+        WORK_STRUCT_PWQ_BIT     = 2,    /* data points to pwq */
        WORK_STRUCT_LINKED_BIT  = 3,    /* next work is linked to this one */
 #ifdef CONFIG_DEBUG_OBJECTS_WORK
        WORK_STRUCT_STATIC_BIT  = 4,    /* static initializer (debugobjects) */
@@ -40,7 +40,7 @@ enum {
        WORK_STRUCT_PENDING     = 1 << WORK_STRUCT_PENDING_BIT,
        WORK_STRUCT_DELAYED     = 1 << WORK_STRUCT_DELAYED_BIT,
-        WORK_STRUCT_CWQ         = 1 << WORK_STRUCT_CWQ_BIT,
+        WORK_STRUCT_PWQ         = 1 << WORK_STRUCT_PWQ_BIT,
        WORK_STRUCT_LINKED      = 1 << WORK_STRUCT_LINKED_BIT,
 #ifdef CONFIG_DEBUG_OBJECTS_WORK
        WORK_STRUCT_STATIC      = 1 << WORK_STRUCT_STATIC_BIT,
@@ -57,29 +57,36 @@ enum {
        /* special cpu IDs */
        WORK_CPU_UNBOUND        = NR_CPUS,
-        WORK_CPU_NONE           = NR_CPUS + 1,
+        WORK_CPU_END            = NR_CPUS + 1,
-        WORK_CPU_LAST           = WORK_CPU_NONE,
        /*
-         * Reserve 7 bits off of cwq pointer w/ debugobjects turned
+         * Reserve 7 bits off of pwq pointer w/ debugobjects turned off.
-         * off.  This makes cwqs aligned to 256 bytes and allows 15
+         * This makes pwqs aligned to 256 bytes and allows 15 workqueue
-         * workqueue flush colors.
+         * flush colors.
         */
        WORK_STRUCT_FLAG_BITS   = WORK_STRUCT_COLOR_SHIFT +
                                  WORK_STRUCT_COLOR_BITS,
-        /* data contains off-queue information when !WORK_STRUCT_CWQ */
+        /* data contains off-queue information when !WORK_STRUCT_PWQ */
        WORK_OFFQ_FLAG_BASE     = WORK_STRUCT_FLAG_BITS,
        WORK_OFFQ_CANCELING     = (1 << WORK_OFFQ_FLAG_BASE),
+        /*
+         * When a work item is off queue, its high bits point to the last
+         * pool it was on.  Cap at 31 bits and use the highest number to
+         * indicate that no pool is associated.
+         */
        WORK_OFFQ_FLAG_BITS     = 1,
-        WORK_OFFQ_CPU_SHIFT     = WORK_OFFQ_FLAG_BASE + WORK_OFFQ_FLAG_BITS,
+        WORK_OFFQ_POOL_SHIFT    = WORK_OFFQ_FLAG_BASE + WORK_OFFQ_FLAG_BITS,
+        WORK_OFFQ_LEFT          = BITS_PER_LONG - WORK_OFFQ_POOL_SHIFT,
+        WORK_OFFQ_POOL_BITS     = WORK_OFFQ_LEFT <= 31 ? WORK_OFFQ_LEFT : 31,
+        WORK_OFFQ_POOL_NONE     = (1LU << WORK_OFFQ_POOL_BITS) - 1,
        /* convenience constants */
        WORK_STRUCT_FLAG_MASK   = (1UL << WORK_STRUCT_FLAG_BITS) - 1,
        WORK_STRUCT_WQ_DATA_MASK = ~WORK_STRUCT_FLAG_MASK,
-        WORK_STRUCT_NO_CPU      = (unsigned long)WORK_CPU_NONE << WORK_OFFQ_CPU_SHIFT,
+        WORK_STRUCT_NO_POOL     = (unsigned long)WORK_OFFQ_POOL_NONE << WORK_OFFQ_POOL_SHIFT,
        /* bit mask for work_busy() return values */
        WORK_BUSY_PENDING       = 1 << 0,
@@ -95,13 +102,16 @@ struct work_struct {
 #endif
 };
-#define WORK_DATA_INIT()        ATOMIC_LONG_INIT(WORK_STRUCT_NO_CPU)
+#define WORK_DATA_INIT()        ATOMIC_LONG_INIT(WORK_STRUCT_NO_POOL)
 #define WORK_DATA_STATIC_INIT() \
-        ATOMIC_LONG_INIT(WORK_STRUCT_NO_CPU | WORK_STRUCT_STATIC)
+        ATOMIC_LONG_INIT(WORK_STRUCT_NO_POOL | WORK_STRUCT_STATIC)
 struct delayed_work {
        struct work_struct work;
        struct timer_list timer;
+        /* target workqueue and CPU ->timer uses to queue ->work */
+        struct workqueue_struct *wq;
        int cpu;
 };
@@ -426,7 +436,6 @@ extern bool cancel_delayed_work_sync(struct delayed_work *dwork);
 extern void workqueue_set_max_active(struct workqueue_struct *wq,
                                     int max_active);
 extern bool workqueue_congested(unsigned int cpu, struct workqueue_struct *wq);
-extern unsigned int work_cpu(struct work_struct *work);
 extern unsigned int work_busy(struct work_struct *work);
 /*