Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.

472 files changed, 13428 insertions, 4668 deletions

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 17b5b5967641..a5db4aeefa36 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -352,8 +352,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
 
 /* Enable _OST when all relevant hotplug operations are enabled */
 #if defined(CONFIG_ACPI_HOTPLUG_CPU) &&                 \
-        (defined(CONFIG_ACPI_HOTPLUG_MEMORY) ||         \
-         defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \
+        defined(CONFIG_ACPI_HOTPLUG_MEMORY) &&          \
         defined(CONFIG_ACPI_CONTAINER)
 #define ACPI_HOTPLUG_OST
 #endif
@@ -482,6 +481,13 @@ void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state,
 
 acpi_status acpi_os_prepare_sleep(u8 sleep_state,
                                   u32 pm1a_control, u32 pm1b_control);
+
+void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state,
+                                        u32 val_a,  u32 val_b));
+
+acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state,
+                                           u32 val_a, u32 val_b);
+
 #ifdef CONFIG_X86
 void arch_reserve_mem_area(acpi_physical_address addr, size_t size);
 #else
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 737f90ab4b62..4dbaa7081530 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -7,6 +7,10 @@
 #ifndef _AER_H_
 #define _AER_H_
 
+#define AER_NONFATAL                    0
+#define AER_FATAL                       1
+#define AER_CORRECTABLE                 2
+
 struct aer_header_log_regs {
         unsigned int dw0;
         unsigned int dw1;
@@ -31,9 +35,9 @@ struct aer_capability_regs {
 
 #if defined(CONFIG_PCIEAER)
 /* pci-e port driver needs this function to enable aer */
-extern int pci_enable_pcie_error_reporting(struct pci_dev *dev);
-extern int pci_disable_pcie_error_reporting(struct pci_dev *dev);
-extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
+int pci_enable_pcie_error_reporting(struct pci_dev *dev);
+int pci_disable_pcie_error_reporting(struct pci_dev *dev);
+int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
 #else
 static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)
 {
@@ -49,11 +53,11 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
 }
 #endif
 
-extern void cper_print_aer(struct pci_dev *dev,
-                           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,
-                              struct aer_capability_regs *aer_regs);
+void cper_print_aer(struct pci_dev *dev, int cper_severity,
+                    struct aer_capability_regs *aer);
+int cper_severity_to_aer(int cper_severity);
+void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
+                       int severity,
+                       struct aer_capability_regs *aer_regs);
 #endif //_AER_H_
 
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 1bdf965339f9..d9c92daa3944 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -27,15 +27,13 @@ struct kiocb;
  */
 #define KIOCB_CANCELLED         ((void *) (~0ULL))
 
-typedef int (kiocb_cancel_fn)(struct kiocb *, struct io_event *);
+typedef int (kiocb_cancel_fn)(struct kiocb *);
 
 struct kiocb {
-        atomic_t                ki_users;
-
         struct file             *ki_filp;
         struct kioctx           *ki_ctx;        /* NULL for sync ops */
         kiocb_cancel_fn         *ki_cancel;
-        void                    (*ki_dtor)(struct kiocb *);
+        void                    *private;
 
         union {
                 void __user             *user;
@@ -44,17 +42,7 @@ struct kiocb {
 
         __u64                   ki_user_data;   /* user's data for completion */
         loff_t                  ki_pos;
-
-        void                    *private;
-        /* State that we remember to be able to restart/retry  */
-        unsigned short          ki_opcode;
-        size_t                  ki_nbytes;      /* copy of iocb->aio_nbytes */
-        char                    __user *ki_buf; /* remaining iocb->aio_buf */
-        size_t                  ki_left;        /* remaining bytes */
-        struct iovec            ki_inline_vec;  /* inline vector */
-        struct iovec            *ki_iovec;
-        unsigned long           ki_nr_segs;
-        unsigned long           ki_cur_seg;
+        size_t                  ki_nbytes;      /* copy of iocb->aio_nbytes */
 
         struct list_head        ki_list;        /* the aio core uses this
                                                  * for cancellation */
@@ -74,7 +62,6 @@ static inline bool is_sync_kiocb(struct kiocb *kiocb)
 static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)
 {
         *kiocb = (struct kiocb) {
-                        .ki_users = ATOMIC_INIT(1),
                         .ki_ctx = NULL,
                         .ki_filp = filp,
                         .ki_obj.tsk = current,
@@ -84,7 +71,6 @@ static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)
 /* prototypes */
 #ifdef CONFIG_AIO
 extern ssize_t wait_on_sync_kiocb(struct kiocb *iocb);
-extern void aio_put_req(struct kiocb *iocb);
 extern void aio_complete(struct kiocb *iocb, long res, long res2);
 struct mm_struct;
 extern void exit_aio(struct mm_struct *mm);
@@ -93,7 +79,6 @@ extern long do_io_submit(aio_context_t ctx_id, long nr,
 void kiocb_set_cancel_fn(struct kiocb *req, kiocb_cancel_fn *cancel);
 #else
 static inline ssize_t wait_on_sync_kiocb(struct kiocb *iocb) { return 0; }
-static inline void aio_put_req(struct kiocb *iocb) { }
 static inline void aio_complete(struct kiocb *iocb, long res, long res2) { }
 struct mm_struct;
 static inline void exit_aio(struct mm_struct *mm) { }
diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h
index 9069694e70eb..a899402a5a0e 100644
--- a/include/linux/alarmtimer.h
+++ b/include/linux/alarmtimer.h
@@ -44,10 +44,14 @@ struct alarm {
 void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
                 enum alarmtimer_restart (*function)(struct alarm *, ktime_t));
 int alarm_start(struct alarm *alarm, ktime_t start);
+int alarm_start_relative(struct alarm *alarm, ktime_t start);
+void alarm_restart(struct alarm *alarm);
 int alarm_try_to_cancel(struct alarm *alarm);
 int alarm_cancel(struct alarm *alarm);
 
 u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval);
+u64 alarm_forward_now(struct alarm *alarm, ktime_t interval);
+ktime_t alarm_expires_remaining(const struct alarm *alarm);
 
 /* Provide way to access the rtc device being used by alarmtimers */
 struct rtc_device *alarmtimer_get_rtcdev(void);
diff --git a/include/linux/amba/pl080.h b/include/linux/amba/pl080.h
index 3e7b62fbefbd..91b84a7f0539 100644
--- a/include/linux/amba/pl080.h
+++ b/include/linux/amba/pl080.h
@@ -87,6 +87,7 @@
 #define PL080_CONTROL_SB_SIZE_MASK              (0x7 << 12)
 #define PL080_CONTROL_SB_SIZE_SHIFT             (12)
 #define PL080_CONTROL_TRANSFER_SIZE_MASK        (0xfff << 0)
+#define PL080S_CONTROL_TRANSFER_SIZE_MASK       (0x1ffffff << 0)
 #define PL080_CONTROL_TRANSFER_SIZE_SHIFT       (0)
 
 #define PL080_BSIZE_1                           (0x0)
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h
index 2a5f64a11b77..10fe2a211c2e 100644
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
@@ -76,11 +76,11 @@ struct pl08x_channel_data {
  * platform, all inclusive, including multiplexed channels. The available
  * physical channels will be multiplexed around these signals as they are
  * requested, just enumerate all possible channels.
- * @get_signal: request a physical signal to be used for a DMA transfer
+ * @get_xfer_signal: request a physical signal to be used for a DMA transfer
  * immediately: if there is some multiplexing or similar blocking the use
  * of the channel the transfer can be denied by returning less than zero,
  * else it returns the allocated signal number
- * @put_signal: indicate to the platform that this physical signal is not
+ * @put_xfer_signal: indicate to the platform that this physical signal is not
  * running any DMA transfer and multiplexing can be recycled
  * @lli_buses: buses which LLIs can be fetched from: PL08X_AHB1 | PL08X_AHB2
  * @mem_buses: buses which memory can be accessed from: PL08X_AHB1 | PL08X_AHB2
@@ -89,8 +89,8 @@ struct pl08x_platform_data {
         const struct pl08x_channel_data *slave_channels;
         unsigned int num_slave_channels;
         struct pl08x_channel_data memcpy_channel;
-        int (*get_signal)(const struct pl08x_channel_data *);
-        void (*put_signal)(const struct pl08x_channel_data *, int);
+        int (*get_xfer_signal)(const struct pl08x_channel_data *);
+        void (*put_xfer_signal)(const struct pl08x_channel_data *, int);
         u8 lli_buses;
         u8 mem_buses;
 };
diff --git a/include/linux/anon_inodes.h b/include/linux/anon_inodes.h
index 8013a45242fe..cf573c22b81e 100644
--- a/include/linux/anon_inodes.h
+++ b/include/linux/anon_inodes.h
@@ -13,6 +13,9 @@ struct file_operations;
 struct file *anon_inode_getfile(const char *name,
                                 const struct file_operations *fops,
                                 void *priv, int flags);
+struct file *anon_inode_getfile_private(const char *name,
+                                const struct file_operations *fops,
+                                void *priv, int flags);
 int anon_inode_getfd(const char *name, const struct file_operations *fops,
                      void *priv, int flags);
 
diff --git a/include/linux/arm-cci.h b/include/linux/arm-cci.h
new file mode 100644
index 000000000000..79d6edf446d5
--- /dev/null
+++ b/include/linux/arm-cci.h
@@ -0,0 +1,61 @@
+/*
+ * CCI cache coherent interconnect support
+ *
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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 __LINUX_ARM_CCI_H
+#define __LINUX_ARM_CCI_H
+
+#include <linux/errno.h>
+#include <linux/types.h>
+
+struct device_node;
+
+#ifdef CONFIG_ARM_CCI
+extern bool cci_probed(void);
+extern int cci_ace_get_port(struct device_node *dn);
+extern int cci_disable_port_by_cpu(u64 mpidr);
+extern int __cci_control_port_by_device(struct device_node *dn, bool enable);
+extern int __cci_control_port_by_index(u32 port, bool enable);
+#else
+static inline bool cci_probed(void) { return false; }
+static inline int cci_ace_get_port(struct device_node *dn)
+{
+        return -ENODEV;
+}
+static inline int cci_disable_port_by_cpu(u64 mpidr) { return -ENODEV; }
+static inline int __cci_control_port_by_device(struct device_node *dn,
+                                               bool enable)
+{
+        return -ENODEV;
+}
+static inline int __cci_control_port_by_index(u32 port, bool enable)
+{
+        return -ENODEV;
+}
+#endif
+#define cci_disable_port_by_device(dev) \
+        __cci_control_port_by_device(dev, false)
+#define cci_enable_port_by_device(dev) \
+        __cci_control_port_by_device(dev, true)
+#define cci_disable_port_by_index(dev) \
+        __cci_control_port_by_index(dev, false)
+#define cci_enable_port_by_index(dev) \
+        __cci_control_port_by_index(dev, true)
+
+#endif
diff --git a/include/linux/async_tx.h b/include/linux/async_tx.h
index a1c486a88e88..179b38ffd351 100644
--- a/include/linux/async_tx.h
+++ b/include/linux/async_tx.h
@@ -182,10 +182,6 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
              unsigned int src_offset, size_t len,
              struct async_submit_ctl *submit);
 
-struct dma_async_tx_descriptor *
-async_memset(struct page *dest, int val, unsigned int offset,
-             size_t len, struct async_submit_ctl *submit);
-
 struct dma_async_tx_descriptor *async_trigger_callback(struct async_submit_ctl *submit);
 
 struct dma_async_tx_descriptor *
diff --git a/include/linux/ata.h b/include/linux/ata.h
index ee0bd9524055..bf4c69ca76df 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -239,6 +239,8 @@ enum {
         ATA_CMD_WRITE_QUEUED_FUA_EXT = 0x3E,
         ATA_CMD_FPDMA_READ      = 0x60,
         ATA_CMD_FPDMA_WRITE     = 0x61,
+        ATA_CMD_FPDMA_SEND      = 0x64,
+        ATA_CMD_FPDMA_RECV      = 0x65,
         ATA_CMD_PIO_READ        = 0x20,
         ATA_CMD_PIO_READ_EXT    = 0x24,
         ATA_CMD_PIO_WRITE       = 0x30,
@@ -293,8 +295,13 @@ enum {
         /* marked obsolete in the ATA/ATAPI-7 spec */
         ATA_CMD_RESTORE         = 0x10,
 
+        /* Subcmds for ATA_CMD_FPDMA_SEND */
+        ATA_SUBCMD_FPDMA_SEND_DSM            = 0x00,
+        ATA_SUBCMD_FPDMA_SEND_WR_LOG_DMA_EXT = 0x02,
+
         /* READ_LOG_EXT pages */
         ATA_LOG_SATA_NCQ        = 0x10,
+        ATA_LOG_NCQ_SEND_RECV     = 0x13,
         ATA_LOG_SATA_ID_DEV_DATA  = 0x30,
         ATA_LOG_SATA_SETTINGS     = 0x08,
         ATA_LOG_DEVSLP_OFFSET     = 0x30,
@@ -305,6 +312,15 @@ enum {
         ATA_LOG_DEVSLP_VALID      = 0x07,
         ATA_LOG_DEVSLP_VALID_MASK = 0x80,
 
+        /* NCQ send and receive log */
+        ATA_LOG_NCQ_SEND_RECV_SUBCMDS_OFFSET    = 0x00,
+        ATA_LOG_NCQ_SEND_RECV_SUBCMDS_DSM       = (1 << 0),
+        ATA_LOG_NCQ_SEND_RECV_DSM_OFFSET        = 0x04,
+        ATA_LOG_NCQ_SEND_RECV_DSM_TRIM          = (1 << 0),
+        ATA_LOG_NCQ_SEND_RECV_RD_LOG_OFFSET     = 0x08,
+        ATA_LOG_NCQ_SEND_RECV_WR_LOG_OFFSET     = 0x0C,
+        ATA_LOG_NCQ_SEND_RECV_SIZE              = 0x10,
+
         /* READ/WRITE LONG (obsolete) */
         ATA_CMD_READ_LONG       = 0x22,
         ATA_CMD_READ_LONG_ONCE  = 0x23,
@@ -446,22 +462,6 @@ enum {
         SERR_TRANS_ST_ERROR     = (1 << 24), /* Transport state trans. error */
         SERR_UNRECOG_FIS        = (1 << 25), /* Unrecognized FIS */
         SERR_DEV_XCHG           = (1 << 26), /* device exchanged */
-
-        /* struct ata_taskfile flags */
-        ATA_TFLAG_LBA48         = (1 << 0), /* enable 48-bit LBA and "HOB" */
-        ATA_TFLAG_ISADDR        = (1 << 1), /* enable r/w to nsect/lba regs */
-        ATA_TFLAG_DEVICE        = (1 << 2), /* enable r/w to device reg */
-        ATA_TFLAG_WRITE         = (1 << 3), /* data dir: host->dev==1 (write) */
-        ATA_TFLAG_LBA           = (1 << 4), /* enable LBA */
-        ATA_TFLAG_FUA           = (1 << 5), /* enable FUA */
-        ATA_TFLAG_POLLING       = (1 << 6), /* set nIEN to 1 and use polling */
-
-        /* protocol flags */
-        ATA_PROT_FLAG_PIO       = (1 << 0), /* is PIO */
-        ATA_PROT_FLAG_DMA       = (1 << 1), /* is DMA */
-        ATA_PROT_FLAG_DATA      = ATA_PROT_FLAG_PIO | ATA_PROT_FLAG_DMA,
-        ATA_PROT_FLAG_NCQ       = (1 << 2), /* is NCQ */
-        ATA_PROT_FLAG_ATAPI     = (1 << 3), /* is ATAPI */
 };
 
 enum ata_tf_protocols {
@@ -488,83 +488,6 @@ struct ata_bmdma_prd {
         __le32                  flags_len;
 };
 
-struct ata_taskfile {
-        unsigned long           flags;          /* ATA_TFLAG_xxx */
-        u8                      protocol;       /* ATA_PROT_xxx */
-
-        u8                      ctl;            /* control reg */
-
-        u8                      hob_feature;    /* additional data */
-        u8                      hob_nsect;      /* to support LBA48 */
-        u8                      hob_lbal;
-        u8                      hob_lbam;
-        u8                      hob_lbah;
-
-        u8                      feature;
-        u8                      nsect;
-        u8                      lbal;
-        u8                      lbam;
-        u8                      lbah;
-
-        u8                      device;
-
-        u8                      command;        /* IO operation */
-};
-
-/*
- * protocol tests
- */
-static inline unsigned int ata_prot_flags(u8 prot)
-{
-        switch (prot) {
-        case ATA_PROT_NODATA:
-                return 0;
-        case ATA_PROT_PIO:
-                return ATA_PROT_FLAG_PIO;
-        case ATA_PROT_DMA:
-                return ATA_PROT_FLAG_DMA;
-        case ATA_PROT_NCQ:
-                return ATA_PROT_FLAG_DMA | ATA_PROT_FLAG_NCQ;
-        case ATAPI_PROT_NODATA:
-                return ATA_PROT_FLAG_ATAPI;
-        case ATAPI_PROT_PIO:
-                return ATA_PROT_FLAG_ATAPI | ATA_PROT_FLAG_PIO;
-        case ATAPI_PROT_DMA:
-                return ATA_PROT_FLAG_ATAPI | ATA_PROT_FLAG_DMA;
-        }
-        return 0;
-}
-
-static inline int ata_is_atapi(u8 prot)
-{
-        return ata_prot_flags(prot) & ATA_PROT_FLAG_ATAPI;
-}
-
-static inline int ata_is_nodata(u8 prot)
-{
-        return !(ata_prot_flags(prot) & ATA_PROT_FLAG_DATA);
-}
-
-static inline int ata_is_pio(u8 prot)
-{
-        return ata_prot_flags(prot) & ATA_PROT_FLAG_PIO;
-}
-
-static inline int ata_is_dma(u8 prot)
-{
-        return ata_prot_flags(prot) & ATA_PROT_FLAG_DMA;
-}
-
-static inline int ata_is_ncq(u8 prot)
-{
-        return ata_prot_flags(prot) & ATA_PROT_FLAG_NCQ;
-}
-
-static inline int ata_is_data(u8 prot)
-{
-        return ata_prot_flags(prot) & ATA_PROT_FLAG_DATA;
-}
-
 /*
  * id tests
  */
@@ -865,6 +788,11 @@ static inline int ata_id_rotation_rate(const u16 *id)
         return val;
 }
 
+static inline bool ata_id_has_ncq_send_and_recv(const u16 *id)
+{
+        return id[ATA_ID_SATA_CAPABILITY_2] & BIT(6);
+}
+
 static inline bool ata_id_has_trim(const u16 *id)
 {
         if (ata_id_major_version(id) >= 7 &&
@@ -1060,15 +988,6 @@ static inline unsigned ata_set_lba_range_entries(void *_buffer,
         return used_bytes;
 }
 
-static inline int is_multi_taskfile(struct ata_taskfile *tf)
-{
-        return (tf->command == ATA_CMD_READ_MULTI) ||
-               (tf->command == ATA_CMD_WRITE_MULTI) ||
-               (tf->command == ATA_CMD_READ_MULTI_EXT) ||
-               (tf->command == ATA_CMD_WRITE_MULTI_EXT) ||
-               (tf->command == ATA_CMD_WRITE_MULTI_FUA_EXT);
-}
-
 static inline bool ata_ok(u8 status)
 {
         return ((status & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | ATA_ERR))
diff --git a/include/linux/atmel-ssc.h b/include/linux/atmel-ssc.h
index deb0ae58b99b..66a0e5384edd 100644
--- a/include/linux/atmel-ssc.h
+++ b/include/linux/atmel-ssc.h
@@ -11,7 +11,7 @@ struct atmel_ssc_platform_data {
 
 struct ssc_device {
         struct list_head        list;
-        resource_size_t         phybase;
+        dma_addr_t              phybase;
         void __iomem            *regs;
         struct platform_device  *pdev;
         struct atmel_ssc_platform_data *pdata;
diff --git a/include/linux/atmel_serial.h b/include/linux/atmel_serial.h
index fd6833764d72..be201ca2990c 100644
--- a/include/linux/atmel_serial.h
+++ b/include/linux/atmel_serial.h
@@ -124,4 +124,6 @@
 #define ATMEL_US_NER            0x44                    /* Number of Errors Register */
 #define ATMEL_US_IF             0x4c                    /* IrDA Filter Register */
 
+#define ATMEL_US_NAME           0xf0                    /* Ip Name */
+
 #endif
diff --git a/include/linux/audit.h b/include/linux/audit.h
index b20b03852f21..729a4d165bcc 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -103,8 +103,11 @@ extern void __audit_syscall_exit(int ret_success, long ret_value);
 extern struct filename *__audit_reusename(const __user char *uptr);
 extern void __audit_getname(struct filename *name);
 extern void audit_putname(struct filename *name);
+
+#define AUDIT_INODE_PARENT      1       /* dentry represents the parent */
+#define AUDIT_INODE_HIDDEN      2       /* audit record should be hidden */
 extern void __audit_inode(struct filename *name, const struct dentry *dentry,
-                                unsigned int parent);
+                                unsigned int flags);
 extern void __audit_inode_child(const struct inode *parent,
                                 const struct dentry *dentry,
                                 const unsigned char type);
@@ -148,10 +151,22 @@ static inline void audit_getname(struct filename *name)
         if (unlikely(!audit_dummy_context()))
                 __audit_getname(name);
 }
-static inline void audit_inode(struct filename *name, const struct dentry *dentry,
+static inline void audit_inode(struct filename *name,
+                                const struct dentry *dentry,
                                 unsigned int parent) {
+        if (unlikely(!audit_dummy_context())) {
+                unsigned int flags = 0;
+                if (parent)
+                        flags |= AUDIT_INODE_PARENT;
+                __audit_inode(name, dentry, flags);
+        }
+}
+static inline void audit_inode_parent_hidden(struct filename *name,
+                                                const struct dentry *dentry)
+{
         if (unlikely(!audit_dummy_context()))
-                __audit_inode(name, dentry, parent);
+                __audit_inode(name, dentry,
+                                AUDIT_INODE_PARENT | AUDIT_INODE_HIDDEN);
 }
 static inline void audit_inode_child(const struct inode *parent,
                                      const struct dentry *dentry,
@@ -311,7 +326,7 @@ static inline void audit_putname(struct filename *name)
 { }
 static inline void __audit_inode(struct filename *name,
                                         const struct dentry *dentry,
-                                        unsigned int parent)
+                                        unsigned int flags)
 { }
 static inline void __audit_inode_child(const struct inode *parent,
                                         const struct dentry *dentry,
@@ -321,6 +336,9 @@ static inline void audit_inode(struct filename *name,
                                 const struct dentry *dentry,
                                 unsigned int parent)
 { }
+static inline void audit_inode_parent_hidden(struct filename *name,
+                                const struct dentry *dentry)
+{ }
 static inline void audit_inode_child(const struct inode *parent,
                                      const struct dentry *dentry,
                                      const unsigned char type)
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index c3881553f7d1..5f66d519a726 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -243,6 +243,8 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
  * BDI_CAP_EXEC_MAP:       Can be mapped for execution
  *
  * BDI_CAP_SWAP_BACKED:    Count shmem/tmpfs objects as swap-backed.
+ *
+ * BDI_CAP_STRICTLIMIT:    Keep number of dirty pages below bdi threshold.
  */
 #define BDI_CAP_NO_ACCT_DIRTY   0x00000001
 #define BDI_CAP_NO_WRITEBACK    0x00000002
@@ -254,6 +256,7 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
 #define BDI_CAP_NO_ACCT_WB      0x00000080
 #define BDI_CAP_SWAP_BACKED     0x00000100
 #define BDI_CAP_STABLE_WRITES   0x00000200
+#define BDI_CAP_STRICTLIMIT     0x00000400
 
 #define BDI_CAP_VMFLAGS \
         (BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP)
diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index da9a0825e007..53b77949c79d 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -114,7 +114,13 @@ static inline void backlight_update_status(struct backlight_device *bd)
 extern struct backlight_device *backlight_device_register(const char *name,
         struct device *dev, void *devdata, const struct backlight_ops *ops,
         const struct backlight_properties *props);
+extern struct backlight_device *devm_backlight_device_register(
+        struct device *dev, const char *name, struct device *parent,
+        void *devdata, const struct backlight_ops *ops,
+        const struct backlight_properties *props);
 extern void backlight_device_unregister(struct backlight_device *bd);
+extern void devm_backlight_device_unregister(struct device *dev,
+                                        struct backlight_device *bd);
 extern void backlight_force_update(struct backlight_device *bd,
                                    enum backlight_update_reason reason);
 
diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h
index f7f1d7169b11..089743ade734 100644
--- a/include/linux/balloon_compaction.h
+++ b/include/linux/balloon_compaction.h
@@ -159,6 +159,26 @@ static inline bool balloon_page_movable(struct page *page)
 }
 
 /*
+ * isolated_balloon_page - identify an isolated balloon page on private
+ *                         compaction/migration page lists.
+ *
+ * After a compaction thread isolates a balloon page for migration, it raises
+ * the page refcount to prevent concurrent compaction threads from re-isolating
+ * the same page. For that reason putback_movable_pages(), or other routines
+ * that need to identify isolated balloon pages on private pagelists, cannot
+ * rely on balloon_page_movable() to accomplish the task.
+ */
+static inline bool isolated_balloon_page(struct page *page)
+{
+        /* Already isolated balloon pages, by default, have a raised refcount */
+        if (page_flags_cleared(page) && !page_mapped(page) &&
+            page_count(page) >= 2)
+                return __is_movable_balloon_page(page);
+
+        return false;
+}
+
+/*
  * balloon_page_insert - insert a page into the balloon's page list and make
  *                       the page->mapping assignment accordingly.
  * @page    : page to be assigned as a 'balloon page'
@@ -243,6 +263,11 @@ static inline bool balloon_page_movable(struct page *page)
         return false;
 }
 
+static inline bool isolated_balloon_page(struct page *page)
+{
+        return false;
+}
+
 static inline bool balloon_page_isolate(struct page *page)
 {
         return false;
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 2e34db82a643..4d043c30216f 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -72,7 +72,19 @@ struct bcma_host_ops {
 /* Core-ID values. */
 #define BCMA_CORE_OOB_ROUTER            0x367   /* Out of band */
 #define BCMA_CORE_4706_CHIPCOMMON       0x500
+#define BCMA_CORE_PCIEG2                0x501
+#define BCMA_CORE_DMA                   0x502
+#define BCMA_CORE_SDIO3                 0x503
+#define BCMA_CORE_USB20                 0x504
+#define BCMA_CORE_USB30                 0x505
+#define BCMA_CORE_A9JTAG                0x506
+#define BCMA_CORE_DDR23                 0x507
+#define BCMA_CORE_ROM                   0x508
+#define BCMA_CORE_NAND                  0x509
+#define BCMA_CORE_QSPI                  0x50A
+#define BCMA_CORE_CHIPCOMMON_B          0x50B
 #define BCMA_CORE_4706_SOC_RAM          0x50E
+#define BCMA_CORE_ARMCA9                0x510
 #define BCMA_CORE_4706_MAC_GBIT         0x52D
 #define BCMA_CORE_AMEMC                 0x52E   /* DDR1/2 memory controller core */
 #define BCMA_CORE_ALTA                  0x534   /* I2S core */
@@ -144,6 +156,7 @@ struct bcma_host_ops {
 
 /* Chip IDs of PCIe devices */
 #define BCMA_CHIP_ID_BCM4313    0x4313
+#define BCMA_CHIP_ID_BCM43142   43142
 #define BCMA_CHIP_ID_BCM43224   43224
 #define  BCMA_PKG_ID_BCM43224_FAB_CSM   0x8
 #define  BCMA_PKG_ID_BCM43224_FAB_SMIC  0xa
@@ -176,6 +189,11 @@ struct bcma_host_ops {
 #define  BCMA_PKG_ID_BCM5357    11
 #define BCMA_CHIP_ID_BCM53572   53572
 #define  BCMA_PKG_ID_BCM47188   9
+#define BCMA_CHIP_ID_BCM4707    53010
+#define  BCMA_PKG_ID_BCM4707    1
+#define  BCMA_PKG_ID_BCM4708    2
+#define  BCMA_PKG_ID_BCM4709    0
+#define BCMA_CHIP_ID_BCM53018   53018
 
 /* Board types (on PCI usually equals to the subsystem dev id) */
 /* BCM4313 */
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index b8b09eac60a4..c49e1a159e6e 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -330,6 +330,8 @@
 #define BCMA_CC_PMU_CAP                 0x0604 /* PMU capabilities */
 #define  BCMA_CC_PMU_CAP_REVISION       0x000000FF /* Revision mask */
 #define BCMA_CC_PMU_STAT                0x0608 /* PMU status */
+#define  BCMA_CC_PMU_STAT_EXT_LPO_AVAIL 0x00000100
+#define  BCMA_CC_PMU_STAT_WDRESET       0x00000080
 #define  BCMA_CC_PMU_STAT_INTPEND       0x00000040 /* Interrupt pending */
 #define  BCMA_CC_PMU_STAT_SBCLKST       0x00000030 /* Backplane clock status? */
 #define  BCMA_CC_PMU_STAT_HAVEALP       0x00000008 /* ALP available */
@@ -355,6 +357,11 @@
 #define BCMA_CC_REGCTL_DATA             0x065C
 #define BCMA_CC_PLLCTL_ADDR             0x0660
 #define BCMA_CC_PLLCTL_DATA             0x0664
+#define BCMA_CC_PMU_STRAPOPT            0x0668 /* (corerev >= 28) */
+#define BCMA_CC_PMU_XTAL_FREQ           0x066C /* (pmurev >= 10) */
+#define  BCMA_CC_PMU_XTAL_FREQ_ILPCTL_MASK      0x00001FFF
+#define  BCMA_CC_PMU_XTAL_FREQ_MEASURE_MASK     0x80000000
+#define  BCMA_CC_PMU_XTAL_FREQ_MEASURE_SHIFT    31
 #define BCMA_CC_SPROM                   0x0800 /* SPROM beginning */
 /* NAND flash MLC controller registers (corerev >= 38) */
 #define BCMA_CC_NAND_REVISION           0x0C00
@@ -435,6 +442,23 @@
 #define  BCMA_CC_PMU6_4706_PROC_NDIV_MODE_MASK  0x00000007
 #define  BCMA_CC_PMU6_4706_PROC_NDIV_MODE_SHIFT 0
 
+/* PMU rev 15 */
+#define BCMA_CC_PMU15_PLL_PLLCTL0       0
+#define  BCMA_CC_PMU15_PLL_PC0_CLKSEL_MASK      0x00000003
+#define  BCMA_CC_PMU15_PLL_PC0_CLKSEL_SHIFT     0
+#define  BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK     0x003FFFFC
+#define  BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT    2
+#define  BCMA_CC_PMU15_PLL_PC0_PRESCALE_MASK    0x00C00000
+#define  BCMA_CC_PMU15_PLL_PC0_PRESCALE_SHIFT   22
+#define  BCMA_CC_PMU15_PLL_PC0_KPCTRL_MASK      0x07000000
+#define  BCMA_CC_PMU15_PLL_PC0_KPCTRL_SHIFT     24
+#define  BCMA_CC_PMU15_PLL_PC0_FCNTCTRL_MASK    0x38000000
+#define  BCMA_CC_PMU15_PLL_PC0_FCNTCTRL_SHIFT   27
+#define  BCMA_CC_PMU15_PLL_PC0_FDCMODE_MASK     0x40000000
+#define  BCMA_CC_PMU15_PLL_PC0_FDCMODE_SHIFT    30
+#define  BCMA_CC_PMU15_PLL_PC0_CTRLBIAS_MASK    0x80000000
+#define  BCMA_CC_PMU15_PLL_PC0_CTRLBIAS_SHIFT   31
+
 /* ALP clock on pre-PMU chips */
 #define BCMA_CC_PMU_ALP_CLOCK           20000000
 /* HT clock for systems with PMU-enabled chipcommon */
@@ -507,6 +531,37 @@
 #define BCMA_CHIPCTL_5357_I2S_PINS_ENABLE       BIT(18)
 #define BCMA_CHIPCTL_5357_I2CSPI_PINS_ENABLE    BIT(19)
 
+#define BCMA_RES_4314_LPLDO_PU                  BIT(0)
+#define BCMA_RES_4314_PMU_SLEEP_DIS             BIT(1)
+#define BCMA_RES_4314_PMU_BG_PU                 BIT(2)
+#define BCMA_RES_4314_CBUCK_LPOM_PU             BIT(3)
+#define BCMA_RES_4314_CBUCK_PFM_PU              BIT(4)
+#define BCMA_RES_4314_CLDO_PU                   BIT(5)
+#define BCMA_RES_4314_LPLDO2_LVM                BIT(6)
+#define BCMA_RES_4314_WL_PMU_PU                 BIT(7)
+#define BCMA_RES_4314_LNLDO_PU                  BIT(8)
+#define BCMA_RES_4314_LDO3P3_PU                 BIT(9)
+#define BCMA_RES_4314_OTP_PU                    BIT(10)
+#define BCMA_RES_4314_XTAL_PU                   BIT(11)
+#define BCMA_RES_4314_WL_PWRSW_PU               BIT(12)
+#define BCMA_RES_4314_LQ_AVAIL                  BIT(13)
+#define BCMA_RES_4314_LOGIC_RET                 BIT(14)
+#define BCMA_RES_4314_MEM_SLEEP                 BIT(15)
+#define BCMA_RES_4314_MACPHY_RET                BIT(16)
+#define BCMA_RES_4314_WL_CORE_READY             BIT(17)
+#define BCMA_RES_4314_ILP_REQ                   BIT(18)
+#define BCMA_RES_4314_ALP_AVAIL                 BIT(19)
+#define BCMA_RES_4314_MISC_PWRSW_PU             BIT(20)
+#define BCMA_RES_4314_SYNTH_PWRSW_PU            BIT(21)
+#define BCMA_RES_4314_RX_PWRSW_PU               BIT(22)
+#define BCMA_RES_4314_RADIO_PU                  BIT(23)
+#define BCMA_RES_4314_VCO_LDO_PU                BIT(24)
+#define BCMA_RES_4314_AFE_LDO_PU                BIT(25)
+#define BCMA_RES_4314_RX_LDO_PU                 BIT(26)
+#define BCMA_RES_4314_TX_LDO_PU                 BIT(27)
+#define BCMA_RES_4314_HT_AVAIL                  BIT(28)
+#define BCMA_RES_4314_MACPHY_CLK_AVAIL          BIT(29)
+
 /* Data for the PMU, if available.
  * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
  */
diff --git a/include/linux/bcma/bcma_driver_pci.h b/include/linux/bcma/bcma_driver_pci.h
index 424760f01b9d..0333e605ea0d 100644
--- a/include/linux/bcma/bcma_driver_pci.h
+++ b/include/linux/bcma/bcma_driver_pci.h
@@ -181,10 +181,31 @@ struct pci_dev;
 
 #define BCMA_CORE_PCI_CFG_DEVCTRL               0xd8
 
+#define BCMA_CORE_PCI_
+
+/* MDIO devices (SERDES modules) */
+#define BCMA_CORE_PCI_MDIO_IEEE0                0x000
+#define BCMA_CORE_PCI_MDIO_IEEE1                0x001
+#define BCMA_CORE_PCI_MDIO_BLK0                 0x800
+#define BCMA_CORE_PCI_MDIO_BLK1                 0x801
+#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT0          0x16
+#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT1          0x17
+#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT2          0x18
+#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT3          0x19
+#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT4          0x1A
+#define BCMA_CORE_PCI_MDIO_BLK2                 0x802
+#define BCMA_CORE_PCI_MDIO_BLK3                 0x803
+#define BCMA_CORE_PCI_MDIO_BLK4                 0x804
+#define BCMA_CORE_PCI_MDIO_TXPLL                0x808   /* TXPLL register block idx */
+#define BCMA_CORE_PCI_MDIO_TXCTRL0              0x820
+#define BCMA_CORE_PCI_MDIO_SERDESID             0x831
+#define BCMA_CORE_PCI_MDIO_RXCTRL0              0x840
+
 /* PCIE Root Capability Register bits (Host mode only) */
 #define BCMA_CORE_PCI_RC_CRS_VISIBILITY         0x0001
 
 struct bcma_drv_pci;
+struct bcma_bus;
 
 #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
 struct bcma_drv_pci_host {
@@ -219,7 +240,9 @@ struct bcma_drv_pci {
 extern void bcma_core_pci_init(struct bcma_drv_pci *pc);
 extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
                                  struct bcma_device *core, bool enable);
-extern void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend);
+extern void bcma_core_pci_up(struct bcma_bus *bus);
+extern void bcma_core_pci_down(struct bcma_bus *bus);
+extern void bcma_core_pci_power_save(struct bcma_bus *bus, bool up);
 
 extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
 extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 70cf138690e9..e8112ae50531 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -31,7 +31,7 @@ struct linux_binprm {
 #ifdef __alpha__
         unsigned int taso:1;
 #endif
-        unsigned int recursion_depth;
+        unsigned int recursion_depth; /* only for search_binary_handler() */
         struct file * file;
         struct cred *cred;      /* new credentials */
         int unsafe;             /* how unsafe this exec is (mask of LSM_UNSAFE_*) */
diff --git a/include/linux/bio.h b/include/linux/bio.h
index ef24466d8f82..ec48bac5b039 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -97,11 +97,11 @@ static inline void *bio_data(struct bio *bio)
  * permanent PIO fall back, user is probably better off disabling highmem
  * I/O completely on that queue (see ide-dma for example)
  */
-#define __bio_kmap_atomic(bio, idx, kmtype)                             \
+#define __bio_kmap_atomic(bio, idx)                             \
         (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) +    \
                 bio_iovec_idx((bio), (idx))->bv_offset)
 
-#define __bio_kunmap_atomic(addr, kmtype) kunmap_atomic(addr)
+#define __bio_kunmap_atomic(addr) kunmap_atomic(addr)
 
 /*
  * merge helpers etc
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 2fdb4a451b49..0e6f765aa1f5 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -862,6 +862,17 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq)
         return blk_queue_get_max_sectors(q, rq->cmd_flags);
 }
 
+static inline unsigned int blk_rq_count_bios(struct request *rq)
+{
+        unsigned int nr_bios = 0;
+        struct bio *bio;
+
+        __rq_for_each_bio(bio, rq)
+                nr_bios++;
+
+        return nr_bios;
+}
+
 /*
  * Request issue related functions.
  */
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 5f0b0e1f7c08..f1f07d31a3af 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -44,8 +44,8 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat,
                                        unsigned long endpfn);
 extern unsigned long init_bootmem(unsigned long addr, unsigned long memend);
 
-extern unsigned long free_all_bootmem_node(pg_data_t *pgdat);
 extern unsigned long free_all_bootmem(void);
+extern void reset_all_zones_managed_pages(void);
 
 extern void free_bootmem_node(pg_data_t *pgdat,
                               unsigned long addr,
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 9e52b0626b39..d77797a52b7b 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -36,6 +36,7 @@ enum bh_state_bits {
         BH_Quiet,       /* Buffer Error Prinks to be quiet */
         BH_Meta,        /* Buffer contains metadata */
         BH_Prio,        /* Buffer should be submitted with REQ_PRIO */
+        BH_Defer_Completion, /* Defer AIO completion to workqueue */
 
         BH_PrivateStart,/* not a state bit, but the first bit available
                          * for private allocation by other entities
@@ -128,6 +129,7 @@ BUFFER_FNS(Write_EIO, write_io_error)
 BUFFER_FNS(Unwritten, unwritten)
 BUFFER_FNS(Meta, meta)
 BUFFER_FNS(Prio, prio)
+BUFFER_FNS(Defer_Completion, defer_completion)
 
 #define bh_offset(bh)           ((unsigned long)(bh)->b_data & ~PAGE_MASK)
 
@@ -139,6 +141,9 @@ BUFFER_FNS(Prio, prio)
         })
 #define page_has_buffers(page)  PagePrivate(page)
 
+void buffer_check_dirty_writeback(struct page *page,
+                                     bool *dirty, bool *writeback);
+
 /*
  * Declarations
  */
@@ -198,7 +203,8 @@ extern int buffer_heads_over_limit;
  * Generic address_space_operations implementations for buffer_head-backed
  * address_spaces.
  */
-void block_invalidatepage(struct page *page, unsigned long offset);
+void block_invalidatepage(struct page *page, unsigned int offset,
+                          unsigned int length);
 int block_write_full_page(struct page *page, get_block_t *get_block,
                                 struct writeback_control *wbc);
 int block_write_full_page_endio(struct page *page, get_block_t *get_block,
diff --git a/include/linux/can/platform/flexcan.h b/include/linux/can/platform/flexcan.h
deleted file mode 100644
index 72b713ab57e9..000000000000
--- a/include/linux/can/platform/flexcan.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2010 Marc Kleine-Budde <kernel@pengutronix.de>
- *
- * This file is released under the GPLv2
- *
- */
-
-#ifndef __CAN_PLATFORM_FLEXCAN_H
-#define __CAN_PLATFORM_FLEXCAN_H
-
-/**
- * struct flexcan_platform_data - flex CAN controller platform data
- * @transceiver_enable:         - called to power on/off the transceiver
- *
- */
-struct flexcan_platform_data {
-        void (*transceiver_switch)(int enable);
-};
-
-#endif /* __CAN_PLATFORM_FLEXCAN_H */
diff --git a/include/linux/can/platform/mcp251x.h b/include/linux/can/platform/mcp251x.h
index 089fe43211a4..dc029dba7a03 100644
--- a/include/linux/can/platform/mcp251x.h
+++ b/include/linux/can/platform/mcp251x.h
@@ -9,26 +9,13 @@
 
 #include <linux/spi/spi.h>
 
-/**
+/*
  * struct mcp251x_platform_data - MCP251X SPI CAN controller platform data
  * @oscillator_frequency:       - oscillator frequency in Hz
- * @irq_flags:                  - IRQF configuration flags
- * @board_specific_setup:       - called before probing the chip (power,reset)
- * @transceiver_enable:         - called to power on/off the transceiver
- * @power_enable:               - called to power on/off the mcp *and* the
- *                                transceiver
- *
- * Please note that you should define power_enable or transceiver_enable or
- * none of them. Defining both of them is no use.
- *
  */
 
 struct mcp251x_platform_data {
         unsigned long oscillator_frequency;
-        unsigned long irq_flags;
-        int (*board_specific_setup)(struct spi_device *spi);
-        int (*transceiver_enable)(int enable);
-        int (*power_enable) (int enable);
 };
 
 #endif /* __CAN_PLATFORM_MCP251X_H__ */
diff --git a/include/linux/capability.h b/include/linux/capability.h
index d9a4f7f40f32..a6ee1f9a5018 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -210,7 +210,6 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
                                       struct user_namespace *ns, int cap);
 extern bool capable(int cap);
 extern bool ns_capable(struct user_namespace *ns, int cap);
-extern bool nsown_capable(int cap);
 extern bool inode_capable(const struct inode *inode, int cap);
 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
 
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 379f71508995..0442c3d800f0 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -160,11 +160,6 @@ static inline void ceph_decode_timespec(struct timespec *ts,
 static inline void ceph_encode_timespec(struct ceph_timespec *tv,
                                         const struct timespec *ts)
 {
-        BUG_ON(ts->tv_sec < 0);
-        BUG_ON(ts->tv_sec > (__kernel_time_t)U32_MAX);
-        BUG_ON(ts->tv_nsec < 0);
-        BUG_ON(ts->tv_nsec > (long)U32_MAX);
-
         tv->tv_sec = cpu_to_le32((u32)ts->tv_sec);
         tv->tv_nsec = cpu_to_le32((u32)ts->tv_nsec);
 }
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 186db0bf4951..8f47625a0661 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -145,7 +145,6 @@ struct ceph_osd_request {
         s32               r_reply_op_result[CEPH_OSD_MAX_OP];
         int               r_got_reply;
         int               r_linger;
-        int               r_completed;
 
         struct ceph_osd_client *r_osdc;
         struct kref       r_kref;
@@ -336,6 +335,8 @@ extern int ceph_osdc_wait_request(struct ceph_osd_client *osdc,
                                   struct ceph_osd_request *req);
 extern void ceph_osdc_sync(struct ceph_osd_client *osdc);
 
+extern void ceph_osdc_flush_notifies(struct ceph_osd_client *osdc);
+
 extern int ceph_osdc_readpages(struct ceph_osd_client *osdc,
                                struct ceph_vino vino,
                                struct ceph_file_layout *layout,
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 8bda1294c035..3561d305b1e0 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -20,6 +20,7 @@
 #include <linux/workqueue.h>
 #include <linux/xattr.h>
 #include <linux/fs.h>
+#include <linux/percpu-refcount.h>
 
 #ifdef CONFIG_CGROUPS
 
@@ -65,27 +66,25 @@ enum cgroup_subsys_id {
 
 /* Per-subsystem/per-cgroup state maintained by the system. */
 struct cgroup_subsys_state {
-        /*
-         * The cgroup that this subsystem is attached to. Useful
-         * for subsystems that want to know about the cgroup
-         * hierarchy structure
-         */
+        /* the cgroup that this css is attached to */
         struct cgroup *cgroup;
 
-        /*
-         * State maintained by the cgroup system to allow subsystems
-         * to be "busy". Should be accessed via css_get(),
-         * css_tryget() and css_put().
-         */
+        /* the cgroup subsystem that this css is attached to */
+        struct cgroup_subsys *ss;
+
+        /* reference count - access via css_[try]get() and css_put() */
+        struct percpu_ref refcnt;
 
-        atomic_t refcnt;
+        /* the parent css */
+        struct cgroup_subsys_state *parent;
 
         unsigned long flags;
         /* ID for this css, if possible */
         struct css_id __rcu *id;
 
-        /* Used to put @cgroup->dentry on the last css_put() */
-        struct work_struct dput_work;
+        /* percpu_ref killing and RCU release */
+        struct rcu_head rcu_head;
+        struct work_struct destroy_work;
 };
 
 /* bits in struct cgroup_subsys_state flags field */
@@ -94,56 +93,52 @@ enum {
         CSS_ONLINE      = (1 << 1), /* between ->css_online() and ->css_offline() */
 };
 
-/* Caller must verify that the css is not for root cgroup */
-static inline void __css_get(struct cgroup_subsys_state *css, int count)
-{
-        atomic_add(count, &css->refcnt);
-}
-
-/*
- * Call css_get() to hold a reference on the css; it can be used
- * for a reference obtained via:
- * - an existing ref-counted reference to the css
- * - task->cgroups for a locked task
+/**
+ * css_get - obtain a reference on the specified css
+ * @css: target css
+ *
+ * The caller must already have a reference.
  */
-
 static inline void css_get(struct cgroup_subsys_state *css)
 {
         /* We don't need to reference count the root state */
         if (!(css->flags & CSS_ROOT))
-                __css_get(css, 1);
+                percpu_ref_get(&css->refcnt);
 }
 
-/*
- * Call css_tryget() to take a reference on a css if your existing
- * (known-valid) reference isn't already ref-counted. Returns false if
- * the css has been destroyed.
+/**
+ * css_tryget - try to obtain a reference on the specified css
+ * @css: target css
+ *
+ * Obtain a reference on @css if it's alive.  The caller naturally needs to
+ * ensure that @css is accessible but doesn't have to be holding a
+ * reference on it - IOW, RCU protected access is good enough for this
+ * function.  Returns %true if a reference count was successfully obtained;
+ * %false otherwise.
  */
-
-extern bool __css_tryget(struct cgroup_subsys_state *css);
 static inline bool css_tryget(struct cgroup_subsys_state *css)
 {
         if (css->flags & CSS_ROOT)
                 return true;
-        return __css_tryget(css);
+        return percpu_ref_tryget(&css->refcnt);
 }
 
-/*
- * css_put() should be called to release a reference taken by
- * css_get() or css_tryget()
+/**
+ * css_put - put a css reference
+ * @css: target css
+ *
+ * Put a reference obtained via css_get() and css_tryget().
  */
-
-extern void __css_put(struct cgroup_subsys_state *css);
 static inline void css_put(struct cgroup_subsys_state *css)
 {
         if (!(css->flags & CSS_ROOT))
-                __css_put(css);
+                percpu_ref_put(&css->refcnt);
 }
 
 /* bits in struct cgroup flags field */
 enum {
         /* Control Group is dead */
-        CGRP_REMOVED,
+        CGRP_DEAD,
         /*
          * Control Group has previously had a child cgroup or a task,
          * but no longer (only if CGRP_NOTIFY_ON_RELEASE is set)
@@ -170,12 +165,15 @@ struct cgroup {
         unsigned long flags;            /* "unsigned long" so bitops work */
 
         /*
-         * count users of this cgroup. >0 means busy, but doesn't
-         * necessarily indicate the number of tasks in the cgroup
+         * idr allocated in-hierarchy ID.
+         *
+         * The ID of the root cgroup is always 0, and a new cgroup
+         * will be assigned with a smallest available ID.
          */
-        atomic_t count;
+        int id;
 
-        int id;                         /* ida allocated in-hierarchy ID */
+        /* the number of attached css's */
+        int nr_css;
 
         /*
          * We link our 'sibling' struct into our parent's 'children'.
@@ -189,6 +187,14 @@ struct cgroup {
         struct dentry *dentry;          /* cgroup fs entry, RCU protected */
 
         /*
+         * Monotonically increasing unique serial number which defines a
+         * uniform order among all cgroups.  It's guaranteed that all
+         * ->children lists are in the ascending order of ->serial_nr.
+         * It's used to allow interrupting and resuming iterations.
+         */
+        u64 serial_nr;
+
+        /*
          * This is a copy of dentry->d_name, and it's needed because
          * we can't use dentry->d_name in cgroup_path().
          *
@@ -202,18 +208,15 @@ struct cgroup {
         struct cgroup_name __rcu *name;
 
         /* Private pointers for each registered subsystem */
-        struct cgroup_subsys_state *subsys[CGROUP_SUBSYS_COUNT];
+        struct cgroup_subsys_state __rcu *subsys[CGROUP_SUBSYS_COUNT];
 
         struct cgroupfs_root *root;
 
         /*
-         * List of cg_cgroup_links pointing at css_sets with
-         * tasks in this cgroup. Protected by css_set_lock
+         * List of cgrp_cset_links pointing at css_sets with tasks in this
+         * cgroup.  Protected by css_set_lock.
          */
-        struct list_head css_sets;
-
-        struct list_head allcg_node;    /* cgroupfs_root->allcg_list */
-        struct list_head cft_q_node;    /* used during cftype add/rm */
+        struct list_head cset_links;
 
         /*
          * Linked list running through all cgroups that can
@@ -229,9 +232,12 @@ struct cgroup {
         struct list_head pidlists;
         struct mutex pidlist_mutex;
 
-        /* For RCU-protected deletion */
+        /* dummy css with NULL ->ss, points back to this cgroup */
+        struct cgroup_subsys_state dummy_css;
+
+        /* For css percpu_ref killing and RCU-protected deletion */
         struct rcu_head rcu_head;
-        struct work_struct free_work;
+        struct work_struct destroy_work;
 
         /* List of events which userspace want to receive */
         struct list_head event_list;
@@ -269,18 +275,35 @@ enum {
          *
          * - Remount is disallowed.
          *
+         * - rename(2) is disallowed.
+         *
+         * - "tasks" is removed.  Everything should be at process
+         *   granularity.  Use "cgroup.procs" instead.
+         *
+         * - "release_agent" and "notify_on_release" are removed.
+         *   Replacement notification mechanism will be implemented.
+         *
+         * - cpuset: tasks will be kept in empty cpusets when hotplug happens
+         *   and take masks of ancestors with non-empty cpus/mems, instead of
+         *   being moved to an ancestor.
+         *
+         * - cpuset: a task can be moved into an empty cpuset, and again it
+         *   takes masks of ancestors.
+         *
          * - memcg: use_hierarchy is on by default and the cgroup file for
          *   the flag is not created.
          *
-         * The followings are planned changes.
-         *
-         * - release_agent will be disallowed once replacement notification
-         *   mechanism is implemented.
+         * - blkcg: blk-throttle becomes properly hierarchical.
          */
         CGRP_ROOT_SANE_BEHAVIOR = (1 << 0),
 
         CGRP_ROOT_NOPREFIX      = (1 << 1), /* mounted subsystems have no named prefix */
         CGRP_ROOT_XATTR         = (1 << 2), /* supports extended attributes */
+
+        /* mount options live below bit 16 */
+        CGRP_ROOT_OPTION_MASK   = (1 << 16) - 1,
+
+        CGRP_ROOT_SUBSYS_BOUND  = (1 << 16), /* subsystems finished binding */
 };
 
 /*
@@ -291,18 +314,12 @@ enum {
 struct cgroupfs_root {
         struct super_block *sb;
 
-        /*
-         * The bitmask of subsystems intended to be attached to this
-         * hierarchy
-         */
+        /* The bitmask of subsystems attached to this hierarchy */
         unsigned long subsys_mask;
 
         /* Unique id for this hierarchy. */
         int hierarchy_id;
 
-        /* The bitmask of subsystems currently attached to this hierarchy */
-        unsigned long actual_subsys_mask;
-
         /* A list running through the attached subsystems */
         struct list_head subsys_list;
 
@@ -315,14 +332,11 @@ struct cgroupfs_root {
         /* A list running through the active hierarchies */
         struct list_head root_list;
 
-        /* All cgroups on this root, cgroup_mutex protected */
-        struct list_head allcg_list;
-
         /* Hierarchy-specific flags */
         unsigned long flags;
 
         /* IDs for cgroups in this hierarchy */
-        struct ida cgroup_ida;
+        struct idr cgroup_idr;
 
         /* The path to use for release notifications. */
         char release_agent_path[PATH_MAX];
@@ -357,11 +371,10 @@ struct css_set {
         struct list_head tasks;
 
         /*
-         * List of cg_cgroup_link objects on link chains from
-         * cgroups referenced from this css_set. Protected by
-         * css_set_lock
+         * List of cgrp_cset_links pointing at cgroups referenced from this
+         * css_set.  Protected by css_set_lock.
          */
-        struct list_head cg_links;
+        struct list_head cgrp_links;
 
         /*
          * Set of subsystem states, one for each subsystem. This array
@@ -394,9 +407,12 @@ struct cgroup_map_cb {
  */
 
 /* cftype->flags */
-#define CFTYPE_ONLY_ON_ROOT     (1U << 0)       /* only create on root cg */
-#define CFTYPE_NOT_ON_ROOT      (1U << 1)       /* don't create on root cg */
-#define CFTYPE_INSANE           (1U << 2)       /* don't create if sane_behavior */
+enum {
+        CFTYPE_ONLY_ON_ROOT     = (1 << 0),     /* only create on root cgrp */
+        CFTYPE_NOT_ON_ROOT      = (1 << 1),     /* don't create on root cgrp */
+        CFTYPE_INSANE           = (1 << 2),     /* don't create if sane_behavior */
+        CFTYPE_NO_PREFIX        = (1 << 3),     /* (DON'T USE FOR NEW FILES) no subsys prefix */
+};
 
 #define MAX_CFTYPE_NAME         64
 
@@ -423,35 +439,41 @@ struct cftype {
         /* CFTYPE_* flags */
         unsigned int flags;
 
+        /*
+         * The subsys this file belongs to.  Initialized automatically
+         * during registration.  NULL for cgroup core files.
+         */
+        struct cgroup_subsys *ss;
+
         int (*open)(struct inode *inode, struct file *file);
-        ssize_t (*read)(struct cgroup *cgrp, struct cftype *cft,
+        ssize_t (*read)(struct cgroup_subsys_state *css, struct cftype *cft,
                         struct file *file,
                         char __user *buf, size_t nbytes, loff_t *ppos);
         /*
          * read_u64() is a shortcut for the common case of returning a
          * single integer. Use it in place of read()
          */
-        u64 (*read_u64)(struct cgroup *cgrp, struct cftype *cft);
+        u64 (*read_u64)(struct cgroup_subsys_state *css, struct cftype *cft);
         /*
          * read_s64() is a signed version of read_u64()
          */
-        s64 (*read_s64)(struct cgroup *cgrp, struct cftype *cft);
+        s64 (*read_s64)(struct cgroup_subsys_state *css, struct cftype *cft);
         /*
          * read_map() is used for defining a map of key/value
          * pairs. It should call cb->fill(cb, key, value) for each
          * entry. The key/value pairs (and their ordering) should not
          * change between reboots.
          */
-        int (*read_map)(struct cgroup *cont, struct cftype *cft,
+        int (*read_map)(struct cgroup_subsys_state *css, struct cftype *cft,
                         struct cgroup_map_cb *cb);
         /*
          * read_seq_string() is used for outputting a simple sequence
          * using seqfile.
          */
-        int (*read_seq_string)(struct cgroup *cont, struct cftype *cft,
-                               struct seq_file *m);
+        int (*read_seq_string)(struct cgroup_subsys_state *css,
+                               struct cftype *cft, struct seq_file *m);
 
-        ssize_t (*write)(struct cgroup *cgrp, struct cftype *cft,
+        ssize_t (*write)(struct cgroup_subsys_state *css, struct cftype *cft,
                          struct file *file,
                          const char __user *buf, size_t nbytes, loff_t *ppos);
 
@@ -460,18 +482,20 @@ struct cftype {
          * a single integer (as parsed by simple_strtoull) from
          * userspace. Use in place of write(); return 0 or error.
          */
-        int (*write_u64)(struct cgroup *cgrp, struct cftype *cft, u64 val);
+        int (*write_u64)(struct cgroup_subsys_state *css, struct cftype *cft,
+                         u64 val);
         /*
          * write_s64() is a signed version of write_u64()
          */
-        int (*write_s64)(struct cgroup *cgrp, struct cftype *cft, s64 val);
+        int (*write_s64)(struct cgroup_subsys_state *css, struct cftype *cft,
+                         s64 val);
 
         /*
          * write_string() is passed a nul-terminated kernelspace
          * buffer of maximum length determined by max_write_len.
          * Returns 0 or -ve error code.
          */
-        int (*write_string)(struct cgroup *cgrp, struct cftype *cft,
+        int (*write_string)(struct cgroup_subsys_state *css, struct cftype *cft,
                             const char *buffer);
         /*
          * trigger() callback can be used to get some kick from the
@@ -479,7 +503,7 @@ struct cftype {
          * at all. The private field can be used to determine the
          * kick type for multiplexing.
          */
-        int (*trigger)(struct cgroup *cgrp, unsigned int event);
+        int (*trigger)(struct cgroup_subsys_state *css, unsigned int event);
 
         int (*release)(struct inode *inode, struct file *file);
 
@@ -489,16 +513,18 @@ struct cftype {
          * you want to provide this functionality. Use eventfd_signal()
          * on eventfd to send notification to userspace.
          */
-        int (*register_event)(struct cgroup *cgrp, struct cftype *cft,
-                        struct eventfd_ctx *eventfd, const char *args);
+        int (*register_event)(struct cgroup_subsys_state *css,
+                              struct cftype *cft, struct eventfd_ctx *eventfd,
+                              const char *args);
         /*
          * unregister_event() callback will be called when userspace
          * closes the eventfd or on cgroup removing.
          * This callback must be implemented, if you want provide
          * notification functionality.
          */
-        void (*unregister_event)(struct cgroup *cgrp, struct cftype *cft,
-                        struct eventfd_ctx *eventfd);
+        void (*unregister_event)(struct cgroup_subsys_state *css,
+                                 struct cftype *cft,
+                                 struct eventfd_ctx *eventfd);
 };
 
 /*
@@ -511,15 +537,6 @@ struct cftype_set {
         struct cftype                   *cfts;
 };
 
-struct cgroup_scanner {
-        struct cgroup *cg;
-        int (*test_task)(struct task_struct *p, struct cgroup_scanner *scan);
-        void (*process_task)(struct task_struct *p,
-                        struct cgroup_scanner *scan);
-        struct ptr_heap *heap;
-        void *data;
-};
-
 /*
  * See the comment above CGRP_ROOT_SANE_BEHAVIOR for details.  This
  * function can be called as long as @cgrp is accessible.
@@ -536,12 +553,12 @@ static inline const char *cgroup_name(const struct cgroup *cgrp)
 }
 
 int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
-int cgroup_rm_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
+int cgroup_rm_cftypes(struct cftype *cfts);
 
-int cgroup_is_removed(const struct cgroup *cgrp);
 bool cgroup_is_descendant(struct cgroup *cgrp, struct cgroup *ancestor);
 
 int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen);
+int task_cgroup_path(struct task_struct *task, char *buf, size_t buflen);
 
 int cgroup_task_count(const struct cgroup *cgrp);
 
@@ -552,20 +569,22 @@ int cgroup_task_count(const struct cgroup *cgrp);
 struct cgroup_taskset;
 struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset);
 struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset);
-struct cgroup *cgroup_taskset_cur_cgroup(struct cgroup_taskset *tset);
+struct cgroup_subsys_state *cgroup_taskset_cur_css(struct cgroup_taskset *tset,
+                                                   int subsys_id);
 int cgroup_taskset_size(struct cgroup_taskset *tset);
 
 /**
  * cgroup_taskset_for_each - iterate cgroup_taskset
  * @task: the loop cursor
- * @skip_cgrp: skip if task's cgroup matches this, %NULL to iterate through all
+ * @skip_css: skip if task's css matches this, %NULL to iterate through all
  * @tset: taskset to iterate
  */
-#define cgroup_taskset_for_each(task, skip_cgrp, tset)                  \
+#define cgroup_taskset_for_each(task, skip_css, tset)                   \
         for ((task) = cgroup_taskset_first((tset)); (task);             \
              (task) = cgroup_taskset_next((tset)))                      \
-                if (!(skip_cgrp) ||                                     \
-                    cgroup_taskset_cur_cgroup((tset)) != (skip_cgrp))
+                if (!(skip_css) ||                                      \
+                    cgroup_taskset_cur_css((tset),                      \
+                        (skip_css)->ss->subsys_id) != (skip_css))
 
 /*
  * Control Group subsystem type.
@@ -573,18 +592,22 @@ int cgroup_taskset_size(struct cgroup_taskset *tset);
  */
 
 struct cgroup_subsys {
-        struct cgroup_subsys_state *(*css_alloc)(struct cgroup *cgrp);
-        int (*css_online)(struct cgroup *cgrp);
-        void (*css_offline)(struct cgroup *cgrp);
-        void (*css_free)(struct cgroup *cgrp);
-
-        int (*can_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);
-        void (*cancel_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);
-        void (*attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);
+        struct cgroup_subsys_state *(*css_alloc)(struct cgroup_subsys_state *parent_css);
+        int (*css_online)(struct cgroup_subsys_state *css);
+        void (*css_offline)(struct cgroup_subsys_state *css);
+        void (*css_free)(struct cgroup_subsys_state *css);
+
+        int (*can_attach)(struct cgroup_subsys_state *css,
+                          struct cgroup_taskset *tset);
+        void (*cancel_attach)(struct cgroup_subsys_state *css,
+                              struct cgroup_taskset *tset);
+        void (*attach)(struct cgroup_subsys_state *css,
+                       struct cgroup_taskset *tset);
         void (*fork)(struct task_struct *task);
-        void (*exit)(struct cgroup *cgrp, struct cgroup *old_cgrp,
+        void (*exit)(struct cgroup_subsys_state *css,
+                     struct cgroup_subsys_state *old_css,
                      struct task_struct *task);
-        void (*bind)(struct cgroup *root);
+        void (*bind)(struct cgroup_subsys_state *root_css);
 
         int subsys_id;
         int disabled;
@@ -640,95 +663,153 @@ struct cgroup_subsys {
 #undef IS_SUBSYS_ENABLED
 #undef SUBSYS
 
-static inline struct cgroup_subsys_state *cgroup_subsys_state(
-        struct cgroup *cgrp, int subsys_id)
+/**
+ * css_parent - find the parent css
+ * @css: the target cgroup_subsys_state
+ *
+ * Return the parent css of @css.  This function is guaranteed to return
+ * non-NULL parent as long as @css isn't the root.
+ */
+static inline
+struct cgroup_subsys_state *css_parent(struct cgroup_subsys_state *css)
 {
-        return cgrp->subsys[subsys_id];
+        return css->parent;
 }
 
-/*
- * function to get the cgroup_subsys_state which allows for extra
- * rcu_dereference_check() conditions, such as locks used during the
- * cgroup_subsys::attach() methods.
+/**
+ * task_css_set_check - obtain a task's css_set with extra access conditions
+ * @task: the task to obtain css_set for
+ * @__c: extra condition expression to be passed to rcu_dereference_check()
+ *
+ * A task's css_set is RCU protected, initialized and exited while holding
+ * task_lock(), and can only be modified while holding both cgroup_mutex
+ * and task_lock() while the task is alive.  This macro verifies that the
+ * caller is inside proper critical section and returns @task's css_set.
+ *
+ * The caller can also specify additional allowed conditions via @__c, such
+ * as locks used during the cgroup_subsys::attach() methods.
  */
 #ifdef CONFIG_PROVE_RCU
 extern struct mutex cgroup_mutex;
-#define task_subsys_state_check(task, subsys_id, __c)                   \
-        rcu_dereference_check((task)->cgroups->subsys[(subsys_id)],     \
-                              lockdep_is_held(&(task)->alloc_lock) ||   \
-                              lockdep_is_held(&cgroup_mutex) || (__c))
+#define task_css_set_check(task, __c)                                   \
+        rcu_dereference_check((task)->cgroups,                          \
+                lockdep_is_held(&(task)->alloc_lock) ||                 \
+                lockdep_is_held(&cgroup_mutex) || (__c))
 #else
-#define task_subsys_state_check(task, subsys_id, __c)                   \
-        rcu_dereference((task)->cgroups->subsys[(subsys_id)])
+#define task_css_set_check(task, __c)                                   \
+        rcu_dereference((task)->cgroups)
 #endif
 
-static inline struct cgroup_subsys_state *
-task_subsys_state(struct task_struct *task, int subsys_id)
+/**
+ * task_css_check - obtain css for (task, subsys) w/ extra access conds
+ * @task: the target task
+ * @subsys_id: the target subsystem ID
+ * @__c: extra condition expression to be passed to rcu_dereference_check()
+ *
+ * Return the cgroup_subsys_state for the (@task, @subsys_id) pair.  The
+ * synchronization rules are the same as task_css_set_check().
+ */
+#define task_css_check(task, subsys_id, __c)                            \
+        task_css_set_check((task), (__c))->subsys[(subsys_id)]
+
+/**
+ * task_css_set - obtain a task's css_set
+ * @task: the task to obtain css_set for
+ *
+ * See task_css_set_check().
+ */
+static inline struct css_set *task_css_set(struct task_struct *task)
 {
-        return task_subsys_state_check(task, subsys_id, false);
+        return task_css_set_check(task, false);
 }
 
-static inline struct cgroup* task_cgroup(struct task_struct *task,
-                                               int subsys_id)
+/**
+ * task_css - obtain css for (task, subsys)
+ * @task: the target task
+ * @subsys_id: the target subsystem ID
+ *
+ * See task_css_check().
+ */
+static inline struct cgroup_subsys_state *task_css(struct task_struct *task,
+                                                   int subsys_id)
+{
+        return task_css_check(task, subsys_id, false);
+}
+
+static inline struct cgroup *task_cgroup(struct task_struct *task,
+                                         int subsys_id)
 {
-        return task_subsys_state(task, subsys_id)->cgroup;
+        return task_css(task, subsys_id)->cgroup;
 }
 
+struct cgroup_subsys_state *css_next_child(struct cgroup_subsys_state *pos,
+                                           struct cgroup_subsys_state *parent);
+
+struct cgroup_subsys_state *css_from_id(int id, struct cgroup_subsys *ss);
+
 /**
- * cgroup_for_each_child - iterate through children of a cgroup
- * @pos: the cgroup * to use as the loop cursor
- * @cgroup: cgroup whose children to walk
+ * css_for_each_child - iterate through children of a css
+ * @pos: the css * to use as the loop cursor
+ * @parent: css whose children to walk
  *
- * Walk @cgroup's children.  Must be called under rcu_read_lock().  A child
- * cgroup which hasn't finished ->css_online() or already has finished
+ * Walk @parent's children.  Must be called under rcu_read_lock().  A child
+ * css which hasn't finished ->css_online() or already has finished
  * ->css_offline() may show up during traversal and it's each subsystem's
  * responsibility to verify that each @pos is alive.
  *
  * If a subsystem synchronizes against the parent in its ->css_online() and
- * before starting iterating, a cgroup which finished ->css_online() is
+ * before starting iterating, a css which finished ->css_online() is
  * guaranteed to be visible in the future iterations.
+ *
+ * It is allowed to temporarily drop RCU read lock during iteration.  The
+ * caller is responsible for ensuring that @pos remains accessible until
+ * the start of the next iteration by, for example, bumping the css refcnt.
  */
-#define cgroup_for_each_child(pos, cgroup)                              \
-        list_for_each_entry_rcu(pos, &(cgroup)->children, sibling)
+#define css_for_each_child(pos, parent)                                 \
+        for ((pos) = css_next_child(NULL, (parent)); (pos);             \
+             (pos) = css_next_child((pos), (parent)))
+
+struct cgroup_subsys_state *
+css_next_descendant_pre(struct cgroup_subsys_state *pos,
+                        struct cgroup_subsys_state *css);
 
-struct cgroup *cgroup_next_descendant_pre(struct cgroup *pos,
-                                          struct cgroup *cgroup);
-struct cgroup *cgroup_rightmost_descendant(struct cgroup *pos);
+struct cgroup_subsys_state *
+css_rightmost_descendant(struct cgroup_subsys_state *pos);
 
 /**
- * cgroup_for_each_descendant_pre - pre-order walk of a cgroup's descendants
- * @pos: the cgroup * to use as the loop cursor
- * @cgroup: cgroup whose descendants to walk
+ * css_for_each_descendant_pre - pre-order walk of a css's descendants
+ * @pos: the css * to use as the loop cursor
+ * @root: css whose descendants to walk
  *
- * Walk @cgroup's descendants.  Must be called under rcu_read_lock().  A
- * descendant cgroup which hasn't finished ->css_online() or already has
+ * Walk @root's descendants.  @root is included in the iteration and the
+ * first node to be visited.  Must be called under rcu_read_lock().  A
+ * descendant css which hasn't finished ->css_online() or already has
  * finished ->css_offline() may show up during traversal and it's each
  * subsystem's responsibility to verify that each @pos is alive.
  *
  * If a subsystem synchronizes against the parent in its ->css_online() and
  * before starting iterating, and synchronizes against @pos on each
- * iteration, any descendant cgroup which finished ->css_online() is
+ * iteration, any descendant css which finished ->css_online() is
  * guaranteed to be visible in the future iterations.
  *
  * In other words, the following guarantees that a descendant can't escape
  * state updates of its ancestors.
  *
- * my_online(@cgrp)
+ * my_online(@css)
  * {
- *      Lock @cgrp->parent and @cgrp;
- *      Inherit state from @cgrp->parent;
+ *      Lock @css's parent and @css;
+ *      Inherit state from the parent;
  *      Unlock both.
  * }
  *
- * my_update_state(@cgrp)
+ * my_update_state(@css)
  * {
- *      Lock @cgrp;
- *      Update @cgrp's state;
- *      Unlock @cgrp;
- *
- *      cgroup_for_each_descendant_pre(@pos, @cgrp) {
+ *      css_for_each_descendant_pre(@pos, @css) {
  *              Lock @pos;
- *              Verify @pos is alive and inherit state from @pos->parent;
+ *              if (@pos == @css)
+ *                      Update @css's state;
+ *              else
+ *                      Verify @pos is alive and inherit state from its parent;
  *              Unlock @pos;
  *      }
  * }
@@ -739,8 +820,7 @@ struct cgroup *cgroup_rightmost_descendant(struct cgroup *pos);
  * visible by walking order and, as long as inheriting operations to the
  * same @pos are atomic to each other, multiple updates racing each other
  * still result in the correct state.  It's guaranateed that at least one
- * inheritance happens for any cgroup after the latest update to its
- * parent.
+ * inheritance happens for any css after the latest update to its parent.
  *
  * If checking parent's state requires locking the parent, each inheriting
  * iteration should lock and unlock both @pos->parent and @pos.
@@ -748,53 +828,50 @@ struct cgroup *cgroup_rightmost_descendant(struct cgroup *pos);
  * Alternatively, a subsystem may choose to use a single global lock to
  * synchronize ->css_online() and ->css_offline() against tree-walking
  * operations.
+ *
+ * It is allowed to temporarily drop RCU read lock during iteration.  The
+ * caller is responsible for ensuring that @pos remains accessible until
+ * the start of the next iteration by, for example, bumping the css refcnt.
  */
-#define cgroup_for_each_descendant_pre(pos, cgroup)                     \
-        for (pos = cgroup_next_descendant_pre(NULL, (cgroup)); (pos);   \
-             pos = cgroup_next_descendant_pre((pos), (cgroup)))
+#define css_for_each_descendant_pre(pos, css)                           \
+        for ((pos) = css_next_descendant_pre(NULL, (css)); (pos);       \
+             (pos) = css_next_descendant_pre((pos), (css)))
 
-struct cgroup *cgroup_next_descendant_post(struct cgroup *pos,
-                                           struct cgroup *cgroup);
+struct cgroup_subsys_state *
+css_next_descendant_post(struct cgroup_subsys_state *pos,
+                         struct cgroup_subsys_state *css);
 
 /**
- * cgroup_for_each_descendant_post - post-order walk of a cgroup's descendants
- * @pos: the cgroup * to use as the loop cursor
- * @cgroup: cgroup whose descendants to walk
+ * css_for_each_descendant_post - post-order walk of a css's descendants
+ * @pos: the css * to use as the loop cursor
+ * @css: css whose descendants to walk
  *
- * Similar to cgroup_for_each_descendant_pre() but performs post-order
- * traversal instead.  Note that the walk visibility guarantee described in
- * pre-order walk doesn't apply the same to post-order walks.
+ * Similar to css_for_each_descendant_pre() but performs post-order
+ * traversal instead.  @root is included in the iteration and the last
+ * node to be visited.  Note that the walk visibility guarantee described
+ * in pre-order walk doesn't apply the same to post-order walks.
  */
-#define cgroup_for_each_descendant_post(pos, cgroup)                    \
-        for (pos = cgroup_next_descendant_post(NULL, (cgroup)); (pos);  \
-             pos = cgroup_next_descendant_post((pos), (cgroup)))
-
-/* A cgroup_iter should be treated as an opaque object */
-struct cgroup_iter {
-        struct list_head *cg_link;
-        struct list_head *task;
+#define css_for_each_descendant_post(pos, css)                          \
+        for ((pos) = css_next_descendant_post(NULL, (css)); (pos);      \
+             (pos) = css_next_descendant_post((pos), (css)))
+
+/* A css_task_iter should be treated as an opaque object */
+struct css_task_iter {
+        struct cgroup_subsys_state      *origin_css;
+        struct list_head                *cset_link;
+        struct list_head                *task;
 };
 
-/*
- * To iterate across the tasks in a cgroup:
- *
- * 1) call cgroup_iter_start to initialize an iterator
- *
- * 2) call cgroup_iter_next() to retrieve member tasks until it
- *    returns NULL or until you want to end the iteration
- *
- * 3) call cgroup_iter_end() to destroy the iterator.
- *
- * Or, call cgroup_scan_tasks() to iterate through every task in a
- * cgroup - cgroup_scan_tasks() holds the css_set_lock when calling
- * the test_task() callback, but not while calling the process_task()
- * callback.
- */
-void cgroup_iter_start(struct cgroup *cgrp, struct cgroup_iter *it);
-struct task_struct *cgroup_iter_next(struct cgroup *cgrp,
-                                        struct cgroup_iter *it);
-void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it);
-int cgroup_scan_tasks(struct cgroup_scanner *scan);
+void css_task_iter_start(struct cgroup_subsys_state *css,
+                         struct css_task_iter *it);
+struct task_struct *css_task_iter_next(struct css_task_iter *it);
+void css_task_iter_end(struct css_task_iter *it);
+
+int css_scan_tasks(struct cgroup_subsys_state *css,
+                   bool (*test)(struct task_struct *, void *),
+                   void (*process)(struct task_struct *, void *),
+                   void *data, struct ptr_heap *heap);
+
 int cgroup_attach_task_all(struct task_struct *from, struct task_struct *);
 int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from);
 
@@ -827,8 +904,8 @@ bool css_is_ancestor(struct cgroup_subsys_state *cg,
 
 /* Get id and depth of css */
 unsigned short css_id(struct cgroup_subsys_state *css);
-unsigned short css_depth(struct cgroup_subsys_state *css);
-struct cgroup_subsys_state *cgroup_css_from_dir(struct file *f, int id);
+struct cgroup_subsys_state *css_from_dir(struct dentry *dentry,
+                                         struct cgroup_subsys *ss);
 
 #else /* !CONFIG_CGROUPS */
 
@@ -838,8 +915,6 @@ static inline void cgroup_fork(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) {}
 
-static inline void cgroup_lock(void) {}
-static inline void cgroup_unlock(void) {}
 static inline int cgroupstats_build(struct cgroupstats *stats,
                                         struct dentry *dentry)
 {
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index 6e7ec64b69ab..b613ffd402d1 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -1,86 +1,55 @@
-/* Add subsystem definitions of the form SUBSYS(<name>) in this
- * file. Surround each one by a line of comment markers so that
- * patches don't collide
+/*
+ * List of cgroup subsystems.
+ *
+ * DO NOT ADD ANY SUBSYSTEM WITHOUT EXPLICIT ACKS FROM CGROUP MAINTAINERS.
  */
-
-/* */
-
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_CPUSETS)
 SUBSYS(cpuset)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_DEBUG)
 SUBSYS(debug)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_SCHED)
 SUBSYS(cpu_cgroup)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_CPUACCT)
 SUBSYS(cpuacct)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_MEMCG)
 SUBSYS(mem_cgroup)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_DEVICE)
 SUBSYS(devices)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_FREEZER)
 SUBSYS(freezer)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_NET_CLS_CGROUP)
 SUBSYS(net_cls)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_BLK_CGROUP)
 SUBSYS(blkio)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_PERF)
 SUBSYS(perf)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_NETPRIO_CGROUP)
 SUBSYS(net_prio)
 #endif
 
-/* */
-
 #if IS_SUBSYS_ENABLED(CONFIG_CGROUP_HUGETLB)
 SUBSYS(hugetlb)
 #endif
-
-/* */
-
-#ifdef CONFIG_CGROUP_BCACHE
-SUBSYS(bcache)
-#endif
-
-/* */
+/*
+ * DO NOT ADD ANY SUBSYSTEM WITHOUT EXPLICIT ACKS FROM CGROUP MAINTAINERS.
+ */
diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
index dd7adff76e81..8138c94409f3 100644
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@ -33,8 +33,11 @@ struct clk {
         const char              **parent_names;
         struct clk              **parents;
         u8                      num_parents;
+        u8                      new_parent_index;
         unsigned long           rate;
         unsigned long           new_rate;
+        struct clk              *new_parent;
+        struct clk              *new_child;
         unsigned long           flags;
         unsigned int            enable_count;
         unsigned int            prepare_count;
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 11860985fecb..73bdb69f0c08 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -12,6 +12,7 @@
 #define __LINUX_CLK_PROVIDER_H
 
 #include <linux/clk.h>
+#include <linux/io.h>
 
 #ifdef CONFIG_COMMON_CLK
 
@@ -27,6 +28,7 @@
 #define CLK_IS_ROOT             BIT(4) /* root clk, has no parent */
 #define CLK_IS_BASIC            BIT(5) /* Basic clk, can't do a to_clk_foo() */
 #define CLK_GET_RATE_NOCACHE    BIT(6) /* do not use the cached clk rate */
+#define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */
 
 struct clk_hw;
 
@@ -79,6 +81,10 @@ struct clk_hw;
  * @round_rate: Given a target rate as input, returns the closest rate actually
  *              supported by the clock.
  *
+ * @determine_rate: Given a target rate as input, returns the closest rate
+ *              actually supported by the clock, and optionally the parent clock
+ *              that should be used to provide the clock rate.
+ *
  * @get_parent: Queries the hardware to determine the parent of a clock.  The
  *              return value is a u8 which specifies the index corresponding to
  *              the parent clock.  This index can be applied to either the
@@ -126,6 +132,9 @@ struct clk_ops {
                                         unsigned long parent_rate);
         long            (*round_rate)(struct clk_hw *hw, unsigned long,
                                         unsigned long *);
+        long            (*determine_rate)(struct clk_hw *hw, unsigned long rate,
+                                        unsigned long *best_parent_rate,
+                                        struct clk **best_parent_clk);
         int             (*set_parent)(struct clk_hw *hw, u8 index);
         u8              (*get_parent)(struct clk_hw *hw);
         int             (*set_rate)(struct clk_hw *hw, unsigned long,
@@ -210,6 +219,10 @@ void of_fixed_clk_setup(struct device_node *np);
  * CLK_GATE_SET_TO_DISABLE - by default this clock sets the bit at bit_idx to
  *      enable the clock.  Setting this flag does the opposite: setting the bit
  *      disable the clock and clearing it enables the clock
+ * CLK_GATE_HIWORD_MASK - The gate settings are only in lower 16-bit
+ *   of this register, and mask of gate bits are in higher 16-bit of this
+ *   register.  While setting the gate bits, higher 16-bit should also be
+ *   updated to indicate changing gate bits.
  */
 struct clk_gate {
         struct clk_hw hw;
@@ -220,6 +233,7 @@ struct clk_gate {
 };
 
 #define CLK_GATE_SET_TO_DISABLE         BIT(0)
+#define CLK_GATE_HIWORD_MASK            BIT(1)
 
 extern const struct clk_ops clk_gate_ops;
 struct clk *clk_register_gate(struct device *dev, const char *name,
@@ -257,6 +271,10 @@ struct clk_div_table {
  *      Some hardware implementations gracefully handle this case and allow a
  *      zero divisor by not modifying their input clock
  *      (divide by one / bypass).
+ * CLK_DIVIDER_HIWORD_MASK - The divider settings are only in lower 16-bit
+ *   of this register, and mask of divider bits are in higher 16-bit of this
+ *   register.  While setting the divider bits, higher 16-bit should also be
+ *   updated to indicate changing divider bits.
  */
 struct clk_divider {
         struct clk_hw   hw;
@@ -271,6 +289,7 @@ struct clk_divider {
 #define CLK_DIVIDER_ONE_BASED           BIT(0)
 #define CLK_DIVIDER_POWER_OF_TWO        BIT(1)
 #define CLK_DIVIDER_ALLOW_ZERO          BIT(2)
+#define CLK_DIVIDER_HIWORD_MASK         BIT(3)
 
 extern const struct clk_ops clk_divider_ops;
 struct clk *clk_register_divider(struct device *dev, const char *name,
@@ -299,6 +318,10 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name,
  * Flags:
  * CLK_MUX_INDEX_ONE - register index starts at 1, not 0
  * CLK_MUX_INDEX_BIT - register index is a single bit (power of two)
+ * CLK_MUX_HIWORD_MASK - The mux settings are only in lower 16-bit of this
+ *   register, and mask of mux bits are in higher 16-bit of this register.
+ *   While setting the mux bits, higher 16-bit should also be updated to
+ *   indicate changing mux bits.
  */
 struct clk_mux {
         struct clk_hw   hw;
@@ -312,8 +335,11 @@ struct clk_mux {
 
 #define CLK_MUX_INDEX_ONE               BIT(0)
 #define CLK_MUX_INDEX_BIT               BIT(1)
+#define CLK_MUX_HIWORD_MASK             BIT(2)
+#define CLK_MUX_READ_ONLY       BIT(3) /* mux setting cannot be changed */
 
 extern const struct clk_ops clk_mux_ops;
+extern const struct clk_ops clk_mux_ro_ops;
 
 struct clk *clk_register_mux(struct device *dev, const char *name,
                 const char **parent_names, u8 num_parents, unsigned long flags,
@@ -403,6 +429,7 @@ const char *__clk_get_name(struct clk *clk);
 struct clk_hw *__clk_get_hw(struct clk *clk);
 u8 __clk_get_num_parents(struct clk *clk);
 struct clk *__clk_get_parent(struct clk *clk);
+struct clk *clk_get_parent_by_index(struct clk *clk, u8 index);
 unsigned int __clk_get_enable_count(struct clk *clk);
 unsigned int __clk_get_prepare_count(struct clk *clk);
 unsigned long __clk_get_rate(struct clk *clk);
@@ -410,6 +437,9 @@ unsigned long __clk_get_flags(struct clk *clk);
 bool __clk_is_prepared(struct clk *clk);
 bool __clk_is_enabled(struct clk *clk);
 struct clk *__clk_lookup(const char *name);
+long __clk_mux_determine_rate(struct clk_hw *hw, unsigned long rate,
+                              unsigned long *best_parent_rate,
+                              struct clk **best_parent_p);
 
 /*
  * FIXME clock api without lock protection
@@ -423,6 +453,17 @@ struct of_device_id;
 
 typedef void (*of_clk_init_cb_t)(struct device_node *);
 
+struct clk_onecell_data {
+        struct clk **clks;
+        unsigned int clk_num;
+};
+
+#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 };
+
+#ifdef CONFIG_OF
 int of_clk_add_provider(struct device_node *np,
                         struct clk *(*clk_src_get)(struct of_phandle_args *args,
                                                    void *data),
@@ -430,19 +471,55 @@ int of_clk_add_provider(struct device_node *np,
 void of_clk_del_provider(struct device_node *np);
 struct clk *of_clk_src_simple_get(struct of_phandle_args *clkspec,
                                   void *data);
-struct clk_onecell_data {
-        struct clk **clks;
-        unsigned int clk_num;
-};
 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 };
+#else /* !CONFIG_OF */
+
+static inline int of_clk_add_provider(struct device_node *np,
+                        struct clk *(*clk_src_get)(struct of_phandle_args *args,
+                                                   void *data),
+                        void *data)
+{
+        return 0;
+}
+#define of_clk_del_provider(np) \
+        { while (0); }
+static inline struct clk *of_clk_src_simple_get(
+        struct of_phandle_args *clkspec, void *data)
+{
+        return ERR_PTR(-ENOENT);
+}
+static inline struct clk *of_clk_src_onecell_get(
+        struct of_phandle_args *clkspec, void *data)
+{
+        return ERR_PTR(-ENOENT);
+}
+static inline const char *of_clk_get_parent_name(struct device_node *np,
+                                                 int index)
+{
+        return NULL;
+}
+#define of_clk_init(matches) \
+        { while (0); }
+#endif /* CONFIG_OF */
+
+/*
+ * wrap access to peripherals in accessor routines
+ * for improved portability across platforms
+ */
+
+static inline u32 clk_readl(u32 __iomem *reg)
+{
+        return readl(reg);
+}
+
+static inline void clk_writel(u32 val, u32 __iomem *reg)
+{
+        writel(val, reg);
+}
 
 #endif /* CONFIG_COMMON_CLK */
 #endif /* CLK_PROVIDER_H */
diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h
index 642789baec74..23a0ceee831f 100644
--- a/include/linux/clk/tegra.h
+++ b/include/linux/clk/tegra.h
@@ -120,9 +120,13 @@ static inline void tegra_cpu_clock_resume(void)
 }
 #endif
 
+#ifdef CONFIG_ARCH_TEGRA
 void tegra_periph_reset_deassert(struct clk *c);
 void tegra_periph_reset_assert(struct clk *c);
-void tegra_clocks_init(void);
+#else
+static inline void tegra_periph_reset_deassert(struct clk *c) {}
+static inline void tegra_periph_reset_assert(struct clk *c) {}
+#endif
 void tegra_clocks_apply_init_table(void);
 
 #endif /* __LINUX_CLK_TEGRA_H_ */
diff --git a/include/linux/clk/zynq.h b/include/linux/clk/zynq.h
index 56be7cd9aa8b..e062d317ccce 100644
--- a/include/linux/clk/zynq.h
+++ b/include/linux/clk/zynq.h
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2013 Xilinx Inc.
  * Copyright (C) 2012 National Instruments
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,6 +20,11 @@
 #ifndef __LINUX_CLK_ZYNQ_H_
 #define __LINUX_CLK_ZYNQ_H_
 
-void __init xilinx_zynq_clocks_init(void __iomem *slcr);
+#include <linux/spinlock.h>
 
+void zynq_clock_init(void __iomem *slcr);
+
+struct clk *clk_register_zynq_pll(const char *name, const char *parent,
+                void __iomem *pll_ctrl, void __iomem *pll_status, u8 lock_index,
+                spinlock_t *lock);
 #endif
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 963d71431388..0857922e8ad0 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -30,6 +30,7 @@ enum clock_event_nofitiers {
 #include <linux/notifier.h>
 
 struct clock_event_device;
+struct module;
 
 /* Clock event mode commands */
 enum clock_event_mode {
@@ -83,6 +84,7 @@ enum clock_event_mode {
  * @irq:                IRQ number (only for non CPU local devices)
  * @cpumask:            cpumask to indicate for which CPUs this device works
  * @list:               list head for the management code
+ * @owner:              module reference
  */
 struct clock_event_device {
         void                    (*event_handler)(struct clock_event_device *);
@@ -112,6 +114,7 @@ struct clock_event_device {
         int                     irq;
         const struct cpumask    *cpumask;
         struct list_head        list;
+        struct module           *owner;
 } ____cacheline_aligned;
 
 /*
@@ -138,6 +141,7 @@ static inline unsigned long div_sc(unsigned long ticks, unsigned long nsec,
 extern u64 clockevent_delta2ns(unsigned long latch,
                                struct clock_event_device *evt);
 extern void clockevents_register_device(struct clock_event_device *dev);
+extern int clockevents_unbind_device(struct clock_event_device *ced, int cpu);
 
 extern void clockevents_config(struct clock_event_device *dev, u32 freq);
 extern void clockevents_config_and_register(struct clock_event_device *dev,
@@ -150,7 +154,6 @@ extern void clockevents_exchange_device(struct clock_event_device *old,
                                         struct clock_event_device *new);
 extern void clockevents_set_mode(struct clock_event_device *dev,
                                  enum clock_event_mode mode);
-extern int clockevents_register_notifier(struct notifier_block *nb);
 extern int clockevents_program_event(struct clock_event_device *dev,
                                      ktime_t expires, bool force);
 
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 7279b94c01da..dbbf8aa7731b 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -21,6 +21,7 @@
 /* clocksource cycle base type */
 typedef u64 cycle_t;
 struct clocksource;
+struct module;
 
 #ifdef CONFIG_ARCH_CLOCKSOURCE_DATA
 #include <asm/clocksource.h>
@@ -162,6 +163,7 @@ extern u64 timecounter_cyc2time(struct timecounter *tc,
  * @suspend:            suspend function for the clocksource, if necessary
  * @resume:             resume function for the clocksource, if necessary
  * @cycle_last:         most recent cycle counter value seen by ::read()
+ * @owner:              module reference, must be set by clocksource in modules
  */
 struct clocksource {
         /*
@@ -195,6 +197,7 @@ struct clocksource {
         cycle_t cs_last;
         cycle_t wd_last;
 #endif
+        struct module *owner;
 } ____cacheline_aligned;
 
 /*
@@ -207,6 +210,7 @@ struct clocksource {
 #define CLOCK_SOURCE_VALID_FOR_HRES             0x20
 #define CLOCK_SOURCE_UNSTABLE                   0x40
 #define CLOCK_SOURCE_SUSPEND_NONSTOP            0x80
+#define CLOCK_SOURCE_RESELECT                   0x100
 
 /* simplify initialization of mask field */
 #define CLOCKSOURCE_MASK(bits) (cycle_t)((bits) < 64 ? ((1ULL<<(bits))-1) : -1)
@@ -279,7 +283,7 @@ static inline s64 clocksource_cyc2ns(cycle_t cycles, u32 mult, u32 shift)
 
 
 extern int clocksource_register(struct clocksource*);
-extern void clocksource_unregister(struct clocksource*);
+extern int clocksource_unregister(struct clocksource*);
 extern void clocksource_touch_watchdog(void);
 extern struct clocksource* clocksource_get_next(void);
 extern void clocksource_change_rating(struct clocksource *cs, int rating);
@@ -321,7 +325,7 @@ static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz)
 }
 
 
-extern void timekeeping_notify(struct clocksource *clock);
+extern int timekeeping_notify(struct clocksource *clock);
 
 extern cycle_t clocksource_mmio_readl_up(struct clocksource *);
 extern cycle_t clocksource_mmio_readl_down(struct clocksource *);
diff --git a/include/linux/cmdline-parser.h b/include/linux/cmdline-parser.h
new file mode 100644
index 000000000000..98e892ef6d5a
--- /dev/null
+++ b/include/linux/cmdline-parser.h
@@ -0,0 +1,43 @@
+/*
+ * Parsing command line, get the partitions information.
+ *
+ * Written by Cai Zhiyong <caizhiyong@huawei.com>
+ *
+ */
+#ifndef CMDLINEPARSEH
+#define CMDLINEPARSEH
+
+#include <linux/blkdev.h>
+
+/* partition flags */
+#define PF_RDONLY                   0x01 /* Device is read only */
+#define PF_POWERUP_LOCK             0x02 /* Always locked after reset */
+
+struct cmdline_subpart {
+        char name[BDEVNAME_SIZE]; /* partition name, such as 'rootfs' */
+        sector_t from;
+        sector_t size;
+        int flags;
+        struct cmdline_subpart *next_subpart;
+};
+
+struct cmdline_parts {
+        char name[BDEVNAME_SIZE]; /* block device, such as 'mmcblk0' */
+        unsigned int nr_subparts;
+        struct cmdline_subpart *subpart;
+        struct cmdline_parts *next_parts;
+};
+
+void cmdline_parts_free(struct cmdline_parts **parts);
+
+int cmdline_parts_parse(struct cmdline_parts **parts, const char *cmdline);
+
+struct cmdline_parts *cmdline_parts_find(struct cmdline_parts *parts,
+                                         const char *bdev);
+
+void cmdline_parts_set(struct cmdline_parts *parts, sector_t disk_size,
+                       int slot,
+                       int (*add_part)(int, struct cmdline_subpart *, void *),
+                       void *param);
+
+#endif /* CMDLINEPARSEH */
diff --git a/include/linux/coda.h b/include/linux/coda.h
index cff544f81105..d30209b9cef8 100644
--- a/include/linux/coda.h
+++ b/include/linux/coda.h
@@ -60,7 +60,6 @@ Mellon the rights to redistribute these changes without encumbrance.
 
 #if defined(__linux__)
 typedef unsigned long long u_quad_t;
-#else
 #endif
 #include <uapi/linux/coda.h>
 #endif 
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 7f0c1dd09079..345da00a86e0 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -43,6 +43,7 @@
 #define COMPAT_SYSCALL_DEFINEx(x, name, ...)                            \
         asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
         static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
+        asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));\
         asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
         {                                                               \
                 return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \
@@ -669,6 +670,13 @@ asmlinkage long compat_sys_sigaltstack(const compat_stack_t __user *uss_ptr,
 
 int compat_restore_altstack(const compat_stack_t __user *uss);
 int __compat_save_altstack(compat_stack_t __user *, unsigned long);
+#define compat_save_altstack_ex(uss, sp) do { \
+        compat_stack_t __user *__uss = uss; \
+        struct task_struct *t = current; \
+        put_user_ex(ptr_to_compat((void __user *)t->sas_ss_sp), &__uss->ss_sp); \
+        put_user_ex(sas_ss_flags(sp), &__uss->ss_flags); \
+        put_user_ex(t->sas_ss_size, &__uss->ss_size); \
+} while (0);
 
 asmlinkage long compat_sys_sched_rr_get_interval(compat_pid_t pid,
                                                  struct compat_timespec __user *interval);
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 33f0280fd533..3cd574d5b19e 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -5,7 +5,7 @@
  * (C) Copyright 2001 Linus Torvalds
  *
  * Atomic wait-for-completion handler data structures.
- * See kernel/sched.c for details.
+ * See kernel/sched/core.c for details.
  */
 
 #include <linux/wait.h>
diff --git a/include/linux/console.h b/include/linux/console.h
index 73bab0f58af5..7571a16bd653 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -75,10 +75,7 @@ extern const struct consw newport_con;	/* SGI Newport console  */
 extern const struct consw prom_con;     /* SPARC PROM console */
 
 int con_is_bound(const struct consw *csw);
-int register_con_driver(const struct consw *csw, int first, int last);
-int unregister_con_driver(const struct consw *csw);
 int do_unregister_con_driver(const struct consw *csw);
-int take_over_console(const struct consw *sw, int first, int last, int deflt);
 int do_take_over_console(const struct consw *sw, int first, int last, int deflt);
 void give_up_console(const struct consw *sw);
 #ifdef CONFIG_HW_CONSOLE
diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index 365f4a61bf04..158158704c30 100644
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -2,59 +2,59 @@
 #define _LINUX_CONTEXT_TRACKING_H
 
 #include <linux/sched.h>
-#include <linux/percpu.h>
+#include <linux/vtime.h>
+#include <linux/context_tracking_state.h>
 #include <asm/ptrace.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 ctx_state {
-                IN_KERNEL = 0,
-                IN_USER,
-        } state;
-};
 
 #ifdef CONFIG_CONTEXT_TRACKING
-DECLARE_PER_CPU(struct context_tracking, context_tracking);
+extern void context_tracking_cpu_set(int cpu);
 
-static inline bool context_tracking_in_user(void)
+extern void context_tracking_user_enter(void);
+extern void context_tracking_user_exit(void);
+extern void __context_tracking_task_switch(struct task_struct *prev,
+                                           struct task_struct *next);
+
+static inline void user_enter(void)
 {
-        return __this_cpu_read(context_tracking.state) == IN_USER;
-}
+        if (static_key_false(&context_tracking_enabled))
+                context_tracking_user_enter();
 
-static inline bool context_tracking_active(void)
+}
+static inline void user_exit(void)
 {
-        return __this_cpu_read(context_tracking.active);
+        if (static_key_false(&context_tracking_enabled))
+                context_tracking_user_exit();
 }
 
-extern void user_enter(void);
-extern void user_exit(void);
-
 static inline enum ctx_state exception_enter(void)
 {
         enum ctx_state prev_ctx;
 
+        if (!static_key_false(&context_tracking_enabled))
+                return 0;
+
         prev_ctx = this_cpu_read(context_tracking.state);
-        user_exit();
+        context_tracking_user_exit();
 
         return prev_ctx;
 }
 
 static inline void exception_exit(enum ctx_state prev_ctx)
 {
-        if (prev_ctx == IN_USER)
-                user_enter();
+        if (static_key_false(&context_tracking_enabled)) {
+                if (prev_ctx == IN_USER)
+                        context_tracking_user_enter();
+        }
 }
 
-extern void context_tracking_task_switch(struct task_struct *prev,
-                                         struct task_struct *next);
+static inline void context_tracking_task_switch(struct task_struct *prev,
+                                                struct task_struct *next)
+{
+        if (static_key_false(&context_tracking_enabled))
+                __context_tracking_task_switch(prev, 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 enum ctx_state exception_enter(void) { return 0; }
@@ -63,4 +63,49 @@ static inline void context_tracking_task_switch(struct task_struct *prev,
                                                 struct task_struct *next) { }
 #endif /* !CONFIG_CONTEXT_TRACKING */
 
+
+#ifdef CONFIG_CONTEXT_TRACKING_FORCE
+extern void context_tracking_init(void);
+#else
+static inline void context_tracking_init(void) { }
+#endif /* CONFIG_CONTEXT_TRACKING_FORCE */
+
+
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
+static inline void guest_enter(void)
+{
+        if (vtime_accounting_enabled())
+                vtime_guest_enter(current);
+        else
+                current->flags |= PF_VCPU;
+}
+
+static inline void guest_exit(void)
+{
+        if (vtime_accounting_enabled())
+                vtime_guest_exit(current);
+        else
+                current->flags &= ~PF_VCPU;
+}
+
+#else
+static inline void guest_enter(void)
+{
+        /*
+         * This is running in ioctl context so its safe
+         * to assume that it's the stime pending cputime
+         * to flush.
+         */
+        vtime_account_system(current);
+        current->flags |= PF_VCPU;
+}
+
+static inline void guest_exit(void)
+{
+        /* Flush the guest cputime we spent on the guest */
+        vtime_account_system(current);
+        current->flags &= ~PF_VCPU;
+}
+#endif /* CONFIG_VIRT_CPU_ACCOUNTING_GEN */
+
 #endif
diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h
new file mode 100644
index 000000000000..0f1979d0674f
--- /dev/null
+++ b/include/linux/context_tracking_state.h
@@ -0,0 +1,39 @@
+#ifndef _LINUX_CONTEXT_TRACKING_STATE_H
+#define _LINUX_CONTEXT_TRACKING_STATE_H
+
+#include <linux/percpu.h>
+#include <linux/static_key.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 ctx_state {
+                IN_KERNEL = 0,
+                IN_USER,
+        } state;
+};
+
+#ifdef CONFIG_CONTEXT_TRACKING
+extern struct static_key context_tracking_enabled;
+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);
+}
+#else
+static inline bool context_tracking_in_user(void) { return false; }
+static inline bool context_tracking_active(void) { return false; }
+#endif /* CONFIG_CONTEXT_TRACKING */
+
+#endif
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index c6f6e0839b61..801ff9e73679 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -6,9 +6,8 @@
  * definitions of processors.
  *
  * Basic handling of the devices is done in drivers/base/cpu.c
- * and system devices are handled in drivers/base/sys.c. 
  *
- * CPUs are exported via sysfs in the class/cpu/devices/
+ * CPUs are exported via sysfs in the devices/system/cpu
  * directory. 
  */
 #ifndef _LINUX_CPU_H_
@@ -29,6 +28,7 @@ struct cpu {
 extern int register_cpu(struct cpu *cpu, int num);
 extern struct device *get_cpu_device(unsigned cpu);
 extern bool cpu_is_hotpluggable(unsigned cpu);
+extern bool arch_match_cpu_phys_id(int cpu, u64 phys_id);
 
 extern int cpu_add_dev_attr(struct device_attribute *attr);
 extern void cpu_remove_dev_attr(struct device_attribute *attr);
@@ -115,7 +115,7 @@ enum {
 /* Need to know about CPUs going up/down? */
 #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)
 #define cpu_notifier(fn, pri) {                                 \
-        static struct notifier_block fn##_nb __cpuinitdata =    \
+        static struct notifier_block fn##_nb =                  \
                 { .notifier_call = fn, .priority = pri };       \
         register_cpu_notifier(&fn##_nb);                        \
 }
@@ -173,8 +173,12 @@ extern struct bus_type cpu_subsys;
 #ifdef CONFIG_HOTPLUG_CPU
 /* Stop CPUs going up and down. */
 
+extern void cpu_hotplug_begin(void);
+extern void cpu_hotplug_done(void);
 extern void get_online_cpus(void);
 extern void put_online_cpus(void);
+extern void cpu_hotplug_disable(void);
+extern void cpu_hotplug_enable(void);
 #define hotcpu_notifier(fn, pri)        cpu_notifier(fn, pri)
 #define register_hotcpu_notifier(nb)    register_cpu_notifier(nb)
 #define unregister_hotcpu_notifier(nb)  unregister_cpu_notifier(nb)
@@ -196,8 +200,12 @@ static inline void cpu_hotplug_driver_unlock(void)
 
 #else           /* CONFIG_HOTPLUG_CPU */
 
+static inline void cpu_hotplug_begin(void) {}
+static inline void cpu_hotplug_done(void) {}
 #define get_online_cpus()       do { } while (0)
 #define put_online_cpus()       do { } while (0)
+#define cpu_hotplug_disable()   do { } while (0)
+#define cpu_hotplug_enable()    do { } while (0)
 #define hotcpu_notifier(fn, pri)        do { (void)(fn); } while (0)
 /* These aren't inline functions due to a GCC bug. */
 #define register_hotcpu_notifier(nb)    ({ (void)(nb); 0; })
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h
index 282e27028418..a5d52eea8232 100644
--- a/include/linux/cpu_cooling.h
+++ b/include/linux/cpu_cooling.h
@@ -41,7 +41,7 @@ cpufreq_cooling_register(const struct cpumask *clip_cpus);
  */
 void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev);
 
-unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int);
+unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq);
 #else /* !CONFIG_CPU_THERMAL */
 static inline struct thermal_cooling_device *
 cpufreq_cooling_register(const struct cpumask *clip_cpus)
@@ -54,7 +54,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
         return;
 }
 static inline
-unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int)
+unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq)
 {
         return THERMAL_CSTATE_INVALID;
 }
diff --git a/include/linux/cpu_rmap.h b/include/linux/cpu_rmap.h
index 1739510d8994..bdd18caa6c94 100644
--- a/include/linux/cpu_rmap.h
+++ b/include/linux/cpu_rmap.h
@@ -52,8 +52,6 @@ static inline void *cpu_rmap_lookup_obj(struct cpu_rmap *rmap, unsigned int cpu)
         return rmap->obj[rmap->near[cpu].index];
 }
 
-#ifdef CONFIG_GENERIC_HARDIRQS
-
 /**
  * alloc_irq_cpu_rmap - allocate CPU affinity reverse-map for IRQs
  * @size: Number of objects to be mapped
@@ -68,5 +66,4 @@ extern void free_irq_cpu_rmap(struct cpu_rmap *rmap);
 
 extern int irq_cpu_rmap_add(struct cpu_rmap *rmap, int irq);
 
-#endif
 #endif /* __LINUX_CPU_RMAP_H */
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 037d36ae63e5..fcabc42d66ab 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -1,8 +1,8 @@
 /*
- *  linux/include/linux/cpufreq.h
+ * linux/include/linux/cpufreq.h
  *
- *  Copyright (C) 2001 Russell King
- *            (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
+ * Copyright (C) 2001 Russell King
+ *           (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
  *
  * 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
@@ -11,68 +11,36 @@
 #ifndef _LINUX_CPUFREQ_H
 #define _LINUX_CPUFREQ_H
 
-#include <asm/cputime.h>
-#include <linux/mutex.h>
-#include <linux/notifier.h>
-#include <linux/threads.h>
+#include <linux/cpumask.h>
+#include <linux/completion.h>
 #include <linux/kobject.h>
+#include <linux/notifier.h>
 #include <linux/sysfs.h>
-#include <linux/completion.h>
-#include <linux/workqueue.h>
-#include <linux/cpumask.h>
-#include <asm/div64.h>
-
-#define CPUFREQ_NAME_LEN 16
-/* Print length for names. Extra 1 space for accomodating '\n' in prints */
-#define CPUFREQ_NAME_PLEN (CPUFREQ_NAME_LEN + 1)
-
 
 /*********************************************************************
- *                     CPUFREQ NOTIFIER INTERFACE                    *
+ *                        CPUFREQ INTERFACE                          *
  *********************************************************************/
-
-#define CPUFREQ_TRANSITION_NOTIFIER     (0)
-#define CPUFREQ_POLICY_NOTIFIER         (1)
-
-#ifdef CONFIG_CPU_FREQ
-int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);
-int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list);
-extern void disable_cpufreq(void);
-#else           /* CONFIG_CPU_FREQ */
-static inline int cpufreq_register_notifier(struct notifier_block *nb,
-                                                unsigned int list)
-{
-        return 0;
-}
-static inline int cpufreq_unregister_notifier(struct notifier_block *nb,
-                                                unsigned int list)
-{
-        return 0;
-}
-static inline void disable_cpufreq(void) { }
-#endif          /* CONFIG_CPU_FREQ */
-
-/* if (cpufreq_driver->target) exists, the ->governor decides what frequency
- * within the limits is used. If (cpufreq_driver->setpolicy> exists, these
- * two generic policies are available:
- */
-
-#define CPUFREQ_POLICY_POWERSAVE        (1)
-#define CPUFREQ_POLICY_PERFORMANCE      (2)
-
-/* Frequency values here are CPU kHz so that hardware which doesn't run
- * with some frequencies can complain without having to guess what per
- * cent / per mille means.
+/*
+ * Frequency values here are CPU kHz
+ *
  * Maximum transition latency is in nanoseconds - if it's unknown,
  * CPUFREQ_ETERNAL shall be used.
  */
 
+#define CPUFREQ_ETERNAL                 (-1)
+#define CPUFREQ_NAME_LEN                16
+/* Print length for names. Extra 1 space for accomodating '\n' in prints */
+#define CPUFREQ_NAME_PLEN               (CPUFREQ_NAME_LEN + 1)
+
 struct cpufreq_governor;
 
-/* /sys/devices/system/cpu/cpufreq: entry point for global variables */
-extern struct kobject *cpufreq_global_kobject;
+struct cpufreq_freqs {
+        unsigned int cpu;       /* cpu nr */
+        unsigned int old;
+        unsigned int new;
+        u8 flags;               /* flags of cpufreq_driver, see below. */
+};
 
-#define CPUFREQ_ETERNAL                 (-1)
 struct cpufreq_cpuinfo {
         unsigned int            max_freq;
         unsigned int            min_freq;
@@ -107,129 +75,109 @@ struct cpufreq_policy {
         unsigned int            policy; /* see above */
         struct cpufreq_governor *governor; /* see below */
         void                    *governor_data;
+        bool                    governor_enabled; /* governor start/stop flag */
 
         struct work_struct      update; /* if update_policy() needs to be
                                          * called, but you're in IRQ context */
 
         struct cpufreq_real_policy      user_policy;
 
+        struct list_head        policy_list;
         struct kobject          kobj;
         struct completion       kobj_unregister;
 };
 
-#define CPUFREQ_ADJUST                  (0)
-#define CPUFREQ_INCOMPATIBLE            (1)
-#define CPUFREQ_NOTIFY                  (2)
-#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*/
 
+struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu);
+void cpufreq_cpu_put(struct cpufreq_policy *policy);
+
 static inline bool policy_is_shared(struct cpufreq_policy *policy)
 {
         return cpumask_weight(policy->cpus) > 1;
 }
 
-/******************** cpufreq transition notifiers *******************/
-
-#define CPUFREQ_PRECHANGE       (0)
-#define CPUFREQ_POSTCHANGE      (1)
-#define CPUFREQ_RESUMECHANGE    (8)
-#define CPUFREQ_SUSPENDCHANGE   (9)
-
-struct cpufreq_freqs {
-        unsigned int cpu;       /* cpu nr */
-        unsigned int old;
-        unsigned int new;
-        u8 flags;               /* flags of cpufreq_driver, see below. */
-};
+/* /sys/devices/system/cpu/cpufreq: entry point for global variables */
+extern struct kobject *cpufreq_global_kobject;
+int cpufreq_get_global_kobject(void);
+void cpufreq_put_global_kobject(void);
+int cpufreq_sysfs_create_file(const struct attribute *attr);
+void cpufreq_sysfs_remove_file(const struct attribute *attr);
 
+#ifdef CONFIG_CPU_FREQ
+unsigned int cpufreq_get(unsigned int cpu);
+unsigned int cpufreq_quick_get(unsigned int cpu);
+unsigned int cpufreq_quick_get_max(unsigned int cpu);
+void disable_cpufreq(void);
 
-/**
- * cpufreq_scale - "old * mult / div" calculation for large values (32-bit-arch safe)
- * @old:   old value
- * @div:   divisor
- * @mult:  multiplier
- *
- *
- *    new = old * mult / div
- */
-static inline unsigned long cpufreq_scale(unsigned long old, u_int div, u_int mult)
+u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy);
+int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
+int cpufreq_update_policy(unsigned int cpu);
+bool have_governor_per_policy(void);
+struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy);
+#else
+static inline unsigned int cpufreq_get(unsigned int cpu)
 {
-#if BITS_PER_LONG == 32
-
-        u64 result = ((u64) old) * ((u64) mult);
-        do_div(result, div);
-        return (unsigned long) result;
-
-#elif BITS_PER_LONG == 64
-
-        unsigned long result = old * ((u64) mult);
-        result /= div;
-        return result;
-
+        return 0;
+}
+static inline unsigned int cpufreq_quick_get(unsigned int cpu)
+{
+        return 0;
+}
+static inline unsigned int cpufreq_quick_get_max(unsigned int cpu)
+{
+        return 0;
+}
+static inline void disable_cpufreq(void) { }
 #endif
-};
 
 /*********************************************************************
- *                          CPUFREQ GOVERNORS                        *
+ *                      CPUFREQ DRIVER INTERFACE                     *
  *********************************************************************/
 
-#define CPUFREQ_GOV_START       1
-#define CPUFREQ_GOV_STOP        2
-#define CPUFREQ_GOV_LIMITS      3
-#define CPUFREQ_GOV_POLICY_INIT 4
-#define CPUFREQ_GOV_POLICY_EXIT 5
+#define CPUFREQ_RELATION_L 0  /* lowest frequency at or above target */
+#define CPUFREQ_RELATION_H 1  /* highest frequency below or at target */
 
-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,
-                                         char *buf);
-        int     (*store_setspeed)       (struct cpufreq_policy *policy,
-                                         unsigned int freq);
-        unsigned int max_transition_latency; /* HW must be able to switch to
-                        next freq faster than this value in nano secs or we
-                        will fallback to performance governor */
-        struct list_head        governor_list;
-        struct module           *owner;
+struct freq_attr {
+        struct attribute attr;
+        ssize_t (*show)(struct cpufreq_policy *, char *);
+        ssize_t (*store)(struct cpufreq_policy *, const char *, size_t count);
 };
 
-/*
- * Pass a target to the cpufreq driver.
- */
-extern int cpufreq_driver_target(struct cpufreq_policy *policy,
-                                 unsigned int target_freq,
-                                 unsigned int relation);
-extern int __cpufreq_driver_target(struct cpufreq_policy *policy,
-                                   unsigned int target_freq,
-                                   unsigned int relation);
-
+#define cpufreq_freq_attr_ro(_name)             \
+static struct freq_attr _name =                 \
+__ATTR(_name, 0444, show_##_name, NULL)
 
-extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy,
-                                   unsigned int cpu);
+#define cpufreq_freq_attr_ro_perm(_name, _perm) \
+static struct freq_attr _name =                 \
+__ATTR(_name, _perm, show_##_name, NULL)
 
-int cpufreq_register_governor(struct cpufreq_governor *governor);
-void cpufreq_unregister_governor(struct cpufreq_governor *governor);
+#define cpufreq_freq_attr_rw(_name)             \
+static struct freq_attr _name =                 \
+__ATTR(_name, 0644, show_##_name, store_##_name)
 
+struct global_attr {
+        struct attribute attr;
+        ssize_t (*show)(struct kobject *kobj,
+                        struct attribute *attr, char *buf);
+        ssize_t (*store)(struct kobject *a, struct attribute *b,
+                         const char *c, size_t count);
+};
 
-/*********************************************************************
- *                      CPUFREQ DRIVER INTERFACE                     *
- *********************************************************************/
+#define define_one_global_ro(_name)             \
+static struct global_attr _name =               \
+__ATTR(_name, 0444, show_##_name, NULL)
 
-#define CPUFREQ_RELATION_L 0  /* lowest frequency at or above target */
-#define CPUFREQ_RELATION_H 1  /* highest frequency below or at target */
+#define define_one_global_rw(_name)             \
+static struct global_attr _name =               \
+__ATTR(_name, 0644, show_##_name, store_##_name)
 
-struct freq_attr;
 
 struct cpufreq_driver {
-        struct module           *owner;
         char                    name[CPUFREQ_NAME_LEN];
         u8                      flags;
         /*
@@ -254,8 +202,6 @@ struct cpufreq_driver {
         unsigned int    (*get)  (unsigned int cpu);
 
         /* optional */
-        unsigned int (*getavg)  (struct cpufreq_policy *policy,
-                                 unsigned int cpu);
         int     (*bios_limit)   (int cpu, unsigned int *limit);
 
         int     (*exit)         (struct cpufreq_policy *policy);
@@ -265,7 +211,6 @@ struct cpufreq_driver {
 };
 
 /* flags */
-
 #define CPUFREQ_STICKY          0x01    /* the driver isn't removed even if
                                          * all ->init() calls failed */
 #define CPUFREQ_CONST_LOOPS     0x02    /* loops_per_jiffy or other kernel
@@ -277,11 +222,10 @@ struct cpufreq_driver {
 int cpufreq_register_driver(struct cpufreq_driver *driver_data);
 int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);
 
+const char *cpufreq_get_current_driver(void);
 
-void cpufreq_notify_transition(struct cpufreq_policy *policy,
-                struct cpufreq_freqs *freqs, unsigned int state);
-
-static inline void cpufreq_verify_within_limits(struct cpufreq_policy *policy, unsigned int min, unsigned int max)
+static inline void cpufreq_verify_within_limits(struct cpufreq_policy *policy,
+                unsigned int min, unsigned int max)
 {
         if (policy->min < min)
                 policy->min = min;
@@ -296,86 +240,121 @@ static inline void cpufreq_verify_within_limits(struct cpufreq_policy *policy, u
         return;
 }
 
-struct freq_attr {
-        struct attribute attr;
-        ssize_t (*show)(struct cpufreq_policy *, char *);
-        ssize_t (*store)(struct cpufreq_policy *, const char *, size_t count);
-};
-
-#define cpufreq_freq_attr_ro(_name)             \
-static struct freq_attr _name =                 \
-__ATTR(_name, 0444, show_##_name, NULL)
-
-#define cpufreq_freq_attr_ro_perm(_name, _perm) \
-static struct freq_attr _name =                 \
-__ATTR(_name, _perm, show_##_name, NULL)
-
-#define cpufreq_freq_attr_rw(_name)             \
-static struct freq_attr _name =                 \
-__ATTR(_name, 0644, show_##_name, store_##_name)
+/*********************************************************************
+ *                     CPUFREQ NOTIFIER INTERFACE                    *
+ *********************************************************************/
 
-struct global_attr {
-        struct attribute attr;
-        ssize_t (*show)(struct kobject *kobj,
-                        struct attribute *attr, char *buf);
-        ssize_t (*store)(struct kobject *a, struct attribute *b,
-                         const char *c, size_t count);
-};
+#define CPUFREQ_TRANSITION_NOTIFIER     (0)
+#define CPUFREQ_POLICY_NOTIFIER         (1)
 
-#define define_one_global_ro(_name)             \
-static struct global_attr _name =               \
-__ATTR(_name, 0444, show_##_name, NULL)
+/* Transition notifiers */
+#define CPUFREQ_PRECHANGE               (0)
+#define CPUFREQ_POSTCHANGE              (1)
+#define CPUFREQ_RESUMECHANGE            (8)
+#define CPUFREQ_SUSPENDCHANGE           (9)
 
-#define define_one_global_rw(_name)             \
-static struct global_attr _name =               \
-__ATTR(_name, 0644, show_##_name, store_##_name)
+/* Policy Notifiers  */
+#define CPUFREQ_ADJUST                  (0)
+#define CPUFREQ_INCOMPATIBLE            (1)
+#define CPUFREQ_NOTIFY                  (2)
+#define CPUFREQ_START                   (3)
+#define CPUFREQ_UPDATE_POLICY_CPU       (4)
 
-struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu);
-void cpufreq_cpu_put(struct cpufreq_policy *data);
-const char *cpufreq_get_current_driver(void);
+#ifdef CONFIG_CPU_FREQ
+int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);
+int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list);
 
-/*********************************************************************
- *                        CPUFREQ 2.6. INTERFACE                     *
- *********************************************************************/
-int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
-int cpufreq_update_policy(unsigned int cpu);
-bool have_governor_per_policy(void);
+void cpufreq_notify_transition(struct cpufreq_policy *policy,
+                struct cpufreq_freqs *freqs, unsigned int state);
 
-#ifdef CONFIG_CPU_FREQ
-/* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */
-unsigned int cpufreq_get(unsigned int cpu);
-#else
-static inline unsigned int cpufreq_get(unsigned int cpu)
+#else /* CONFIG_CPU_FREQ */
+static inline int cpufreq_register_notifier(struct notifier_block *nb,
+                                                unsigned int list)
 {
         return 0;
 }
-#endif
-
-/* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it */
-#ifdef CONFIG_CPU_FREQ
-unsigned int cpufreq_quick_get(unsigned int cpu);
-unsigned int cpufreq_quick_get_max(unsigned int cpu);
-#else
-static inline unsigned int cpufreq_quick_get(unsigned int cpu)
+static inline int cpufreq_unregister_notifier(struct notifier_block *nb,
+                                                unsigned int list)
 {
         return 0;
 }
-static inline unsigned int cpufreq_quick_get_max(unsigned int cpu)
+#endif /* !CONFIG_CPU_FREQ */
+
+/**
+ * cpufreq_scale - "old * mult / div" calculation for large values (32-bit-arch
+ * safe)
+ * @old:   old value
+ * @div:   divisor
+ * @mult:  multiplier
+ *
+ *
+ * new = old * mult / div
+ */
+static inline unsigned long cpufreq_scale(unsigned long old, u_int div,
+                u_int mult)
 {
-        return 0;
-}
-#endif
+#if BITS_PER_LONG == 32
+        u64 result = ((u64) old) * ((u64) mult);
+        do_div(result, div);
+        return (unsigned long) result;
 
+#elif BITS_PER_LONG == 64
+        unsigned long result = old * ((u64) mult);
+        result /= div;
+        return result;
+#endif
+}
 
 /*********************************************************************
- *                       CPUFREQ DEFAULT GOVERNOR                    *
+ *                          CPUFREQ GOVERNORS                        *
  *********************************************************************/
 
+/*
+ * If (cpufreq_driver->target) exists, the ->governor decides what frequency
+ * within the limits is used. If (cpufreq_driver->setpolicy> exists, these
+ * two generic policies are available:
+ */
+#define CPUFREQ_POLICY_POWERSAVE        (1)
+#define CPUFREQ_POLICY_PERFORMANCE      (2)
+
+/* Governor Events */
+#define CPUFREQ_GOV_START       1
+#define CPUFREQ_GOV_STOP        2
+#define CPUFREQ_GOV_LIMITS      3
+#define CPUFREQ_GOV_POLICY_INIT 4
+#define CPUFREQ_GOV_POLICY_EXIT 5
+
+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,
+                                         char *buf);
+        int     (*store_setspeed)       (struct cpufreq_policy *policy,
+                                         unsigned int freq);
+        unsigned int max_transition_latency; /* HW must be able to switch to
+                        next freq faster than this value in nano secs or we
+                        will fallback to performance governor */
+        struct list_head        governor_list;
+        struct module           *owner;
+};
 
+/* Pass a target to the cpufreq driver */
+int cpufreq_driver_target(struct cpufreq_policy *policy,
+                                 unsigned int target_freq,
+                                 unsigned int relation);
+int __cpufreq_driver_target(struct cpufreq_policy *policy,
+                                   unsigned int target_freq,
+                                   unsigned int relation);
+int cpufreq_register_governor(struct cpufreq_governor *governor);
+void cpufreq_unregister_governor(struct cpufreq_governor *governor);
+
+/* CPUFREQ DEFAULT GOVERNOR */
 /*
-  Performance governor is fallback governor if any other gov failed to
-  auto load due latency restrictions
-*/
+ * Performance governor is fallback governor if any other gov failed to auto
+ * load due latency restrictions
+ */
 #ifdef CONFIG_CPU_FREQ_GOV_PERFORMANCE
 extern struct cpufreq_governor cpufreq_gov_performance;
 #endif
@@ -395,7 +374,6 @@ extern struct cpufreq_governor cpufreq_gov_conservative;
 #define CPUFREQ_DEFAULT_GOVERNOR        (&cpufreq_gov_conservative)
 #endif
 
-
 /*********************************************************************
  *                     FREQUENCY TABLE HELPERS                       *
  *********************************************************************/
@@ -404,7 +382,7 @@ extern struct cpufreq_governor cpufreq_gov_conservative;
 #define CPUFREQ_TABLE_END     ~1
 
 struct cpufreq_frequency_table {
-        unsigned int    index;     /* any */
+        unsigned int    driver_data; /* driver specific data, not used by core */
         unsigned int    frequency; /* kHz - doesn't need to be in ascending
                                     * order */
 };
@@ -421,15 +399,16 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                                    unsigned int relation,
                                    unsigned int *index);
 
-/* the following 3 funtions are for cpufreq core use only */
+void cpufreq_frequency_table_update_policy_cpu(struct cpufreq_policy *policy);
+ssize_t cpufreq_show_cpus(const struct cpumask *mask, char *buf);
+
+/* the following funtion is for cpufreq core use only */
 struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu);
 
 /* 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 8f0406230a0a..781addc66f03 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -13,8 +13,6 @@
 
 #include <linux/percpu.h>
 #include <linux/list.h>
-#include <linux/kobject.h>
-#include <linux/completion.h>
 #include <linux/hrtimer.h>
 
 #define CPUIDLE_STATE_MAX       10
@@ -61,6 +59,10 @@ struct cpuidle_state {
 
 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
 
+struct cpuidle_device_kobj;
+struct cpuidle_state_kobj;
+struct cpuidle_driver_kobj;
+
 struct cpuidle_device {
         unsigned int            registered:1;
         unsigned int            enabled:1;
@@ -71,9 +73,8 @@ struct cpuidle_device {
         struct cpuidle_state_usage      states_usage[CPUIDLE_STATE_MAX];
         struct cpuidle_state_kobj *kobjs[CPUIDLE_STATE_MAX];
         struct cpuidle_driver_kobj *kobj_driver;
+        struct cpuidle_device_kobj *kobj_dev;
         struct list_head        device_list;
-        struct kobject          kobj;
-        struct completion       kobj_unregister;
 
 #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
         int                     safe_state_index;
@@ -111,6 +112,9 @@ struct cpuidle_driver {
         struct cpuidle_state    states[CPUIDLE_STATE_MAX];
         int                     state_count;
         int                     safe_state_index;
+
+        /* the driver handles the cpus in cpumask */
+        struct cpumask       *cpumask;
 };
 
 #ifdef CONFIG_CPU_IDLE
@@ -135,9 +139,6 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev);
 extern int cpuidle_play_dead(void);
 
 extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev);
-extern int cpuidle_register_cpu_driver(struct cpuidle_driver *drv, int cpu);
-extern void cpuidle_unregister_cpu_driver(struct cpuidle_driver *drv, int cpu);
-
 #else
 static inline void disable_cpuidle(void) { }
 static inline int cpuidle_idle_call(void) { return -ENODEV; }
diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
index 37e4f8da7cdf..fe68a5a98583 100644
--- a/include/linux/crash_dump.h
+++ b/include/linux/crash_dump.h
@@ -12,6 +12,15 @@
 extern unsigned long long elfcorehdr_addr;
 extern unsigned long long elfcorehdr_size;
 
+extern int __weak elfcorehdr_alloc(unsigned long long *addr,
+                                   unsigned long long *size);
+extern void __weak elfcorehdr_free(unsigned long long addr);
+extern ssize_t __weak elfcorehdr_read(char *buf, size_t count, u64 *ppos);
+extern ssize_t __weak elfcorehdr_read_notes(char *buf, size_t count, u64 *ppos);
+extern int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
+                                         unsigned long from, unsigned long pfn,
+                                         unsigned long size, pgprot_t prot);
+
 extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
                                                 unsigned long, int);
 
diff --git a/include/linux/crc-t10dif.h b/include/linux/crc-t10dif.h
index a9c96d865ee7..b3cb71f0d3b0 100644
--- a/include/linux/crc-t10dif.h
+++ b/include/linux/crc-t10dif.h
@@ -3,6 +3,10 @@
 
 #include <linux/types.h>
 
+#define CRC_T10DIF_DIGEST_SIZE 2
+#define CRC_T10DIF_BLOCK_SIZE 1
+
+__u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, size_t len);
 __u16 crc_t10dif(unsigned char const *, size_t);
 
 #endif
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 1a6bb81f0fe5..59066e0b4ff1 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -9,6 +9,7 @@
 #include <linux/seqlock.h>
 #include <linux/cache.h>
 #include <linux/rcupdate.h>
+#include <linux/lockref.h>
 
 struct nameidata;
 struct path;
@@ -54,11 +55,11 @@ struct qstr {
 #define hashlen_len(hashlen)  ((u32)((hashlen) >> 32))
 
 struct dentry_stat_t {
-        int nr_dentry;
-        int nr_unused;
-        int age_limit;          /* age in seconds */
-        int want_pages;         /* pages requested by system */
-        int dummy[2];
+        long nr_dentry;
+        long nr_unused;
+        long age_limit;          /* age in seconds */
+        long want_pages;         /* pages requested by system */
+        long dummy[2];
 };
 extern struct dentry_stat_t dentry_stat;
 
@@ -100,6 +101,8 @@ extern unsigned int full_name_hash(const unsigned char *, unsigned int);
 # endif
 #endif
 
+#define d_lock  d_lockref.lock
+
 struct dentry {
         /* RCU lookup touched fields */
         unsigned int d_flags;           /* protected by d_lock */
@@ -112,8 +115,7 @@ struct dentry {
         unsigned char d_iname[DNAME_INLINE_LEN];        /* small names */
 
         /* Ref lookup also touches following */
-        unsigned int d_count;           /* protected by d_lock */
-        spinlock_t d_lock;              /* per dentry lock */
+        struct lockref d_lockref;       /* per-dentry lock and refcount */
         const struct dentry_operations *d_op;
         struct super_block *d_sb;       /* The root of the dentry tree */
         unsigned long d_time;           /* used by d_revalidate */
@@ -146,10 +148,8 @@ enum dentry_d_lock_class
 struct dentry_operations {
         int (*d_revalidate)(struct dentry *, unsigned int);
         int (*d_weak_revalidate)(struct dentry *, unsigned int);
-        int (*d_hash)(const struct dentry *, const struct inode *,
-                        struct qstr *);
-        int (*d_compare)(const struct dentry *, const struct inode *,
-                        const struct dentry *, const struct inode *,
+        int (*d_hash)(const struct dentry *, struct qstr *);
+        int (*d_compare)(const struct dentry *, const struct dentry *,
                         unsigned int, const char *, const struct qstr *);
         int (*d_delete)(const struct dentry *);
         void (*d_release)(struct dentry *);
@@ -208,11 +208,12 @@ struct dentry_operations {
 #define DCACHE_MANAGED_DENTRY \
         (DCACHE_MOUNTED|DCACHE_NEED_AUTOMOUNT|DCACHE_MANAGE_TRANSIT)
 
+#define DCACHE_LRU_LIST         0x80000
 #define DCACHE_DENTRY_KILLED    0x100000
 
 extern seqlock_t rename_lock;
 
-static inline int dname_external(struct dentry *dentry)
+static inline int dname_external(const struct dentry *dentry)
 {
         return dentry->d_name.name != dentry->d_iname;
 }
@@ -246,11 +247,14 @@ extern struct dentry * d_make_root(struct inode *);
 /* <clickety>-<click> the ramfs-type tree */
 extern void d_genocide(struct dentry *);
 
+extern void d_tmpfile(struct dentry *, struct inode *);
+
 extern struct dentry *d_find_alias(struct inode *);
 extern void d_prune_aliases(struct inode *);
 
 /* test whether we have any submounts in a subdir tree */
 extern int have_submounts(struct dentry *);
+extern int check_submounts_and_drop(struct dentry *);
 
 /*
  * This adds the entry to the hash queues.
@@ -300,29 +304,11 @@ extern struct dentry *d_lookup(const struct dentry *, const struct qstr *);
 extern struct dentry *d_hash_and_lookup(struct dentry *, struct qstr *);
 extern struct dentry *__d_lookup(const struct dentry *, const struct qstr *);
 extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
-                                const struct qstr *name,
-                                unsigned *seq, struct inode *inode);
+                                const struct qstr *name, unsigned *seq);
 
-/**
- * __d_rcu_to_refcount - take a refcount on dentry if sequence check is ok
- * @dentry: dentry to take a ref on
- * @seq: seqcount to verify against
- * Returns: 0 on failure, else 1.
- *
- * __d_rcu_to_refcount operates on a dentry,seq pair that was returned
- * by __d_lookup_rcu, to get a reference on an rcu-walk dentry.
- */
-static inline int __d_rcu_to_refcount(struct dentry *dentry, unsigned seq)
+static inline unsigned d_count(const struct dentry *dentry)
 {
-        int ret = 0;
-
-        assert_spin_locked(&dentry->d_lock);
-        if (!read_seqcount_retry(&dentry->d_seq, seq)) {
-                ret = 1;
-                dentry->d_count++;
-        }
-
-        return ret;
+        return dentry->d_lockref.count;
 }
 
 /* validate "insecure" dentry pointer */
@@ -332,6 +318,7 @@ extern int d_validate(struct dentry *, struct dentry *);
  * helper function for dentry_operations.d_dname() members
  */
 extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
+extern char *simple_dname(struct dentry *, char *, int);
 
 extern char *__d_path(const struct path *, const struct path *, char *, int);
 extern char *d_absolute_path(const struct path *, char *, int);
@@ -352,17 +339,14 @@ extern char *dentry_path(struct dentry *, char *, int);
 static inline struct dentry *dget_dlock(struct dentry *dentry)
 {
         if (dentry)
-                dentry->d_count++;
+                dentry->d_lockref.count++;
         return dentry;
 }
 
 static inline struct dentry *dget(struct dentry *dentry)
 {
-        if (dentry) {
-                spin_lock(&dentry->d_lock);
-                dget_dlock(dentry);
-                spin_unlock(&dentry->d_lock);
-        }
+        if (dentry)
+                lockref_get(&dentry->d_lockref);
         return dentry;
 }
 
@@ -375,17 +359,17 @@ extern struct dentry *dget_parent(struct dentry *dentry);
  *      Returns true if the dentry passed is not currently hashed.
  */
  
-static inline int d_unhashed(struct dentry *dentry)
+static inline int d_unhashed(const struct dentry *dentry)
 {
         return hlist_bl_unhashed(&dentry->d_hash);
 }
 
-static inline int d_unlinked(struct dentry *dentry)
+static inline int d_unlinked(const struct dentry *dentry)
 {
         return d_unhashed(dentry) && !IS_ROOT(dentry);
 }
 
-static inline int cant_mount(struct dentry *dentry)
+static inline int cant_mount(const struct dentry *dentry)
 {
         return (dentry->d_flags & DCACHE_CANT_MOUNT);
 }
@@ -399,16 +383,20 @@ static inline void dont_mount(struct dentry *dentry)
 
 extern void dput(struct dentry *);
 
-static inline bool d_managed(struct dentry *dentry)
+static inline bool d_managed(const struct dentry *dentry)
 {
         return dentry->d_flags & DCACHE_MANAGED_DENTRY;
 }
 
-static inline bool d_mountpoint(struct dentry *dentry)
+static inline bool d_mountpoint(const struct dentry *dentry)
 {
         return dentry->d_flags & DCACHE_MOUNTED;
 }
 
 extern int sysctl_vfs_cache_pressure;
 
+static inline unsigned long vfs_pressure_ratio(unsigned long val)
+{
+        return mult_frac(val, sysctl_vfs_cache_pressure, 100);
+}
 #endif  /* __LINUX_DCACHE_H */
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 21ca773f77bf..822c1354f3a6 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -51,7 +51,7 @@ struct task_struct;
 extern void debug_show_all_locks(void);
 extern void debug_show_held_locks(struct task_struct *task);
 extern void debug_check_no_locks_freed(const void *from, unsigned long len);
-extern void debug_check_no_locks_held(struct task_struct *task);
+extern void debug_check_no_locks_held(void);
 #else
 static inline void debug_show_all_locks(void)
 {
@@ -67,7 +67,7 @@ debug_check_no_locks_freed(const void *from, unsigned long len)
 }
 
 static inline void
-debug_check_no_locks_held(struct task_struct *task)
+debug_check_no_locks_held(void)
 {
 }
 #endif
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 63f2465807d4..263489d0788d 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -79,6 +79,8 @@ struct dentry *debugfs_create_x64(const char *name, umode_t mode,
                                   struct dentry *parent, u64 *value);
 struct dentry *debugfs_create_size_t(const char *name, umode_t mode,
                                      struct dentry *parent, size_t *value);
+struct dentry *debugfs_create_atomic_t(const char *name, umode_t mode,
+                                     struct dentry *parent, atomic_t *value);
 struct dentry *debugfs_create_bool(const char *name, umode_t mode,
                                   struct dentry *parent, u32 *value);
 
@@ -190,6 +192,13 @@ static inline struct dentry *debugfs_create_x32(const char *name, umode_t mode,
         return ERR_PTR(-ENODEV);
 }
 
+static inline struct dentry *debugfs_create_x64(const char *name, umode_t mode,
+                                                struct dentry *parent,
+                                                u64 *value)
+{
+        return ERR_PTR(-ENODEV);
+}
+
 static inline struct dentry *debugfs_create_size_t(const char *name, umode_t mode,
                                      struct dentry *parent,
                                      size_t *value)
diff --git a/include/linux/debugobjects.h b/include/linux/debugobjects.h
index 0e5f5785d9f2..98ffcbd4888e 100644
--- a/include/linux/debugobjects.h
+++ b/include/linux/debugobjects.h
@@ -63,7 +63,7 @@ struct debug_obj_descr {
 extern void debug_object_init      (void *addr, struct debug_obj_descr *descr);
 extern void
 debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr);
-extern void debug_object_activate  (void *addr, struct debug_obj_descr *descr);
+extern int debug_object_activate  (void *addr, struct debug_obj_descr *descr);
 extern void debug_object_deactivate(void *addr, struct debug_obj_descr *descr);
 extern void debug_object_destroy   (void *addr, struct debug_obj_descr *descr);
 extern void debug_object_free      (void *addr, struct debug_obj_descr *descr);
@@ -85,8 +85,8 @@ static inline void
 debug_object_init      (void *addr, struct debug_obj_descr *descr) { }
 static inline void
 debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr) { }
-static inline void
-debug_object_activate  (void *addr, struct debug_obj_descr *descr) { }
+static inline int
+debug_object_activate  (void *addr, struct debug_obj_descr *descr) { return 0; }
 static inline void
 debug_object_deactivate(void *addr, struct debug_obj_descr *descr) { }
 static inline void
diff --git a/include/linux/decompress/unlz4.h b/include/linux/decompress/unlz4.h
new file mode 100644
index 000000000000..d5b68bf3ec92
--- /dev/null
+++ b/include/linux/decompress/unlz4.h
@@ -0,0 +1,10 @@
+#ifndef DECOMPRESS_UNLZ4_H
+#define DECOMPRESS_UNLZ4_H
+
+int unlz4(unsigned char *inbuf, int len,
+        int(*fill)(void*, unsigned int),
+        int(*flush)(void*, unsigned int),
+        unsigned char *output,
+        int *pos,
+        void(*error)(char *x));
+#endif
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index fe8c4476f7e4..5f1ab92107e6 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -181,6 +181,8 @@ extern struct devfreq *devfreq_add_device(struct device *dev,
                                   const char *governor_name,
                                   void *data);
 extern int devfreq_remove_device(struct devfreq *devfreq);
+
+/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */
 extern int devfreq_suspend_device(struct devfreq *devfreq);
 extern int devfreq_resume_device(struct devfreq *devfreq);
 
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 3cd32478f2fd..ed419c62dde1 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -10,6 +10,7 @@
 
 #include <linux/bio.h>
 #include <linux/blkdev.h>
+#include <linux/math64.h>
 #include <linux/ratelimit.h>
 
 struct dm_dev;
@@ -405,13 +406,14 @@ int dm_noflush_suspending(struct dm_target *ti);
 union map_info *dm_get_mapinfo(struct bio *bio);
 union map_info *dm_get_rq_mapinfo(struct request *rq);
 
+struct queue_limits *dm_get_queue_limits(struct mapped_device *md);
+
 /*
  * Geometry functions.
  */
 int dm_get_geometry(struct mapped_device *md, struct hd_geometry *geo);
 int dm_set_geometry(struct mapped_device *md, struct hd_geometry *geo);
 
-
 /*-----------------------------------------------------------------
  * Functions for manipulating device-mapper tables.
  *---------------------------------------------------------------*/
@@ -446,9 +448,9 @@ int __must_check dm_set_target_max_io_len(struct dm_target *ti, sector_t len);
 /*
  * Table reference counting.
  */
-struct dm_table *dm_get_live_table(struct mapped_device *md);
-void dm_table_get(struct dm_table *t);
-void dm_table_put(struct dm_table *t);
+struct dm_table *dm_get_live_table(struct mapped_device *md, int *srcu_idx);
+void dm_put_live_table(struct mapped_device *md, int srcu_idx);
+void dm_sync_table(struct mapped_device *md);
 
 /*
  * Queries
@@ -550,6 +552,14 @@ extern struct ratelimit_state dm_ratelimit_state;
 #define DM_MAPIO_REMAPPED       1
 #define DM_MAPIO_REQUEUE        DM_ENDIO_REQUEUE
 
+#define dm_sector_div64(x, y)( \
+{ \
+        u64 _res; \
+        (x) = div64_u64_rem(x, y, &_res); \
+        _res; \
+} \
+)
+
 /*
  * Ceiling(n / sz)
  */
diff --git a/include/linux/device.h b/include/linux/device.h
index c0a126125325..2a9d6ed59579 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -47,7 +47,11 @@ struct bus_attribute {
 };
 
 #define BUS_ATTR(_name, _mode, _show, _store)   \
-struct bus_attribute bus_attr_##_name = __ATTR(_name, _mode, _show, _store)
+        struct bus_attribute bus_attr_##_name = __ATTR(_name, _mode, _show, _store)
+#define BUS_ATTR_RW(_name) \
+        struct bus_attribute bus_attr_##_name = __ATTR_RW(_name)
+#define BUS_ATTR_RO(_name) \
+        struct bus_attribute bus_attr_##_name = __ATTR_RO(_name)
 
 extern int __must_check bus_create_file(struct bus_type *,
                                         struct bus_attribute *);
@@ -62,6 +66,9 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
  * @bus_attrs:  Default attributes of the bus.
  * @dev_attrs:  Default attributes of the devices on the bus.
  * @drv_attrs:  Default attributes of the device drivers on the bus.
+ * @bus_groups: Default attributes of the bus.
+ * @dev_groups: Default attributes of the devices on the bus.
+ * @drv_groups: Default attributes of the device drivers on the bus.
  * @match:      Called, perhaps multiple times, whenever a new device or driver
  *              is added for this bus. It should return a nonzero value if the
  *              given device can be handled by the given driver.
@@ -71,6 +78,10 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
  *              the specific driver's probe to initial the matched device.
  * @remove:     Called when a device removed from this bus.
  * @shutdown:   Called at shut-down time to quiesce the device.
+ *
+ * @online:     Called to put the device back online (after offlining it).
+ * @offline:    Called to put the device offline for hot-removal. May fail.
+ *
  * @suspend:    Called when a device on this bus wants to go to sleep mode.
  * @resume:     Called to bring a device on this bus out of sleep mode.
  * @pm:         Power management operations of this bus, callback the specific
@@ -80,6 +91,7 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
  *              bus-specific setup
  * @p:          The private data of the driver core, only the driver core can
  *              touch this.
+ * @lock_key:   Lock class key for use by the lock validator
  *
  * A bus is a channel between the processor and one or more devices. For the
  * purposes of the device model, all devices are connected via a bus, even if
@@ -94,9 +106,12 @@ struct bus_type {
         const char              *name;
         const char              *dev_name;
         struct device           *dev_root;
-        struct bus_attribute    *bus_attrs;
-        struct device_attribute *dev_attrs;
-        struct driver_attribute *drv_attrs;
+        struct bus_attribute    *bus_attrs;     /* use bus_groups instead */
+        struct device_attribute *dev_attrs;     /* use dev_groups instead */
+        struct driver_attribute *drv_attrs;     /* use drv_groups instead */
+        const struct attribute_group **bus_groups;
+        const struct attribute_group **dev_groups;
+        const struct attribute_group **drv_groups;
 
         int (*match)(struct device *dev, struct device_driver *drv);
         int (*uevent)(struct device *dev, struct kobj_uevent_env *env);
@@ -104,6 +119,9 @@ struct bus_type {
         int (*remove)(struct device *dev);
         void (*shutdown)(struct device *dev);
 
+        int (*online)(struct device *dev);
+        int (*offline)(struct device *dev);
+
         int (*suspend)(struct device *dev, pm_message_t state);
         int (*resume)(struct device *dev);
 
@@ -253,9 +271,14 @@ struct driver_attribute {
                          size_t count);
 };
 
-#define DRIVER_ATTR(_name, _mode, _show, _store)        \
-struct driver_attribute driver_attr_##_name =           \
-        __ATTR(_name, _mode, _show, _store)
+#define DRIVER_ATTR(_name, _mode, _show, _store) \
+        struct driver_attribute driver_attr_##_name = __ATTR(_name, _mode, _show, _store)
+#define DRIVER_ATTR_RW(_name) \
+        struct driver_attribute driver_attr_##_name = __ATTR_RW(_name)
+#define DRIVER_ATTR_RO(_name) \
+        struct driver_attribute driver_attr_##_name = __ATTR_RO(_name)
+#define DRIVER_ATTR_WO(_name) \
+        struct driver_attribute driver_attr_##_name = __ATTR_WO(_name)
 
 extern int __must_check driver_create_file(struct device_driver *driver,
                                         const struct driver_attribute *attr);
@@ -305,6 +328,7 @@ int subsys_virtual_register(struct bus_type *subsys,
  * @name:       Name of the class.
  * @owner:      The module owner.
  * @class_attrs: Default attributes of this class.
+ * @dev_groups: Default attributes of the devices that belong to the class.
  * @dev_attrs:  Default attributes of the devices belong to the class.
  * @dev_bin_attrs: Default binary attributes of the devices belong to the class.
  * @dev_kobj:   The kobject that represents this class and links it into the hierarchy.
@@ -334,7 +358,8 @@ struct class {
         struct module           *owner;
 
         struct class_attribute          *class_attrs;
-        struct device_attribute         *dev_attrs;
+        struct device_attribute         *dev_attrs;     /* use dev_groups instead */
+        const struct attribute_group    **dev_groups;
         struct bin_attribute            *dev_bin_attrs;
         struct kobject                  *dev_kobj;
 
@@ -406,8 +431,12 @@ struct class_attribute {
                                  const struct class_attribute *attr);
 };
 
-#define CLASS_ATTR(_name, _mode, _show, _store)                 \
-struct class_attribute class_attr_##_name = __ATTR(_name, _mode, _show, _store)
+#define CLASS_ATTR(_name, _mode, _show, _store) \
+        struct class_attribute class_attr_##_name = __ATTR(_name, _mode, _show, _store)
+#define CLASS_ATTR_RW(_name) \
+        struct class_attribute class_attr_##_name = __ATTR_RW(_name)
+#define CLASS_ATTR_RO(_name) \
+        struct class_attribute class_attr_##_name = __ATTR_RO(_name)
 
 extern int __must_check class_create_file(struct class *class,
                                           const struct class_attribute *attr);
@@ -415,7 +444,6 @@ extern void class_remove_file(struct class *class,
                               const struct class_attribute *attr);
 
 /* Simple class attribute that is just a static string */
-
 struct class_attribute_string {
         struct class_attribute attr;
         char *str;
@@ -504,6 +532,12 @@ ssize_t device_store_bool(struct device *dev, struct device_attribute *attr,
 
 #define DEVICE_ATTR(_name, _mode, _show, _store) \
         struct device_attribute dev_attr_##_name = __ATTR(_name, _mode, _show, _store)
+#define DEVICE_ATTR_RW(_name) \
+        struct device_attribute dev_attr_##_name = __ATTR_RW(_name)
+#define DEVICE_ATTR_RO(_name) \
+        struct device_attribute dev_attr_##_name = __ATTR_RO(_name)
+#define DEVICE_ATTR_WO(_name) \
+        struct device_attribute dev_attr_##_name = __ATTR_WO(_name)
 #define DEVICE_ULONG_ATTR(_name, _mode, _var) \
         struct dev_ext_attribute dev_attr_##_name = \
                 { __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) }
@@ -635,6 +669,7 @@ struct acpi_dev_node {
  *              segment limitations.
  * @dma_pools:  Dma pools (if dma'ble device).
  * @dma_mem:    Internal for coherent mem override.
+ * @cma_area:   Contiguous memory area for dma allocations
  * @archdata:   For arch-specific additions.
  * @of_node:    Associated device tree node.
  * @acpi_node:  Associated ACPI device node.
@@ -648,6 +683,10 @@ struct acpi_dev_node {
  * @release:    Callback to free the device after all references have
  *              gone away. This should be set by the allocator of the
  *              device (i.e. the bus driver that discovered the device).
+ * @iommu_group: IOMMU group the device belongs to.
+ *
+ * @offline_disabled: If set, the device is permanently online.
+ * @offline:    Set after successful invocation of bus type's .offline().
  *
  * At the lowest level, every device in a Linux system is represented by an
  * instance of struct device. The device structure contains the information
@@ -698,7 +737,7 @@ struct device {
 
         struct dma_coherent_mem *dma_mem; /* internal for coherent mem
                                              override */
-#ifdef CONFIG_CMA
+#ifdef CONFIG_DMA_CMA
         struct cma *cma_area;           /* contiguous memory area for dma
                                            allocations */
 #endif
@@ -720,6 +759,9 @@ struct device {
 
         void    (*release)(struct device *dev);
         struct iommu_group      *iommu_group;
+
+        bool                    offline_disabled:1;
+        bool                    offline:1;
 };
 
 static inline struct device *kobj_to_dev(struct kobject *kobj)
@@ -856,6 +898,16 @@ extern const char *device_get_devnode(struct device *dev,
 extern void *dev_get_drvdata(const struct device *dev);
 extern int dev_set_drvdata(struct device *dev, void *data);
 
+static inline bool device_supports_offline(struct device *dev)
+{
+        return dev->bus && dev->bus->offline && dev->bus->online;
+}
+
+extern void lock_device_hotplug(void);
+extern void unlock_device_hotplug(void);
+extern int lock_device_hotplug_sysfs(void);
+extern int device_offline(struct device *dev);
+extern int device_online(struct device *dev);
 /*
  * Root device objects for grouping under /sys/devices
  */
@@ -899,6 +951,11 @@ extern __printf(5, 6)
 struct device *device_create(struct class *cls, struct device *parent,
                              dev_t devt, void *drvdata,
                              const char *fmt, ...);
+extern __printf(6, 7)
+struct device *device_create_with_groups(struct class *cls,
+                             struct device *parent, dev_t devt, void *drvdata,
+                             const struct attribute_group **groups,
+                             const char *fmt, ...);
 extern void device_destroy(struct class *cls, dev_t devt);
 
 /*
@@ -1053,7 +1110,8 @@ do {									\
         dev_level_ratelimited(dev_notice, dev, fmt, ##__VA_ARGS__)
 #define dev_info_ratelimited(dev, fmt, ...)                             \
         dev_level_ratelimited(dev_info, dev, fmt, ##__VA_ARGS__)
-#if defined(CONFIG_DYNAMIC_DEBUG) || defined(DEBUG)
+#if defined(CONFIG_DYNAMIC_DEBUG)
+/* descriptor check is first to prevent flooding with "callbacks suppressed" */
 #define dev_dbg_ratelimited(dev, fmt, ...)                              \
 do {                                                                    \
         static DEFINE_RATELIMIT_STATE(_rs,                              \
@@ -1062,8 +1120,17 @@ do {									\
         DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);                 \
         if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) &&        \
             __ratelimit(&_rs))                                          \
-                __dynamic_pr_debug(&descriptor, pr_fmt(fmt),            \
-                                   ##__VA_ARGS__);                      \
+                __dynamic_dev_dbg(&descriptor, dev, fmt,                \
+                                  ##__VA_ARGS__);                       \
+} while (0)
+#elif defined(DEBUG)
+#define dev_dbg_ratelimited(dev, fmt, ...)                              \
+do {                                                                    \
+        static DEFINE_RATELIMIT_STATE(_rs,                              \
+                                      DEFAULT_RATELIMIT_INTERVAL,       \
+                                      DEFAULT_RATELIMIT_BURST);         \
+        if (__ratelimit(&_rs))                                          \
+                dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__);        \
 } while (0)
 #else
 #define dev_dbg_ratelimited(dev, fmt, ...)                      \
diff --git a/include/linux/dm9000.h b/include/linux/dm9000.h
index 96e87693d933..841925fbfe8a 100644
--- a/include/linux/dm9000.h
+++ b/include/linux/dm9000.h
@@ -14,6 +14,8 @@
 #ifndef __DM9000_PLATFORM_DATA
 #define __DM9000_PLATFORM_DATA __FILE__
 
+#include <linux/if_ether.h>
+
 /* IO control flags */
 
 #define DM9000_PLATF_8BITONLY   (0x0001)
@@ -27,7 +29,7 @@
 
 struct dm9000_plat_data {
         unsigned int    flags;
-        unsigned char   dev_addr[6];
+        unsigned char   dev_addr[ETH_ALEN];
 
         /* allow replacement IO routines */
 
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h
index 01b5c84be828..3b28f937d959 100644
--- a/include/linux/dma-contiguous.h
+++ b/include/linux/dma-contiguous.h
@@ -57,7 +57,7 @@ struct cma;
 struct page;
 struct device;
 
-#ifdef CONFIG_CMA
+#ifdef CONFIG_DMA_CMA
 
 /*
  * There is always at least global CMA area and a few optional device
@@ -67,9 +67,53 @@ struct device;
 
 extern struct cma *dma_contiguous_default_area;
 
+static inline struct cma *dev_get_cma_area(struct device *dev)
+{
+        if (dev && dev->cma_area)
+                return dev->cma_area;
+        return dma_contiguous_default_area;
+}
+
+static inline void dev_set_cma_area(struct device *dev, struct cma *cma)
+{
+        if (dev)
+                dev->cma_area = cma;
+}
+
+static inline void dma_contiguous_set_default(struct cma *cma)
+{
+        dma_contiguous_default_area = cma;
+}
+
 void dma_contiguous_reserve(phys_addr_t addr_limit);
-int dma_declare_contiguous(struct device *dev, phys_addr_t size,
-                           phys_addr_t base, phys_addr_t limit);
+
+int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
+                                       phys_addr_t limit, struct cma **res_cma);
+
+/**
+ * dma_declare_contiguous() - reserve area for contiguous memory handling
+ *                            for particular device
+ * @dev:   Pointer to device structure.
+ * @size:  Size of the reserved memory.
+ * @base:  Start address of the reserved memory (optional, 0 for any).
+ * @limit: End address of the reserved memory (optional, 0 for any).
+ *
+ * This function reserves memory for specified device. It should be
+ * called by board specific code when early allocator (memblock or bootmem)
+ * is still activate.
+ */
+
+static inline int dma_declare_contiguous(struct device *dev, phys_addr_t size,
+                                         phys_addr_t base, phys_addr_t limit)
+{
+        struct cma *cma;
+        int ret;
+        ret = dma_contiguous_reserve_area(size, base, limit, &cma);
+        if (ret == 0)
+                dev_set_cma_area(dev, cma);
+
+        return ret;
+}
 
 struct page *dma_alloc_from_contiguous(struct device *dev, int count,
                                        unsigned int order);
@@ -80,8 +124,22 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages,
 
 #define MAX_CMA_AREAS   (0)
 
+static inline struct cma *dev_get_cma_area(struct device *dev)
+{
+        return NULL;
+}
+
+static inline void dev_set_cma_area(struct device *dev, struct cma *cma) { }
+
+static inline void dma_contiguous_set_default(struct cma *cma) { }
+
 static inline void dma_contiguous_reserve(phys_addr_t limit) { }
 
+static inline int dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
+                                       phys_addr_t limit, struct cma **res_cma) {
+        return -ENOSYS;
+}
+
 static inline
 int dma_declare_contiguous(struct device *dev, phys_addr_t size,
                            phys_addr_t base, phys_addr_t limit)
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 94af41858513..3a8d0a2af607 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -132,9 +132,8 @@ static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask)
 static inline void *dma_zalloc_coherent(struct device *dev, size_t size,
                                         dma_addr_t *dma_handle, gfp_t flag)
 {
-        void *ret = dma_alloc_coherent(dev, size, dma_handle, flag);
-        if (ret)
-                memset(ret, 0, size);
+        void *ret = dma_alloc_coherent(dev, size, dma_handle,
+                                       flag | __GFP_ZERO);
         return ret;
 }
 
diff --git a/include/linux/dma/mmp-pdma.h b/include/linux/dma/mmp-pdma.h
new file mode 100644
index 000000000000..2dc9b2bc18fc
--- /dev/null
+++ b/include/linux/dma/mmp-pdma.h
@@ -0,0 +1,15 @@
+#ifndef _MMP_PDMA_H_
+#define _MMP_PDMA_H_
+
+struct dma_chan;
+
+#ifdef CONFIG_MMP_PDMA
+bool mmp_pdma_filter_fn(struct dma_chan *chan, void *param);
+#else
+static inline bool mmp_pdma_filter_fn(struct dma_chan *chan, void *param)
+{
+        return false;
+}
+#endif
+
+#endif /* _MMP_PDMA_H_ */
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 96d3e4ab11a9..0bc727534108 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -38,7 +38,10 @@ typedef s32 dma_cookie_t;
 #define DMA_MIN_COOKIE  1
 #define DMA_MAX_COOKIE  INT_MAX
 
-#define dma_submit_error(cookie) ((cookie) < 0 ? 1 : 0)
+static inline int dma_submit_error(dma_cookie_t cookie)
+{
+        return cookie < 0 ? cookie : 0;
+}
 
 /**
  * enum dma_status - DMA transaction status
@@ -66,7 +69,6 @@ enum dma_transaction_type {
         DMA_PQ,
         DMA_XOR_VAL,
         DMA_PQ_VAL,
-        DMA_MEMSET,
         DMA_INTERRUPT,
         DMA_SG,
         DMA_PRIVATE,
@@ -371,6 +373,25 @@ struct dma_slave_config {
         unsigned int slave_id;
 };
 
+/* struct dma_slave_caps - expose capabilities of a slave channel only
+ *
+ * @src_addr_widths: bit mask of src addr widths the channel supports
+ * @dstn_addr_widths: bit mask of dstn addr widths the channel supports
+ * @directions: bit mask of slave direction the channel supported
+ *      since the enum dma_transfer_direction is not defined as bits for each
+ *      type of direction, the dma controller should fill (1 << <TYPE>) and same
+ *      should be checked by controller as well
+ * @cmd_pause: true, if pause and thereby resume is supported
+ * @cmd_terminate: true, if terminate cmd is supported
+ */
+struct dma_slave_caps {
+        u32 src_addr_widths;
+        u32 dstn_addr_widths;
+        u32 directions;
+        bool cmd_pause;
+        bool cmd_terminate;
+};
+
 static inline const char *dma_chan_name(struct dma_chan *chan)
 {
         return dev_name(&chan->dev->device);
@@ -520,7 +541,6 @@ struct dma_tx_state {
  * @device_prep_dma_xor_val: prepares a xor validation operation
  * @device_prep_dma_pq: prepares a pq operation
  * @device_prep_dma_pq_val: prepares a pqzero_sum operation
- * @device_prep_dma_memset: prepares a memset operation
  * @device_prep_dma_interrupt: prepares an end of chain interrupt operation
  * @device_prep_slave_sg: prepares a slave dma operation
  * @device_prep_dma_cyclic: prepare a cyclic dma operation suitable for audio.
@@ -534,6 +554,7 @@ struct dma_tx_state {
  *      struct with auxiliary transfer status information, otherwise the call
  *      will just return a simple status code
  * @device_issue_pending: push pending transactions to hardware
+ * @device_slave_caps: return the slave channel capabilities
  */
 struct dma_device {
 
@@ -573,9 +594,6 @@ struct dma_device {
                 struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src,
                 unsigned int src_cnt, const unsigned char *scf, size_t len,
                 enum sum_check_flags *pqres, unsigned long flags);
-        struct dma_async_tx_descriptor *(*device_prep_dma_memset)(
-                struct dma_chan *chan, dma_addr_t dest, int value, size_t len,
-                unsigned long flags);
         struct dma_async_tx_descriptor *(*device_prep_dma_interrupt)(
                 struct dma_chan *chan, unsigned long flags);
         struct dma_async_tx_descriptor *(*device_prep_dma_sg)(
@@ -602,6 +620,7 @@ struct dma_device {
                                             dma_cookie_t cookie,
                                             struct dma_tx_state *txstate);
         void (*device_issue_pending)(struct dma_chan *chan);
+        int (*device_slave_caps)(struct dma_chan *chan, struct dma_slave_caps *caps);
 };
 
 static inline int dmaengine_device_control(struct dma_chan *chan,
@@ -675,6 +694,21 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_interleaved_dma(
         return chan->device->device_prep_interleaved_dma(chan, xt, flags);
 }
 
+static inline int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps)
+{
+        if (!chan || !caps)
+                return -EINVAL;
+
+        /* check if the channel supports slave transactions */
+        if (!test_bit(DMA_SLAVE, chan->device->cap_mask.bits))
+                return -ENXIO;
+
+        if (chan->device->device_slave_caps)
+                return chan->device->device_slave_caps(chan, caps);
+
+        return -ENXIO;
+}
+
 static inline int dmaengine_terminate_all(struct dma_chan *chan)
 {
         return dmaengine_device_control(chan, DMA_TERMINATE_ALL, 0);
@@ -963,8 +997,9 @@ dma_set_tx_state(struct dma_tx_state *st, dma_cookie_t last, dma_cookie_t used,
         }
 }
 
-enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie);
 #ifdef CONFIG_DMA_ENGINE
+struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);
+enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie);
 enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
 void dma_issue_pending_all(void);
 struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
@@ -972,6 +1007,14 @@ struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
 struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name);
 void dma_release_channel(struct dma_chan *chan);
 #else
+static inline struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type)
+{
+        return NULL;
+}
+static inline enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie)
+{
+        return DMA_SUCCESS;
+}
 static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
 {
         return DMA_SUCCESS;
@@ -999,7 +1042,7 @@ static inline void dma_release_channel(struct dma_chan *chan)
 int dma_async_device_register(struct dma_device *device);
 void dma_async_device_unregister(struct dma_device *device);
 void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
-struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);
+struct dma_chan *dma_get_slave_channel(struct dma_chan *chan);
 struct dma_chan *net_dma_find_channel(void);
 #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
 #define dma_request_slave_channel_compat(mask, x, y, dev, name) \
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 1b4d4ee1168f..de7d74ab3de6 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -177,7 +177,11 @@ enum drbd_ret_code {
         ERR_NEED_APV_100        = 163,
         ERR_NEED_ALLOW_TWO_PRI  = 164,
         ERR_MD_UNCLEAN          = 165,
-
+        ERR_MD_LAYOUT_CONNECTED = 166,
+        ERR_MD_LAYOUT_TOO_BIG   = 167,
+        ERR_MD_LAYOUT_TOO_SMALL = 168,
+        ERR_MD_LAYOUT_NO_FIT    = 169,
+        ERR_IMPLICIT_SHRINK     = 170,
         /* insert new ones above this line */
         AFTER_LAST_ERR_CODE
 };
diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index d0d8fac8a6e4..e8c44572b8cb 100644
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -181,6 +181,8 @@ GENL_struct(DRBD_NLA_RESIZE_PARMS, 7, resize_parms,
         __u64_field(1, DRBD_GENLA_F_MANDATORY,  resize_size)
         __flg_field(2, DRBD_GENLA_F_MANDATORY,  resize_force)
         __flg_field(3, DRBD_GENLA_F_MANDATORY,  no_resync)
+        __u32_field_def(4, 0 /* OPTIONAL */, al_stripes, DRBD_AL_STRIPES_DEF)
+        __u32_field_def(5, 0 /* OPTIONAL */, al_stripe_size, DRBD_AL_STRIPE_SIZE_DEF)
 )
 
 GENL_struct(DRBD_NLA_STATE_INFO, 8, state_info,
diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h
index 1fedf2b17cc8..17e50bb00521 100644
--- a/include/linux/drbd_limits.h
+++ b/include/linux/drbd_limits.h
@@ -215,4 +215,13 @@
 #define DRBD_ALWAYS_ASBP_DEF    0
 #define DRBD_USE_RLE_DEF        1
 
+#define DRBD_AL_STRIPES_MIN     1
+#define DRBD_AL_STRIPES_MAX     1024
+#define DRBD_AL_STRIPES_DEF     1
+#define DRBD_AL_STRIPES_SCALE   '1'
+
+#define DRBD_AL_STRIPE_SIZE_MIN   4
+#define DRBD_AL_STRIPE_SIZE_MAX   16777216
+#define DRBD_AL_STRIPE_SIZE_DEF   32
+#define DRBD_AL_STRIPE_SIZE_SCALE 'k' /* kilobytes */
 #endif
diff --git a/include/linux/dw_apb_timer.h b/include/linux/dw_apb_timer.h
index dd755ce2a5eb..1f79b20918b1 100644
--- a/include/linux/dw_apb_timer.h
+++ b/include/linux/dw_apb_timer.h
@@ -51,7 +51,5 @@ dw_apb_clocksource_init(unsigned rating, const char *name, void __iomem *base,
 void dw_apb_clocksource_register(struct dw_apb_clocksource *dw_cs);
 void dw_apb_clocksource_start(struct dw_apb_clocksource *dw_cs);
 cycle_t dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs);
-void dw_apb_clocksource_unregister(struct dw_apb_clocksource *dw_cs);
 
-extern void dw_apb_timer_init(void);
 #endif /* __DW_APB_TIMER_H__ */
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 0b763276f619..5c6d7fbaf89e 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -622,7 +622,7 @@ struct edac_raw_error_desc {
  */
 struct mem_ctl_info {
         struct device                   dev;
-        struct bus_type                 bus;
+        struct bus_type                 *bus;
 
         struct list_head link;  /* for global list of mem_ctl_info structs */
 
@@ -742,4 +742,9 @@ struct mem_ctl_info {
 #endif
 };
 
+/*
+ * Maximum number of memory controllers in the coherent fabric.
+ */
+#define EDAC_MAX_MCS    16
+
 #endif
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 2bc0ad78d058..5f8f176154f7 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -287,20 +287,20 @@ typedef struct {
 
 typedef struct {
         efi_table_hdr_t hdr;
-        unsigned long get_time;
-        unsigned long set_time;
-        unsigned long get_wakeup_time;
-        unsigned long set_wakeup_time;
-        unsigned long set_virtual_address_map;
-        unsigned long convert_pointer;
-        unsigned long get_variable;
-        unsigned long get_next_variable;
-        unsigned long set_variable;
-        unsigned long get_next_high_mono_count;
-        unsigned long reset_system;
-        unsigned long update_capsule;
-        unsigned long query_capsule_caps;
-        unsigned long query_variable_info;
+        void *get_time;
+        void *set_time;
+        void *get_wakeup_time;
+        void *set_wakeup_time;
+        void *set_virtual_address_map;
+        void *convert_pointer;
+        void *get_variable;
+        void *get_next_variable;
+        void *set_variable;
+        void *get_next_high_mono_count;
+        void *reset_system;
+        void *update_capsule;
+        void *query_capsule_caps;
+        void *query_variable_info;
 } efi_runtime_services_t;
 
 typedef efi_status_t efi_get_time_t (efi_time_t *tm, efi_time_cap_t *tc);
@@ -594,8 +594,8 @@ extern u64 efi_mem_attribute (unsigned long phys_addr, unsigned long size);
 extern int __init efi_uart_console_only (void);
 extern void efi_initialize_iomem_resources(struct resource *code_resource,
                 struct resource *data_resource, struct resource *bss_resource);
-extern unsigned long efi_get_time(void);
-extern int efi_set_rtc_mmss(unsigned long nowtime);
+extern void efi_get_time(struct timespec *now);
+extern int efi_set_rtc_mmss(const struct timespec *now);
 extern void efi_reserve_boot_services(void);
 extern struct efi_memory_map memmap;
 
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index acd0312d46fb..306dd8cd0b6f 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -7,6 +7,7 @@
 #ifdef CONFIG_BLOCK
 
 struct io_cq;
+struct elevator_type;
 
 typedef int (elevator_merge_fn) (struct request_queue *, struct request **,
                                  struct bio *);
@@ -35,7 +36,8 @@ typedef void (elevator_put_req_fn) (struct request *);
 typedef void (elevator_activate_req_fn) (struct request_queue *, struct request *);
 typedef void (elevator_deactivate_req_fn) (struct request_queue *, struct request *);
 
-typedef int (elevator_init_fn) (struct request_queue *);
+typedef int (elevator_init_fn) (struct request_queue *,
+                                struct elevator_type *e);
 typedef void (elevator_exit_fn) (struct elevator_queue *);
 
 struct elevator_ops
@@ -155,6 +157,8 @@ extern int elevator_init(struct request_queue *, char *);
 extern void elevator_exit(struct elevator_queue *);
 extern int elevator_change(struct request_queue *, const char *);
 extern bool elv_rq_merge_ok(struct request *, struct bio *);
+extern struct elevator_queue *elevator_alloc(struct request_queue *,
+                                        struct elevator_type *);
 
 /*
  * Helper functions.
diff --git a/include/linux/err.h b/include/linux/err.h
index f2edce25a76b..15f92e072450 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -24,17 +24,17 @@ static inline void * __must_check ERR_PTR(long error)
         return (void *) error;
 }
 
-static inline long __must_check PTR_ERR(const void *ptr)
+static inline long __must_check PTR_ERR(__force const void *ptr)
 {
         return (long) ptr;
 }
 
-static inline long __must_check IS_ERR(const void *ptr)
+static inline long __must_check IS_ERR(__force const void *ptr)
 {
         return IS_ERR_VALUE((unsigned long)ptr);
 }
 
-static inline long __must_check IS_ERR_OR_NULL(const void *ptr)
+static inline long __must_check IS_ERR_OR_NULL(__force const void *ptr)
 {
         return !ptr || IS_ERR_VALUE((unsigned long)ptr);
 }
@@ -46,13 +46,13 @@ static inline long __must_check IS_ERR_OR_NULL(const void *ptr)
  * Explicitly cast an error-valued pointer to another pointer type in such a
  * way as to make it clear that's what's going on.
  */
-static inline void * __must_check ERR_CAST(const void *ptr)
+static inline void * __must_check ERR_CAST(__force const void *ptr)
 {
         /* cast away the const */
         return (void *) ptr;
 }
 
-static inline int __must_check PTR_RET(const void *ptr)
+static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr)
 {
         if (IS_ERR(ptr))
                 return PTR_ERR(ptr);
@@ -60,6 +60,9 @@ static inline int __must_check PTR_RET(const void *ptr)
                 return 0;
 }
 
+/* Deprecated */
+#define PTR_RET(p) PTR_ERR_OR_ZERO(p)
+
 #endif
 
 #endif /* _LINUX_ERR_H */
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index c623861964e4..d8b512496e50 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -199,6 +199,21 @@ static inline void eth_hw_addr_random(struct net_device *dev)
 }
 
 /**
+ * eth_hw_addr_inherit - Copy dev_addr from another net_device
+ * @dst: pointer to net_device to copy dev_addr to
+ * @src: pointer to net_device to copy dev_addr from
+ *
+ * Copy the Ethernet address from one net_device to another along with
+ * the address attributes (addr_assign_type).
+ */
+static inline void eth_hw_addr_inherit(struct net_device *dst,
+                                       struct net_device *src)
+{
+        dst->addr_assign_type = src->addr_assign_type;
+        memcpy(dst->dev_addr, src->dev_addr, ETH_ALEN);
+}
+
+/**
  * compare_ether_addr - Compare two Ethernet addresses
  * @addr1: Pointer to a six-byte array containing the Ethernet address
  * @addr2: Pointer other six-byte array containing the Ethernet address
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index cf5d2af61b81..ff0b981f078e 100644
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -9,7 +9,6 @@
 #define _LINUX_EVENTFD_H
 
 #include <linux/fcntl.h>
-#include <linux/file.h>
 #include <linux/wait.h>
 
 /*
@@ -26,6 +25,8 @@
 #define EFD_SHARED_FCNTL_FLAGS (O_CLOEXEC | O_NONBLOCK)
 #define EFD_FLAGS_SET (EFD_SHARED_FCNTL_FLAGS | EFD_SEMAPHORE)
 
+struct file;
+
 #ifdef CONFIG_EVENTFD
 
 struct file *eventfd_file_create(unsigned int count, int flags);
diff --git a/include/linux/extcon/of_extcon.h b/include/linux/extcon/of_extcon.h
new file mode 100644
index 000000000000..0ebfeff1b55d
--- /dev/null
+++ b/include/linux/extcon/of_extcon.h
@@ -0,0 +1,31 @@
+/*
+ * OF helpers for External connector (extcon) framework
+ *
+ * Copyright (C) 2013 Texas Instruments, Inc.
+ * Kishon Vijay Abraham I <kishon@ti.com>
+ *
+ * Copyright (C) 2013 Samsung Electronics
+ * Chanwoo Choi <cw00.choi@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __LINUX_OF_EXTCON_H
+#define __LINUX_OF_EXTCON_H
+
+#include <linux/err.h>
+
+#if IS_ENABLED(CONFIG_OF_EXTCON)
+extern struct extcon_dev
+        *of_extcon_get_extcon_dev(struct device *dev, int index);
+#else
+static inline struct extcon_dev
+        *of_extcon_get_extcon_dev(struct device *dev, int index)
+{
+        return ERR_PTR(-ENOSYS);
+}
+#endif /* CONFIG_OF_EXTCON */
+#endif /* __LINUX_OF_EXTCON_H */
diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index df6fab82f87e..bb942f6d5702 100644
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -20,8 +20,8 @@
 #define F2FS_BLKSIZE                    4096    /* support only 4KB block */
 #define F2FS_MAX_EXTENSION              64      /* # of extension entries */
 
-#define NULL_ADDR               0x0U
-#define NEW_ADDR                -1U
+#define NULL_ADDR               ((block_t)0)    /* used as block_t addresses */
+#define NEW_ADDR                ((block_t)-1)   /* used as block_t addresses */
 
 #define F2FS_ROOT_INO(sbi)      (sbi->root_ino_num)
 #define F2FS_NODE_INO(sbi)      (sbi->node_ino_num)
@@ -140,14 +140,24 @@ struct f2fs_extent {
 } __packed;
 
 #define F2FS_NAME_LEN           255
-#define ADDRS_PER_INODE         923     /* Address Pointers in an Inode */
-#define ADDRS_PER_BLOCK         1018    /* Address Pointers in a Direct Block */
-#define NIDS_PER_BLOCK          1018    /* Node IDs in an Indirect Block */
+#define F2FS_INLINE_XATTR_ADDRS 50      /* 200 bytes for inline xattrs */
+#define DEF_ADDRS_PER_INODE     923     /* Address Pointers in an Inode */
+#define ADDRS_PER_INODE(fi)     addrs_per_inode(fi)
+#define ADDRS_PER_BLOCK         1018    /* Address Pointers in a Direct Block */
+#define NIDS_PER_BLOCK          1018    /* Node IDs in an Indirect Block */
+
+#define NODE_DIR1_BLOCK         (DEF_ADDRS_PER_INODE + 1)
+#define NODE_DIR2_BLOCK         (DEF_ADDRS_PER_INODE + 2)
+#define NODE_IND1_BLOCK         (DEF_ADDRS_PER_INODE + 3)
+#define NODE_IND2_BLOCK         (DEF_ADDRS_PER_INODE + 4)
+#define NODE_DIND_BLOCK         (DEF_ADDRS_PER_INODE + 5)
+
+#define F2FS_INLINE_XATTR       0x01    /* file inline xattr flag */
 
 struct f2fs_inode {
         __le16 i_mode;                  /* file mode */
         __u8 i_advise;                  /* file hints */
-        __u8 i_reserved;                /* reserved */
+        __u8 i_inline;                  /* file inline flags */
         __le32 i_uid;                   /* user ID */
         __le32 i_gid;                   /* group ID */
         __le32 i_links;                 /* links count */
@@ -170,7 +180,7 @@ struct f2fs_inode {
 
         struct f2fs_extent i_ext;       /* caching a largest extent */
 
-        __le32 i_addr[ADDRS_PER_INODE]; /* Pointers to data blocks */
+        __le32 i_addr[DEF_ADDRS_PER_INODE];     /* Pointers to data blocks */
 
         __le32 i_nid[5];                /* direct(2), indirect(2),
                                                 double_indirect(1) node id */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index d49c60f5aa4c..ffac70aab3e9 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -624,7 +624,7 @@ extern void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u3
 extern void fb_set_suspend(struct fb_info *info, int state);
 extern int fb_get_color_depth(struct fb_var_screeninfo *var,
                               struct fb_fix_screeninfo *fix);
-extern int fb_get_options(char *name, char **option);
+extern int fb_get_options(const char *name, char **option);
 extern int fb_new_modelist(struct fb_info *info);
 
 extern struct fb_info *registered_fb[FB_MAX];
diff --git a/include/linux/filter.h b/include/linux/filter.h
index c050dcc322a4..a6ac84871d6d 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -46,6 +46,7 @@ extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
 extern int sk_detach_filter(struct sock *sk);
 extern int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
 extern int sk_get_filter(struct sock *sk, struct sock_filter __user *filter, unsigned len);
+extern void sk_decode_filter(struct sock_filter *filt, struct sock_filter *to);
 
 #ifdef CONFIG_BPF_JIT
 #include <stdarg.h>
@@ -58,10 +59,10 @@ extern void bpf_jit_free(struct sk_filter *fp);
 static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen,
                                 u32 pass, void *image)
 {
-        pr_err("flen=%u proglen=%u pass=%u image=%p\n",
+        pr_err("flen=%u proglen=%u pass=%u image=%pK\n",
                flen, proglen, pass, image);
         if (image)
-                print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_ADDRESS,
+                print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_OFFSET,
                                16, 1, image, proglen, false);
 }
 #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns)
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 191501afd7fb..5d7782e42b8f 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -251,8 +251,10 @@ struct ieee1394_device_id;
 
 struct fw_driver {
         struct device_driver driver;
+        int (*probe)(struct fw_unit *unit, const struct ieee1394_device_id *id);
         /* Called when the parent device sits through a bus reset. */
         void (*update)(struct fw_unit *unit);
+        void (*remove)(struct fw_unit *unit);
         const struct ieee1394_device_id *id_table;
 };
 
@@ -434,6 +436,7 @@ struct fw_iso_context {
         int type;
         int channel;
         int speed;
+        bool drop_overflow_headers;
         size_t header_size;
         union {
                 fw_iso_callback_t sc;
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index e4279fedb93a..e154c1005cd1 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -47,8 +47,6 @@ int request_firmware_nowait(
         void (*cont)(const struct firmware *fw, void *context));
 
 void release_firmware(const struct firmware *fw);
-int cache_firmware(const char *name);
-int uncache_firmware(const char *name);
 #else
 static inline int request_firmware(const struct firmware **fw,
                                    const char *name,
@@ -68,15 +66,6 @@ static inline void release_firmware(const struct firmware *fw)
 {
 }
 
-static inline int cache_firmware(const char *name)
-{
-        return -ENOENT;
-}
-
-static inline int uncache_firmware(const char *name)
-{
-        return -EINVAL;
-}
 #endif
 
 #endif
diff --git a/include/linux/fmc-sdb.h b/include/linux/fmc-sdb.h
new file mode 100644
index 000000000000..1974317a9b3d
--- /dev/null
+++ b/include/linux/fmc-sdb.h
@@ -0,0 +1,36 @@
+/*
+ * This file is separate from sdb.h, because I want that one to remain
+ * unchanged (as far as possible) from the official sdb distribution
+ *
+ * This file and associated functionality are a playground for me to
+ * understand stuff which will later be implemented in more generic places.
+ */
+#include <linux/sdb.h>
+
+/* This is the union of all currently defined types */
+union sdb_record {
+        struct sdb_interconnect ic;
+        struct sdb_device dev;
+        struct sdb_bridge bridge;
+        struct sdb_integration integr;
+        struct sdb_empty empty;
+};
+
+struct fmc_device;
+
+/* Every sdb table is turned into this structure */
+struct sdb_array {
+        int len;
+        int level;
+        unsigned long baseaddr;
+        struct fmc_device *fmc;         /* the device that hosts it */
+        struct sdb_array *parent;       /* NULL at root */
+        union sdb_record *record;       /* copies of the struct */
+        struct sdb_array **subtree;     /* only valid for bridge items */
+};
+
+extern int fmc_scan_sdb_tree(struct fmc_device *fmc, unsigned long address);
+extern void fmc_show_sdb_tree(const struct fmc_device *fmc);
+extern signed long fmc_find_sdb_device(struct sdb_array *tree, uint64_t vendor,
+                                       uint32_t device, unsigned long *sz);
+extern int fmc_free_sdb_tree(struct fmc_device *fmc);
diff --git a/include/linux/fmc.h b/include/linux/fmc.h
new file mode 100644
index 000000000000..a5f0aa5c2a8d
--- /dev/null
+++ b/include/linux/fmc.h
@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2012 CERN (www.cern.ch)
+ * Author: Alessandro Rubini <rubini@gnudd.com>
+ *
+ * Released according to the GNU GPL, version 2 or any later version.
+ *
+ * This work is part of the White Rabbit project, a research effort led
+ * by CERN, the European Institute for Nuclear Research.
+ */
+#ifndef __LINUX_FMC_H__
+#define __LINUX_FMC_H__
+#include <linux/types.h>
+#include <linux/moduleparam.h>
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+
+struct fmc_device;
+struct fmc_driver;
+
+/*
+ * This bus abstraction is developed separately from drivers, so we need
+ * to check the version of the data structures we receive.
+ */
+
+#define FMC_MAJOR       3
+#define FMC_MINOR       0
+#define FMC_VERSION     ((FMC_MAJOR << 16) | FMC_MINOR)
+#define __FMC_MAJOR(x)  ((x) >> 16)
+#define __FMC_MINOR(x)  ((x) & 0xffff)
+
+/*
+ * The device identification, as defined by the IPMI FRU (Field Replaceable
+ * Unit) includes four different strings to describe the device. Here we
+ * only match the "Board Manufacturer" and the "Board Product Name",
+ * ignoring the "Board Serial Number" and "Board Part Number". All 4 are
+ * expected to be strings, so they are treated as zero-terminated C strings.
+ * Unspecified string (NULL) means "any", so if both are unspecified this
+ * is a catch-all driver. So null entries are allowed and we use array
+ * and length. This is unlike pci and usb that use null-terminated arrays
+ */
+struct fmc_fru_id {
+        char *manufacturer;
+        char *product_name;
+};
+
+/*
+ * If the FPGA is already programmed (think Etherbone or the second
+ * SVEC slot), we can match on SDB devices in the memory image. This
+ * match uses an array of devices that must all be present, and the
+ * match is based on vendor and device only. Further checks are expected
+ * to happen in the probe function. Zero means "any" and catch-all is allowed.
+ */
+struct fmc_sdb_one_id {
+        uint64_t vendor;
+        uint32_t device;
+};
+struct fmc_sdb_id {
+        struct fmc_sdb_one_id *cores;
+        int cores_nr;
+};
+
+struct fmc_device_id {
+        struct fmc_fru_id *fru_id;
+        int fru_id_nr;
+        struct fmc_sdb_id *sdb_id;
+        int sdb_id_nr;
+};
+
+/* This sizes the module_param_array used by generic module parameters */
+#define FMC_MAX_CARDS 32
+
+/* The driver is a pretty simple thing */
+struct fmc_driver {
+        unsigned long version;
+        struct device_driver driver;
+        int (*probe)(struct fmc_device *);
+        int (*remove)(struct fmc_device *);
+        const struct fmc_device_id id_table;
+        /* What follows is for generic module parameters */
+        int busid_n;
+        int busid_val[FMC_MAX_CARDS];
+        int gw_n;
+        char *gw_val[FMC_MAX_CARDS];
+};
+#define to_fmc_driver(x) container_of((x), struct fmc_driver, driver)
+
+/* These are the generic parameters, that drivers may instantiate */
+#define FMC_PARAM_BUSID(_d) \
+    module_param_array_named(busid, _d.busid_val, int, &_d.busid_n, 0444)
+#define FMC_PARAM_GATEWARE(_d) \
+    module_param_array_named(gateware, _d.gw_val, charp, &_d.gw_n, 0444)
+
+/*
+ * Drivers may need to configure gpio pins in the carrier. To read input
+ * (a very uncommon operation, and definitely not in the hot paths), just
+ * configure one gpio only and get 0 or 1 as retval of the config method
+ */
+struct fmc_gpio {
+        char *carrier_name; /* name or NULL for virtual pins */
+        int gpio;
+        int _gpio;      /* internal use by the carrier */
+        int mode;       /* GPIOF_DIR_OUT etc, from <linux/gpio.h> */
+        int irqmode;    /* IRQF_TRIGGER_LOW and so on */
+};
+
+/* The numbering of gpio pins allows access to raw pins or virtual roles */
+#define FMC_GPIO_RAW(x)         (x)             /* 4096 of them */
+#define __FMC_GPIO_IS_RAW(x)    ((x) < 0x1000)
+#define FMC_GPIO_IRQ(x)         ((x) + 0x1000)  /*  256 of them */
+#define FMC_GPIO_LED(x)         ((x) + 0x1100)  /*  256 of them */
+#define FMC_GPIO_KEY(x)         ((x) + 0x1200)  /*  256 of them */
+#define FMC_GPIO_TP(x)          ((x) + 0x1300)  /*  256 of them */
+#define FMC_GPIO_USER(x)        ((x) + 0x1400)  /*  256 of them */
+/* We may add SCL and SDA, or other roles if the need arises */
+
+/* GPIOF_DIR_IN etc are missing before 3.0. copy from <linux/gpio.h> */
+#ifndef GPIOF_DIR_IN
+#  define GPIOF_DIR_OUT   (0 << 0)
+#  define GPIOF_DIR_IN    (1 << 0)
+#  define GPIOF_INIT_LOW  (0 << 1)
+#  define GPIOF_INIT_HIGH (1 << 1)
+#endif
+
+/*
+ * The operations are offered by each carrier and should make driver
+ * design completely independent of the carrier. Named GPIO pins may be
+ * the exception.
+ */
+struct fmc_operations {
+        uint32_t (*read32)(struct fmc_device *fmc, int offset);
+        void (*write32)(struct fmc_device *fmc, uint32_t value, int offset);
+        int (*validate)(struct fmc_device *fmc, struct fmc_driver *drv);
+        int (*reprogram)(struct fmc_device *f, struct fmc_driver *d, char *gw);
+        int (*irq_request)(struct fmc_device *fmc, irq_handler_t h,
+                           char *name, int flags);
+        void (*irq_ack)(struct fmc_device *fmc);
+        int (*irq_free)(struct fmc_device *fmc);
+        int (*gpio_config)(struct fmc_device *fmc, struct fmc_gpio *gpio,
+                           int ngpio);
+        int (*read_ee)(struct fmc_device *fmc, int pos, void *d, int l);
+        int (*write_ee)(struct fmc_device *fmc, int pos, const void *d, int l);
+};
+
+/* Prefer this helper rather than calling of fmc->reprogram directly */
+extern int fmc_reprogram(struct fmc_device *f, struct fmc_driver *d, char *gw,
+                     int sdb_entry);
+
+/*
+ * The device reports all information needed to access hw.
+ *
+ * If we have eeprom_len and not contents, the core reads it.
+ * Then, parsing of identifiers is done by the core which fills fmc_fru_id..
+ * Similarly a device that must be matched based on SDB cores must
+ * fill the entry point and the core will scan the bus (FIXME: sdb match)
+ */
+struct fmc_device {
+        unsigned long version;
+        unsigned long flags;
+        struct module *owner;           /* char device must pin it */
+        struct fmc_fru_id id;           /* for EEPROM-based match */
+        struct fmc_operations *op;      /* carrier-provided */
+        int irq;                        /* according to host bus. 0 == none */
+        int eeprom_len;                 /* Usually 8kB, may be less */
+        int eeprom_addr;                /* 0x50, 0x52 etc */
+        uint8_t *eeprom;                /* Full contents or leading part */
+        char *carrier_name;             /* "SPEC" or similar, for special use */
+        void *carrier_data;             /* "struct spec *" or equivalent */
+        __iomem void *fpga_base;        /* May be NULL (Etherbone) */
+        __iomem void *slot_base;        /* Set by the driver */
+        struct fmc_device **devarray;   /* Allocated by the bus */
+        int slot_id;                    /* Index in the slot array */
+        int nr_slots;                   /* Number of slots in this carrier */
+        unsigned long memlen;           /* Used for the char device */
+        struct device dev;              /* For Linux use */
+        struct device *hwdev;           /* The underlying hardware device */
+        unsigned long sdbfs_entry;
+        struct sdb_array *sdb;
+        uint32_t device_id;             /* Filled by the device */
+        char *mezzanine_name;           /* Defaults to ``fmc'' */
+        void *mezzanine_data;
+};
+#define to_fmc_device(x) container_of((x), struct fmc_device, dev)
+
+#define FMC_DEVICE_HAS_GOLDEN           1
+#define FMC_DEVICE_HAS_CUSTOM           2
+#define FMC_DEVICE_NO_MEZZANINE         4
+#define FMC_DEVICE_MATCH_SDB            8 /* fmc-core must scan sdb in fpga */
+
+/*
+ * If fpga_base can be used, the carrier offers no readl/writel methods, and
+ * this expands to a single, fast, I/O access.
+ */
+static inline uint32_t fmc_readl(struct fmc_device *fmc, int offset)
+{
+        if (unlikely(fmc->op->read32))
+                return fmc->op->read32(fmc, offset);
+        return readl(fmc->fpga_base + offset);
+}
+static inline void fmc_writel(struct fmc_device *fmc, uint32_t val, int off)
+{
+        if (unlikely(fmc->op->write32))
+                fmc->op->write32(fmc, val, off);
+        else
+                writel(val, fmc->fpga_base + off);
+}
+
+/* pci-like naming */
+static inline void *fmc_get_drvdata(const struct fmc_device *fmc)
+{
+        return dev_get_drvdata(&fmc->dev);
+}
+
+static inline void fmc_set_drvdata(struct fmc_device *fmc, void *data)
+{
+        dev_set_drvdata(&fmc->dev, data);
+}
+
+/* The 4 access points */
+extern int fmc_driver_register(struct fmc_driver *drv);
+extern void fmc_driver_unregister(struct fmc_driver *drv);
+extern int fmc_device_register(struct fmc_device *tdev);
+extern void fmc_device_unregister(struct fmc_device *tdev);
+
+/* Two more for device sets, all driven by the same FPGA */
+extern int fmc_device_register_n(struct fmc_device **devs, int n);
+extern void fmc_device_unregister_n(struct fmc_device **devs, int n);
+
+/* Internal cross-calls between files; not exported to other modules */
+extern int fmc_match(struct device *dev, struct device_driver *drv);
+extern int fmc_fill_id_info(struct fmc_device *fmc);
+extern void fmc_free_id_info(struct fmc_device *fmc);
+extern void fmc_dump_eeprom(const struct fmc_device *fmc);
+extern void fmc_dump_sdb(const struct fmc_device *fmc);
+
+#endif /* __LINUX_FMC_H__ */
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index e70df40d84f6..7fd81b8c4897 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -3,6 +3,7 @@
 #ifndef FREEZER_H_INCLUDED
 #define FREEZER_H_INCLUDED
 
+#include <linux/debug_locks.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/atomic.h>
@@ -46,7 +47,11 @@ extern int freeze_kernel_threads(void);
 extern void thaw_processes(void);
 extern void thaw_kernel_threads(void);
 
-static inline bool try_to_freeze(void)
+/*
+ * DO NOT ADD ANY NEW CALLERS OF THIS FUNCTION
+ * If try_to_freeze causes a lockdep warning it means the caller may deadlock
+ */
+static inline bool try_to_freeze_unsafe(void)
 {
         might_sleep();
         if (likely(!freezing(current)))
@@ -54,6 +59,13 @@ static inline bool try_to_freeze(void)
         return __refrigerator(false);
 }
 
+static inline bool try_to_freeze(void)
+{
+        if (!(current->flags & PF_NOFREEZE))
+                debug_check_no_locks_held();
+        return try_to_freeze_unsafe();
+}
+
 extern bool freeze_task(struct task_struct *p);
 extern bool set_freezable(void);
 
@@ -115,6 +127,14 @@ static inline void freezer_count(void)
         try_to_freeze();
 }
 
+/* DO NOT ADD ANY NEW CALLERS OF THIS FUNCTION */
+static inline void freezer_count_unsafe(void)
+{
+        current->flags &= ~PF_FREEZER_SKIP;
+        smp_mb();
+        try_to_freeze_unsafe();
+}
+
 /**
  * freezer_should_skip - whether to skip a task when determining frozen
  *                       state is reached
@@ -139,28 +159,86 @@ static inline bool freezer_should_skip(struct task_struct *p)
 }
 
 /*
- * These macros are intended to be used whenever you want allow a sleeping
+ * These functions are intended to be used whenever you want allow a sleeping
  * task to be frozen. Note that neither return any clear indication of
  * whether a freeze event happened while in this function.
  */
 
 /* Like schedule(), but should not block the freezer. */
-#define freezable_schedule()                                            \
-({                                                                      \
-        freezer_do_not_count();                                         \
-        schedule();                                                     \
-        freezer_count();                                                \
-})
+static inline void freezable_schedule(void)
+{
+        freezer_do_not_count();
+        schedule();
+        freezer_count();
+}
+
+/* DO NOT ADD ANY NEW CALLERS OF THIS FUNCTION */
+static inline void freezable_schedule_unsafe(void)
+{
+        freezer_do_not_count();
+        schedule();
+        freezer_count_unsafe();
+}
+
+/*
+ * Like freezable_schedule_timeout(), but should not block the freezer.  Do not
+ * call this with locks held.
+ */
+static inline long freezable_schedule_timeout(long timeout)
+{
+        long __retval;
+        freezer_do_not_count();
+        __retval = schedule_timeout(timeout);
+        freezer_count();
+        return __retval;
+}
+
+/*
+ * Like schedule_timeout_interruptible(), but should not block the freezer.  Do not
+ * call this with locks held.
+ */
+static inline long freezable_schedule_timeout_interruptible(long timeout)
+{
+        long __retval;
+        freezer_do_not_count();
+        __retval = schedule_timeout_interruptible(timeout);
+        freezer_count();
+        return __retval;
+}
 
 /* Like schedule_timeout_killable(), but should not block the freezer. */
-#define freezable_schedule_timeout_killable(timeout)                    \
-({                                                                      \
-        long __retval;                                                  \
-        freezer_do_not_count();                                         \
-        __retval = schedule_timeout_killable(timeout);                  \
-        freezer_count();                                                \
-        __retval;                                                       \
-})
+static inline long freezable_schedule_timeout_killable(long timeout)
+{
+        long __retval;
+        freezer_do_not_count();
+        __retval = schedule_timeout_killable(timeout);
+        freezer_count();
+        return __retval;
+}
+
+/* DO NOT ADD ANY NEW CALLERS OF THIS FUNCTION */
+static inline long freezable_schedule_timeout_killable_unsafe(long timeout)
+{
+        long __retval;
+        freezer_do_not_count();
+        __retval = schedule_timeout_killable(timeout);
+        freezer_count_unsafe();
+        return __retval;
+}
+
+/*
+ * Like schedule_hrtimeout_range(), but should not block the freezer.  Do not
+ * call this with locks held.
+ */
+static inline int freezable_schedule_hrtimeout_range(ktime_t *expires,
+                unsigned long delta, const enum hrtimer_mode mode)
+{
+        int __retval;
+        freezer_do_not_count();
+        __retval = schedule_hrtimeout_range(expires, delta, mode);
+        freezer_count();
+        return __retval;
+}
 
 /*
  * Freezer-friendly wrappers around wait_event_interruptible(),
@@ -177,33 +255,45 @@ static inline bool freezer_should_skip(struct task_struct *p)
         __retval;                                                       \
 })
 
+/* DO NOT ADD ANY NEW CALLERS OF THIS FUNCTION */
+#define wait_event_freezekillable_unsafe(wq, condition)                 \
+({                                                                      \
+        int __retval;                                                   \
+        freezer_do_not_count();                                         \
+        __retval = wait_event_killable(wq, (condition));                \
+        freezer_count_unsafe();                                         \
+        __retval;                                                       \
+})
+
 #define wait_event_freezable(wq, condition)                             \
 ({                                                                      \
         int __retval;                                                   \
-        for (;;) {                                                      \
-                __retval = wait_event_interruptible(wq,                 \
-                                (condition) || freezing(current));      \
-                if (__retval || (condition))                            \
-                        break;                                          \
-                try_to_freeze();                                        \
-        }                                                               \
+        freezer_do_not_count();                                         \
+        __retval = wait_event_interruptible(wq, (condition));           \
+        freezer_count();                                                \
         __retval;                                                       \
 })
 
 #define wait_event_freezable_timeout(wq, condition, timeout)            \
 ({                                                                      \
         long __retval = timeout;                                        \
-        for (;;) {                                                      \
-                __retval = wait_event_interruptible_timeout(wq,         \
-                                (condition) || freezing(current),       \
-                                __retval);                              \
-                if (__retval <= 0 || (condition))                       \
-                        break;                                          \
-                try_to_freeze();                                        \
-        }                                                               \
+        freezer_do_not_count();                                         \
+        __retval = wait_event_interruptible_timeout(wq, (condition),    \
+                                __retval);                              \
+        freezer_count();                                                \
         __retval;                                                       \
 })
 
+#define wait_event_freezable_exclusive(wq, condition)                   \
+({                                                                      \
+        int __retval;                                                   \
+        freezer_do_not_count();                                         \
+        __retval = wait_event_interruptible_exclusive(wq, condition);   \
+        freezer_count();                                                \
+        __retval;                                                       \
+})
+
+
 #else /* !CONFIG_FREEZER */
 static inline bool frozen(struct task_struct *p) { return false; }
 static inline bool freezing(struct task_struct *p) { return false; }
@@ -225,18 +315,37 @@ static inline void set_freezable(void) {}
 
 #define freezable_schedule()  schedule()
 
+#define freezable_schedule_unsafe()  schedule()
+
+#define freezable_schedule_timeout(timeout)  schedule_timeout(timeout)
+
+#define freezable_schedule_timeout_interruptible(timeout)               \
+        schedule_timeout_interruptible(timeout)
+
 #define freezable_schedule_timeout_killable(timeout)                    \
         schedule_timeout_killable(timeout)
 
+#define freezable_schedule_timeout_killable_unsafe(timeout)             \
+        schedule_timeout_killable(timeout)
+
+#define freezable_schedule_hrtimeout_range(expires, delta, mode)        \
+        schedule_hrtimeout_range(expires, delta, mode)
+
 #define wait_event_freezable(wq, condition)                             \
                 wait_event_interruptible(wq, condition)
 
 #define wait_event_freezable_timeout(wq, condition, timeout)            \
                 wait_event_interruptible_timeout(wq, condition, timeout)
 
+#define wait_event_freezable_exclusive(wq, condition)                   \
+                wait_event_interruptible_exclusive(wq, condition)
+
 #define wait_event_freezekillable(wq, condition)                \
                 wait_event_killable(wq, condition)
 
+#define wait_event_freezekillable_unsafe(wq, condition)                 \
+                wait_event_killable(wq, condition)
+
 #endif /* !CONFIG_FREEZER */
 
 #endif  /* FREEZER_H_INCLUDED */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 43db02e9c9fa..3f40547ba191 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -10,6 +10,8 @@
 #include <linux/stat.h>
 #include <linux/cache.h>
 #include <linux/list.h>
+#include <linux/list_lru.h>
+#include <linux/llist.h>
 #include <linux/radix-tree.h>
 #include <linux/rbtree.h>
 #include <linux/init.h>
@@ -45,6 +47,7 @@ struct vfsmount;
 struct cred;
 struct swap_info_struct;
 struct seq_file;
+struct workqueue_struct;
 
 extern void __init inode_init(void);
 extern void __init inode_init_early(void);
@@ -62,8 +65,7 @@ struct buffer_head;
 typedef int (get_block_t)(struct inode *inode, sector_t iblock,
                         struct buffer_head *bh_result, int create);
 typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
-                        ssize_t bytes, void *private, int ret,
-                        bool is_async);
+                        ssize_t bytes, void *private);
 
 #define MAY_EXEC                0x00000001
 #define MAY_WRITE               0x00000002
@@ -364,7 +366,7 @@ struct address_space_operations {
 
         /* Unfortunately this kludge is needed for FIBMAP. Don't use it */
         sector_t (*bmap)(struct address_space *, sector_t);
-        void (*invalidatepage) (struct page *, unsigned long);
+        void (*invalidatepage) (struct page *, unsigned int, unsigned int);
         int (*releasepage) (struct page *, gfp_t);
         void (*freepage)(struct page *);
         ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
@@ -372,14 +374,15 @@ struct address_space_operations {
         int (*get_xip_mem)(struct address_space *, pgoff_t, int,
                                                 void **, unsigned long *);
         /*
-         * migrate the contents of a page to the specified target. If sync
-         * is false, it must not block.
+         * migrate the contents of a page to the specified target. If
+         * migrate_mode is MIGRATE_ASYNC, it must not block.
          */
         int (*migratepage) (struct address_space *,
                         struct page *, struct page *, enum migrate_mode);
         int (*launder_page) (struct page *);
         int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
                                         unsigned long);
+        void (*is_dirty_writeback) (struct page *, bool *, bool *);
         int (*error_remove_page)(struct address_space *, struct page *);
 
         /* swapfile support */
@@ -767,6 +770,7 @@ struct file {
          */
         union {
                 struct list_head        fu_list;
+                struct llist_node       fu_llist;
                 struct rcu_head         fu_rcuhead;
         } f_u;
         struct path             f_path;
@@ -908,6 +912,7 @@ struct file_lock_operations {
 
 struct lock_manager_operations {
         int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
+        unsigned long (*lm_owner_key)(struct file_lock *);
         void (*lm_notify)(struct file_lock *);  /* unblock callback */
         int (*lm_grant)(struct file_lock *, struct file_lock *, int);
         void (*lm_break)(struct file_lock *);
@@ -926,14 +931,33 @@ int locks_in_grace(struct net *);
 /* that will die - we need it for nfs_lock_info */
 #include <linux/nfs_fs_i.h>
 
+/*
+ * struct file_lock represents a generic "file lock". It's used to represent
+ * POSIX byte range locks, BSD (flock) locks, and leases. It's important to
+ * note that the same struct is used to represent both a request for a lock and
+ * the lock itself, but the same object is never used for both.
+ *
+ * FIXME: should we create a separate "struct lock_request" to help distinguish
+ * these two uses?
+ *
+ * The i_flock list is ordered by:
+ *
+ * 1) lock type -- FL_LEASEs first, then FL_FLOCK, and finally FL_POSIX
+ * 2) lock owner
+ * 3) lock range start
+ * 4) lock range end
+ *
+ * Obviously, the last two criteria only matter for POSIX locks.
+ */
 struct file_lock {
         struct file_lock *fl_next;      /* singly linked list for this inode  */
-        struct list_head fl_link;       /* doubly linked list of all locks */
+        struct hlist_node fl_link;      /* node in global lists */
         struct list_head fl_block;      /* circular list of blocked processes */
         fl_owner_t fl_owner;
         unsigned int fl_flags;
         unsigned char fl_type;
         unsigned int fl_pid;
+        int fl_link_cpu;                /* what cpu's list is this on? */
         struct pid *fl_nspid;
         wait_queue_head_t fl_wait;
         struct file *fl_file;
@@ -994,7 +1018,7 @@ extern void locks_release_private(struct file_lock *);
 extern void posix_test_lock(struct file *, struct file_lock *);
 extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *);
 extern int posix_lock_file_wait(struct file *, struct file_lock *);
-extern int posix_unblock_lock(struct file *, struct file_lock *);
+extern int posix_unblock_lock(struct file_lock *);
 extern int vfs_test_lock(struct file *, struct file_lock *);
 extern int vfs_lock_file(struct file *, unsigned int, struct file_lock *, struct file_lock *);
 extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl);
@@ -1006,9 +1030,6 @@ extern int vfs_setlease(struct file *, long, struct file_lock **);
 extern int lease_modify(struct file_lock **, int);
 extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
 extern int lock_may_write(struct inode *, loff_t start, unsigned long count);
-extern void locks_delete_block(struct file_lock *waiter);
-extern void lock_flocks(void);
-extern void unlock_flocks(void);
 #else /* !CONFIG_FILE_LOCKING */
 static inline int fcntl_getlk(struct file *file, struct flock __user *user)
 {
@@ -1084,8 +1105,7 @@ static inline int posix_lock_file_wait(struct file *filp, struct file_lock *fl)
         return -ENOLCK;
 }
 
-static inline int posix_unblock_lock(struct file *filp,
-                                     struct file_lock *waiter)
+static inline int posix_unblock_lock(struct file_lock *waiter)
 {
         return -ENOENT;
 }
@@ -1150,19 +1170,6 @@ static inline int lock_may_write(struct inode *inode, loff_t start,
 {
         return 1;
 }
-
-static inline void locks_delete_block(struct file_lock *waiter)
-{
-}
-
-static inline void lock_flocks(void)
-{
-}
-
-static inline void unlock_flocks(void)
-{
-}
-
 #endif /* !CONFIG_FILE_LOCKING */
 
 
@@ -1263,15 +1270,6 @@ struct super_block {
         struct list_head        s_files;
 #endif
         struct list_head        s_mounts;       /* list of mounts; _not_ for fs use */
-        /* s_dentry_lru, s_nr_dentry_unused protected by dcache.c lru locks */
-        struct list_head        s_dentry_lru;   /* unused dentry lru */
-        int                     s_nr_dentry_unused;     /* # of dentry on lru */
-
-        /* s_inode_lru_lock protects s_inode_lru and s_nr_inodes_unused */
-        spinlock_t              s_inode_lru_lock ____cacheline_aligned_in_smp;
-        struct list_head        s_inode_lru;            /* unused inode lru */
-        int                     s_nr_inodes_unused;     /* # of inodes on lru */
-
         struct block_device     *s_bdev;
         struct backing_dev_info *s_bdi;
         struct mtd_info         *s_mtd;
@@ -1322,11 +1320,17 @@ struct super_block {
 
         /* Being remounted read-only */
         int s_readonly_remount;
-};
 
-/* superblock cache pruning functions */
-extern void prune_icache_sb(struct super_block *sb, int nr_to_scan);
-extern void prune_dcache_sb(struct super_block *sb, int nr_to_scan);
+        /* AIO completions deferred from interrupt context */
+        struct workqueue_struct *s_dio_done_wq;
+
+        /*
+         * Keep the lru lists last in the structure so they always sit on their
+         * own individual cachelines.
+         */
+        struct list_lru         s_dentry_lru ____cacheline_aligned_in_smp;
+        struct list_lru         s_inode_lru ____cacheline_aligned_in_smp;
+};
 
 extern struct timespec current_fs_time(struct super_block *sb);
 
@@ -1506,6 +1510,11 @@ int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags);
  * to have different dirent layouts depending on the binary type.
  */
 typedef int (*filldir_t)(void *, const char *, int, loff_t, u64, unsigned);
+struct dir_context {
+        const filldir_t actor;
+        loff_t pos;
+};
+
 struct block_device_operations;
 
 /* These macros are for out of kernel modules to test that
@@ -1521,7 +1530,7 @@ struct file_operations {
         ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
         ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
         ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
-        int (*readdir) (struct file *, void *, filldir_t);
+        int (*iterate) (struct file *, struct dir_context *);
         unsigned int (*poll) (struct file *, struct poll_table_struct *);
         long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
         long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
@@ -1575,6 +1584,7 @@ struct inode_operations {
         int (*atomic_open)(struct inode *, struct dentry *,
                            struct file *, unsigned open_flag,
                            umode_t create_mode, int *opened);
+        int (*tmpfile) (struct inode *, struct dentry *, umode_t);
 } ____cacheline_aligned;
 
 ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
@@ -1614,8 +1624,8 @@ struct super_operations {
         ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
 #endif
         int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
-        int (*nr_cached_objects)(struct super_block *);
-        void (*free_cached_objects)(struct super_block *, int);
+        long (*nr_cached_objects)(struct super_block *, int);
+        long (*free_cached_objects)(struct super_block *, long, int);
 };
 
 /*
@@ -1738,6 +1748,7 @@ struct super_operations {
 #define I_REFERENCED            (1 << 8)
 #define __I_DIO_WAKEUP          9
 #define I_DIO_WAKEUP            (1 << I_DIO_WAKEUP)
+#define I_LINKABLE              (1 << 10)
 
 #define I_DIRTY (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES)
 
@@ -1791,7 +1802,7 @@ enum file_time_flags {
         S_VERSION = 8,
 };
 
-extern void touch_atime(struct path *);
+extern void touch_atime(const struct path *);
 static inline void file_accessed(struct file *file)
 {
         if (!(file->f_flags & O_NOATIME))
@@ -1884,6 +1895,7 @@ extern int vfs_ustat(dev_t, struct kstatfs *);
 extern int freeze_super(struct super_block *super);
 extern int thaw_super(struct super_block *super);
 extern bool our_mnt(struct vfsmount *mnt);
+extern bool fs_fully_visible(struct file_system_type *);
 
 extern int current_umask(void);
 
@@ -1891,7 +1903,6 @@ extern int current_umask(void);
 extern struct kobject *fs_kobj;
 
 #define MAX_RW_COUNT (INT_MAX & PAGE_CACHE_MASK)
-extern int rw_verify_area(int, struct file *, loff_t *, size_t);
 
 #define FLOCK_VERIFY_READ  1
 #define FLOCK_VERIFY_WRITE 2
@@ -2058,6 +2069,7 @@ extern struct super_block *freeze_bdev(struct block_device *);
 extern void emergency_thaw_all(void);
 extern int thaw_bdev(struct block_device *bdev, struct super_block *sb);
 extern int fsync_bdev(struct block_device *);
+extern int sb_is_blkdev_sb(struct super_block *sb);
 #else
 static inline void bd_forget(struct inode *inode) {}
 static inline int sync_blockdev(struct block_device *bdev) { return 0; }
@@ -2077,6 +2089,11 @@ static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb)
 static inline void iterate_bdevs(void (*f)(struct block_device *, void *), void *arg)
 {
 }
+
+static inline int sb_is_blkdev_sb(struct super_block *sb)
+{
+        return 0;
+}
 #endif
 extern int sync_filesystem(struct super_block *);
 extern const struct file_operations def_blk_fops;
@@ -2304,7 +2321,6 @@ extern struct file * open_exec(const char *);
 /* fs/dcache.c -- generic fs support functions */
 extern int is_subdir(struct dentry *, struct dentry *);
 extern int path_is_under(struct path *, struct path *);
-extern ino_t find_inode_number(struct dentry *, struct qstr *);
 
 #include <linux/err.h>
 
@@ -2414,16 +2430,17 @@ extern ssize_t generic_file_splice_write(struct pipe_inode_info *,
                 struct file *, loff_t *, size_t, unsigned int);
 extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
                 struct file *out, loff_t *, size_t len, unsigned int flags);
-extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
-                size_t len, unsigned int flags);
 
 extern void
 file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
 extern loff_t noop_llseek(struct file *file, loff_t offset, int whence);
 extern loff_t no_llseek(struct file *file, loff_t offset, int whence);
+extern loff_t vfs_setpos(struct file *file, loff_t offset, loff_t maxsize);
 extern loff_t generic_file_llseek(struct file *file, loff_t offset, int whence);
 extern loff_t generic_file_llseek_size(struct file *file, loff_t offset,
                 int whence, loff_t maxsize, loff_t eof);
+extern loff_t fixed_size_llseek(struct file *file, loff_t offset,
+                int whence, loff_t size);
 extern int generic_file_open(struct inode * inode, struct file * filp);
 extern int nonseekable_open(struct inode * inode, struct file * filp);
 
@@ -2478,7 +2495,6 @@ extern const struct file_operations generic_ro_fops;
 #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
 
 extern int vfs_readlink(struct dentry *, char __user *, int, const char *);
-extern int vfs_follow_link(struct nameidata *, const char *);
 extern int page_readlink(struct dentry *, char __user *, int);
 extern void *page_follow_link_light(struct dentry *, struct nameidata *);
 extern void page_put_link(struct dentry *, struct nameidata *, void *);
@@ -2491,11 +2507,13 @@ extern void generic_fillattr(struct inode *, struct kstat *);
 extern int vfs_getattr(struct path *, struct kstat *);
 void __inode_add_bytes(struct inode *inode, loff_t bytes);
 void inode_add_bytes(struct inode *inode, loff_t bytes);
+void __inode_sub_bytes(struct inode *inode, loff_t bytes);
 void inode_sub_bytes(struct inode *inode, loff_t bytes);
 loff_t inode_get_bytes(struct inode *inode);
 void inode_set_bytes(struct inode *inode, loff_t bytes);
 
 extern int vfs_readdir(struct file *, filldir_t, void *);
+extern int iterate_dir(struct file *, struct dir_context *);
 
 extern int vfs_stat(const char __user *, struct kstat *);
 extern int vfs_lstat(const char __user *, struct kstat *);
@@ -2526,7 +2544,7 @@ extern void iterate_supers_type(struct file_system_type *,
 extern int dcache_dir_open(struct inode *, struct file *);
 extern int dcache_dir_close(struct inode *, struct file *);
 extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
-extern int dcache_readdir(struct file *, void *, filldir_t);
+extern int dcache_readdir(struct file *, struct dir_context *);
 extern int simple_setattr(struct dentry *, struct iattr *);
 extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 extern int simple_statfs(struct dentry *, struct kstatfs *);
@@ -2690,4 +2708,41 @@ static inline void inode_has_no_xattr(struct inode *inode)
                 inode->i_flags |= S_NOSEC;
 }
 
+static inline bool dir_emit(struct dir_context *ctx,
+                            const char *name, int namelen,
+                            u64 ino, unsigned type)
+{
+        return ctx->actor(ctx, name, namelen, ctx->pos, ino, type) == 0;
+}
+static inline bool dir_emit_dot(struct file *file, struct dir_context *ctx)
+{
+        return ctx->actor(ctx, ".", 1, ctx->pos,
+                          file->f_path.dentry->d_inode->i_ino, DT_DIR) == 0;
+}
+static inline bool dir_emit_dotdot(struct file *file, struct dir_context *ctx)
+{
+        return ctx->actor(ctx, "..", 2, ctx->pos,
+                          parent_ino(file->f_path.dentry), DT_DIR) == 0;
+}
+static inline bool dir_emit_dots(struct file *file, struct dir_context *ctx)
+{
+        if (ctx->pos == 0) {
+                if (!dir_emit_dot(file, ctx))
+                        return false;
+                ctx->pos = 1;
+        }
+        if (ctx->pos == 1) {
+                if (!dir_emit_dotdot(file, ctx))
+                        return false;
+                ctx->pos = 2;
+        }
+        return true;
+}
+static inline bool dir_relax(struct inode *inode)
+{
+        mutex_unlock(&inode->i_mutex);
+        mutex_lock(&inode->i_mutex);
+        return !IS_DEADDIR(inode);
+}
+
 #endif /* _LINUX_FS_H */
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 51b793466ff3..efb05961bdd8 100644
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -16,8 +16,10 @@
 #ifndef FS_ENET_PD_H
 #define FS_ENET_PD_H
 
+#include <linux/clk.h>
 #include <linux/string.h>
 #include <linux/of_mdio.h>
+#include <linux/if_ether.h>
 #include <asm/types.h>
 
 #define FS_ENET_NAME    "fs_enet"
@@ -135,13 +137,15 @@ struct fs_platform_info {
         const struct fs_mii_bus_info *bus_info;
 
         int rx_ring, tx_ring;   /* number of buffers on rx     */
-        __u8 macaddr[6];        /* mac address                 */
+        __u8 macaddr[ETH_ALEN]; /* mac address                 */
         int rx_copybreak;       /* limit we copy small frames  */
         int use_napi;           /* use NAPI                    */
         int napi_weight;        /* NAPI weight                 */
 
         int use_rmii;           /* use RMII mode               */
         int has_phy;            /* if the network is phy container as well...*/
+
+        struct clk *clk_per;    /* 'per' clock for register access */
 };
 struct fs_mii_fec_platform_info {
         u32 irq[32];
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index 2b93a9a5a1e6..0efc3e62843a 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -39,17 +39,6 @@ static inline void get_fs_pwd(struct fs_struct *fs, struct path *pwd)
         spin_unlock(&fs->lock);
 }
 
-static inline void get_fs_root_and_pwd(struct fs_struct *fs, struct path *root,
-                                       struct path *pwd)
-{
-        spin_lock(&fs->lock);
-        *root = fs->root;
-        path_get(root);
-        *pwd = fs->pwd;
-        path_get(pwd);
-        spin_unlock(&fs->lock);
-}
-
 extern bool current_chrooted(void);
 
 #endif /* _LINUX_FS_STRUCT_H */
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
index 5dfa0aa216b6..7823e9ef995e 100644
--- a/include/linux/fscache-cache.h
+++ b/include/linux/fscache-cache.h
@@ -97,7 +97,8 @@ struct fscache_operation {
 #define FSCACHE_OP_WAITING      4       /* cleared when op is woken */
 #define FSCACHE_OP_EXCLUSIVE    5       /* exclusive op, other ops must wait */
 #define FSCACHE_OP_DEC_READ_CNT 6       /* decrement object->n_reads on destruction */
-#define FSCACHE_OP_KEEP_FLAGS   0x0070  /* flags to keep when repurposing an op */
+#define FSCACHE_OP_UNUSE_COOKIE 7       /* call fscache_unuse_cookie() on completion */
+#define FSCACHE_OP_KEEP_FLAGS   0x00f0  /* flags to keep when repurposing an op */
 
         enum fscache_operation_state state;
         atomic_t                usage;
@@ -150,7 +151,7 @@ struct fscache_retrieval {
         void                    *context;       /* netfs read context (pinned) */
         struct list_head        to_do;          /* list of things to be done by the backend */
         unsigned long           start_time;     /* time at which retrieval started */
-        unsigned                n_pages;        /* number of pages to be retrieved */
+        atomic_t                n_pages;        /* number of pages to be retrieved */
 };
 
 typedef int (*fscache_page_retrieval_func_t)(struct fscache_retrieval *op,
@@ -194,15 +195,14 @@ static inline void fscache_enqueue_retrieval(struct fscache_retrieval *op)
 static inline void fscache_retrieval_complete(struct fscache_retrieval *op,
                                               int n_pages)
 {
-        op->n_pages -= n_pages;
-        if (op->n_pages <= 0)
+        atomic_sub(n_pages, &op->n_pages);
+        if (atomic_read(&op->n_pages) <= 0)
                 fscache_op_complete(&op->op, true);
 }
 
 /**
  * fscache_put_retrieval - Drop a reference to a retrieval operation
  * @op: The retrieval operation affected
- * @n_pages: The number of pages to account for
  *
  * Drop a reference to a retrieval operation.
  */
@@ -251,6 +251,10 @@ struct fscache_cache_ops {
         /* unpin an object in the cache */
         void (*unpin_object)(struct fscache_object *object);
 
+        /* check the consistency between the backing cache and the FS-Cache
+         * cookie */
+        bool (*check_consistency)(struct fscache_operation *op);
+
         /* store the updated auxiliary data on an object */
         void (*update_object)(struct fscache_object *object);
 
@@ -314,6 +318,7 @@ struct fscache_cache_ops {
 struct fscache_cookie {
         atomic_t                        usage;          /* number of users of this cookie */
         atomic_t                        n_children;     /* number of children of this cookie */
+        atomic_t                        n_active;       /* number of active users of netfs ptrs */
         spinlock_t                      lock;
         spinlock_t                      stores_lock;    /* lock on page store tree */
         struct hlist_head               backing_objects; /* object(s) backing this file/index */
@@ -326,13 +331,11 @@ struct fscache_cookie {
 
         unsigned long                   flags;
 #define FSCACHE_COOKIE_LOOKING_UP       0       /* T if non-index cookie being looked up still */
-#define FSCACHE_COOKIE_CREATING         1       /* T if non-index object being created still */
-#define FSCACHE_COOKIE_NO_DATA_YET      2       /* T if new object with no cached data yet */
-#define FSCACHE_COOKIE_PENDING_FILL     3       /* T if pending initial fill on object */
-#define FSCACHE_COOKIE_FILLING          4       /* T if filling object incrementally */
-#define FSCACHE_COOKIE_UNAVAILABLE      5       /* T if cookie is unavailable (error, etc) */
-#define FSCACHE_COOKIE_WAITING_ON_READS 6       /* T if cookie is waiting on reads */
-#define FSCACHE_COOKIE_INVALIDATING     7       /* T if cookie is being invalidated */
+#define FSCACHE_COOKIE_NO_DATA_YET      1       /* T if new object with no cached data yet */
+#define FSCACHE_COOKIE_UNAVAILABLE      2       /* T if cookie is unavailable (error, etc) */
+#define FSCACHE_COOKIE_INVALIDATING     3       /* T if cookie is being invalidated */
+#define FSCACHE_COOKIE_RELINQUISHED     4       /* T if cookie has been relinquished */
+#define FSCACHE_COOKIE_RETIRED          5       /* T if cookie was retired */
 };
 
 extern struct fscache_cookie fscache_fsdef_index;
@@ -341,45 +344,40 @@ extern struct fscache_cookie fscache_fsdef_index;
  * Event list for fscache_object::{event_mask,events}
  */
 enum {
-        FSCACHE_OBJECT_EV_REQUEUE,      /* T if object should be requeued */
+        FSCACHE_OBJECT_EV_NEW_CHILD,    /* T if object has a new child */
+        FSCACHE_OBJECT_EV_PARENT_READY, /* T if object's parent is ready */
         FSCACHE_OBJECT_EV_UPDATE,       /* T if object should be updated */
         FSCACHE_OBJECT_EV_INVALIDATE,   /* T if cache requested object invalidation */
         FSCACHE_OBJECT_EV_CLEARED,      /* T if accessors all gone */
         FSCACHE_OBJECT_EV_ERROR,        /* T if fatal error occurred during processing */
-        FSCACHE_OBJECT_EV_RELEASE,      /* T if netfs requested object release */
-        FSCACHE_OBJECT_EV_RETIRE,       /* T if netfs requested object retirement */
-        FSCACHE_OBJECT_EV_WITHDRAW,     /* T if cache requested object withdrawal */
+        FSCACHE_OBJECT_EV_KILL,         /* T if netfs relinquished or cache withdrew object */
         NR_FSCACHE_OBJECT_EVENTS
 };
 
 #define FSCACHE_OBJECT_EVENTS_MASK ((1UL << NR_FSCACHE_OBJECT_EVENTS) - 1)
 
 /*
+ * States for object state machine.
+ */
+struct fscache_transition {
+        unsigned long events;
+        const struct fscache_state *transit_to;
+};
+
+struct fscache_state {
+        char name[24];
+        char short_name[8];
+        const struct fscache_state *(*work)(struct fscache_object *object,
+                                            int event);
+        const struct fscache_transition transitions[];
+};
+
+/*
  * on-disk cache file or index handle
  */
 struct fscache_object {
-        enum fscache_object_state {
-                FSCACHE_OBJECT_INIT,            /* object in initial unbound state */
-                FSCACHE_OBJECT_LOOKING_UP,      /* looking up object */
-                FSCACHE_OBJECT_CREATING,        /* creating object */
-
-                /* active states */
-                FSCACHE_OBJECT_AVAILABLE,       /* cleaning up object after creation */
-                FSCACHE_OBJECT_ACTIVE,          /* object is usable */
-                FSCACHE_OBJECT_INVALIDATING,    /* object is invalidating */
-                FSCACHE_OBJECT_UPDATING,        /* object is updating */
-
-                /* terminal states */
-                FSCACHE_OBJECT_DYING,           /* object waiting for accessors to finish */
-                FSCACHE_OBJECT_LC_DYING,        /* object cleaning up after lookup/create */
-                FSCACHE_OBJECT_ABORT_INIT,      /* abort the init state */
-                FSCACHE_OBJECT_RELEASING,       /* releasing object */
-                FSCACHE_OBJECT_RECYCLING,       /* retiring object */
-                FSCACHE_OBJECT_WITHDRAWING,     /* withdrawing object */
-                FSCACHE_OBJECT_DEAD,            /* object is now dead */
-                FSCACHE_OBJECT__NSTATES
-        } state;
-
+        const struct fscache_state *state;      /* Object state machine state */
+        const struct fscache_transition *oob_table; /* OOB state transition table */
         int                     debug_id;       /* debugging ID */
         int                     n_children;     /* number of child objects */
         int                     n_ops;          /* number of extant ops on object */
@@ -390,6 +388,7 @@ struct fscache_object {
         spinlock_t              lock;           /* state and operations lock */
 
         unsigned long           lookup_jif;     /* time at which lookup started */
+        unsigned long           oob_event_mask; /* OOB events this object is interested in */
         unsigned long           event_mask;     /* events this object is interested in */
         unsigned long           events;         /* events to be processed by this object
                                                  * (order is important - using fls) */
@@ -398,6 +397,9 @@ struct fscache_object {
 #define FSCACHE_OBJECT_LOCK             0       /* T if object is busy being processed */
 #define FSCACHE_OBJECT_PENDING_WRITE    1       /* T if object has pending write */
 #define FSCACHE_OBJECT_WAITING          2       /* T if object is waiting on its parent */
+#define FSCACHE_OBJECT_IS_LIVE          3       /* T if object is not withdrawn or relinquished */
+#define FSCACHE_OBJECT_IS_LOOKED_UP     4       /* T if object has been looked up */
+#define FSCACHE_OBJECT_IS_AVAILABLE     5       /* T if object has become active */
 
         struct list_head        cache_link;     /* link in cache->object_list */
         struct hlist_node       cookie_link;    /* link in cookie->backing_objects */
@@ -415,62 +417,40 @@ struct fscache_object {
         loff_t                  store_limit_l;  /* current storage limit */
 };
 
-extern const char *fscache_object_states[];
+extern void fscache_object_init(struct fscache_object *, struct fscache_cookie *,
+                                struct fscache_cache *);
+extern void fscache_object_destroy(struct fscache_object *);
 
-#define fscache_object_is_active(obj)                         \
-        (!test_bit(FSCACHE_IOERROR, &(obj)->cache->flags) &&  \
-         (obj)->state >= FSCACHE_OBJECT_AVAILABLE &&          \
-         (obj)->state < FSCACHE_OBJECT_DYING)
+extern void fscache_object_lookup_negative(struct fscache_object *object);
+extern void fscache_obtained_object(struct fscache_object *object);
 
-#define fscache_object_is_dead(obj)                             \
-        (test_bit(FSCACHE_IOERROR, &(obj)->cache->flags) &&     \
-         (obj)->state >= FSCACHE_OBJECT_DYING)
+static inline bool fscache_object_is_live(struct fscache_object *object)
+{
+        return test_bit(FSCACHE_OBJECT_IS_LIVE, &object->flags);
+}
 
-extern void fscache_object_work_func(struct work_struct *work);
+static inline bool fscache_object_is_dying(struct fscache_object *object)
+{
+        return !fscache_object_is_live(object);
+}
 
-/**
- * fscache_object_init - Initialise a cache object description
- * @object: Object description
- *
- * Initialise a cache object description to its basic values.
- *
- * See Documentation/filesystems/caching/backend-api.txt for a complete
- * description.
- */
-static inline
-void fscache_object_init(struct fscache_object *object,
-                         struct fscache_cookie *cookie,
-                         struct fscache_cache *cache)
+static inline bool fscache_object_is_available(struct fscache_object *object)
 {
-        atomic_inc(&cache->object_count);
-
-        object->state = FSCACHE_OBJECT_INIT;
-        spin_lock_init(&object->lock);
-        INIT_LIST_HEAD(&object->cache_link);
-        INIT_HLIST_NODE(&object->cookie_link);
-        INIT_WORK(&object->work, fscache_object_work_func);
-        INIT_LIST_HEAD(&object->dependents);
-        INIT_LIST_HEAD(&object->dep_link);
-        INIT_LIST_HEAD(&object->pending_ops);
-        object->n_children = 0;
-        object->n_ops = object->n_in_progress = object->n_exclusive = 0;
-        object->events = object->event_mask = 0;
-        object->flags = 0;
-        object->store_limit = 0;
-        object->store_limit_l = 0;
-        object->cache = cache;
-        object->cookie = cookie;
-        object->parent = NULL;
+        return test_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
 }
 
-extern void fscache_object_lookup_negative(struct fscache_object *object);
-extern void fscache_obtained_object(struct fscache_object *object);
+static inline bool fscache_object_is_active(struct fscache_object *object)
+{
+        return fscache_object_is_available(object) &&
+                fscache_object_is_live(object) &&
+                !test_bit(FSCACHE_IOERROR, &object->cache->flags);
+}
 
-#ifdef CONFIG_FSCACHE_OBJECT_LIST
-extern void fscache_object_destroy(struct fscache_object *object);
-#else
-#define fscache_object_destroy(object) do {} while(0)
-#endif
+static inline bool fscache_object_is_dead(struct fscache_object *object)
+{
+        return fscache_object_is_dying(object) &&
+                test_bit(FSCACHE_IOERROR, &object->cache->flags);
+}
 
 /**
  * fscache_object_destroyed - Note destruction of an object in a cache
@@ -531,6 +511,33 @@ static inline void fscache_end_io(struct fscache_retrieval *op,
         op->end_io_func(page, op->context, error);
 }
 
+/**
+ * fscache_use_cookie - Request usage of cookie attached to an object
+ * @object: Object description
+ * 
+ * Request usage of the cookie attached to an object.  NULL is returned if the
+ * relinquishment had reduced the cookie usage count to 0.
+ */
+static inline bool fscache_use_cookie(struct fscache_object *object)
+{
+        struct fscache_cookie *cookie = object->cookie;
+        return atomic_inc_not_zero(&cookie->n_active) != 0;
+}
+
+/**
+ * fscache_unuse_cookie - Cease usage of cookie attached to an object
+ * @object: Object description
+ * 
+ * Cease usage of the cookie attached to an object.  When the users count
+ * reaches zero then the cookie relinquishment will be permitted to proceed.
+ */
+static inline void fscache_unuse_cookie(struct fscache_object *object)
+{
+        struct fscache_cookie *cookie = object->cookie;
+        if (atomic_dec_and_test(&cookie->n_active))
+                wake_up_atomic_t(&cookie->n_active);
+}
+
 /*
  * out-of-line cache backend functions
  */
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
index 7a086235da4b..19b46458e4e8 100644
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
@@ -183,6 +183,7 @@ extern struct fscache_cookie *__fscache_acquire_cookie(
         const struct fscache_cookie_def *,
         void *);
 extern void __fscache_relinquish_cookie(struct fscache_cookie *, int);
+extern int __fscache_check_consistency(struct fscache_cookie *);
 extern void __fscache_update_cookie(struct fscache_cookie *);
 extern int __fscache_attr_changed(struct fscache_cookie *);
 extern void __fscache_invalidate(struct fscache_cookie *);
@@ -208,6 +209,8 @@ extern bool __fscache_maybe_release_page(struct fscache_cookie *, struct page *,
                                          gfp_t);
 extern void __fscache_uncache_all_inode_pages(struct fscache_cookie *,
                                               struct inode *);
+extern void __fscache_readpages_cancel(struct fscache_cookie *cookie,
+                                       struct list_head *pages);
 
 /**
  * fscache_register_netfs - Register a filesystem as desiring caching services
@@ -326,6 +329,25 @@ void fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
 }
 
 /**
+ * fscache_check_consistency - Request that if the cache is updated
+ * @cookie: The cookie representing the cache object
+ *
+ * Request an consistency check from fscache, which passes the request
+ * to the backing cache.
+ *
+ * Returns 0 if consistent and -ESTALE if inconsistent.  May also
+ * return -ENOMEM and -ERESTARTSYS.
+ */
+static inline
+int fscache_check_consistency(struct fscache_cookie *cookie)
+{
+        if (fscache_cookie_valid(cookie))
+                return __fscache_check_consistency(cookie);
+        else
+                return 0;
+}
+
+/**
  * fscache_update_cookie - Request that a cache object be updated
  * @cookie: The cookie representing the cache object
  *
@@ -570,6 +592,26 @@ int fscache_alloc_page(struct fscache_cookie *cookie,
 }
 
 /**
+ * fscache_readpages_cancel - Cancel read/alloc on pages
+ * @cookie: The cookie representing the inode's cache object.
+ * @pages: The netfs pages that we canceled write on in readpages()
+ *
+ * Uncache/unreserve the pages reserved earlier in readpages() via
+ * fscache_readpages_or_alloc() and similar.  In most successful caches in
+ * readpages() this doesn't do anything.  In cases when the underlying netfs's
+ * readahead failed we need to clean up the pagelist (unmark and uncache).
+ *
+ * This function may sleep as it may have to clean up disk state.
+ */
+static inline
+void fscache_readpages_cancel(struct fscache_cookie *cookie,
+                              struct list_head *pages)
+{
+        if (fscache_cookie_valid(cookie))
+                __fscache_readpages_cancel(cookie, pages);
+}
+
+/**
  * fscache_write_page - Request storage of a page in the cache
  * @cookie: The cookie representing the cache object
  * @page: The netfs page to store
diff --git a/include/linux/fsl/mxs-dma.h b/include/linux/fsl/mxs-dma.h
deleted file mode 100644
index 55d870238399..000000000000
--- a/include/linux/fsl/mxs-dma.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __MACH_MXS_DMA_H__
-#define __MACH_MXS_DMA_H__
-
-#include <linux/dmaengine.h>
-
-struct mxs_dma_data {
-        int chan_irq;
-};
-
-extern int mxs_dma_is_apbh(struct dma_chan *chan);
-extern int mxs_dma_is_apbx(struct dma_chan *chan);
-#endif /* __MACH_MXS_DMA_H__ */
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index a78680a92dba..1c804b057fb1 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -38,7 +38,7 @@ static inline int fsnotify_parent(struct path *path, struct dentry *dentry, __u3
 static inline int fsnotify_perm(struct file *file, int mask)
 {
         struct path *path = &file->f_path;
-        struct inode *inode = path->dentry->d_inode;
+        struct inode *inode = file_inode(file);
         __u32 fsnotify_mask = 0;
         int ret;
 
@@ -192,7 +192,7 @@ static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
 static inline void fsnotify_access(struct file *file)
 {
         struct path *path = &file->f_path;
-        struct inode *inode = path->dentry->d_inode;
+        struct inode *inode = file_inode(file);
         __u32 mask = FS_ACCESS;
 
         if (S_ISDIR(inode->i_mode))
@@ -210,7 +210,7 @@ static inline void fsnotify_access(struct file *file)
 static inline void fsnotify_modify(struct file *file)
 {
         struct path *path = &file->f_path;
-        struct inode *inode = path->dentry->d_inode;
+        struct inode *inode = file_inode(file);
         __u32 mask = FS_MODIFY;
 
         if (S_ISDIR(inode->i_mode))
@@ -228,7 +228,7 @@ static inline void fsnotify_modify(struct file *file)
 static inline void fsnotify_open(struct file *file)
 {
         struct path *path = &file->f_path;
-        struct inode *inode = path->dentry->d_inode;
+        struct inode *inode = file_inode(file);
         __u32 mask = FS_OPEN;
 
         if (S_ISDIR(inode->i_mode))
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 99d0fbcbaf79..9f15c0064c50 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -566,10 +566,6 @@ static inline ssize_t ftrace_filter_write(struct file *file, const char __user *
                             size_t cnt, loff_t *ppos) { return -ENODEV; }
 static inline ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf,
                              size_t cnt, loff_t *ppos) { return -ENODEV; }
-static inline loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int whence)
-{
-        return -ENODEV;
-}
 static inline int
 ftrace_regex_release(struct inode *inode, struct file *file) { return -ENODEV; }
 #endif /* CONFIG_DYNAMIC_FTRACE */
@@ -828,10 +824,15 @@ enum ftrace_dump_mode;
 
 extern enum ftrace_dump_mode ftrace_dump_on_oops;
 
+extern void disable_trace_on_warning(void);
+extern int __disable_trace_on_warning;
+
 #ifdef CONFIG_PREEMPT
 #define INIT_TRACE_RECURSION            .trace_recursion = 0,
 #endif
 
+#else /* CONFIG_TRACING */
+static inline void  disable_trace_on_warning(void) { }
 #endif /* CONFIG_TRACING */
 
 #ifndef INIT_TRACE_RECURSION
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 4372658c73ae..5eaa746735ff 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -78,6 +78,11 @@ struct trace_iterator {
         /* trace_seq for __print_flags() and __print_symbolic() etc. */
         struct trace_seq        tmp_seq;
 
+        cpumask_var_t           started;
+
+        /* it's true when current open file is snapshot */
+        bool                    snapshot;
+
         /* The below is zeroed out in pipe_read */
         struct trace_seq        seq;
         struct trace_entry      *ent;
@@ -90,10 +95,7 @@ struct trace_iterator {
         loff_t                  pos;
         long                    idx;
 
-        cpumask_var_t           started;
-
-        /* it's true when current open file is snapshot */
-        bool                    snapshot;
+        /* All new field here will be zeroed out in pipe_read */
 };
 
 enum trace_iter_flags {
@@ -332,7 +334,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
                               const char *name, int offset, int size,
                               int is_signed, int filter_type);
 extern int trace_add_event_call(struct ftrace_event_call *call);
-extern void trace_remove_event_call(struct ftrace_event_call *call);
+extern int trace_remove_event_call(struct ftrace_event_call *call);
 
 #define is_signed_type(type)    (((type)(-1)) < (type)1)
 
@@ -357,6 +359,40 @@ do {									\
                 __trace_printk(ip, fmt, ##args);                        \
 } while (0)
 
+/**
+ * tracepoint_string - register constant persistent string to trace system
+ * @str - a constant persistent string that will be referenced in tracepoints
+ *
+ * If constant strings are being used in tracepoints, it is faster and
+ * more efficient to just save the pointer to the string and reference
+ * that with a printf "%s" instead of saving the string in the ring buffer
+ * and wasting space and time.
+ *
+ * The problem with the above approach is that userspace tools that read
+ * the binary output of the trace buffers do not have access to the string.
+ * Instead they just show the address of the string which is not very
+ * useful to users.
+ *
+ * With tracepoint_string(), the string will be registered to the tracing
+ * system and exported to userspace via the debugfs/tracing/printk_formats
+ * file that maps the string address to the string text. This way userspace
+ * tools that read the binary buffers have a way to map the pointers to
+ * the ASCII strings they represent.
+ *
+ * The @str used must be a constant string and persistent as it would not
+ * make sense to show a string that no longer exists. But it is still fine
+ * to be used with modules, because when modules are unloaded, if they
+ * had tracepoints, the ring buffers are cleared too. As long as the string
+ * does not change during the life of the module, it is fine to use
+ * tracepoint_string() within a module.
+ */
+#define tracepoint_string(str)                                          \
+        ({                                                              \
+                static const char *___tp_str __tracepoint_string = str; \
+                ___tp_str;                                              \
+        })
+#define __tracepoint_string     __attribute__((section("__tracepoint_str")))
+
 #ifdef CONFIG_PERF_EVENTS
 struct perf_event;
 
diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index 661d374aeb2d..f8d41cb1cbe0 100644
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -66,8 +66,8 @@ struct gen_pool_chunk {
         struct list_head next_chunk;    /* next chunk in pool */
         atomic_t avail;
         phys_addr_t phys_addr;          /* physical starting address of memory chunk */
-        unsigned long start_addr;       /* starting address of memory chunk */
-        unsigned long end_addr;         /* ending address of memory chunk */
+        unsigned long start_addr;       /* start address of memory chunk */
+        unsigned long end_addr;         /* end address of memory chunk (inclusive) */
         unsigned long bits[0];          /* bitmap for allocating memory chunk */
 };
 
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 0f615eb23d05..9b4dd491f7e8 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -209,7 +209,7 @@ static inline int allocflags_to_migratetype(gfp_t gfp_flags)
  *       0x9    => DMA or NORMAL (MOVABLE+DMA)
  *       0xa    => MOVABLE (Movable is valid only if HIGHMEM is set too)
  *       0xb    => BAD (MOVABLE+HIGHMEM+DMA)
- *       0xc    => DMA32 (MOVABLE+HIGHMEM+DMA32)
+ *       0xc    => DMA32 (MOVABLE+DMA32)
  *       0xd    => BAD (MOVABLE+DMA32+DMA)
  *       0xe    => BAD (MOVABLE+DMA32+HIGHMEM)
  *       0xf    => BAD (MOVABLE+DMA32+HIGHMEM+DMA)
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index c1d6555d2567..1e041063b226 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -1,134 +1,15 @@
 #ifndef LINUX_HARDIRQ_H
 #define LINUX_HARDIRQ_H
 
-#include <linux/preempt.h>
+#include <linux/preempt_mask.h>
 #include <linux/lockdep.h>
 #include <linux/ftrace_irq.h>
 #include <linux/vtime.h>
-#include <asm/hardirq.h>
 
-/*
- * We put the hardirq and softirq counter into the preemption
- * counter. The bitmask has the following meaning:
- *
- * - bits 0-7 are the preemption count (max preemption depth: 256)
- * - bits 8-15 are the softirq count (max # of softirqs: 256)
- *
- * The hardirq count can in theory reach the same as NR_IRQS.
- * In reality, the number of nested IRQS is limited to the stack
- * size as well. For archs with over 1000 IRQS it is not practical
- * to expect that they will all nest. We give a max of 10 bits for
- * hardirq nesting. An arch may choose to give less than 10 bits.
- * m68k expects it to be 8.
- *
- * - bits 16-25 are the hardirq count (max # of nested hardirqs: 1024)
- * - bit 26 is the NMI_MASK
- * - bit 27 is the PREEMPT_ACTIVE flag
- *
- * PREEMPT_MASK: 0x000000ff
- * SOFTIRQ_MASK: 0x0000ff00
- * HARDIRQ_MASK: 0x03ff0000
- *     NMI_MASK: 0x04000000
- */
-#define PREEMPT_BITS    8
-#define SOFTIRQ_BITS    8
-#define NMI_BITS        1
-
-#define MAX_HARDIRQ_BITS 10
-
-#ifndef HARDIRQ_BITS
-# define HARDIRQ_BITS   MAX_HARDIRQ_BITS
-#endif
-
-#if HARDIRQ_BITS > MAX_HARDIRQ_BITS
-#error HARDIRQ_BITS too high!
-#endif
-
-#define PREEMPT_SHIFT   0
-#define SOFTIRQ_SHIFT   (PREEMPT_SHIFT + PREEMPT_BITS)
-#define HARDIRQ_SHIFT   (SOFTIRQ_SHIFT + SOFTIRQ_BITS)
-#define NMI_SHIFT       (HARDIRQ_SHIFT + HARDIRQ_BITS)
-
-#define __IRQ_MASK(x)   ((1UL << (x))-1)
-
-#define PREEMPT_MASK    (__IRQ_MASK(PREEMPT_BITS) << PREEMPT_SHIFT)
-#define SOFTIRQ_MASK    (__IRQ_MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT)
-#define HARDIRQ_MASK    (__IRQ_MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT)
-#define NMI_MASK        (__IRQ_MASK(NMI_BITS)     << NMI_SHIFT)
 
-#define PREEMPT_OFFSET  (1UL << PREEMPT_SHIFT)
-#define SOFTIRQ_OFFSET  (1UL << SOFTIRQ_SHIFT)
-#define HARDIRQ_OFFSET  (1UL << HARDIRQ_SHIFT)
-#define NMI_OFFSET      (1UL << NMI_SHIFT)
-
-#define SOFTIRQ_DISABLE_OFFSET  (2 * SOFTIRQ_OFFSET)
-
-#ifndef PREEMPT_ACTIVE
-#define PREEMPT_ACTIVE_BITS     1
-#define PREEMPT_ACTIVE_SHIFT    (NMI_SHIFT + NMI_BITS)
-#define PREEMPT_ACTIVE  (__IRQ_MASK(PREEMPT_ACTIVE_BITS) << PREEMPT_ACTIVE_SHIFT)
-#endif
-
-#if PREEMPT_ACTIVE < (1 << (NMI_SHIFT + NMI_BITS))
-#error PREEMPT_ACTIVE is too low!
-#endif
-
-#define hardirq_count() (preempt_count() & HARDIRQ_MASK)
-#define softirq_count() (preempt_count() & SOFTIRQ_MASK)
-#define irq_count()     (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK \
-                                 | NMI_MASK))
-
-/*
- * Are we doing bottom half or hardware interrupt processing?
- * Are we in a softirq context? Interrupt context?
- * in_softirq - Are we currently processing softirq or have bh disabled?
- * in_serving_softirq - Are we currently processing softirq?
- */
-#define in_irq()                (hardirq_count())
-#define in_softirq()            (softirq_count())
-#define in_interrupt()          (irq_count())
-#define in_serving_softirq()    (softirq_count() & SOFTIRQ_OFFSET)
-
-/*
- * Are we in NMI context?
- */
-#define in_nmi()        (preempt_count() & NMI_MASK)
-
-#if defined(CONFIG_PREEMPT_COUNT)
-# define PREEMPT_CHECK_OFFSET 1
-#else
-# define PREEMPT_CHECK_OFFSET 0
-#endif
-
-/*
- * Are we running in atomic context?  WARNING: this macro cannot
- * always detect atomic context; in particular, it cannot know about
- * held spinlocks in non-preemptible kernels.  Thus it should not be
- * used in the general case to determine whether sleeping is possible.
- * Do not use in_atomic() in driver code.
- */
-#define in_atomic()     ((preempt_count() & ~PREEMPT_ACTIVE) != 0)
-
-/*
- * Check whether we were atomic before we did preempt_disable():
- * (used by the scheduler, *after* releasing the kernel lock)
- */
-#define in_atomic_preempt_off() \
-                ((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_CHECK_OFFSET)
-
-#ifdef CONFIG_PREEMPT_COUNT
-# define preemptible()  (preempt_count() == 0 && !irqs_disabled())
-#else
-# define preemptible()  0
-#endif
-
-#if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS)
 extern void synchronize_irq(unsigned int irq);
-#else
-# define synchronize_irq(irq)   barrier()
-#endif
 
-#if defined(CONFIG_TINY_RCU) || defined(CONFIG_TINY_PREEMPT_RCU)
+#if defined(CONFIG_TINY_RCU)
 
 static inline void rcu_nmi_enter(void)
 {
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index 3b589440ecfe..9231be9e90a2 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -18,11 +18,21 @@ enum hdmi_infoframe_type {
         HDMI_INFOFRAME_TYPE_AUDIO = 0x84,
 };
 
+#define HDMI_IEEE_OUI 0x000c03
 #define HDMI_INFOFRAME_HEADER_SIZE  4
 #define HDMI_AVI_INFOFRAME_SIZE    13
 #define HDMI_SPD_INFOFRAME_SIZE    25
 #define HDMI_AUDIO_INFOFRAME_SIZE  10
 
+#define HDMI_INFOFRAME_SIZE(type)       \
+        (HDMI_INFOFRAME_HEADER_SIZE + HDMI_ ## type ## _INFOFRAME_SIZE)
+
+struct hdmi_any_infoframe {
+        enum hdmi_infoframe_type type;
+        unsigned char version;
+        unsigned char length;
+};
+
 enum hdmi_colorspace {
         HDMI_COLORSPACE_RGB,
         HDMI_COLORSPACE_YUV422,
@@ -100,9 +110,6 @@ struct hdmi_avi_infoframe {
         unsigned char version;
         unsigned char length;
         enum hdmi_colorspace colorspace;
-        bool active_info_valid;
-        bool horizontal_bar_valid;
-        bool vertical_bar_valid;
         enum hdmi_scan_mode scan_mode;
         enum hdmi_colorimetry colorimetry;
         enum hdmi_picture_aspect picture_aspect;
@@ -218,14 +225,52 @@ int hdmi_audio_infoframe_init(struct hdmi_audio_infoframe *frame);
 ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame,
                                   void *buffer, size_t size);
 
+enum hdmi_3d_structure {
+        HDMI_3D_STRUCTURE_INVALID = -1,
+        HDMI_3D_STRUCTURE_FRAME_PACKING = 0,
+        HDMI_3D_STRUCTURE_FIELD_ALTERNATIVE,
+        HDMI_3D_STRUCTURE_LINE_ALTERNATIVE,
+        HDMI_3D_STRUCTURE_SIDE_BY_SIDE_FULL,
+        HDMI_3D_STRUCTURE_L_DEPTH,
+        HDMI_3D_STRUCTURE_L_DEPTH_GFX_GFX_DEPTH,
+        HDMI_3D_STRUCTURE_TOP_AND_BOTTOM,
+        HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF = 8,
+};
+
+
 struct hdmi_vendor_infoframe {
         enum hdmi_infoframe_type type;
         unsigned char version;
         unsigned char length;
-        u8 data[27];
+        unsigned int oui;
+        u8 vic;
+        enum hdmi_3d_structure s3d_struct;
+        unsigned int s3d_ext_data;
 };
 
+int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *frame);
 ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
                                    void *buffer, size_t size);
 
+union hdmi_vendor_any_infoframe {
+        struct {
+                enum hdmi_infoframe_type type;
+                unsigned char version;
+                unsigned char length;
+                unsigned int oui;
+        } any;
+        struct hdmi_vendor_infoframe hdmi;
+};
+
+union hdmi_infoframe {
+        struct hdmi_any_infoframe any;
+        struct hdmi_avi_infoframe avi;
+        struct hdmi_spd_infoframe spd;
+        union hdmi_vendor_any_infoframe vendor;
+        struct hdmi_audio_infoframe audio;
+};
+
+ssize_t
+hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, size_t size);
+
 #endif /* _DRM_HDMI_H */
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h
index ecefb7311dd6..32ba45158d39 100644
--- a/include/linux/hid-sensor-hub.h
+++ b/include/linux/hid-sensor-hub.h
@@ -172,7 +172,7 @@ struct hid_sensor_common {
         struct hid_sensor_hub_attribute_info sensitivity;
 };
 
-/*Convert from hid unit expo to regular exponent*/
+/* Convert from hid unit expo to regular exponent */
 static inline int hid_sensor_convert_exponent(int unit_expo)
 {
         if (unit_expo < 0x08)
diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h
index 6f24446e7669..4f945d3ed49f 100644
--- a/include/linux/hid-sensor-ids.h
+++ b/include/linux/hid-sensor-ids.h
@@ -37,7 +37,7 @@
 #define HID_USAGE_SENSOR_ANGL_VELOCITY_Y_AXIS                   0x200458
 #define HID_USAGE_SENSOR_ANGL_VELOCITY_Z_AXIS                   0x200459
 
-/*ORIENTATION: Compass 3D: (200083) */
+/* ORIENTATION: Compass 3D: (200083) */
 #define HID_USAGE_SENSOR_COMPASS_3D                             0x200083
 #define HID_USAGE_SENSOR_ORIENT_MAGN_HEADING                    0x200471
 #define HID_USAGE_SENSOR_ORIENT_MAGN_HEADING_X                  0x200472
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 0c48991b0402..31b9d299ef6c 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -252,6 +252,8 @@ struct hid_item {
 #define HID_OUTPUT_REPORT       1
 #define HID_FEATURE_REPORT      2
 
+#define HID_REPORT_TYPES        3
+
 /*
  * HID connect requests
  */
@@ -283,6 +285,7 @@ struct hid_item {
 #define HID_QUIRK_MULTI_INPUT                   0x00000040
 #define HID_QUIRK_HIDINPUT_FORCE                0x00000080
 #define HID_QUIRK_NO_EMPTY_INPUT                0x00000100
+#define HID_QUIRK_NO_INIT_INPUT_REPORTS         0x00000200
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS           0x00010000
 #define HID_QUIRK_FULLSPEED_INTERVAL            0x10000000
 #define HID_QUIRK_NO_INIT_REPORTS               0x20000000
@@ -295,6 +298,7 @@ struct hid_item {
 #define HID_GROUP_GENERIC                       0x0001
 #define HID_GROUP_MULTITOUCH                    0x0002
 #define HID_GROUP_SENSOR_HUB                    0x0003
+#define HID_GROUP_MULTITOUCH_WIN_8              0x0004
 
 /*
  * This is the global environment of the parser. This information is
@@ -393,14 +397,14 @@ struct hid_report {
         struct hid_device *device;                      /* associated device */
 };
 
+#define HID_MAX_IDS 256
+
 struct hid_report_enum {
         unsigned numbered;
         struct list_head report_list;
-        struct hid_report *report_id_hash[256];
+        struct hid_report *report_id_hash[HID_MAX_IDS];
 };
 
-#define HID_REPORT_TYPES 3
-
 #define HID_MIN_BUFFER_SIZE     64              /* make sure there is at least a packet size of space */
 #define HID_MAX_BUFFER_SIZE     4096            /* 4kb */
 #define HID_CONTROL_FIFO_SIZE   256             /* to init devices with >100 reports */
@@ -456,6 +460,7 @@ struct hid_device {							/* device report descriptor */
         enum hid_type type;                                             /* device type (mouse, kbd, ...) */
         unsigned country;                                               /* HID country */
         struct hid_report_enum report_enum[HID_REPORT_TYPES];
+        struct work_struct led_work;                                    /* delayed LED worker */
 
         struct semaphore driver_lock;                                   /* protects the current driver, except during input */
         struct semaphore driver_input_lock;                             /* protects the current driver */
@@ -532,6 +537,8 @@ static inline void hid_set_drvdata(struct hid_device *hdev, void *data)
 #define HID_GLOBAL_STACK_SIZE 4
 #define HID_COLLECTION_STACK_SIZE 4
 
+#define HID_SCAN_FLAG_MT_WIN_8                  0x00000001
+
 struct hid_parser {
         struct hid_global     global;
         struct hid_global     global_stack[HID_GLOBAL_STACK_SIZE];
@@ -540,6 +547,7 @@ struct hid_parser {
         unsigned              collection_stack[HID_COLLECTION_STACK_SIZE];
         unsigned              collection_stack_ptr;
         struct hid_device    *device;
+        unsigned              scan_flags;
 };
 
 struct hid_class_descriptor {
@@ -744,9 +752,14 @@ struct hid_field *hidinput_get_led_field(struct hid_device *hid);
 unsigned int hidinput_count_leds(struct hid_device *hid);
 __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code);
 void hid_output_report(struct hid_report *report, __u8 *data);
+u8 *hid_alloc_report_buf(struct hid_report *report, gfp_t flags);
 struct hid_device *hid_allocate_device(void);
 struct hid_report *hid_register_report(struct hid_device *device, unsigned type, unsigned id);
 int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);
+struct hid_report *hid_validate_values(struct hid_device *hid,
+                                       unsigned int type, unsigned int id,
+                                       unsigned int field_index,
+                                       unsigned int report_counts);
 int hid_open_report(struct hid_device *device);
 int hid_check_keys_pressed(struct hid_device *hid);
 int hid_connect(struct hid_device *hid, unsigned int connect_mask);
@@ -989,7 +1002,6 @@ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
 u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct);
 int usbhid_quirks_init(char **quirks_param);
 void usbhid_quirks_exit(void);
-void usbhid_set_leds(struct hid_device *hid);
 
 #ifdef CONFIG_HID_PID
 int hid_pidff_init(struct hid_device *hid);
diff --git a/include/linux/hidraw.h b/include/linux/hidraw.h
index 2451662c728a..ddf52612eed8 100644
--- a/include/linux/hidraw.h
+++ b/include/linux/hidraw.h
@@ -23,6 +23,7 @@ struct hidraw {
         wait_queue_head_t wait;
         struct hid_device *hid;
         struct device *dev;
+        spinlock_t list_lock;
         struct list_head list;
 };
 
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index 528454c2caa9..3935428c57cf 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -60,9 +60,9 @@ extern pmd_t *page_check_address_pmd(struct page *page,
 #define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-#define HPAGE_PMD_SHIFT HPAGE_SHIFT
-#define HPAGE_PMD_MASK HPAGE_MASK
-#define HPAGE_PMD_SIZE HPAGE_SIZE
+#define HPAGE_PMD_SHIFT PMD_SHIFT
+#define HPAGE_PMD_SIZE  ((1UL) << HPAGE_PMD_SHIFT)
+#define HPAGE_PMD_MASK  (~(HPAGE_PMD_SIZE - 1))
 
 extern bool is_vma_temporary_stack(struct vm_area_struct *vma);
 
@@ -96,9 +96,6 @@ extern int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
                           pmd_t *dst_pmd, pmd_t *src_pmd,
                           struct vm_area_struct *vma,
                           unsigned long addr, unsigned long end);
-extern int handle_pte_fault(struct mm_struct *mm,
-                            struct vm_area_struct *vma, unsigned long address,
-                            pte_t *pte, pmd_t *pmd, unsigned int flags);
 extern int split_huge_page_to_list(struct page *page, struct list_head *list);
 static inline int split_huge_page(struct page *page)
 {
@@ -123,7 +120,7 @@ extern void __split_huge_page_pmd(struct vm_area_struct *vma,
         } while (0)
 extern void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address,
                 pmd_t *pmd);
-#if HPAGE_PMD_ORDER > MAX_ORDER
+#if HPAGE_PMD_ORDER >= MAX_ORDER
 #error "hugepages can't be allocated by the buddy allocator"
 #endif
 extern int hugepage_madvise(struct vm_area_struct *vma,
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 6b4890fa57e7..0393270466c3 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -55,7 +55,6 @@ void __unmap_hugepage_range_final(struct mmu_gather *tlb,
 void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
                                 unsigned long start, unsigned long end,
                                 struct page *ref_page);
-int hugetlb_prefault(struct address_space *, struct vm_area_struct *);
 void hugetlb_report_meminfo(struct seq_file *);
 int hugetlb_report_node_meminfo(int, char *);
 void hugetlb_show_meminfo(void);
@@ -67,8 +66,15 @@ int hugetlb_reserve_pages(struct inode *inode, long from, long to,
                                                 vm_flags_t vm_flags);
 void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed);
 int dequeue_hwpoisoned_huge_page(struct page *page);
+bool isolate_huge_page(struct page *page, struct list_head *list);
+void putback_active_hugepage(struct page *page);
+bool is_hugepage_active(struct page *page);
 void copy_huge_page(struct page *dst, struct page *src);
 
+#ifdef CONFIG_ARCH_WANT_HUGE_PMD_SHARE
+pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud);
+#endif
+
 extern unsigned long hugepages_treat_as_movable;
 extern const unsigned long hugetlb_zero, hugetlb_infinity;
 extern int sysctl_hugetlb_shm_group;
@@ -110,7 +116,6 @@ static inline unsigned long hugetlb_total_pages(void)
 #define follow_hugetlb_page(m,v,p,vs,a,b,i,w)   ({ BUG(); 0; })
 #define follow_huge_addr(mm, addr, write)       ERR_PTR(-EINVAL)
 #define copy_hugetlb_page_range(src, dst, vma)  ({ BUG(); 0; })
-#define hugetlb_prefault(mapping, vma)          ({ BUG(); 0; })
 static inline void hugetlb_report_meminfo(struct seq_file *m)
 {
 }
@@ -132,6 +137,9 @@ static inline int dequeue_hwpoisoned_huge_page(struct page *page)
         return 0;
 }
 
+#define isolate_huge_page(p, l) false
+#define putback_active_hugepage(p)      do {} while (0)
+#define is_hugepage_active(x)   false
 static inline void copy_huge_page(struct page *dst, struct page *src)
 {
 }
@@ -259,6 +267,8 @@ struct huge_bootmem_page {
 };
 
 struct page *alloc_huge_page_node(struct hstate *h, int nid);
+struct page *alloc_huge_page_noerr(struct vm_area_struct *vma,
+                                unsigned long addr, int avoid_reserve);
 
 /* arch callback */
 int __init alloc_bootmem_huge_page(struct hstate *h);
@@ -358,9 +368,34 @@ static inline int hstate_index(struct hstate *h)
         return h - hstates;
 }
 
+pgoff_t __basepage_index(struct page *page);
+
+/* Return page->index in PAGE_SIZE units */
+static inline pgoff_t basepage_index(struct page *page)
+{
+        if (!PageCompound(page))
+                return page->index;
+
+        return __basepage_index(page);
+}
+
+extern void dissolve_free_huge_pages(unsigned long start_pfn,
+                                     unsigned long end_pfn);
+int pmd_huge_support(void);
+/*
+ * Currently hugepage migration is enabled only for pmd-based hugepage.
+ * This function will be updated when hugepage migration is more widely
+ * supported.
+ */
+static inline int hugepage_migration_support(struct hstate *h)
+{
+        return pmd_huge_support() && (huge_page_shift(h) == PMD_SHIFT);
+}
+
 #else   /* CONFIG_HUGETLB_PAGE */
 struct hstate {};
 #define alloc_huge_page_node(h, nid) NULL
+#define alloc_huge_page_noerr(v, a, r) NULL
 #define alloc_bootmem_huge_page(h) NULL
 #define hstate_file(f) NULL
 #define hstate_sizelog(s) NULL
@@ -378,6 +413,14 @@ static inline unsigned int pages_per_huge_page(struct hstate *h)
 }
 #define hstate_index_to_shift(index) 0
 #define hstate_index(h) 0
+
+static inline pgoff_t basepage_index(struct page *page)
+{
+        return page->index;
+}
+#define dissolve_free_huge_pages(s, e)  do {} while (0)
+#define pmd_huge_support()      0
+#define hugepage_migration_support(h)   0
 #endif  /* CONFIG_HUGETLB_PAGE */
 
 #endif /* _LINUX_HUGETLB_H */
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index c2559847d7ee..d98503bde7e9 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -27,6 +27,17 @@
 
 #include <linux/types.h>
 
+/*
+ * Framework version for util services.
+ */
+#define UTIL_FW_MINOR  0
+
+#define UTIL_WS2K8_FW_MAJOR  1
+#define UTIL_WS2K8_FW_VERSION     (UTIL_WS2K8_FW_MAJOR << 16 | UTIL_FW_MINOR)
+
+#define UTIL_FW_MAJOR  3
+#define UTIL_FW_VERSION     (UTIL_FW_MAJOR << 16 | UTIL_FW_MINOR)
+
 
 /*
  * Implementation of host controlled snapshot of the guest.
@@ -455,27 +466,6 @@ hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi,
         *read = dsize - *write;
 }
 
-
-/*
- * We use the same version numbering for all Hyper-V modules.
- *
- * Definition of versioning is as follows;
- *
- *      Major Number    Changes for these scenarios;
- *                      1.      When a new version of Windows Hyper-V
- *                              is released.
- *                      2.      A Major change has occurred in the
- *                              Linux IC's.
- *                      (For example the merge for the first time
- *                      into the kernel) Every time the Major Number
- *                      changes, the Revision number is reset to 0.
- *      Minor Number    Changes when new functionality is added
- *                      to the Linux IC's that is not a bug fix.
- *
- * 3.1 - Added completed hv_utils driver. Shutdown/Heartbeat/Timesync
- */
-#define HV_DRV_VERSION           "3.1"
-
 /*
  * VMBUS version is 32 bit entity broken up into
  * two 16 bit quantities: major_number. minor_number.
@@ -909,6 +899,7 @@ enum vmbus_channel_state {
         CHANNEL_OFFER_STATE,
         CHANNEL_OPENING_STATE,
         CHANNEL_OPEN_STATE,
+        CHANNEL_OPENED_STATE,
 };
 
 struct vmbus_channel_debug_info {
@@ -1046,6 +1037,38 @@ struct vmbus_channel {
          * preserve the earlier behavior.
          */
         u32 target_vp;
+        /*
+         * Support for sub-channels. For high performance devices,
+         * it will be useful to have multiple sub-channels to support
+         * a scalable communication infrastructure with the host.
+         * The support for sub-channels is implemented as an extention
+         * to the current infrastructure.
+         * The initial offer is considered the primary channel and this
+         * offer message will indicate if the host supports sub-channels.
+         * The guest is free to ask for sub-channels to be offerred and can
+         * open these sub-channels as a normal "primary" channel. However,
+         * all sub-channels will have the same type and instance guids as the
+         * primary channel. Requests sent on a given channel will result in a
+         * response on the same channel.
+         */
+
+        /*
+         * Sub-channel creation callback. This callback will be called in
+         * process context when a sub-channel offer is received from the host.
+         * The guest can open the sub-channel in the context of this callback.
+         */
+        void (*sc_creation_callback)(struct vmbus_channel *new_sc);
+
+        spinlock_t sc_lock;
+        /*
+         * All Sub-channels of a primary channel are linked here.
+         */
+        struct list_head sc_list;
+        /*
+         * The primary channel this sub-channel belongs to.
+         * This will be NULL for the primary channel.
+         */
+        struct vmbus_channel *primary_channel;
 };
 
 static inline void set_channel_read_state(struct vmbus_channel *c, bool state)
@@ -1057,6 +1080,34 @@ void vmbus_onmessage(void *context);
 
 int vmbus_request_offers(void);
 
+/*
+ * APIs for managing sub-channels.
+ */
+
+void vmbus_set_sc_create_callback(struct vmbus_channel *primary_channel,
+                        void (*sc_cr_cb)(struct vmbus_channel *new_sc));
+
+/*
+ * Retrieve the (sub) channel on which to send an outgoing request.
+ * When a primary channel has multiple sub-channels, we choose a
+ * channel whose VCPU binding is closest to the VCPU on which
+ * this call is being made.
+ */
+struct vmbus_channel *vmbus_get_outgoing_channel(struct vmbus_channel *primary);
+
+/*
+ * Check if sub-channels have already been offerred. This API will be useful
+ * when the driver is unloaded after establishing sub-channels. In this case,
+ * when the driver is re-loaded, the driver would have to check if the
+ * subchannels have already been established before attempting to request
+ * the creation of sub-channels.
+ * This function returns TRUE to indicate that subchannels have already been
+ * created.
+ * This function should be invoked after setting the callback function for
+ * sub-channel creation.
+ */
+bool vmbus_are_subchannels_present(struct vmbus_channel *primary);
+
 /* The format must be the same as struct vmdata_gpa_direct */
 struct vmbus_channel_packet_page_buffer {
         u16 type;
@@ -1327,6 +1378,15 @@ void vmbus_driver_unregister(struct hv_driver *hv_driver);
                         0x8e, 0x77, 0x05, 0x58, 0xeb, 0x10, 0x73, 0xf8 \
                 }
 
+/*
+ * Synthetic FC GUID
+ * {2f9bcc4a-0069-4af3-b76b-6fd0be528cda}
+ */
+#define HV_SYNTHFC_GUID \
+        .guid = { \
+                        0x4A, 0xCC, 0x9B, 0x2F, 0x69, 0x00, 0xF3, 0x4A, \
+                        0xB7, 0x6B, 0x6F, 0xD0, 0xBE, 0x52, 0x8C, 0xDA \
+                }
 
 /*
  * Common header for Hyper-V ICs
@@ -1424,7 +1484,7 @@ struct hyperv_service_callback {
 };
 
 #define MAX_SRV_VER     0x7ffffff
-extern void vmbus_prep_negotiate_resp(struct icmsg_hdr *,
+extern bool vmbus_prep_negotiate_resp(struct icmsg_hdr *,
                                         struct icmsg_negotiate *, u8 *, int,
                                         int);
 
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index e988fa935b3c..2ab11dc38077 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -447,11 +447,13 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
 static inline struct i2c_adapter *
 i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter)
 {
+#if IS_ENABLED(I2C_MUX)
         struct device *parent = adapter->dev.parent;
 
         if (parent != NULL && parent->type == &i2c_adapter_type)
                 return to_i2c_adapter(parent);
         else
+#endif
                 return NULL;
 }
 
@@ -542,10 +544,24 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap)
 
 #endif /* I2C */
 
-#if IS_ENABLED(CONFIG_ACPI_I2C)
-extern void acpi_i2c_register_devices(struct i2c_adapter *adap);
+#if IS_ENABLED(CONFIG_OF)
+/* must call put_device() when done with returned i2c_client device */
+extern struct i2c_client *of_find_i2c_device_by_node(struct device_node *node);
+
+/* must call put_device() when done with returned i2c_adapter device */
+extern struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node);
+
 #else
-static inline void acpi_i2c_register_devices(struct i2c_adapter *adap) {}
-#endif
+
+static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)
+{
+        return NULL;
+}
+
+static inline struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)
+{
+        return NULL;
+}
+#endif /* CONFIG_OF */
 
 #endif /* _LINUX_I2C_H */
diff --git a/include/linux/i2c/i2c-hid.h b/include/linux/i2c/i2c-hid.h
index 60e411d764d4..7aa901d92058 100644
--- a/include/linux/i2c/i2c-hid.h
+++ b/include/linux/i2c/i2c-hid.h
@@ -19,7 +19,8 @@
  * @hid_descriptor_address: i2c register where the HID descriptor is stored.
  *
  * Note that it is the responsibility of the platform driver (or the acpi 5.0
- * driver) to setup the irq related to the gpio in the struct i2c_board_info.
+ * driver, or the flattened device tree) to setup the irq related to the gpio in
+ * the struct i2c_board_info.
  * The platform driver should also setup the gpio according to the device:
  *
  * A typical example is the following:
diff --git a/include/linux/i2c/pxa-i2c.h b/include/linux/i2c/pxa-i2c.h
index 1a9f65e6ec0f..53aab243cbd8 100644
--- a/include/linux/i2c/pxa-i2c.h
+++ b/include/linux/i2c/pxa-i2c.h
@@ -67,6 +67,9 @@ struct i2c_pxa_platform_data {
         unsigned int            class;
         unsigned int            use_pio :1;
         unsigned int            fast_mode :1;
+        unsigned int            high_mode:1;
+        unsigned char           master_code;
+        unsigned long           rate;
 };
 
 extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 488debbef895..81cbbdb96aae 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -658,7 +658,6 @@ struct twl4030_power_data {
         bool use_poweroff;      /* Board is wired for TWL poweroff */
 };
 
-extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
 extern int twl4030_remove_script(u8 flags);
 extern void twl4030_power_off(void);
 
@@ -726,7 +725,7 @@ struct twl4030_platform_data {
         struct regulator_init_data              *clk32kg;
         struct regulator_init_data              *v1v8;
         struct regulator_init_data              *v2v1;
-        /* TWL6025 LDO regulators */
+        /* TWL6032 LDO regulators */
         struct regulator_init_data              *ldo1;
         struct regulator_init_data              *ldo2;
         struct regulator_init_data              *ldo3;
@@ -736,7 +735,7 @@ struct twl4030_platform_data {
         struct regulator_init_data              *ldo7;
         struct regulator_init_data              *ldoln;
         struct regulator_init_data              *ldousb;
-        /* TWL6025 DCDC regulators */
+        /* TWL6032 DCDC regulators */
         struct regulator_init_data              *smps3;
         struct regulator_init_data              *smps4;
         struct regulator_init_data              *vio6025;
@@ -753,7 +752,7 @@ struct twl_regulator_driver_data {
 #define TPS_SUBSET              BIT(1)  /* tps659[23]0 have fewer LDOs */
 #define TWL5031                 BIT(2)  /* twl5031 has different registers */
 #define TWL6030_CLASS           BIT(3)  /* TWL6030 class */
-#define TWL6025_SUBCLASS        BIT(4)  /* TWL6025 has changed registers */
+#define TWL6032_SUBCLASS        BIT(4)  /* TWL6032 has changed registers */
 #define TWL4030_ALLOW_UNSUPPORTED BIT(5) /* Some voltages are possible
                                           * but not officially supported.
                                           * This flag is necessary to
@@ -840,20 +839,20 @@ static inline int twl4030charger_usb_en(int enable) { return 0; }
 #define TWL6030_REG_CLK32KG     48
 
 /* LDOs on 6025 have different names */
-#define TWL6025_REG_LDO2        49
-#define TWL6025_REG_LDO4        50
-#define TWL6025_REG_LDO3        51
-#define TWL6025_REG_LDO5        52
-#define TWL6025_REG_LDO1        53
-#define TWL6025_REG_LDO7        54
-#define TWL6025_REG_LDO6        55
-#define TWL6025_REG_LDOLN       56
-#define TWL6025_REG_LDOUSB      57
+#define TWL6032_REG_LDO2        49
+#define TWL6032_REG_LDO4        50
+#define TWL6032_REG_LDO3        51
+#define TWL6032_REG_LDO5        52
+#define TWL6032_REG_LDO1        53
+#define TWL6032_REG_LDO7        54
+#define TWL6032_REG_LDO6        55
+#define TWL6032_REG_LDOLN       56
+#define TWL6032_REG_LDOUSB      57
 
 /* 6025 DCDC supplies */
-#define TWL6025_REG_SMPS3       58
-#define TWL6025_REG_SMPS4       59
-#define TWL6025_REG_VIO         60
+#define TWL6032_REG_SMPS3       58
+#define TWL6032_REG_SMPS4       59
+#define TWL6032_REG_VIO         60
 
 
 #endif /* End of __TWL4030_H */
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 06b0ed0154a4..a5b598a79bec 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -16,6 +16,7 @@
 #define LINUX_IEEE80211_H
 
 #include <linux/types.h>
+#include <linux/if_ether.h>
 #include <asm/byteorder.h>
 
 /*
@@ -146,6 +147,7 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)
 #define IEEE80211_MAX_RTS_THRESHOLD     2353
 #define IEEE80211_MAX_AID               2007
 #define IEEE80211_MAX_TIM_LEN           251
+#define IEEE80211_MAX_MESH_PEERINGS     63
 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
    6.2.1.1.2.
 
@@ -208,28 +210,28 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)
 struct ieee80211_hdr {
         __le16 frame_control;
         __le16 duration_id;
-        u8 addr1[6];
-        u8 addr2[6];
-        u8 addr3[6];
+        u8 addr1[ETH_ALEN];
+        u8 addr2[ETH_ALEN];
+        u8 addr3[ETH_ALEN];
         __le16 seq_ctrl;
-        u8 addr4[6];
+        u8 addr4[ETH_ALEN];
 } __packed __aligned(2);
 
 struct ieee80211_hdr_3addr {
         __le16 frame_control;
         __le16 duration_id;
-        u8 addr1[6];
-        u8 addr2[6];
-        u8 addr3[6];
+        u8 addr1[ETH_ALEN];
+        u8 addr2[ETH_ALEN];
+        u8 addr3[ETH_ALEN];
         __le16 seq_ctrl;
 } __packed __aligned(2);
 
 struct ieee80211_qos_hdr {
         __le16 frame_control;
         __le16 duration_id;
-        u8 addr1[6];
-        u8 addr2[6];
-        u8 addr3[6];
+        u8 addr1[ETH_ALEN];
+        u8 addr2[ETH_ALEN];
+        u8 addr3[ETH_ALEN];
         __le16 seq_ctrl;
         __le16 qos_ctrl;
 } __packed __aligned(2);
@@ -607,8 +609,8 @@ struct ieee80211s_hdr {
         u8 flags;
         u8 ttl;
         __le32 seqnum;
-        u8 eaddr1[6];
-        u8 eaddr2[6];
+        u8 eaddr1[ETH_ALEN];
+        u8 eaddr2[ETH_ALEN];
 } __packed __aligned(2);
 
 /* Mesh flags */
@@ -757,7 +759,7 @@ struct ieee80211_rann_ie {
         u8 rann_flags;
         u8 rann_hopcount;
         u8 rann_ttl;
-        u8 rann_addr[6];
+        u8 rann_addr[ETH_ALEN];
         __le32 rann_seq;
         __le32 rann_interval;
         __le32 rann_metric;
@@ -801,9 +803,9 @@ enum ieee80211_vht_opmode_bits {
 struct ieee80211_mgmt {
         __le16 frame_control;
         __le16 duration;
-        u8 da[6];
-        u8 sa[6];
-        u8 bssid[6];
+        u8 da[ETH_ALEN];
+        u8 sa[ETH_ALEN];
+        u8 bssid[ETH_ALEN];
         __le16 seq_ctrl;
         union {
                 struct {
@@ -832,7 +834,7 @@ struct ieee80211_mgmt {
                 struct {
                         __le16 capab_info;
                         __le16 listen_interval;
-                        u8 current_ap[6];
+                        u8 current_ap[ETH_ALEN];
                         /* followed by SSID and Supported rates */
                         u8 variable[0];
                 } __packed reassoc_req;
@@ -965,21 +967,21 @@ struct ieee80211_vendor_ie {
 struct ieee80211_rts {
         __le16 frame_control;
         __le16 duration;
-        u8 ra[6];
-        u8 ta[6];
+        u8 ra[ETH_ALEN];
+        u8 ta[ETH_ALEN];
 } __packed __aligned(2);
 
 struct ieee80211_cts {
         __le16 frame_control;
         __le16 duration;
-        u8 ra[6];
+        u8 ra[ETH_ALEN];
 } __packed __aligned(2);
 
 struct ieee80211_pspoll {
         __le16 frame_control;
         __le16 aid;
-        u8 bssid[6];
-        u8 ta[6];
+        u8 bssid[ETH_ALEN];
+        u8 ta[ETH_ALEN];
 } __packed __aligned(2);
 
 /* TDLS */
@@ -988,14 +990,14 @@ struct ieee80211_pspoll {
 struct ieee80211_tdls_lnkie {
         u8 ie_type; /* Link Identifier IE */
         u8 ie_len;
-        u8 bssid[6];
-        u8 init_sta[6];
-        u8 resp_sta[6];
+        u8 bssid[ETH_ALEN];
+        u8 init_sta[ETH_ALEN];
+        u8 resp_sta[ETH_ALEN];
 } __packed;
 
 struct ieee80211_tdls_data {
-        u8 da[6];
-        u8 sa[6];
+        u8 da[ETH_ALEN];
+        u8 sa[ETH_ALEN];
         __be16 ether_type;
         u8 payload_type;
         u8 category;
@@ -1089,8 +1091,8 @@ struct ieee80211_p2p_noa_attr {
 struct ieee80211_bar {
         __le16 frame_control;
         __le16 duration;
-        __u8 ra[6];
-        __u8 ta[6];
+        __u8 ra[ETH_ALEN];
+        __u8 ta[ETH_ALEN];
         __le16 control;
         __le16 start_seq_num;
 } __packed;
@@ -1708,6 +1710,10 @@ enum ieee80211_eid {
         WLAN_EID_OPMODE_NOTIF = 199,
         WLAN_EID_WIDE_BW_CHANNEL_SWITCH = 194,
         WLAN_EID_CHANNEL_SWITCH_WRAPPER = 196,
+        WLAN_EID_EXTENDED_BSS_LOAD = 193,
+        WLAN_EID_VHT_TX_POWER_ENVELOPE = 195,
+        WLAN_EID_AID = 197,
+        WLAN_EID_QUIET_CHANNEL = 198,
 
         /* 802.11ad */
         WLAN_EID_NON_TX_BSSID_CAP =  83,
@@ -1829,6 +1835,15 @@ enum ieee80211_key_len {
         WLAN_KEY_LEN_AES_CMAC = 16,
 };
 
+#define IEEE80211_WEP_IV_LEN            4
+#define IEEE80211_WEP_ICV_LEN           4
+#define IEEE80211_CCMP_HDR_LEN          8
+#define IEEE80211_CCMP_MIC_LEN          8
+#define IEEE80211_CCMP_PN_LEN           6
+#define IEEE80211_TKIP_IV_LEN           8
+#define IEEE80211_TKIP_ICV_LEN          4
+#define IEEE80211_CMAC_PN_LEN           6
+
 /* Public action codes */
 enum ieee80211_pub_actioncode {
         WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4,
@@ -1850,6 +1865,11 @@ enum ieee80211_tdls_actioncode {
         WLAN_TDLS_DISCOVERY_REQUEST = 10,
 };
 
+/* Interworking capabilities are set in 7th bit of 4th byte of the
+ * @WLAN_EID_EXT_CAPABILITY information element
+ */
+#define WLAN_EXT_CAPA4_INTERWORKING_ENABLED     BIT(7)
+
 /*
  * TDLS capabililites to be enabled in the 5th byte of the
  * @WLAN_EID_EXT_CAPABILITY information element
@@ -2269,4 +2289,8 @@ static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,
         return !!(tim->virtual_map[index] & mask);
 }
 
+/* convert time units */
+#define TU_TO_JIFFIES(x)        (usecs_to_jiffies((x) * 1024))
+#define TU_TO_EXP_TIME(x)       (jiffies + TU_TO_JIFFIES(x))
+
 #endif /* LINUX_IEEE80211_H */
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 12b4d55a02af..d5569734f672 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -30,7 +30,6 @@ static inline struct ethhdr *eth_hdr(const struct sk_buff *skb)
 
 int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr);
 
-int mac_pton(const char *s, u8 *mac);
 extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
 
 #endif  /* _LINUX_IF_ETHER_H */
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index c3f817c3eb45..a86784dec3d3 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -12,5 +12,6 @@ struct ifla_vf_info {
         __u32 qos;
         __u32 tx_rate;
         __u32 spoofchk;
+        __u32 linkstate;
 };
 #endif /* _LINUX_IF_LINK_H */
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index 84dde1dd1da4..ddd33fd5904d 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -8,7 +8,7 @@
 #include <net/netlink.h>
 #include <linux/u64_stats_sync.h>
 
-#if defined(CONFIG_MACVTAP) || defined(CONFIG_MACVTAP_MODULE)
+#if IS_ENABLED(CONFIG_MACVTAP)
 struct socket *macvtap_get_socket(struct file *);
 #else
 #include <linux/err.h>
@@ -50,7 +50,7 @@ struct macvlan_pcpu_stats {
  * Maximum times a macvtap device can be opened. This can be used to
  * configure the number of receive queue, e.g. for multiqueue virtio.
  */
-#define MAX_MACVTAP_QUEUES      (NR_CPUS < 16 ? NR_CPUS : 16)
+#define MAX_MACVTAP_QUEUES      16
 
 #define MACVLAN_MC_FILTER_BITS  8
 #define MACVLAN_MC_FILTER_SZ    (1 << MACVLAN_MC_FILTER_BITS)
@@ -65,12 +65,18 @@ struct macvlan_dev {
 
         DECLARE_BITMAP(mc_filter, MACVLAN_MC_FILTER_SZ);
 
+        netdev_features_t       set_features;
         enum macvlan_mode       mode;
         u16                     flags;
         int (*receive)(struct sk_buff *skb);
         int (*forward)(struct net_device *dev, struct sk_buff *skb);
-        struct macvtap_queue    *taps[MAX_MACVTAP_QUEUES];
+        /* This array tracks active taps. */
+        struct macvtap_queue    __rcu *taps[MAX_MACVTAP_QUEUES];
+        /* This list tracks all taps (both enabled and disabled) */
+        struct list_head        queue_list;
         int                     numvtaps;
+        int                     numqueues;
+        netdev_features_t       tap_features;
         int                     minor;
 };
 
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 4474557904f6..a899dc24be15 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -10,9 +10,9 @@
 #ifndef _LINUX_IF_TEAM_H_
 #define _LINUX_IF_TEAM_H_
 
-
 #include <linux/netpoll.h>
 #include <net/sch_generic.h>
+#include <linux/types.h>
 #include <uapi/linux/if_team.h>
 
 struct team_pcpu_stats {
@@ -69,6 +69,7 @@ struct team_port {
         s32 priority; /* lower number ~ higher priority */
         u16 queue_id;
         struct list_head qom_list; /* node in queue override mapping list */
+        struct rcu_head rcu;
         long mode_priv[0];
 };
 
@@ -193,6 +194,18 @@ struct team {
         bool user_carrier_enabled;
         bool queue_override_enabled;
         struct list_head *qom_lists; /* array of queue override mapping lists */
+        struct {
+                unsigned int count;
+                unsigned int interval; /* in ms */
+                atomic_t count_pending;
+                struct delayed_work dw;
+        } notify_peers;
+        struct {
+                unsigned int count;
+                unsigned int interval; /* in ms */
+                atomic_t count_pending;
+                struct delayed_work dw;
+        } mcast_rejoin;
         long mode_priv[TEAM_MODE_PRIV_LONGS];
 };
 
@@ -228,6 +241,16 @@ static inline struct team_port *team_get_port_by_index(struct team *team,
                         return port;
         return NULL;
 }
+
+static inline int team_num_to_port_index(struct team *team, int num)
+{
+        int en_port_count = ACCESS_ONCE(team->en_port_count);
+
+        if (unlikely(!en_port_count))
+                return 0;
+        return num % en_port_count;
+}
+
 static inline struct team_port *team_get_port_by_index_rcu(struct team *team,
                                                            int port_index)
 {
@@ -249,12 +272,12 @@ team_get_first_port_txable_rcu(struct team *team, struct team_port *port)
                 return port;
         cur = port;
         list_for_each_entry_continue_rcu(cur, &team->port_list, list)
-                if (team_port_txable(port))
+                if (team_port_txable(cur))
                         return cur;
         list_for_each_entry_rcu(cur, &team->port_list, list) {
                 if (cur == port)
                         break;
-                if (team_port_txable(port))
+                if (team_port_txable(cur))
                         return cur;
         }
         return NULL;
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 52bd03b38962..715c343f7c00 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -44,7 +44,7 @@ struct vlan_hdr {
  *      struct vlan_ethhdr - vlan ethernet header (ethhdr + vlan_hdr)
  *      @h_dest: destination ethernet address
  *      @h_source: source ethernet address
- *      @h_vlan_proto: ethernet protocol (always 0x8100)
+ *      @h_vlan_proto: ethernet protocol
  *      @h_vlan_TCI: priority and VLAN ID
  *      @h_vlan_encapsulated_proto: packet type ID or len
  */
@@ -79,9 +79,8 @@ static inline int is_vlan_dev(struct net_device *dev)
 }
 
 #define vlan_tx_tag_present(__skb)      ((__skb)->vlan_tci & VLAN_TAG_PRESENT)
-#define vlan_tx_nonzero_tag_present(__skb) \
-        (vlan_tx_tag_present(__skb) && ((__skb)->vlan_tci & VLAN_VID_MASK))
 #define vlan_tx_tag_get(__skb)          ((__skb)->vlan_tci & ~VLAN_TAG_PRESENT)
+#define vlan_tx_tag_get_id(__skb)       ((__skb)->vlan_tci & VLAN_VID_MASK)
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 
@@ -243,8 +242,6 @@ static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb,
         return skb;
 }
 
-#define HAVE_VLAN_PUT_TAG
-
 /**
  * vlan_put_tag - inserts VLAN tag according to device features
  * @skb: skbuff to tag
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 7f2bf1518480..f47550d75f85 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -84,6 +84,7 @@ struct ip_mc_list {
                 struct ip_mc_list *next;
                 struct ip_mc_list __rcu *next_rcu;
         };
+        struct ip_mc_list __rcu *next_hash;
         struct timer_list       timer;
         int                     users;
         atomic_t                refcnt;
@@ -128,6 +129,5 @@ extern void ip_mc_unmap(struct in_device *);
 extern void ip_mc_remap(struct in_device *);
 extern void ip_mc_dec_group(struct in_device *in_dev, __be32 addr);
 extern void ip_mc_inc_group(struct in_device *in_dev, __be32 addr);
-extern void ip_mc_rejoin_groups(struct in_device *in_dev);
 
 #endif
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 172c5b23cb84..e51f65480ea5 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -17,6 +17,8 @@
 #include <linux/iio/trigger.h>
 #include <linux/bitops.h>
 
+#include <linux/platform_data/st_sensors_pdata.h>
+
 #define ST_SENSORS_TX_MAX_LENGTH                2
 #define ST_SENSORS_RX_MAX_LENGTH                6
 
@@ -24,14 +26,10 @@
 #define ST_SENSORS_FULLSCALE_AVL_MAX            10
 
 #define ST_SENSORS_NUMBER_ALL_CHANNELS          4
-#define ST_SENSORS_NUMBER_DATA_CHANNELS         3
 #define ST_SENSORS_ENABLE_ALL_AXIS              0x07
-#define ST_SENSORS_BYTE_FOR_CHANNEL             2
 #define ST_SENSORS_SCAN_X                       0
 #define ST_SENSORS_SCAN_Y                       1
 #define ST_SENSORS_SCAN_Z                       2
-#define ST_SENSORS_DEFAULT_12_REALBITS          12
-#define ST_SENSORS_DEFAULT_16_REALBITS          16
 #define ST_SENSORS_DEFAULT_POWER_ON_VALUE       0x01
 #define ST_SENSORS_DEFAULT_POWER_OFF_VALUE      0x00
 #define ST_SENSORS_DEFAULT_WAI_ADDRESS          0x0f
@@ -42,20 +40,20 @@
 #define ST_SENSORS_MAX_NAME                     17
 #define ST_SENSORS_MAX_4WAI                     7
 
-#define ST_SENSORS_LSM_CHANNELS(device_type, index, mod, endian, bits, addr) \
+#define ST_SENSORS_LSM_CHANNELS(device_type, mask, index, mod, \
+                                        ch2, s, endian, rbits, sbits, addr) \
 { \
         .type = device_type, \
-        .modified = 1, \
-        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-                        BIT(IIO_CHAN_INFO_SCALE), \
+        .modified = mod, \
+        .info_mask_separate = mask, \
         .scan_index = index, \
-        .channel2 = mod, \
+        .channel2 = ch2, \
         .address = addr, \
         .scan_type = { \
-                .sign = 's', \
-                .realbits = bits, \
-                .shift = 16 - bits, \
-                .storagebits = 16, \
+                .sign = s, \
+                .realbits = rbits, \
+                .shift = sbits - rbits, \
+                .storagebits = sbits, \
                 .endianness = endian, \
         }, \
 }
@@ -122,14 +120,16 @@ struct st_sensor_bdu {
 /**
  * struct st_sensor_data_ready_irq - ST sensor device data-ready interrupt
  * @addr: address of the register.
- * @mask: mask to write the on/off value.
+ * @mask_int1: mask to enable/disable IRQ on INT1 pin.
+ * @mask_int2: mask to enable/disable IRQ on INT2 pin.
  * struct ig1 - represents the Interrupt Generator 1 of sensors.
  * @en_addr: address of the enable ig1 register.
  * @en_mask: mask to write the on/off value for enable.
  */
 struct st_sensor_data_ready_irq {
         u8 addr;
-        u8 mask;
+        u8 mask_int1;
+        u8 mask_int2;
         struct {
                 u8 en_addr;
                 u8 en_mask;
@@ -204,6 +204,8 @@ struct st_sensors {
  * @multiread_bit: Use or not particular bit for [I2C/SPI] multiread.
  * @buffer_data: Data used by buffer part.
  * @odr: Output data rate of the sensor [Hz].
+ * num_data_channels: Number of data channels used in buffer.
+ * @drdy_int_pin: Redirect DRDY on pin 1 (1) or pin 2 (2).
  * @get_irq_data_ready: Function to get the IRQ used for data ready signal.
  * @tf: Transfer function structure used by I/O operations.
  * @tb: Transfer buffers and mutex used by I/O operations.
@@ -220,6 +222,9 @@ struct st_sensor_data {
         char *buffer_data;
 
         unsigned int odr;
+        unsigned int num_data_channels;
+
+        u8 drdy_int_pin;
 
         unsigned int (*get_irq_data_ready) (struct iio_dev *indio_dev);
 
@@ -251,7 +256,8 @@ static inline void st_sensors_deallocate_trigger(struct iio_dev *indio_dev)
 }
 #endif
 
-int st_sensors_init_sensor(struct iio_dev *indio_dev);
+int st_sensors_init_sensor(struct iio_dev *indio_dev,
+                                        struct st_sensors_platform_data *pdata);
 
 int st_sensors_set_enable(struct iio_dev *indio_dev, bool enable);
 
diff --git a/include/linux/iio/frequency/adf4350.h b/include/linux/iio/frequency/adf4350.h
index be91f344d5fc..ffd8c8f90928 100644
--- a/include/linux/iio/frequency/adf4350.h
+++ b/include/linux/iio/frequency/adf4350.h
@@ -1,7 +1,7 @@
 /*
  * ADF4350/ADF4351 SPI PLL driver
  *
- * Copyright 2012 Analog Devices Inc.
+ * Copyright 2012-2013 Analog Devices Inc.
  *
  * Licensed under the GPL-2.
  */
@@ -41,7 +41,7 @@
 #define ADF4350_REG2_RDIV2_EN                   (1 << 24)
 #define ADF4350_REG2_RMULT2_EN                  (1 << 25)
 #define ADF4350_REG2_MUXOUT(x)                  ((x) << 26)
-#define ADF4350_REG2_NOISE_MODE(x)              ((x) << 29)
+#define ADF4350_REG2_NOISE_MODE(x)              (((unsigned)(x)) << 29)
 #define ADF4350_MUXOUT_THREESTATE               0
 #define ADF4350_MUXOUT_DVDD                     1
 #define ADF4350_MUXOUT_GND                      2
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 8d171f427632..2103cc32a5fb 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -211,8 +211,8 @@ struct iio_chan_spec {
 static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
         enum iio_chan_info_enum type)
 {
-        return (chan->info_mask_separate & type) |
-               (chan->info_mask_shared_by_type & type);
+        return (chan->info_mask_separate & BIT(type)) |
+               (chan->info_mask_shared_by_type & BIT(type));
 }
 
 #define IIO_ST(si, rb, sb, sh)                                          \
@@ -532,6 +532,60 @@ static inline struct iio_dev *iio_priv_to_dev(void *priv)
 void iio_device_free(struct iio_dev *indio_dev);
 
 /**
+ * devm_iio_device_alloc - Resource-managed iio_device_alloc()
+ * @dev:                Device to allocate iio_dev for
+ * @sizeof_priv:        Space to allocate for private structure.
+ *
+ * Managed iio_device_alloc.  iio_dev allocated with this function is
+ * automatically freed on driver detach.
+ *
+ * If an iio_dev allocated with this function needs to be freed separately,
+ * devm_iio_device_free() must be used.
+ *
+ * RETURNS:
+ * Pointer to allocated iio_dev on success, NULL on failure.
+ */
+struct iio_dev *devm_iio_device_alloc(struct device *dev, int sizeof_priv);
+
+/**
+ * devm_iio_device_free - Resource-managed iio_device_free()
+ * @dev:                Device this iio_dev belongs to
+ * @indio_dev:          the iio_dev associated with the device
+ *
+ * Free iio_dev allocated with devm_iio_device_alloc().
+ */
+void devm_iio_device_free(struct device *dev, struct iio_dev *indio_dev);
+
+/**
+ * devm_iio_trigger_alloc - Resource-managed iio_trigger_alloc()
+ * @dev:                Device to allocate iio_trigger for
+ * @fmt:                trigger name format. If it includes format
+ *                      specifiers, the additional arguments following
+ *                      format are formatted and inserted in the resulting
+ *                      string replacing their respective specifiers.
+ *
+ * Managed iio_trigger_alloc.  iio_trigger allocated with this function is
+ * automatically freed on driver detach.
+ *
+ * If an iio_trigger allocated with this function needs to be freed separately,
+ * devm_iio_trigger_free() must be used.
+ *
+ * RETURNS:
+ * Pointer to allocated iio_trigger on success, NULL on failure.
+ */
+struct iio_trigger *devm_iio_trigger_alloc(struct device *dev,
+                                                const char *fmt, ...);
+
+/**
+ * devm_iio_trigger_free - Resource-managed iio_trigger_free()
+ * @dev:                Device this iio_dev belongs to
+ * @iio_trig:           the iio_trigger associated with the device
+ *
+ * Free iio_trigger allocated with devm_iio_trigger_alloc().
+ */
+void devm_iio_trigger_free(struct device *dev, struct iio_trigger *iio_trig);
+
+/**
  * iio_buffer_enabled() - helper function to test if the buffer is enabled
  * @indio_dev:          IIO device structure for device
  **/
diff --git a/include/linux/iio/sysfs.h b/include/linux/iio/sysfs.h
index b7a934b9431b..2958c960003a 100644
--- a/include/linux/iio/sysfs.h
+++ b/include/linux/iio/sysfs.h
@@ -73,11 +73,6 @@ struct iio_const_attr {
             .dev_attr = __ATTR(_name, S_IRUGO, iio_read_const_attr, NULL)}
 
 /* Generic attributes of onetype or another */
-/**
- * IIO_DEV_ATTR_RESET: resets the device
- **/
-#define IIO_DEV_ATTR_RESET(_store)                      \
-        IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, _store, 0)
 
 /**
  * IIO_DEV_ATTR_SAMP_FREQ - sets any internal clock frequency
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index 3869c525b052..369cf2cd5144 100644
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -8,6 +8,7 @@
  */
 #include <linux/irq.h>
 #include <linux/module.h>
+#include <linux/atomic.h>
 
 #ifndef _IIO_TRIGGER_H_
 #define _IIO_TRIGGER_H_
@@ -61,7 +62,7 @@ struct iio_trigger {
 
         struct list_head                list;
         struct list_head                alloc_list;
-        int use_count;
+        atomic_t                        use_count;
 
         struct irq_chip                 subirq_chip;
         int                             subirq_base;
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index ea1e3b863890..79640e015a86 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -5,57 +5,30 @@
 
 #include <linux/bitmap.h>
 #include <linux/if.h>
+#include <linux/ip.h>
 #include <linux/netdevice.h>
 #include <linux/rcupdate.h>
 #include <linux/timer.h>
 #include <linux/sysctl.h>
 #include <linux/rtnetlink.h>
 
-enum
-{
-        IPV4_DEVCONF_FORWARDING=1,
-        IPV4_DEVCONF_MC_FORWARDING,
-        IPV4_DEVCONF_PROXY_ARP,
-        IPV4_DEVCONF_ACCEPT_REDIRECTS,
-        IPV4_DEVCONF_SECURE_REDIRECTS,
-        IPV4_DEVCONF_SEND_REDIRECTS,
-        IPV4_DEVCONF_SHARED_MEDIA,
-        IPV4_DEVCONF_RP_FILTER,
-        IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE,
-        IPV4_DEVCONF_BOOTP_RELAY,
-        IPV4_DEVCONF_LOG_MARTIANS,
-        IPV4_DEVCONF_TAG,
-        IPV4_DEVCONF_ARPFILTER,
-        IPV4_DEVCONF_MEDIUM_ID,
-        IPV4_DEVCONF_NOXFRM,
-        IPV4_DEVCONF_NOPOLICY,
-        IPV4_DEVCONF_FORCE_IGMP_VERSION,
-        IPV4_DEVCONF_ARP_ANNOUNCE,
-        IPV4_DEVCONF_ARP_IGNORE,
-        IPV4_DEVCONF_PROMOTE_SECONDARIES,
-        IPV4_DEVCONF_ARP_ACCEPT,
-        IPV4_DEVCONF_ARP_NOTIFY,
-        IPV4_DEVCONF_ACCEPT_LOCAL,
-        IPV4_DEVCONF_SRC_VMARK,
-        IPV4_DEVCONF_PROXY_ARP_PVLAN,
-        IPV4_DEVCONF_ROUTE_LOCALNET,
-        __IPV4_DEVCONF_MAX
-};
-
-#define IPV4_DEVCONF_MAX (__IPV4_DEVCONF_MAX - 1)
-
 struct ipv4_devconf {
         void    *sysctl;
         int     data[IPV4_DEVCONF_MAX];
         DECLARE_BITMAP(state, IPV4_DEVCONF_MAX);
 };
 
+#define MC_HASH_SZ_LOG 9
+
 struct in_device {
         struct net_device       *dev;
         atomic_t                refcnt;
         int                     dead;
         struct in_ifaddr        *ifa_list;      /* IP ifaddr chain              */
+
         struct ip_mc_list __rcu *mc_list;       /* IP multicast filter chain    */
+        struct ip_mc_list __rcu * __rcu *mc_hash;
+
         int                     mc_count;       /* Number of installed mcasts   */
         spinlock_t              mc_tomb_lock;
         struct ip_mc_list       *mc_tomb;
diff --git a/include/linux/init.h b/include/linux/init.h
index 861814710d52..f1c27a71d03c 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -93,13 +93,13 @@
 
 #define __exit          __section(.exit.text) __exitused __cold notrace
 
-/* Used for HOTPLUG_CPU */
-#define __cpuinit        __section(.cpuinit.text) __cold notrace
-#define __cpuinitdata    __section(.cpuinit.data)
-#define __cpuinitconst   __constsection(.cpuinit.rodata)
-#define __cpuexit        __section(.cpuexit.text) __exitused __cold notrace
-#define __cpuexitdata    __section(.cpuexit.data)
-#define __cpuexitconst   __constsection(.cpuexit.rodata)
+/* temporary, until all users are removed */
+#define __cpuinit
+#define __cpuinitdata
+#define __cpuinitconst
+#define __cpuexit
+#define __cpuexitdata
+#define __cpuexitconst
 
 /* Used for MEMORY_HOTPLUG */
 #define __meminit        __section(.meminit.text) __cold notrace
@@ -118,9 +118,8 @@
 #define __INITRODATA    .section        ".init.rodata","a",%progbits
 #define __FINITDATA     .previous
 
-#define __CPUINIT        .section       ".cpuinit.text", "ax"
-#define __CPUINITDATA    .section       ".cpuinit.data", "aw"
-#define __CPUINITRODATA  .section       ".cpuinit.rodata", "a"
+/* temporary, until all users are removed */
+#define __CPUINIT
 
 #define __MEMINIT        .section       ".meminit.text", "ax"
 #define __MEMINITDATA    .section       ".meminit.data", "aw"
@@ -154,6 +153,7 @@ extern unsigned int reset_devices;
 void setup_arch(char **);
 void prepare_namespace(void);
 void __init load_default_modules(void);
+int __init init_rootfs(void);
 
 extern void (*late_time_init)(void);
 
diff --git a/include/linux/input/ti_am335x_tsc.h b/include/linux/input/ti_am335x_tsc.h
deleted file mode 100644
index 49269a2aa329..000000000000
--- a/include/linux/input/ti_am335x_tsc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __LINUX_TI_AM335X_TSC_H
-#define __LINUX_TI_AM335X_TSC_H
-
-/**
- * struct tsc_data      Touchscreen wire configuration
- * @wires:              Wires refer to application modes
- *                      i.e. 4/5/8 wire touchscreen support
- *                      on the platform.
- * @x_plate_resistance: X plate resistance.
- * @steps_to_configure: The sequencer supports a total of
- *                      16 programmable steps.
- *                      A step configured to read a single
- *                      co-ordinate value, can be applied
- *                      more number of times for better results.
- */
-
-struct tsc_data {
-        int wires;
-        int x_plate_resistance;
-        int steps_to_configure;
-};
-
-#endif
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 78e2ada50cd5..d380c5e68008 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -55,7 +55,7 @@
 #define DMAR_IQT_REG    0x88    /* Invalidation queue tail register */
 #define DMAR_IQ_SHIFT   4       /* Invalidation queue head/tail shift */
 #define DMAR_IQA_REG    0x90    /* Invalidation queue addr register */
-#define DMAR_ICS_REG    0x98    /* Invalidation complete status register */
+#define DMAR_ICS_REG    0x9c    /* Invalidation complete status register */
 #define DMAR_IRTA_REG   0xb8    /* Interrupt remapping table addr register */
 
 #define OFFSET_STRIDE           (9)
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 5fa5afeeb759..5e865b554940 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -120,7 +120,6 @@ struct irqaction {
 
 extern irqreturn_t no_action(int cpl, void *dev_id);
 
-#ifdef CONFIG_GENERIC_HARDIRQS
 extern int __must_check
 request_threaded_irq(unsigned int irq, irq_handler_t handler,
                      irq_handler_t thread_fn,
@@ -140,40 +139,6 @@ request_any_context_irq(unsigned int irq, irq_handler_t handler,
 extern int __must_check
 request_percpu_irq(unsigned int irq, irq_handler_t handler,
                    const char *devname, void __percpu *percpu_dev_id);
-#else
-
-extern int __must_check
-request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,
-            const char *name, void *dev);
-
-/*
- * Special function to avoid ifdeffery in kernel/irq/devres.c which
- * gets magically built by GENERIC_HARDIRQS=n architectures (sparc,
- * m68k). I really love these $@%#!* obvious Makefile references:
- * ../../../kernel/irq/devres.o
- */
-static inline int __must_check
-request_threaded_irq(unsigned int irq, irq_handler_t handler,
-                     irq_handler_t thread_fn,
-                     unsigned long flags, const char *name, void *dev)
-{
-        return request_irq(irq, handler, flags, name, dev);
-}
-
-static inline int __must_check
-request_any_context_irq(unsigned int irq, irq_handler_t handler,
-                        unsigned long flags, const char *name, void *dev_id)
-{
-        return request_irq(irq, handler, flags, name, dev_id);
-}
-
-static inline int __must_check
-request_percpu_irq(unsigned int irq, irq_handler_t handler,
-                   const char *devname, void __percpu *percpu_dev_id)
-{
-        return request_irq(irq, handler, 0, devname, percpu_dev_id);
-}
-#endif
 
 extern void free_irq(unsigned int, void *);
 extern void free_percpu_irq(unsigned int, void __percpu *);
@@ -221,7 +186,6 @@ extern void enable_irq(unsigned int irq);
 extern void enable_percpu_irq(unsigned int irq, unsigned int type);
 
 /* The following three functions are for the core kernel use only. */
-#ifdef CONFIG_GENERIC_HARDIRQS
 extern void suspend_device_irqs(void);
 extern void resume_device_irqs(void);
 #ifdef CONFIG_PM_SLEEP
@@ -229,13 +193,8 @@ extern int check_wakeup_irqs(void);
 #else
 static inline int check_wakeup_irqs(void) { return 0; }
 #endif
-#else
-static inline void suspend_device_irqs(void) { };
-static inline void resume_device_irqs(void) { };
-static inline int check_wakeup_irqs(void) { return 0; }
-#endif
 
-#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
+#if defined(CONFIG_SMP)
 
 extern cpumask_var_t irq_default_affinity;
 
@@ -287,9 +246,8 @@ static inline int irq_set_affinity_hint(unsigned int irq,
 {
         return -EINVAL;
 }
-#endif /* CONFIG_SMP && CONFIG_GENERIC_HARDIRQS */
+#endif /* CONFIG_SMP */
 
-#ifdef CONFIG_GENERIC_HARDIRQS
 /*
  * Special lockdep variants of irq disabling/enabling.
  * These should be used for locking constructs that
@@ -354,33 +312,6 @@ static inline int disable_irq_wake(unsigned int irq)
         return irq_set_irq_wake(irq, 0);
 }
 
-#else /* !CONFIG_GENERIC_HARDIRQS */
-/*
- * NOTE: non-genirq architectures, if they want to support the lock
- * validator need to define the methods below in their asm/irq.h
- * files, under an #ifdef CONFIG_LOCKDEP section.
- */
-#ifndef CONFIG_LOCKDEP
-#  define disable_irq_nosync_lockdep(irq)       disable_irq_nosync(irq)
-#  define disable_irq_nosync_lockdep_irqsave(irq, flags) \
-                                                disable_irq_nosync(irq)
-#  define disable_irq_lockdep(irq)              disable_irq(irq)
-#  define enable_irq_lockdep(irq)               enable_irq(irq)
-#  define enable_irq_lockdep_irqrestore(irq, flags) \
-                                                enable_irq(irq)
-# endif
-
-static inline int enable_irq_wake(unsigned int irq)
-{
-        return 0;
-}
-
-static inline int disable_irq_wake(unsigned int irq)
-{
-        return 0;
-}
-#endif /* CONFIG_GENERIC_HARDIRQS */
-
 
 #ifdef CONFIG_IRQ_FORCED_THREADING
 extern bool force_irqthreads;
@@ -655,7 +586,7 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer)
  * if more than one irq occurred.
  */
 
-#if defined(CONFIG_GENERIC_HARDIRQS) && !defined(CONFIG_GENERIC_IRQ_PROBE) 
+#if !defined(CONFIG_GENERIC_IRQ_PROBE) 
 static inline unsigned long probe_irq_on(void)
 {
         return 0;
diff --git a/include/linux/io.h b/include/linux/io.h
index 069e4075f872..f4f42faec686 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -76,4 +76,29 @@ void devm_ioremap_release(struct device *dev, void *res);
 #define arch_has_dev_port()     (1)
 #endif
 
+/*
+ * Some systems (x86 without PAT) have a somewhat reliable way to mark a
+ * physical address range such that uncached mappings will actually
+ * end up write-combining.  This facility should be used in conjunction
+ * with pgprot_writecombine, ioremap-wc, or set_memory_wc, since it has
+ * no effect if the per-page mechanisms are functional.
+ * (On x86 without PAT, these functions manipulate MTRRs.)
+ *
+ * arch_phys_del_wc(0) or arch_phys_del_wc(any error code) is guaranteed
+ * to have no effect.
+ */
+#ifndef arch_phys_wc_add
+static inline int __must_check arch_phys_wc_add(unsigned long base,
+                                                unsigned long size)
+{
+        return 0;  /* It worked (i.e. did nothing). */
+}
+
+static inline void arch_phys_wc_del(int handle)
+{
+}
+
+#define arch_phys_wc_add arch_phys_wc_add
+#endif
+
 #endif /* _LINUX_IO_H */
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 3aeb7305e2f5..7ea319e95b47 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -58,10 +58,26 @@ struct iommu_domain {
 #define IOMMU_CAP_CACHE_COHERENCY       0x1
 #define IOMMU_CAP_INTR_REMAP            0x2     /* isolates device intrs */
 
+/*
+ * Following constraints are specifc to FSL_PAMUV1:
+ *  -aperture must be power of 2, and naturally aligned
+ *  -number of windows must be power of 2, and address space size
+ *   of each window is determined by aperture size / # of windows
+ *  -the actual size of the mapped region of a window must be power
+ *   of 2 starting with 4KB and physical address must be naturally
+ *   aligned.
+ * DOMAIN_ATTR_FSL_PAMUV1 corresponds to the above mentioned contraints.
+ * The caller can invoke iommu_domain_get_attr to check if the underlying
+ * iommu implementation supports these constraints.
+ */
+
 enum iommu_attr {
         DOMAIN_ATTR_GEOMETRY,
         DOMAIN_ATTR_PAGING,
         DOMAIN_ATTR_WINDOWS,
+        DOMAIN_ATTR_FSL_PAMU_STASH,
+        DOMAIN_ATTR_FSL_PAMU_ENABLE,
+        DOMAIN_ATTR_FSL_PAMUV1,
         DOMAIN_ATTR_MAX,
 };
 
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index c4d870b0d5e6..19c19a5eee29 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -22,7 +22,7 @@ struct ipc_ids {
         int in_use;
         unsigned short seq;
         unsigned short seq_max;
-        struct rw_semaphore rw_mutex;
+        struct rw_semaphore rwsem;
         struct idr ipcs_idr;
         int next_id;
 };
diff --git a/include/linux/ipmi-fru.h b/include/linux/ipmi-fru.h
new file mode 100644
index 000000000000..4d3a76380e32
--- /dev/null
+++ b/include/linux/ipmi-fru.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2012 CERN (www.cern.ch)
+ * Author: Alessandro Rubini <rubini@gnudd.com>
+ *
+ * Released according to the GNU GPL, version 2 or any later version.
+ *
+ * This work is part of the White Rabbit project, a research effort led
+ * by CERN, the European Institute for Nuclear Research.
+ */
+#ifndef __LINUX_IPMI_FRU_H__
+#define __LINUX_IPMI_FRU_H__
+#ifdef __KERNEL__
+#  include <linux/types.h>
+#  include <linux/string.h>
+#else
+#  include <stdint.h>
+#  include <string.h>
+#endif
+
+/*
+ * These structures match the unaligned crap we have in FRU1011.pdf
+ * (http://download.intel.com/design/servers/ipmi/FRU1011.pdf)
+ */
+
+/* chapter 8, page 5 */
+struct fru_common_header {
+        uint8_t format;                 /* 0x01 */
+        uint8_t internal_use_off;       /* multiple of 8 bytes */
+        uint8_t chassis_info_off;       /* multiple of 8 bytes */
+        uint8_t board_area_off;         /* multiple of 8 bytes */
+        uint8_t product_area_off;       /* multiple of 8 bytes */
+        uint8_t multirecord_off;        /* multiple of 8 bytes */
+        uint8_t pad;                    /* must be 0 */
+        uint8_t checksum;               /* sum modulo 256 must be 0 */
+};
+
+/* chapter 9, page 5 -- internal_use: not used by us */
+
+/* chapter 10, page 6 -- chassis info: not used by us */
+
+/* chapter 13, page 9 -- used by board_info_area below */
+struct fru_type_length {
+        uint8_t type_length;
+        uint8_t data[0];
+};
+
+/* chapter 11, page 7 */
+struct fru_board_info_area {
+        uint8_t format;                 /* 0x01 */
+        uint8_t area_len;               /* multiple of 8 bytes */
+        uint8_t language;               /* I hope it's 0 */
+        uint8_t mfg_date[3];            /* LSB, minutes since 1996-01-01 */
+        struct fru_type_length tl[0];   /* type-length stuff follows */
+
+        /*
+         * the TL there are in order:
+         * Board Manufacturer
+         * Board Product Name
+         * Board Serial Number
+         * Board Part Number
+         * FRU File ID (may be null)
+         * more manufacturer-specific stuff
+         * 0xc1 as a terminator
+         * 0x00 pad to a multiple of 8 bytes - 1
+         * checksum (sum of all stuff module 256 must be zero)
+         */
+};
+
+enum fru_type {
+        FRU_TYPE_BINARY         = 0x00,
+        FRU_TYPE_BCDPLUS        = 0x40,
+        FRU_TYPE_ASCII6         = 0x80,
+        FRU_TYPE_ASCII          = 0xc0, /* not ascii: depends on language */
+};
+
+/*
+ * some helpers
+ */
+static inline struct fru_board_info_area *fru_get_board_area(
+        const struct fru_common_header *header)
+{
+        /* we know for sure that the header is 8 bytes in size */
+        return (struct fru_board_info_area *)(header + header->board_area_off);
+}
+
+static inline int fru_type(struct fru_type_length *tl)
+{
+        return tl->type_length & 0xc0;
+}
+
+static inline int fru_length(struct fru_type_length *tl)
+{
+        return (tl->type_length & 0x3f) + 1; /* len of whole record */
+}
+
+/* assume ascii-latin1 encoding */
+static inline int fru_strlen(struct fru_type_length *tl)
+{
+        return fru_length(tl) - 1;
+}
+
+static inline char *fru_strcpy(char *dest, struct fru_type_length *tl)
+{
+        int len = fru_strlen(tl);
+        memcpy(dest, tl->data, len);
+        dest[len] = '\0';
+        return dest;
+}
+
+static inline struct fru_type_length *fru_next_tl(struct fru_type_length *tl)
+{
+        return tl + fru_length(tl);
+}
+
+static inline int fru_is_eof(struct fru_type_length *tl)
+{
+        return tl->type_length == 0xc1;
+}
+
+/*
+ * External functions defined in fru-parse.c.
+ */
+extern int fru_header_cksum_ok(struct fru_common_header *header);
+extern int fru_bia_cksum_ok(struct fru_board_info_area *bia);
+
+/* All these 4 return allocated strings by calling fru_alloc() */
+extern char *fru_get_board_manufacturer(struct fru_common_header *header);
+extern char *fru_get_product_name(struct fru_common_header *header);
+extern char *fru_get_serial_number(struct fru_common_header *header);
+extern char *fru_get_part_number(struct fru_common_header *header);
+
+/* This must be defined by the caller of the above functions */
+extern void *fru_alloc(size_t size);
+
+#endif /* __LINUX_IMPI_FRU_H__ */
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 850e95bc766c..28ea38439313 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -19,6 +19,8 @@ struct ipv6_devconf {
         __s32           rtr_solicit_interval;
         __s32           rtr_solicit_delay;
         __s32           force_mld_version;
+        __s32           mldv1_unsolicited_report_interval;
+        __s32           mldv2_unsolicited_report_interval;
 #ifdef CONFIG_IPV6_PRIVACY
         __s32           use_tempaddr;
         __s32           temp_valid_lft;
@@ -48,6 +50,7 @@ struct ipv6_devconf {
         __s32           accept_dad;
         __s32           force_tllao;
         __s32           ndisc_notify;
+        __s32           suppress_frag_ndisc;
         void            *sysctl;
 };
 
@@ -101,6 +104,7 @@ struct inet6_skb_parm {
 #define IP6SKB_FORWARDED        2
 #define IP6SKB_REROUTED         4
 #define IP6SKB_ROUTERALERT      8
+#define IP6SKB_FRAGMENTED      16
 };
 
 #define IP6CB(skb)      ((struct inet6_skb_parm*)((skb)->cb))
diff --git a/include/linux/irq.h b/include/linux/irq.h
index bc4e06611958..56bb0dc8b7d4 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -119,6 +119,7 @@ struct irq_domain;
 
 /**
  * struct irq_data - per irq and irq chip data passed down to chip functions
+ * @mask:               precomputed bitmask for accessing the chip registers
  * @irq:                interrupt number
  * @hwirq:              hardware interrupt number, local to the interrupt domain
  * @node:               node index useful for balancing
@@ -138,6 +139,7 @@ struct irq_domain;
  * irq_data.
  */
 struct irq_data {
+        u32                     mask;
         unsigned int            irq;
         unsigned long           hwirq;
         unsigned int            node;
@@ -294,6 +296,7 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)
  * @irq_suspend:        function called from core code on suspend once per chip
  * @irq_resume:         function called from core code on resume once per chip
  * @irq_pm_shutdown:    function called from core code on shutdown once per chip
+ * @irq_calc_mask:      Optional function to set irq_data.mask for special cases
  * @irq_print_chip:     optional to print special chip info in show_interrupts
  * @flags:              chip specific flags
  */
@@ -325,6 +328,8 @@ struct irq_chip {
         void            (*irq_resume)(struct irq_data *data);
         void            (*irq_pm_shutdown)(struct irq_data *data);
 
+        void            (*irq_calc_mask)(struct irq_data *data);
+
         void            (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
 
         unsigned long   flags;
@@ -377,8 +382,6 @@ extern void irq_cpu_online(void);
 extern void irq_cpu_offline(void);
 extern int __irq_set_affinity_locked(struct irq_data *data,  const struct cpumask *cpumask);
 
-#ifdef CONFIG_GENERIC_HARDIRQS
-
 #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_PENDING_IRQ)
 void irq_move_irq(struct irq_data *data);
 void irq_move_masked_irq(struct irq_data *data);
@@ -579,6 +582,12 @@ static inline struct msi_desc *irq_data_get_msi(struct irq_data *d)
         return d->msi_desc;
 }
 
+static inline u32 irq_get_trigger_type(unsigned int irq)
+{
+        struct irq_data *d = irq_get_irq_data(irq);
+        return d ? irqd_get_trigger_type(d) : 0;
+}
+
 int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
                 struct module *owner);
 
@@ -644,6 +653,8 @@ struct irq_chip_regs {
  * @regs:               Register offsets for this chip
  * @handler:            Flow handler associated with this chip
  * @type:               Chip can handle these flow types
+ * @mask_cache_priv:    Cached mask register private to the chip type
+ * @mask_cache:         Pointer to cached mask register
  *
  * A irq_generic_chip can have several instances of irq_chip_type when
  * it requires different functions and register offsets for different
@@ -654,6 +665,8 @@ struct irq_chip_type {
         struct irq_chip_regs    regs;
         irq_flow_handler_t      handler;
         u32                     type;
+        u32                     mask_cache_priv;
+        u32                     *mask_cache;
 };
 
 /**
@@ -662,13 +675,16 @@ struct irq_chip_type {
  * @reg_base:           Register base address (virtual)
  * @irq_base:           Interrupt base nr for this chip
  * @irq_cnt:            Number of interrupts handled by this chip
- * @mask_cache:         Cached mask register
+ * @mask_cache:         Cached mask register shared between all chip types
  * @type_cache:         Cached type register
  * @polarity_cache:     Cached polarity register
  * @wake_enabled:       Interrupt can wakeup from suspend
  * @wake_active:        Interrupt is marked as an wakeup from suspend source
  * @num_ct:             Number of available irq_chip_type instances (usually 1)
  * @private:            Private data for non generic chip callbacks
+ * @installed:          bitfield to denote installed interrupts
+ * @unused:             bitfield to denote unused interrupts
+ * @domain:             irq domain pointer
  * @list:               List head for keeping track of instances
  * @chip_types:         Array of interrupt irq_chip_types
  *
@@ -690,6 +706,9 @@ struct irq_chip_generic {
         u32                     wake_active;
         unsigned int            num_ct;
         void                    *private;
+        unsigned long           installed;
+        unsigned long           unused;
+        struct irq_domain       *domain;
         struct list_head        list;
         struct irq_chip_type    chip_types[0];
 };
@@ -700,10 +719,32 @@ struct irq_chip_generic {
  * @IRQ_GC_INIT_NESTED_LOCK:    Set the lock class of the irqs to nested for
  *                              irq chips which need to call irq_set_wake() on
  *                              the parent irq. Usually GPIO implementations
+ * @IRQ_GC_MASK_CACHE_PER_TYPE: Mask cache is chip type private
+ * @IRQ_GC_NO_MASK:             Do not calculate irq_data->mask
  */
 enum irq_gc_flags {
         IRQ_GC_INIT_MASK_CACHE          = 1 << 0,
         IRQ_GC_INIT_NESTED_LOCK         = 1 << 1,
+        IRQ_GC_MASK_CACHE_PER_TYPE      = 1 << 2,
+        IRQ_GC_NO_MASK                  = 1 << 3,
+};
+
+/*
+ * struct irq_domain_chip_generic - Generic irq chip data structure for irq domains
+ * @irqs_per_chip:      Number of interrupts per chip
+ * @num_chips:          Number of chips
+ * @irq_flags_to_set:   IRQ* flags to set on irq setup
+ * @irq_flags_to_clear: IRQ* flags to clear on irq setup
+ * @gc_flags:           Generic chip specific setup flags
+ * @gc:                 Array of pointers to generic interrupt chips
+ */
+struct irq_domain_chip_generic {
+        unsigned int            irqs_per_chip;
+        unsigned int            num_chips;
+        unsigned int            irq_flags_to_clear;
+        unsigned int            irq_flags_to_set;
+        enum irq_gc_flags       gc_flags;
+        struct irq_chip_generic *gc[0];
 };
 
 /* Generic chip callback functions */
@@ -729,6 +770,14 @@ int irq_setup_alt_chip(struct irq_data *d, unsigned int type);
 void irq_remove_generic_chip(struct irq_chip_generic *gc, u32 msk,
                              unsigned int clr, unsigned int set);
 
+struct irq_chip_generic *irq_get_domain_generic_chip(struct irq_domain *d, unsigned int hw_irq);
+int irq_alloc_domain_generic_chips(struct irq_domain *d, int irqs_per_chip,
+                                   int num_ct, const char *name,
+                                   irq_flow_handler_t handler,
+                                   unsigned int clr, unsigned int set,
+                                   enum irq_gc_flags flags);
+
+
 static inline struct irq_chip_type *irq_data_get_chip_type(struct irq_data *d)
 {
         return container_of(d->chip, struct irq_chip_type, chip);
@@ -751,11 +800,4 @@ static inline void irq_gc_lock(struct irq_chip_generic *gc) { }
 static inline void irq_gc_unlock(struct irq_chip_generic *gc) { }
 #endif
 
-#else /* !CONFIG_GENERIC_HARDIRQS */
-
-extern struct msi_desc *irq_get_msi_desc(unsigned int irq);
-extern int irq_set_msi_desc(unsigned int irq, struct msi_desc *entry);
-
-#endif /* CONFIG_GENERIC_HARDIRQS */
-
 #endif /* _LINUX_IRQ_H */
diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h
index e0006f1d35a0..14d79131f53d 100644
--- a/include/linux/irqchip.h
+++ b/include/linux/irqchip.h
@@ -11,6 +11,10 @@
 #ifndef _LINUX_IRQCHIP_H
 #define _LINUX_IRQCHIP_H
 
+#ifdef CONFIG_IRQCHIP
 void irqchip_init(void);
+#else
+static inline void irqchip_init(void) {}
+#endif
 
 #endif
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index 3e203eb23cc7..0e5d9ecdb2b6 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -66,6 +66,7 @@ extern struct irq_chip gic_arch_extn;
 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
                     u32 offset, struct device_node *);
 void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);
+void gic_cpu_if_down(void);
 
 static inline void gic_init(unsigned int nr, int start,
                             void __iomem *dist , void __iomem *cpu)
diff --git a/include/linux/irqchip/mmp.h b/include/linux/irqchip/mmp.h
new file mode 100644
index 000000000000..c78a8921185d
--- /dev/null
+++ b/include/linux/irqchip/mmp.h
@@ -0,0 +1,6 @@
+#ifndef __IRQCHIP_MMP_H
+#define __IRQCHIP_MMP_H
+
+extern struct irq_chip icu_irq_chip;
+
+#endif  /* __IRQCHIP_MMP_H */
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index 623325e2ff97..56fb646909dc 100644
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -76,8 +76,6 @@ struct irq_desc {
 extern struct irq_desc irq_desc[NR_IRQS];
 #endif
 
-#ifdef CONFIG_GENERIC_HARDIRQS
-
 static inline struct irq_data *irq_desc_get_irq_data(struct irq_desc *desc)
 {
         return &desc->irq_data;
@@ -173,6 +171,5 @@ __irq_set_preflow_handler(unsigned int irq, irq_preflow_handler_t handler)
         desc->preflow_handler = handler;
 }
 #endif
-#endif
 
 #endif
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 0d5b17bf5e51..c983ed18c332 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -66,52 +66,55 @@ struct irq_domain_ops {
                      unsigned long *out_hwirq, unsigned int *out_type);
 };
 
+extern struct irq_domain_ops irq_generic_chip_ops;
+
+struct irq_domain_chip_generic;
+
 /**
  * struct irq_domain - Hardware interrupt number translation object
  * @link: Element in global irq_domain list.
- * @revmap_type: Method used for reverse mapping hwirq numbers to linux irq. This
- *               will be one of the IRQ_DOMAIN_MAP_* values.
- * @revmap_data: Revmap method specific data.
+ * @name: Name of interrupt domain
  * @ops: pointer to irq_domain methods
  * @host_data: private data pointer for use by owner.  Not touched by irq_domain
  *             core code.
- * @irq_base: Start of irq_desc range assigned to the irq_domain.  The creator
- *            of the irq_domain is responsible for allocating the array of
- *            irq_desc structures.
- * @nr_irq: Number of irqs managed by the irq domain
- * @hwirq_base: Starting number for hwirqs managed by the irq domain
- * @of_node: (optional) Pointer to device tree nodes associated with the
- *           irq_domain.  Used when decoding device tree interrupt specifiers.
+ *
+ * Optional elements
+ * @of_node: Pointer to device tree nodes associated with the irq_domain. Used
+ *           when decoding device tree interrupt specifiers.
+ * @gc: Pointer to a list of generic chips. There is a helper function for
+ *      setting up one or more generic chips for interrupt controllers
+ *      drivers using the generic chip library which uses this pointer.
+ *
+ * Revmap data, used internally by irq_domain
+ * @revmap_direct_max_irq: The largest hwirq that can be set for controllers that
+ *                         support direct mapping
+ * @revmap_size: Size of the linear map table @linear_revmap[]
+ * @revmap_tree: Radix map tree for hwirqs that don't fit in the linear map
+ * @linear_revmap: Linear table of hwirq->virq reverse mappings
  */
 struct irq_domain {
         struct list_head link;
-
-        /* type of reverse mapping_technique */
-        unsigned int revmap_type;
-        union {
-                struct {
-                        unsigned int size;
-                        unsigned int first_irq;
-                        irq_hw_number_t first_hwirq;
-                } legacy;
-                struct {
-                        unsigned int size;
-                        unsigned int *revmap;
-                } linear;
-                struct {
-                        unsigned int max_irq;
-                } nomap;
-                struct radix_tree_root tree;
-        } revmap_data;
+        const char *name;
         const struct irq_domain_ops *ops;
         void *host_data;
-        irq_hw_number_t inval_irq;
 
-        /* Optional device node pointer */
+        /* Optional data */
         struct device_node *of_node;
+        struct irq_domain_chip_generic *gc;
+
+        /* reverse map data. The linear map gets appended to the irq_domain */
+        irq_hw_number_t hwirq_max;
+        unsigned int revmap_direct_max_irq;
+        unsigned int revmap_size;
+        struct radix_tree_root revmap_tree;
+        unsigned int linear_revmap[];
 };
 
 #ifdef CONFIG_IRQ_DOMAIN
+struct irq_domain *__irq_domain_add(struct device_node *of_node, int size,
+                                    irq_hw_number_t hwirq_max, int direct_max,
+                                    const struct irq_domain_ops *ops,
+                                    void *host_data);
 struct irq_domain *irq_domain_add_simple(struct device_node *of_node,
                                          unsigned int size,
                                          unsigned int first_irq,
@@ -123,21 +126,30 @@ struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,
                                          irq_hw_number_t first_hwirq,
                                          const struct irq_domain_ops *ops,
                                          void *host_data);
-struct irq_domain *irq_domain_add_linear(struct device_node *of_node,
+extern struct irq_domain *irq_find_host(struct device_node *node);
+extern void irq_set_default_host(struct irq_domain *host);
+
+/**
+ * irq_domain_add_linear() - Allocate and register a linear revmap irq_domain.
+ * @of_node: pointer to interrupt controller's device tree node.
+ * @size: Number of interrupts in the domain.
+ * @ops: map/unmap domain callbacks
+ * @host_data: Controller private data pointer
+ */
+static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_node,
                                          unsigned int size,
                                          const struct irq_domain_ops *ops,
-                                         void *host_data);
-struct irq_domain *irq_domain_add_nomap(struct device_node *of_node,
+                                         void *host_data)
+{
+        return __irq_domain_add(of_node, size, size, 0, ops, host_data);
+}
+static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_node,
                                          unsigned int max_irq,
                                          const struct irq_domain_ops *ops,
-                                         void *host_data);
-struct irq_domain *irq_domain_add_tree(struct device_node *of_node,
-                                         const struct irq_domain_ops *ops,
-                                         void *host_data);
-
-extern struct irq_domain *irq_find_host(struct device_node *node);
-extern void irq_set_default_host(struct irq_domain *host);
-
+                                         void *host_data)
+{
+        return __irq_domain_add(of_node, 0, max_irq, max_irq, ops, host_data);
+}
 static inline struct irq_domain *irq_domain_add_legacy_isa(
                                 struct device_node *of_node,
                                 const struct irq_domain_ops *ops,
@@ -146,21 +158,40 @@ static inline struct irq_domain *irq_domain_add_legacy_isa(
         return irq_domain_add_legacy(of_node, NUM_ISA_INTERRUPTS, 0, 0, ops,
                                      host_data);
 }
+static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node,
+                                         const struct irq_domain_ops *ops,
+                                         void *host_data)
+{
+        return __irq_domain_add(of_node, 0, ~0, 0, ops, host_data);
+}
 
 extern void irq_domain_remove(struct irq_domain *host);
 
-extern int irq_domain_associate_many(struct irq_domain *domain,
-                                     unsigned int irq_base,
-                                     irq_hw_number_t hwirq_base, int count);
-static inline int irq_domain_associate(struct irq_domain *domain, unsigned int irq,
-                                        irq_hw_number_t hwirq)
-{
-        return irq_domain_associate_many(domain, irq, hwirq, 1);
-}
+extern int irq_domain_associate(struct irq_domain *domain, unsigned int irq,
+                                        irq_hw_number_t hwirq);
+extern void irq_domain_associate_many(struct irq_domain *domain,
+                                      unsigned int irq_base,
+                                      irq_hw_number_t hwirq_base, int count);
 
 extern unsigned int irq_create_mapping(struct irq_domain *host,
                                        irq_hw_number_t hwirq);
 extern void irq_dispose_mapping(unsigned int virq);
+
+/**
+ * irq_linear_revmap() - Find a linux irq from a hw irq number.
+ * @domain: domain owning this hardware interrupt
+ * @hwirq: hardware irq number in that domain space
+ *
+ * This is a fast path alternative to irq_find_mapping() that can be
+ * called directly by irq controller code to save a handful of
+ * instructions. It is always safe to call, but won't find irqs mapped
+ * using the radix tree.
+ */
+static inline unsigned int irq_linear_revmap(struct irq_domain *domain,
+                                             irq_hw_number_t hwirq)
+{
+        return hwirq < domain->revmap_size ? domain->linear_revmap[hwirq] : 0;
+}
 extern unsigned int irq_find_mapping(struct irq_domain *host,
                                      irq_hw_number_t hwirq);
 extern unsigned int irq_create_direct_mapping(struct irq_domain *host);
@@ -174,9 +205,6 @@ static inline int irq_create_identity_mapping(struct irq_domain *host,
         return irq_create_strict_mappings(host, hwirq, hwirq, 1);
 }
 
-extern unsigned int irq_linear_revmap(struct irq_domain *host,
-                                      irq_hw_number_t hwirq);
-
 extern const struct irq_domain_ops irq_domain_simple_ops;
 
 /* stock xlate functions */
@@ -190,14 +218,6 @@ int irq_domain_xlate_onetwocell(struct irq_domain *d, struct device_node *ctrlr,
                         const u32 *intspec, unsigned int intsize,
                         irq_hw_number_t *out_hwirq, unsigned int *out_type);
 
-#if defined(CONFIG_OF_IRQ)
-extern void irq_domain_generate_simple(const struct of_device_id *match,
-                                        u64 phys_base, unsigned int irq_start);
-#else /* CONFIG_OF_IRQ */
-static inline void irq_domain_generate_simple(const struct of_device_id *match,
-                                        u64 phys_base, unsigned int irq_start) { }
-#endif /* !CONFIG_OF_IRQ */
-
 #else /* CONFIG_IRQ_DOMAIN */
 static inline void irq_dispose_mapping(unsigned int virq) { }
 #endif /* !CONFIG_IRQ_DOMAIN */
diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h
index 0a2dc46cdaf6..fdd5cc16c9c4 100644
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
@@ -4,23 +4,6 @@
 #include <uapi/linux/irqnr.h>
 
 
-#ifndef CONFIG_GENERIC_HARDIRQS
-#include <asm/irq.h>
-
-/*
- * Wrappers for non-genirq architectures:
- */
-#define nr_irqs                 NR_IRQS
-#define irq_to_desc(irq)        (&irq_desc[irq])
-
-# define for_each_irq_desc(irq, desc)           \
-        for (irq = 0; irq < nr_irqs; irq++)
-
-# define for_each_irq_desc_reverse(irq, desc)                          \
-        for (irq = nr_irqs - 1; irq >= 0; irq--)
-
-#else /* CONFIG_GENERIC_HARDIRQS */
-
 extern int nr_irqs;
 extern struct irq_desc *irq_to_desc(unsigned int irq);
 unsigned int irq_get_next_irq(unsigned int offset);
@@ -50,8 +33,6 @@ unsigned int irq_get_next_irq(unsigned int offset);
         for (irq = irq_get_next_irq(0); irq < nr_irqs;  \
              irq = irq_get_next_irq(irq + 1))
 
-#endif /* CONFIG_GENERIC_HARDIRQS */
-
 #define for_each_irq_nr(irq)                   \
        for (irq = 0; irq < nr_irqs; irq++)
 
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 7e0b622503c4..31229e0be90b 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -27,7 +27,6 @@
 #include <linux/buffer_head.h>
 #include <linux/journal-head.h>
 #include <linux/stddef.h>
-#include <linux/bit_spinlock.h>
 #include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/lockdep.h>
@@ -58,16 +57,13 @@
 #define JBD_EXPENSIVE_CHECKING
 extern u8 journal_enable_debug;
 
-#define jbd_debug(n, f, a...)                                           \
-        do {                                                            \
-                if ((n) <= journal_enable_debug) {                      \
-                        printk (KERN_DEBUG "(%s, %d): %s: ",            \
-                                __FILE__, __LINE__, __func__);  \
-                        printk (f, ## a);                               \
-                }                                                       \
-        } while (0)
+void __jbd_debug(int level, const char *file, const char *func,
+                 unsigned int line, const char *fmt, ...);
+
+#define jbd_debug(n, fmt, a...) \
+        __jbd_debug((n), __FILE__, __func__, __LINE__, (fmt), ##a)
 #else
-#define jbd_debug(f, a...)      /**/
+#define jbd_debug(n, fmt, a...)    /**/
 #endif
 
 static inline void *jbd_alloc(size_t size, gfp_t flags)
@@ -78,7 +74,7 @@ static inline void *jbd_alloc(size_t size, gfp_t flags)
 static inline void jbd_free(void *ptr, size_t size)
 {
         free_pages((unsigned long)ptr, get_order(size));
-};
+}
 
 #define JFS_MIN_JOURNAL_BLOCKS 1024
 
@@ -244,6 +240,31 @@ typedef struct journal_superblock_s
 
 #include <linux/fs.h>
 #include <linux/sched.h>
+
+enum jbd_state_bits {
+        BH_JBD                  /* Has an attached ext3 journal_head */
+          = BH_PrivateStart,
+        BH_JWrite,              /* Being written to log (@@@ DEBUGGING) */
+        BH_Freed,               /* Has been freed (truncated) */
+        BH_Revoked,             /* Has been revoked from the log */
+        BH_RevokeValid,         /* Revoked flag is valid */
+        BH_JBDDirty,            /* Is dirty but journaled */
+        BH_State,               /* Pins most journal_head state */
+        BH_JournalHead,         /* Pins bh->b_private and jh->b_bh */
+        BH_Unshadow,            /* Dummy bit, for BJ_Shadow wakeup filtering */
+        BH_JBDPrivateStart,     /* First bit available for private use by FS */
+};
+
+BUFFER_FNS(JBD, jbd)
+BUFFER_FNS(JWrite, jwrite)
+BUFFER_FNS(JBDDirty, jbddirty)
+TAS_BUFFER_FNS(JBDDirty, jbddirty)
+BUFFER_FNS(Revoked, revoked)
+TAS_BUFFER_FNS(Revoked, revoked)
+BUFFER_FNS(RevokeValid, revokevalid)
+TAS_BUFFER_FNS(RevokeValid, revokevalid)
+BUFFER_FNS(Freed, freed)
+
 #include <linux/jbd_common.h>
 
 #define J_ASSERT(assert)        BUG_ON(!(assert))
@@ -840,7 +861,7 @@ extern void	 journal_release_buffer (handle_t *, struct buffer_head *);
 extern int       journal_forget (handle_t *, struct buffer_head *);
 extern void      journal_sync_buffer (struct buffer_head *);
 extern void      journal_invalidatepage(journal_t *,
-                                struct page *, unsigned long);
+                                struct page *, unsigned int, unsigned int);
 extern int       journal_try_to_free_buffers(journal_t *, struct page *, gfp_t);
 extern int       journal_stop(handle_t *);
 extern int       journal_flush (journal_t *);
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 6e051f472edb..d5b50a19463c 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -26,7 +26,6 @@
 #include <linux/buffer_head.h>
 #include <linux/journal-head.h>
 #include <linux/stddef.h>
-#include <linux/bit_spinlock.h>
 #include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/slab.h>
@@ -57,17 +56,13 @@
  */
 #define JBD2_EXPENSIVE_CHECKING
 extern ushort jbd2_journal_enable_debug;
+void __jbd2_debug(int level, const char *file, const char *func,
+                  unsigned int line, const char *fmt, ...);
 
-#define jbd_debug(n, f, a...)                                           \
-        do {                                                            \
-                if ((n) <= jbd2_journal_enable_debug) {                 \
-                        printk (KERN_DEBUG "(%s, %d): %s: ",            \
-                                __FILE__, __LINE__, __func__);  \
-                        printk (f, ## a);                               \
-                }                                                       \
-        } while (0)
+#define jbd_debug(n, fmt, a...) \
+        __jbd2_debug((n), __FILE__, __func__, __LINE__, (fmt), ##a)
 #else
-#define jbd_debug(f, a...)      /**/
+#define jbd_debug(n, fmt, a...)    /**/
 #endif
 
 extern void *jbd2_alloc(size_t size, gfp_t flags);
@@ -302,6 +297,34 @@ typedef struct journal_superblock_s
 
 #include <linux/fs.h>
 #include <linux/sched.h>
+
+enum jbd_state_bits {
+        BH_JBD                  /* Has an attached ext3 journal_head */
+          = BH_PrivateStart,
+        BH_JWrite,              /* Being written to log (@@@ DEBUGGING) */
+        BH_Freed,               /* Has been freed (truncated) */
+        BH_Revoked,             /* Has been revoked from the log */
+        BH_RevokeValid,         /* Revoked flag is valid */
+        BH_JBDDirty,            /* Is dirty but journaled */
+        BH_State,               /* Pins most journal_head state */
+        BH_JournalHead,         /* Pins bh->b_private and jh->b_bh */
+        BH_Shadow,              /* IO on shadow buffer is running */
+        BH_Verified,            /* Metadata block has been verified ok */
+        BH_JBDPrivateStart,     /* First bit available for private use by FS */
+};
+
+BUFFER_FNS(JBD, jbd)
+BUFFER_FNS(JWrite, jwrite)
+BUFFER_FNS(JBDDirty, jbddirty)
+TAS_BUFFER_FNS(JBDDirty, jbddirty)
+BUFFER_FNS(Revoked, revoked)
+TAS_BUFFER_FNS(Revoked, revoked)
+BUFFER_FNS(RevokeValid, revokevalid)
+TAS_BUFFER_FNS(RevokeValid, revokevalid)
+BUFFER_FNS(Freed, freed)
+BUFFER_FNS(Shadow, shadow)
+BUFFER_FNS(Verified, verified)
+
 #include <linux/jbd_common.h>
 
 #define J_ASSERT(assert)        BUG_ON(!(assert))
@@ -382,8 +405,15 @@ struct jbd2_revoke_table_s;
 
 struct jbd2_journal_handle
 {
-        /* Which compound transaction is this update a part of? */
-        transaction_t           *h_transaction;
+        union {
+                /* Which compound transaction is this update a part of? */
+                transaction_t   *h_transaction;
+                /* Which journal handle belongs to - used iff h_reserved set */
+                journal_t       *h_journal;
+        };
+
+        /* Handle reserved for finishing the logical operation */
+        handle_t                *h_rsv_handle;
 
         /* Number of remaining buffers we are allowed to dirty: */
         int                     h_buffer_credits;
@@ -398,6 +428,7 @@ struct jbd2_journal_handle
         /* Flags [no locking] */
         unsigned int    h_sync:         1;      /* sync-on-close */
         unsigned int    h_jdata:        1;      /* force data journaling */
+        unsigned int    h_reserved:     1;      /* handle with reserved credits */
         unsigned int    h_aborted:      1;      /* fatal error on handle */
         unsigned int    h_type:         8;      /* for handle statistics */
         unsigned int    h_line_no:      16;     /* for handle statistics */
@@ -524,12 +555,6 @@ struct transaction_s
         struct journal_head     *t_checkpoint_io_list;
 
         /*
-         * Doubly-linked circular list of temporary buffers currently undergoing
-         * IO in the log [j_list_lock]
-         */
-        struct journal_head     *t_iobuf_list;
-
-        /*
          * Doubly-linked circular list of metadata buffers being shadowed by log
          * IO.  The IO buffers on the iobuf list and the shadow buffers on this
          * list match each other one for one at all times. [j_list_lock]
@@ -537,12 +562,6 @@ struct transaction_s
         struct journal_head     *t_shadow_list;
 
         /*
-         * Doubly-linked circular list of control buffers being written to the
-         * log. [j_list_lock]
-         */
-        struct journal_head     *t_log_list;
-
-        /*
          * List of inodes whose data we've modified in data=ordered mode.
          * [j_list_lock]
          */
@@ -671,11 +690,10 @@ jbd2_time_diff(unsigned long start, unsigned long end)
  *  waiting for checkpointing
  * @j_wait_transaction_locked: Wait queue for waiting for a locked transaction
  *  to start committing, or for a barrier lock to be released
- * @j_wait_logspace: Wait queue for waiting for checkpointing to complete
  * @j_wait_done_commit: Wait queue for waiting for commit to complete
- * @j_wait_checkpoint:  Wait queue to trigger checkpointing
  * @j_wait_commit: Wait queue to trigger commit
  * @j_wait_updates: Wait queue to wait for updates to complete
+ * @j_wait_reserved: Wait queue to wait for reserved buffer credits to drop
  * @j_checkpoint_mutex: Mutex for locking against concurrent checkpoints
  * @j_head: Journal head - identifies the first unused block in the journal
  * @j_tail: Journal tail - identifies the oldest still-used block in the
@@ -689,6 +707,7 @@ jbd2_time_diff(unsigned long start, unsigned long end)
  *     journal
  * @j_fs_dev: Device which holds the client fs.  For internal journal this will
  *     be equal to j_dev
+ * @j_reserved_credits: Number of buffers reserved from the running transaction
  * @j_maxlen: Total maximum capacity of the journal region on disk.
  * @j_list_lock: Protects the buffer lists and internal buffer state.
  * @j_inode: Optional inode where we store the journal.  If present, all journal
@@ -778,21 +797,18 @@ struct journal_s
          */
         wait_queue_head_t       j_wait_transaction_locked;
 
-        /* Wait queue for waiting for checkpointing to complete */
-        wait_queue_head_t       j_wait_logspace;
-
         /* Wait queue for waiting for commit to complete */
         wait_queue_head_t       j_wait_done_commit;
 
-        /* Wait queue to trigger checkpointing */
-        wait_queue_head_t       j_wait_checkpoint;
-
         /* Wait queue to trigger commit */
         wait_queue_head_t       j_wait_commit;
 
         /* Wait queue to wait for updates to complete */
         wait_queue_head_t       j_wait_updates;
 
+        /* Wait queue to wait for reserved buffer credits to drop */
+        wait_queue_head_t       j_wait_reserved;
+
         /* Semaphore for locking against concurrent checkpoints */
         struct mutex            j_checkpoint_mutex;
 
@@ -847,6 +863,9 @@ struct journal_s
         /* Total maximum capacity of the journal region on disk. */
         unsigned int            j_maxlen;
 
+        /* Number of buffers reserved from the running transaction */
+        atomic_t                j_reserved_credits;
+
         /*
          * Protects the buffer lists and internal buffer state.
          */
@@ -991,9 +1010,17 @@ extern void __jbd2_journal_file_buffer(struct journal_head *, transaction_t *, i
 extern void __journal_free_buffer(struct journal_head *bh);
 extern void jbd2_journal_file_buffer(struct journal_head *, transaction_t *, int);
 extern void __journal_clean_data_list(transaction_t *transaction);
+static inline void jbd2_file_log_bh(struct list_head *head, struct buffer_head *bh)
+{
+        list_add_tail(&bh->b_assoc_buffers, head);
+}
+static inline void jbd2_unfile_log_bh(struct buffer_head *bh)
+{
+        list_del_init(&bh->b_assoc_buffers);
+}
 
 /* Log buffer allocation */
-extern struct journal_head * jbd2_journal_get_descriptor_buffer(journal_t *);
+struct buffer_head *jbd2_journal_get_descriptor_buffer(journal_t *journal);
 int jbd2_journal_next_log_block(journal_t *, unsigned long long *);
 int jbd2_journal_get_log_tail(journal_t *journal, tid_t *tid,
                               unsigned long *block);
@@ -1039,11 +1066,10 @@ extern void jbd2_buffer_abort_trigger(struct journal_head *jh,
                                       struct jbd2_buffer_trigger_type *triggers);
 
 /* Buffer IO */
-extern int
-jbd2_journal_write_metadata_buffer(transaction_t          *transaction,
-                              struct journal_head  *jh_in,
-                              struct journal_head **jh_out,
-                              unsigned long long   blocknr);
+extern int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
+                                              struct journal_head *jh_in,
+                                              struct buffer_head **bh_out,
+                                              sector_t blocknr);
 
 /* Transaction locking */
 extern void             __wait_on_journal (journal_t *);
@@ -1076,10 +1102,14 @@ static inline handle_t *journal_current_handle(void)
  */
 
 extern handle_t *jbd2_journal_start(journal_t *, int nblocks);
-extern handle_t *jbd2__journal_start(journal_t *, int nblocks, gfp_t gfp_mask,
-                                     unsigned int type, unsigned int line_no);
+extern handle_t *jbd2__journal_start(journal_t *, int blocks, int rsv_blocks,
+                                     gfp_t gfp_mask, unsigned int type,
+                                     unsigned int line_no);
 extern int       jbd2_journal_restart(handle_t *, int nblocks);
 extern int       jbd2__journal_restart(handle_t *, int nblocks, gfp_t gfp_mask);
+extern int       jbd2_journal_start_reserved(handle_t *handle,
+                                unsigned int type, unsigned int line_no);
+extern void      jbd2_journal_free_reserved(handle_t *handle);
 extern int       jbd2_journal_extend (handle_t *, int nblocks);
 extern int       jbd2_journal_get_write_access(handle_t *, struct buffer_head *);
 extern int       jbd2_journal_get_create_access (handle_t *, struct buffer_head *);
@@ -1090,7 +1120,7 @@ extern int	 jbd2_journal_dirty_metadata (handle_t *, struct buffer_head *);
 extern int       jbd2_journal_forget (handle_t *, struct buffer_head *);
 extern void      journal_sync_buffer (struct buffer_head *);
 extern int       jbd2_journal_invalidatepage(journal_t *,
-                                struct page *, unsigned long);
+                                struct page *, unsigned int, unsigned int);
 extern int       jbd2_journal_try_to_free_buffers(journal_t *, struct page *, gfp_t);
 extern int       jbd2_journal_stop(handle_t *);
 extern int       jbd2_journal_flush (journal_t *);
@@ -1125,6 +1155,7 @@ extern void	   jbd2_journal_ack_err    (journal_t *);
 extern int         jbd2_journal_clear_err  (journal_t *);
 extern int         jbd2_journal_bmap(journal_t *, unsigned long, unsigned long long *);
 extern int         jbd2_journal_force_commit(journal_t *);
+extern int         jbd2_journal_force_commit_nested(journal_t *);
 extern int         jbd2_journal_file_inode(handle_t *handle, struct jbd2_inode *inode);
 extern int         jbd2_journal_begin_ordered_truncate(journal_t *journal,
                                 struct jbd2_inode *inode, loff_t new_size);
@@ -1178,8 +1209,10 @@ extern int	   jbd2_journal_init_revoke_caches(void);
 extern void        jbd2_journal_destroy_revoke(journal_t *);
 extern int         jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *);
 extern int         jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);
-extern void        jbd2_journal_write_revoke_records(journal_t *,
-                                                     transaction_t *, int);
+extern void        jbd2_journal_write_revoke_records(journal_t *journal,
+                                                     transaction_t *transaction,
+                                                     struct list_head *log_bufs,
+                                                     int write_op);
 
 /* Recovery revoke support */
 extern int      jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t);
@@ -1195,11 +1228,9 @@ extern void	jbd2_clear_buffer_revoked_flags(journal_t *journal);
  * transitions on demand.
  */
 
-int __jbd2_log_space_left(journal_t *); /* Called with journal locked */
 int jbd2_log_start_commit(journal_t *journal, tid_t tid);
 int __jbd2_log_start_commit(journal_t *journal, tid_t tid);
 int jbd2_journal_start_commit(journal_t *journal, tid_t *tid);
-int jbd2_journal_force_commit_nested(journal_t *journal);
 int jbd2_log_wait_commit(journal_t *journal, tid_t tid);
 int jbd2_complete_transaction(journal_t *journal, tid_t tid);
 int jbd2_log_do_checkpoint(journal_t *journal);
@@ -1235,7 +1266,7 @@ static inline int is_journal_aborted(journal_t *journal)
 
 static inline int is_handle_aborted(handle_t *handle)
 {
-        if (handle->h_aborted)
+        if (handle->h_aborted || !handle->h_transaction)
                 return 1;
         return is_journal_aborted(handle->h_transaction->t_journal);
 }
@@ -1266,16 +1297,37 @@ extern int jbd2_journal_blocks_per_page(struct inode *inode);
 extern size_t journal_tag_bytes(journal_t *journal);
 
 /*
+ * We reserve t_outstanding_credits >> JBD2_CONTROL_BLOCKS_SHIFT for
+ * transaction control blocks.
+ */
+#define JBD2_CONTROL_BLOCKS_SHIFT 5
+
+/*
  * Return the minimum number of blocks which must be free in the journal
  * before a new transaction may be started.  Must be called under j_state_lock.
  */
-static inline int jbd_space_needed(journal_t *journal)
+static inline int jbd2_space_needed(journal_t *journal)
 {
         int nblocks = journal->j_max_transaction_buffers;
-        if (journal->j_committing_transaction)
-                nblocks += atomic_read(&journal->j_committing_transaction->
-                                       t_outstanding_credits);
-        return nblocks;
+        return nblocks + (nblocks >> JBD2_CONTROL_BLOCKS_SHIFT);
+}
+
+/*
+ * Return number of free blocks in the log. Must be called under j_state_lock.
+ */
+static inline unsigned long jbd2_log_space_left(journal_t *journal)
+{
+        /* Allow for rounding errors */
+        unsigned long free = journal->j_free - 32;
+
+        if (journal->j_committing_transaction) {
+                unsigned long committing = atomic_read(&journal->
+                        j_committing_transaction->t_outstanding_credits);
+
+                /* Transaction + control blocks */
+                free -= committing + (committing >> JBD2_CONTROL_BLOCKS_SHIFT);
+        }
+        return free;
 }
 
 /*
@@ -1286,11 +1338,9 @@ static inline int jbd_space_needed(journal_t *journal)
 #define BJ_None         0       /* Not journaled */
 #define BJ_Metadata     1       /* Normal journaled metadata */
 #define BJ_Forget       2       /* Buffer superseded by this transaction */
-#define BJ_IO           3       /* Buffer is for temporary IO use */
-#define BJ_Shadow       4       /* Buffer contents being shadowed to the log */
-#define BJ_LogCtl       5       /* Buffer contains log descriptors */
-#define BJ_Reserved     6       /* Buffer is reserved for access by journal */
-#define BJ_Types        7
+#define BJ_Shadow       3       /* Buffer contents being shadowed to the log */
+#define BJ_Reserved     4       /* Buffer is reserved for access by journal */
+#define BJ_Types        5
 
 extern int jbd_blocks_per_page(struct inode *inode);
 
@@ -1319,6 +1369,19 @@ static inline u32 jbd2_chksum(journal_t *journal, u32 crc,
         return *(u32 *)desc.ctx;
 }
 
+/* Return most recent uncommitted transaction */
+static inline tid_t  jbd2_get_latest_transaction(journal_t *journal)
+{
+        tid_t tid;
+
+        read_lock(&journal->j_state_lock);
+        tid = journal->j_commit_request;
+        if (journal->j_running_transaction)
+                tid = journal->j_running_transaction->t_tid;
+        read_unlock(&journal->j_state_lock);
+        return tid;
+}
+
 #ifdef __KERNEL__
 
 #define buffer_trace_init(bh)   do {} while (0)
diff --git a/include/linux/jbd_common.h b/include/linux/jbd_common.h
index 6133679bc4c0..3dc53432355f 100644
--- a/include/linux/jbd_common.h
+++ b/include/linux/jbd_common.h
@@ -1,31 +1,7 @@
 #ifndef _LINUX_JBD_STATE_H
 #define _LINUX_JBD_STATE_H
 
-enum jbd_state_bits {
-        BH_JBD                  /* Has an attached ext3 journal_head */
-          = BH_PrivateStart,
-        BH_JWrite,              /* Being written to log (@@@ DEBUGGING) */
-        BH_Freed,               /* Has been freed (truncated) */
-        BH_Revoked,             /* Has been revoked from the log */
-        BH_RevokeValid,         /* Revoked flag is valid */
-        BH_JBDDirty,            /* Is dirty but journaled */
-        BH_State,               /* Pins most journal_head state */
-        BH_JournalHead,         /* Pins bh->b_private and jh->b_bh */
-        BH_Unshadow,            /* Dummy bit, for BJ_Shadow wakeup filtering */
-        BH_Verified,            /* Metadata block has been verified ok */
-        BH_JBDPrivateStart,     /* First bit available for private use by FS */
-};
-
-BUFFER_FNS(JBD, jbd)
-BUFFER_FNS(JWrite, jwrite)
-BUFFER_FNS(JBDDirty, jbddirty)
-TAS_BUFFER_FNS(JBDDirty, jbddirty)
-BUFFER_FNS(Revoked, revoked)
-TAS_BUFFER_FNS(Revoked, revoked)
-BUFFER_FNS(RevokeValid, revokevalid)
-TAS_BUFFER_FNS(RevokeValid, revokevalid)
-BUFFER_FNS(Freed, freed)
-BUFFER_FNS(Verified, verified)
+#include <linux/bit_spinlock.h>
 
 static inline struct buffer_head *jh2bh(struct journal_head *jh)
 {
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 8fb8edf12417..d235e88cfd7c 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -101,13 +101,13 @@ static inline u64 get_jiffies_64(void)
 #define time_after(a,b)         \
         (typecheck(unsigned long, a) && \
          typecheck(unsigned long, b) && \
-         ((long)(b) - (long)(a) < 0))
+         ((long)((b) - (a)) < 0))
 #define time_before(a,b)        time_after(b,a)
 
 #define time_after_eq(a,b)      \
         (typecheck(unsigned long, a) && \
          typecheck(unsigned long, b) && \
-         ((long)(a) - (long)(b) >= 0))
+         ((long)((a) - (b)) >= 0))
 #define time_before_eq(a,b)     time_after_eq(b,a)
 
 /*
@@ -130,15 +130,19 @@ static inline u64 get_jiffies_64(void)
 #define time_after64(a,b)       \
         (typecheck(__u64, a) && \
          typecheck(__u64, b) && \
-         ((__s64)(b) - (__s64)(a) < 0))
+         ((__s64)((b) - (a)) < 0))
 #define time_before64(a,b)      time_after64(b,a)
 
 #define time_after_eq64(a,b)    \
         (typecheck(__u64, a) && \
          typecheck(__u64, b) && \
-         ((__s64)(a) - (__s64)(b) >= 0))
+         ((__s64)((a) - (b)) >= 0))
 #define time_before_eq64(a,b)   time_after_eq64(b,a)
 
+#define time_in_range64(a, b, c) \
+        (time_after_eq64(a, b) && \
+         time_before_eq64(a, c))
+
 /*
  * These four macros compare jiffies and 'a' for convenience.
  */
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 0976fc46d1e0..a5079072da66 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -48,7 +48,6 @@
 
 #include <linux/types.h>
 #include <linux/compiler.h>
-#include <linux/workqueue.h>
 
 #if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
 
@@ -61,12 +60,6 @@ struct static_key {
 #endif
 };
 
-struct static_key_deferred {
-        struct static_key key;
-        unsigned long timeout;
-        struct delayed_work work;
-};
-
 # include <asm/jump_label.h>
 # define HAVE_JUMP_LABEL
 #endif  /* CC_HAVE_ASM_GOTO && CONFIG_JUMP_LABEL */
@@ -78,6 +71,7 @@ enum jump_label_type {
 
 struct module;
 
+#include <linux/atomic.h>
 #ifdef HAVE_JUMP_LABEL
 
 #define JUMP_LABEL_TRUE_BRANCH 1UL
@@ -119,10 +113,7 @@ extern void arch_jump_label_transform_static(struct jump_entry *entry,
 extern int jump_label_text_reserved(void *start, void *end);
 extern void static_key_slow_inc(struct static_key *key);
 extern void static_key_slow_dec(struct static_key *key);
-extern void static_key_slow_dec_deferred(struct static_key_deferred *key);
 extern void jump_label_apply_nops(struct module *mod);
-extern void
-jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);
 
 #define STATIC_KEY_INIT_TRUE ((struct static_key) \
         { .enabled = ATOMIC_INIT(1), .entries = (void *)1 })
@@ -131,8 +122,6 @@ jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);
 
 #else  /* !HAVE_JUMP_LABEL */
 
-#include <linux/atomic.h>
-
 struct static_key {
         atomic_t enabled;
 };
@@ -141,10 +130,6 @@ static __always_inline void jump_label_init(void)
 {
 }
 
-struct static_key_deferred {
-        struct static_key  key;
-};
-
 static __always_inline bool static_key_false(struct static_key *key)
 {
         if (unlikely(atomic_read(&key->enabled)) > 0)
@@ -169,11 +154,6 @@ static inline void static_key_slow_dec(struct static_key *key)
         atomic_dec(&key->enabled);
 }
 
-static inline void static_key_slow_dec_deferred(struct static_key_deferred *key)
-{
-        static_key_slow_dec(&key->key);
-}
-
 static inline int jump_label_text_reserved(void *start, void *end)
 {
         return 0;
@@ -187,12 +167,6 @@ static inline int jump_label_apply_nops(struct module *mod)
         return 0;
 }
 
-static inline void
-jump_label_rate_limit(struct static_key_deferred *key,
-                unsigned long rl)
-{
-}
-
 #define STATIC_KEY_INIT_TRUE ((struct static_key) \
                 { .enabled = ATOMIC_INIT(1) })
 #define STATIC_KEY_INIT_FALSE ((struct static_key) \
diff --git a/include/linux/jump_label_ratelimit.h b/include/linux/jump_label_ratelimit.h
new file mode 100644
index 000000000000..113788389b3d
--- /dev/null
+++ b/include/linux/jump_label_ratelimit.h
@@ -0,0 +1,34 @@
+#ifndef _LINUX_JUMP_LABEL_RATELIMIT_H
+#define _LINUX_JUMP_LABEL_RATELIMIT_H
+
+#include <linux/jump_label.h>
+#include <linux/workqueue.h>
+
+#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
+struct static_key_deferred {
+        struct static_key key;
+        unsigned long timeout;
+        struct delayed_work work;
+};
+#endif
+
+#ifdef HAVE_JUMP_LABEL
+extern void static_key_slow_dec_deferred(struct static_key_deferred *key);
+extern void
+jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);
+
+#else   /* !HAVE_JUMP_LABEL */
+struct static_key_deferred {
+        struct static_key  key;
+};
+static inline void static_key_slow_dec_deferred(struct static_key_deferred *key)
+{
+        static_key_slow_dec(&key->key);
+}
+static inline void
+jump_label_rate_limit(struct static_key_deferred *key,
+                unsigned long rl)
+{
+}
+#endif  /* HAVE_JUMP_LABEL */
+#endif  /* _LINUX_JUMP_LABEL_RATELIMIT_H */
diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
index b7c8cdc1d422..cbfb171bbcba 100644
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -36,10 +36,9 @@ struct kbd_struct {
 #define VC_CTRLRLOCK    KG_CTRLR        /* ctrlr lock mode */
         unsigned char slockstate;       /* for `sticky' Shift, Ctrl, etc. */
 
-        unsigned char ledmode:2;        /* one 2-bit value */
+        unsigned char ledmode:1;
 #define LED_SHOW_FLAGS 0        /* traditional state */
 #define LED_SHOW_IOCTL 1        /* only change leds upon ioctl */
-#define LED_SHOW_MEM 2          /* `heartbeat': peek into memory */
 
         unsigned char ledflagstate:4;   /* flags, not lights */
         unsigned char default_ledflagstate:4;
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index e9ef6d6b51d5..672ddc4de4af 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -193,13 +193,10 @@ extern int _cond_resched(void);
                 (__x < 0) ? -__x : __x;         \
         })
 
-#ifdef CONFIG_PROVE_LOCKING
+#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)
 void might_fault(void);
 #else
-static inline void might_fault(void)
-{
-        might_sleep();
-}
+static inline void might_fault(void) { }
 #endif
 
 extern struct atomic_notifier_head panic_notifier_list;
@@ -442,6 +439,17 @@ static inline char *hex_byte_pack(char *buf, u8 byte)
         return buf;
 }
 
+extern const char hex_asc_upper[];
+#define hex_asc_upper_lo(x)     hex_asc_upper[((x) & 0x0f)]
+#define hex_asc_upper_hi(x)     hex_asc_upper[((x) & 0xf0) >> 4]
+
+static inline char *hex_byte_pack_upper(char *buf, u8 byte)
+{
+        *buf++ = hex_asc_upper_hi(byte);
+        *buf++ = hex_asc_upper_lo(byte);
+        return buf;
+}
+
 static inline char * __deprecated pack_hex_byte(char *buf, u8 byte)
 {
         return hex_byte_pack(buf, byte);
@@ -450,6 +458,8 @@ static inline char * __deprecated pack_hex_byte(char *buf, u8 byte)
 extern int hex_to_bin(char ch);
 extern int __must_check hex2bin(u8 *dst, const char *src, size_t count);
 
+int mac_pton(const char *s, u8 *mac);
+
 /*
  * General tracing related utility functions - trace_printk(),
  * tracing_on/tracing_off and tracing_start()/tracing_stop
@@ -562,9 +572,6 @@ int __trace_bprintk(unsigned long ip, const char *fmt, ...);
 extern __printf(2, 3)
 int __trace_printk(unsigned long ip, const char *fmt, ...);
 
-extern int __trace_bputs(unsigned long ip, const char *str);
-extern int __trace_puts(unsigned long ip, const char *str, int size);
-
 /**
  * trace_puts - write a string into the ftrace buffer
  * @str: the string to record
@@ -600,6 +607,8 @@ extern int __trace_puts(unsigned long ip, const char *str, int size);
         else                                                            \
                 __trace_puts(_THIS_IP_, str, strlen(str));              \
 })
+extern int __trace_bputs(unsigned long ip, const char *str);
+extern int __trace_puts(unsigned long ip, const char *str, int size);
 
 extern void trace_dump_stack(int skip);
 
@@ -631,7 +640,7 @@ extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);
 static inline void tracing_start(void) { }
 static inline void tracing_stop(void) { }
 static inline void ftrace_off_permanent(void) { }
-static inline void trace_dump_stack(void) { }
+static inline void trace_dump_stack(int skip) { }
 
 static inline void tracing_on(void) { }
 static inline void tracing_off(void) { }
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index ed5f6ed6eb77..51c72be4a7c3 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -36,9 +36,6 @@ struct kernel_cpustat {
 };
 
 struct kernel_stat {
-#ifndef CONFIG_GENERIC_HARDIRQS
-       unsigned int irqs[NR_IRQS];
-#endif
         unsigned long irqs_sum;
         unsigned int softirqs[NR_SOFTIRQS];
 };
@@ -54,22 +51,6 @@ DECLARE_PER_CPU(struct kernel_cpustat, kernel_cpustat);
 
 extern unsigned long long nr_context_switches(void);
 
-#ifndef CONFIG_GENERIC_HARDIRQS
-
-struct irq_desc;
-
-static inline void kstat_incr_irqs_this_cpu(unsigned int irq,
-                                            struct irq_desc *desc)
-{
-        __this_cpu_inc(kstat.irqs[irq]);
-        __this_cpu_inc(kstat.irqs_sum);
-}
-
-static inline unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
-{
-       return kstat_cpu(cpu).irqs[irq];
-}
-#else
 #include <linux/irq.h>
 extern unsigned int kstat_irqs_cpu(unsigned int irq, int cpu);
 
@@ -79,8 +60,6 @@ do {							\
         __this_cpu_inc(kstat.irqs_sum);                 \
 } while (0)
 
-#endif
-
 static inline void kstat_incr_softirqs_this_cpu(unsigned int irq)
 {
         __this_cpu_inc(kstat.softirqs[irq]);
@@ -94,20 +73,7 @@ static inline unsigned int kstat_softirqs_cpu(unsigned int irq, int cpu)
 /*
  * Number of interrupts per specific IRQ source, since bootup
  */
-#ifndef CONFIG_GENERIC_HARDIRQS
-static inline unsigned int kstat_irqs(unsigned int irq)
-{
-        unsigned int sum = 0;
-        int cpu;
-
-        for_each_possible_cpu(cpu)
-                sum += kstat_irqs_cpu(irq, cpu);
-
-        return sum;
-}
-#else
 extern unsigned int kstat_irqs(unsigned int irq);
-#endif
 
 /*
  * Number of interrupts per cpu, since bootup
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 939b11268c86..de6dcbcc6ef7 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/wait.h>
 #include <linux/atomic.h>
+#include <linux/workqueue.h>
 
 #define UEVENT_HELPER_PATH_LEN          256
 #define UEVENT_NUM_ENVP                 32      /* number of env pointers */
@@ -65,6 +66,9 @@ struct kobject {
         struct kobj_type        *ktype;
         struct sysfs_dirent     *sd;
         struct kref             kref;
+#ifdef CONFIG_DEBUG_KOBJECT_RELEASE
+        struct delayed_work     release;
+#endif
         unsigned int state_initialized:1;
         unsigned int state_in_sysfs:1;
         unsigned int state_add_uevent_sent:1;
diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
index f66b065a8b5f..df32d2508290 100644
--- a/include/linux/kobject_ns.h
+++ b/include/linux/kobject_ns.h
@@ -39,6 +39,7 @@ enum kobj_ns_type {
  */
 struct kobj_ns_type_operations {
         enum kobj_ns_type type;
+        bool (*current_may_mount)(void);
         void *(*grab_current_ns)(void);
         const void *(*netlink_ns)(struct sock *sk);
         const void *(*initial_ns)(void);
@@ -50,6 +51,7 @@ int kobj_ns_type_registered(enum kobj_ns_type type);
 const struct kobj_ns_type_operations *kobj_child_ns_ops(struct kobject *parent);
 const struct kobj_ns_type_operations *kobj_ns_ops(struct kobject *kobj);
 
+bool kobj_ns_current_may_mount(enum kobj_ns_type type);
 void *kobj_ns_grab_current(enum kobj_ns_type type);
 const void *kobj_ns_netlink(enum kobj_ns_type type, struct sock *sk);
 const void *kobj_ns_initial(enum kobj_ns_type type);
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index ca1d27a0d6a6..925eaf28fca9 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -264,10 +264,36 @@ extern void arch_arm_kprobe(struct kprobe *p);
 extern void arch_disarm_kprobe(struct kprobe *p);
 extern int arch_init_kprobes(void);
 extern void show_registers(struct pt_regs *regs);
-extern kprobe_opcode_t *get_insn_slot(void);
-extern void free_insn_slot(kprobe_opcode_t *slot, int dirty);
 extern void kprobes_inc_nmissed_count(struct kprobe *p);
 
+struct kprobe_insn_cache {
+        struct mutex mutex;
+        void *(*alloc)(void);   /* allocate insn page */
+        void (*free)(void *);   /* free insn page */
+        struct list_head pages; /* list of kprobe_insn_page */
+        size_t insn_size;       /* size of instruction slot */
+        int nr_garbage;
+};
+
+extern kprobe_opcode_t *__get_insn_slot(struct kprobe_insn_cache *c);
+extern void __free_insn_slot(struct kprobe_insn_cache *c,
+                             kprobe_opcode_t *slot, int dirty);
+
+#define DEFINE_INSN_CACHE_OPS(__name)                                   \
+extern struct kprobe_insn_cache kprobe_##__name##_slots;                \
+                                                                        \
+static inline kprobe_opcode_t *get_##__name##_slot(void)                \
+{                                                                       \
+        return __get_insn_slot(&kprobe_##__name##_slots);               \
+}                                                                       \
+                                                                        \
+static inline void free_##__name##_slot(kprobe_opcode_t *slot, int dirty)\
+{                                                                       \
+        __free_insn_slot(&kprobe_##__name##_slots, slot, dirty);        \
+}                                                                       \
+
+DEFINE_INSN_CACHE_OPS(insn);
+
 #ifdef CONFIG_OPTPROBES
 /*
  * Internal structure for direct jump optimized probe
@@ -287,13 +313,13 @@ extern void arch_optimize_kprobes(struct list_head *oplist);
 extern void arch_unoptimize_kprobes(struct list_head *oplist,
                                     struct list_head *done_list);
 extern void arch_unoptimize_kprobe(struct optimized_kprobe *op);
-extern kprobe_opcode_t *get_optinsn_slot(void);
-extern void free_optinsn_slot(kprobe_opcode_t *slot, int dirty);
 extern int arch_within_optimized_kprobe(struct optimized_kprobe *op,
                                         unsigned long addr);
 
 extern void opt_pre_handler(struct kprobe *p, struct pt_regs *regs);
 
+DEFINE_INSN_CACHE_OPS(optinsn);
+
 #ifdef CONFIG_SYSCTL
 extern int sysctl_kprobes_optimization;
 extern int proc_kprobes_optimization_handler(struct ctl_table *table,
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index bbca12804d12..31c0cd1c941a 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -69,7 +69,7 @@ typedef union ktime ktime_t;		/* Kill this */
  * @secs:       seconds to set
  * @nsecs:      nanoseconds to set
  *
- * Return the ktime_t representation of the value
+ * Return: The ktime_t representation of the value.
  */
 static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
 {
@@ -151,7 +151,7 @@ static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
  * @lhs:        minuend
  * @rhs:        subtrahend
  *
- * Returns the remainder of the subtraction
+ * Return: The remainder of the subtraction.
  */
 static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs)
 {
@@ -169,7 +169,7 @@ static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs)
  * @add1:       addend1
  * @add2:       addend2
  *
- * Returns the sum of @add1 and @add2.
+ * Return: The sum of @add1 and @add2.
  */
 static inline ktime_t ktime_add(const ktime_t add1, const ktime_t add2)
 {
@@ -195,7 +195,7 @@ static inline ktime_t ktime_add(const ktime_t add1, const ktime_t add2)
  * @kt:         addend
  * @nsec:       the scalar nsec value to add
  *
- * Returns the sum of @kt and @nsec in ktime_t format
+ * Return: The sum of @kt and @nsec in ktime_t format.
  */
 extern ktime_t ktime_add_ns(const ktime_t kt, u64 nsec);
 
@@ -204,7 +204,7 @@ extern ktime_t ktime_add_ns(const ktime_t kt, u64 nsec);
  * @kt:         minuend
  * @nsec:       the scalar nsec value to subtract
  *
- * Returns the subtraction of @nsec from @kt in ktime_t format
+ * Return: The subtraction of @nsec from @kt in ktime_t format.
  */
 extern ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec);
 
@@ -212,7 +212,7 @@ extern ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec);
  * timespec_to_ktime - convert a timespec to ktime_t format
  * @ts:         the timespec variable to convert
  *
- * Returns a ktime_t variable with the converted timespec value
+ * Return: A ktime_t variable with the converted timespec value.
  */
 static inline ktime_t timespec_to_ktime(const struct timespec ts)
 {
@@ -224,19 +224,20 @@ static inline ktime_t timespec_to_ktime(const struct timespec ts)
  * timeval_to_ktime - convert a timeval to ktime_t format
  * @tv:         the timeval variable to convert
  *
- * Returns a ktime_t variable with the converted timeval value
+ * Return: A ktime_t variable with the converted timeval value.
  */
 static inline ktime_t timeval_to_ktime(const struct timeval tv)
 {
         return (ktime_t) { .tv = { .sec = (s32)tv.tv_sec,
-                                   .nsec = (s32)tv.tv_usec * 1000 } };
+                                   .nsec = (s32)(tv.tv_usec *
+                                                 NSEC_PER_USEC) } };
 }
 
 /**
  * ktime_to_timespec - convert a ktime_t variable to timespec format
  * @kt:         the ktime_t variable to convert
  *
- * Returns the timespec representation of the ktime value
+ * Return: The timespec representation of the ktime value.
  */
 static inline struct timespec ktime_to_timespec(const ktime_t kt)
 {
@@ -248,7 +249,7 @@ static inline struct timespec ktime_to_timespec(const ktime_t kt)
  * ktime_to_timeval - convert a ktime_t variable to timeval format
  * @kt:         the ktime_t variable to convert
  *
- * Returns the timeval representation of the ktime value
+ * Return: The timeval representation of the ktime value.
  */
 static inline struct timeval ktime_to_timeval(const ktime_t kt)
 {
@@ -261,7 +262,7 @@ static inline struct timeval ktime_to_timeval(const ktime_t kt)
  * ktime_to_ns - convert a ktime_t variable to scalar nanoseconds
  * @kt:         the ktime_t variable to convert
  *
- * Returns the scalar nanoseconds representation of @kt
+ * Return: The scalar nanoseconds representation of @kt.
  */
 static inline s64 ktime_to_ns(const ktime_t kt)
 {
@@ -275,7 +276,9 @@ static inline s64 ktime_to_ns(const ktime_t kt)
  * @cmp1:       comparable1
  * @cmp2:       comparable2
  *
- * Compare two ktime_t variables, returns 1 if equal
+ * Compare two ktime_t variables.
+ *
+ * Return: 1 if equal.
  */
 static inline int ktime_equal(const ktime_t cmp1, const ktime_t cmp2)
 {
@@ -287,7 +290,7 @@ static inline int ktime_equal(const ktime_t cmp1, const ktime_t cmp2)
  * @cmp1:       comparable1
  * @cmp2:       comparable2
  *
- * Returns ...
+ * Return: ...
  *   cmp1  < cmp2: return <0
  *   cmp1 == cmp2: return 0
  *   cmp1  > cmp2: return >0
@@ -320,12 +323,17 @@ static inline s64 ktime_us_delta(const ktime_t later, const ktime_t earlier)
 
 static inline ktime_t ktime_add_us(const ktime_t kt, const u64 usec)
 {
-        return ktime_add_ns(kt, usec * 1000);
+        return ktime_add_ns(kt, usec * NSEC_PER_USEC);
+}
+
+static inline ktime_t ktime_add_ms(const ktime_t kt, const u64 msec)
+{
+        return ktime_add_ns(kt, msec * NSEC_PER_MSEC);
 }
 
 static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)
 {
-        return ktime_sub_ns(kt, usec * 1000);
+        return ktime_sub_ns(kt, usec * NSEC_PER_USEC);
 }
 
 extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);
@@ -336,9 +344,10 @@ extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);
  * @kt:         the ktime_t variable to convert
  * @ts:         the timespec variable to store the result in
  *
- * Returns true if there was a successful conversion, false if kt was 0.
+ * Return: %true if there was a successful conversion, %false if kt was 0.
  */
-static inline bool ktime_to_timespec_cond(const ktime_t kt, struct timespec *ts)
+static inline __must_check bool ktime_to_timespec_cond(const ktime_t kt,
+                                                       struct timespec *ts)
 {
         if (kt.tv64) {
                 *ts = ktime_to_timespec(kt);
@@ -366,7 +375,15 @@ extern void ktime_get_ts(struct timespec *ts);
 static inline ktime_t ns_to_ktime(u64 ns)
 {
         static const ktime_t ktime_zero = { .tv64 = 0 };
+
         return ktime_add_ns(ktime_zero, ns);
 }
 
+static inline ktime_t ms_to_ktime(u64 ms)
+{
+        static const ktime_t ktime_zero = { .tv64 = 0 };
+
+        return ktime_add_ms(ktime_zero, ms);
+}
+
 #endif
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index f0eea07d2c2b..0fbbc7aa02cb 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -23,6 +23,7 @@
 #include <linux/ratelimit.h>
 #include <linux/err.h>
 #include <linux/irqflags.h>
+#include <linux/context_tracking.h>
 #include <asm/signal.h>
 
 #include <linux/kvm.h>
@@ -84,6 +85,12 @@ static inline bool is_noslot_pfn(pfn_t pfn)
         return pfn == KVM_PFN_NOSLOT;
 }
 
+/*
+ * architectures with KVM_HVA_ERR_BAD other than PAGE_OFFSET (e.g. s390)
+ * provide own defines and kvm_is_error_hva
+ */
+#ifndef KVM_HVA_ERR_BAD
+
 #define KVM_HVA_ERR_BAD         (PAGE_OFFSET)
 #define KVM_HVA_ERR_RO_BAD      (PAGE_OFFSET + PAGE_SIZE)
 
@@ -92,6 +99,8 @@ static inline bool kvm_is_error_hva(unsigned long addr)
         return addr >= PAGE_OFFSET;
 }
 
+#endif
+
 #define KVM_ERR_PTR_BAD_PAGE    (ERR_PTR(-ENOENT))
 
 static inline bool is_error_page(struct page *page)
@@ -124,6 +133,7 @@ static inline bool is_error_page(struct page *page)
 #define KVM_REQ_MCLOCK_INPROGRESS 19
 #define KVM_REQ_EPR_EXIT          20
 #define KVM_REQ_SCAN_IOAPIC       21
+#define KVM_REQ_GLOBAL_CLOCK_UPDATE 22
 
 #define KVM_USERSPACE_IRQ_SOURCE_ID             0
 #define KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID        1
@@ -144,7 +154,8 @@ struct kvm_io_range {
 #define NR_IOBUS_DEVS 1000
 
 struct kvm_io_bus {
-        int                   dev_count;
+        int dev_count;
+        int ioeventfd_count;
         struct kvm_io_range range[];
 };
 
@@ -157,8 +168,12 @@ enum kvm_bus {
 
 int kvm_io_bus_write(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
                      int len, const void *val);
+int kvm_io_bus_write_cookie(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
+                            int len, const void *val, long cookie);
 int kvm_io_bus_read(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, int len,
                     void *val);
+int kvm_io_bus_read_cookie(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
+                           int len, void *val, long cookie);
 int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
                             int len, struct kvm_io_device *dev);
 int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
@@ -496,6 +511,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
 void kvm_arch_free_memslot(struct kvm_memory_slot *free,
                            struct kvm_memory_slot *dont);
 int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages);
+void kvm_arch_memslots_updated(struct kvm *kvm);
 int kvm_arch_prepare_memory_region(struct kvm *kvm,
                                 struct kvm_memory_slot *memslot,
                                 struct kvm_userspace_memory_region *mem,
@@ -517,6 +533,7 @@ int gfn_to_page_many_atomic(struct kvm *kvm, gfn_t gfn, struct page **pages,
 
 struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn);
 unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn);
+unsigned long gfn_to_hva_prot(struct kvm *kvm, gfn_t gfn, bool *writable);
 unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot, gfn_t gfn);
 void kvm_release_page_clean(struct page *page);
 void kvm_release_page_dirty(struct page *page);
@@ -760,42 +777,6 @@ static inline int kvm_iommu_unmap_guest(struct kvm *kvm)
 }
 #endif
 
-static inline void __guest_enter(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;
-}
-
-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;
diff --git a/include/linux/lcd.h b/include/linux/lcd.h
index e00c3b0ebc6b..504f6246f38f 100644
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h
@@ -112,7 +112,12 @@ static inline void lcd_set_power(struct lcd_device *ld, int power)
 
 extern struct lcd_device *lcd_device_register(const char *name,
         struct device *parent, void *devdata, struct lcd_ops *ops);
+extern struct lcd_device *devm_lcd_device_register(struct device *dev,
+        const char *name, struct device *parent,
+        void *devdata, struct lcd_ops *ops);
 extern void lcd_device_unregister(struct lcd_device *ld);
+extern void devm_lcd_device_unregister(struct device *dev,
+        struct lcd_device *ld);
 
 #define to_lcd_device(obj) container_of(obj, struct lcd_device, dev)
 
diff --git a/include/linux/libata.h b/include/linux/libata.h
index eae7a053dc51..0e23c26485f4 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -138,6 +138,22 @@ enum {
         ATA_SHT_THIS_ID         = -1,
         ATA_SHT_USE_CLUSTERING  = 1,
 
+        /* struct ata_taskfile flags */
+        ATA_TFLAG_LBA48         = (1 << 0), /* enable 48-bit LBA and "HOB" */
+        ATA_TFLAG_ISADDR        = (1 << 1), /* enable r/w to nsect/lba regs */
+        ATA_TFLAG_DEVICE        = (1 << 2), /* enable r/w to device reg */
+        ATA_TFLAG_WRITE         = (1 << 3), /* data dir: host->dev==1 (write) */
+        ATA_TFLAG_LBA           = (1 << 4), /* enable LBA */
+        ATA_TFLAG_FUA           = (1 << 5), /* enable FUA */
+        ATA_TFLAG_POLLING       = (1 << 6), /* set nIEN to 1 and use polling */
+
+        /* protocol flags */
+        ATA_PROT_FLAG_PIO       = (1 << 0), /* is PIO */
+        ATA_PROT_FLAG_DMA       = (1 << 1), /* is DMA */
+        ATA_PROT_FLAG_DATA      = ATA_PROT_FLAG_PIO | ATA_PROT_FLAG_DMA,
+        ATA_PROT_FLAG_NCQ       = (1 << 2), /* is NCQ */
+        ATA_PROT_FLAG_ATAPI     = (1 << 3), /* is ATAPI */
+
         /* struct ata_device stuff */
         ATA_DFLAG_LBA           = (1 << 0), /* device supports LBA */
         ATA_DFLAG_LBA48         = (1 << 1), /* device supports LBA48 */
@@ -156,6 +172,7 @@ enum {
         ATA_DFLAG_DUBIOUS_XFER  = (1 << 16), /* data transfer not verified */
         ATA_DFLAG_NO_UNLOAD     = (1 << 17), /* device doesn't support unload */
         ATA_DFLAG_UNLOCK_HPA    = (1 << 18), /* unlock HPA */
+        ATA_DFLAG_NCQ_SEND_RECV = (1 << 19), /* device supports NCQ SEND and RECV */
         ATA_DFLAG_INIT_MASK     = (1 << 24) - 1,
 
         ATA_DFLAG_DETACH        = (1 << 24),
@@ -207,6 +224,7 @@ enum {
         ATA_FLAG_ACPI_SATA      = (1 << 17), /* need native SATA ACPI layout */
         ATA_FLAG_AN             = (1 << 18), /* controller supports AN */
         ATA_FLAG_PMP            = (1 << 19), /* controller supports PMP */
+        ATA_FLAG_FPDMA_AUX      = (1 << 20), /* controller supports H2DFIS aux field */
         ATA_FLAG_EM             = (1 << 21), /* driver supports enclosure
                                               * management */
         ATA_FLAG_SW_ACTIVITY    = (1 << 22), /* driver supports sw activity
@@ -399,6 +417,7 @@ enum {
         ATA_HORKAGE_BROKEN_FPDMA_AA     = (1 << 15),    /* skip AA */
         ATA_HORKAGE_DUMP_ID     = (1 << 16),    /* dump IDENTIFY data */
         ATA_HORKAGE_MAX_SEC_LBA48 = (1 << 17),  /* Set max sects to 65535 */
+        ATA_HORKAGE_ATAPI_DMADIR = (1 << 18),   /* device requires dmadir */
 
          /* DMA mask for user DMA control: User visible values; DO NOT
             renumber */
@@ -517,6 +536,33 @@ enum sw_activity {
         BLINK_OFF,
 };
 
+struct ata_taskfile {
+        unsigned long           flags;          /* ATA_TFLAG_xxx */
+        u8                      protocol;       /* ATA_PROT_xxx */
+
+        u8                      ctl;            /* control reg */
+
+        u8                      hob_feature;    /* additional data */
+        u8                      hob_nsect;      /* to support LBA48 */
+        u8                      hob_lbal;
+        u8                      hob_lbam;
+        u8                      hob_lbah;
+
+        u8                      feature;
+        u8                      nsect;
+        u8                      lbal;
+        u8                      lbam;
+        u8                      lbah;
+
+        u8                      device;
+
+        u8                      command;        /* IO operation */
+
+        u32                     auxiliary;      /* auxiliary field */
+                                                /* from SATA 3.1 and */
+                                                /* ATA-8 ACS-3 */
+};
+
 #ifdef CONFIG_ATA_SFF
 struct ata_ioports {
         void __iomem            *cmd_addr;
@@ -659,6 +705,9 @@ struct ata_device {
         /* DEVSLP Timing Variables from Identify Device Data Log */
         u8                      devslp_timing[ATA_LOG_DEVSLP_SIZE];
 
+        /* NCQ send and receive log subcommand support */
+        u8                      ncq_send_recv_cmds[ATA_LOG_NCQ_SEND_RECV_SIZE];
+
         /* error history */
         int                     spdn_cnt;
         /* ering is CLEAR_END, read comment above CLEAR_END */
@@ -746,6 +795,7 @@ struct ata_port {
         /* Flags that change dynamically, protected by ap->lock */
         unsigned int            pflags; /* ATA_PFLAG_xxx */
         unsigned int            print_id; /* user visible unique port ID */
+        unsigned int            local_port_no; /* host local port num */
         unsigned int            port_no; /* 0 based port no. inside the host */
 
 #ifdef CONFIG_ATA_SFF
@@ -908,6 +958,9 @@ struct ata_port_operations {
         ssize_t (*sw_activity_show)(struct ata_device *dev, char *buf);
         ssize_t (*sw_activity_store)(struct ata_device *dev,
                                      enum sw_activity val);
+        ssize_t (*transmit_led_message)(struct ata_port *ap, u32 state,
+                                        ssize_t size);
+
         /*
          * Obsolete
          */
@@ -954,6 +1007,69 @@ extern const unsigned long sata_deb_timing_long[];
 extern struct ata_port_operations ata_dummy_port_ops;
 extern const struct ata_port_info ata_dummy_port_info;
 
+/*
+ * protocol tests
+ */
+static inline unsigned int ata_prot_flags(u8 prot)
+{
+        switch (prot) {
+        case ATA_PROT_NODATA:
+                return 0;
+        case ATA_PROT_PIO:
+                return ATA_PROT_FLAG_PIO;
+        case ATA_PROT_DMA:
+                return ATA_PROT_FLAG_DMA;
+        case ATA_PROT_NCQ:
+                return ATA_PROT_FLAG_DMA | ATA_PROT_FLAG_NCQ;
+        case ATAPI_PROT_NODATA:
+                return ATA_PROT_FLAG_ATAPI;
+        case ATAPI_PROT_PIO:
+                return ATA_PROT_FLAG_ATAPI | ATA_PROT_FLAG_PIO;
+        case ATAPI_PROT_DMA:
+                return ATA_PROT_FLAG_ATAPI | ATA_PROT_FLAG_DMA;
+        }
+        return 0;
+}
+
+static inline int ata_is_atapi(u8 prot)
+{
+        return ata_prot_flags(prot) & ATA_PROT_FLAG_ATAPI;
+}
+
+static inline int ata_is_nodata(u8 prot)
+{
+        return !(ata_prot_flags(prot) & ATA_PROT_FLAG_DATA);
+}
+
+static inline int ata_is_pio(u8 prot)
+{
+        return ata_prot_flags(prot) & ATA_PROT_FLAG_PIO;
+}
+
+static inline int ata_is_dma(u8 prot)
+{
+        return ata_prot_flags(prot) & ATA_PROT_FLAG_DMA;
+}
+
+static inline int ata_is_ncq(u8 prot)
+{
+        return ata_prot_flags(prot) & ATA_PROT_FLAG_NCQ;
+}
+
+static inline int ata_is_data(u8 prot)
+{
+        return ata_prot_flags(prot) & ATA_PROT_FLAG_DATA;
+}
+
+static inline int is_multi_taskfile(struct ata_taskfile *tf)
+{
+        return (tf->command == ATA_CMD_READ_MULTI) ||
+               (tf->command == ATA_CMD_WRITE_MULTI) ||
+               (tf->command == ATA_CMD_READ_MULTI_EXT) ||
+               (tf->command == ATA_CMD_WRITE_MULTI_EXT) ||
+               (tf->command == ATA_CMD_WRITE_MULTI_FUA_EXT);
+}
+
 static inline const unsigned long *
 sata_ehc_deb_timing(struct ata_eh_context *ehc)
 {
@@ -1137,8 +1253,6 @@ int ata_acpi_stm(struct ata_port *ap, const struct ata_acpi_gtm *stm);
 int ata_acpi_gtm(struct ata_port *ap, struct ata_acpi_gtm *stm);
 unsigned long ata_acpi_gtm_xfermask(struct ata_device *dev,
                                     const struct ata_acpi_gtm *gtm);
-acpi_handle ata_ap_acpi_handle(struct ata_port *ap);
-acpi_handle ata_dev_acpi_handle(struct ata_device *dev);
 int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm);
 #else
 static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap)
@@ -1492,6 +1606,13 @@ static inline int ata_ncq_enabled(struct ata_device *dev)
                               ATA_DFLAG_NCQ)) == ATA_DFLAG_NCQ;
 }
 
+static inline bool ata_fpdma_dsm_supported(struct ata_device *dev)
+{
+        return (dev->flags & ATA_DFLAG_NCQ_SEND_RECV) &&
+                (dev->ncq_send_recv_cmds[ATA_LOG_NCQ_SEND_RECV_DSM_OFFSET] &
+                 ATA_LOG_NCQ_SEND_RECV_DSM_TRIM);
+}
+
 static inline void ata_qc_set_polling(struct ata_queued_cmd *qc)
 {
         qc->tf.ctl |= ATA_NIEN;
diff --git a/include/linux/list.h b/include/linux/list.h
index b83e5657365a..f4d8a2f12a33 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -381,17 +381,6 @@ static inline void list_splice_tail_init(struct list_head *list,
         for (pos = (head)->next; pos != (head); pos = pos->next)
 
 /**
- * __list_for_each      -       iterate over a list
- * @pos:        the &struct list_head to use as a loop cursor.
- * @head:       the head for your list.
- *
- * This variant doesn't differ from list_for_each() any more.
- * We don't do prefetching in either case.
- */
-#define __list_for_each(pos, head) \
-        for (pos = (head)->next; pos != (head); pos = pos->next)
-
-/**
  * list_for_each_prev   -       iterate over a list backwards
  * @pos:        the &struct list_head to use as a loop cursor.
  * @head:       the head for your list.
diff --git a/include/linux/list_lru.h b/include/linux/list_lru.h
new file mode 100644
index 000000000000..3ce541753c88
--- /dev/null
+++ b/include/linux/list_lru.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2013 Red Hat, Inc. and Parallels Inc. All rights reserved.
+ * Authors: David Chinner and Glauber Costa
+ *
+ * Generic LRU infrastructure
+ */
+#ifndef _LRU_LIST_H
+#define _LRU_LIST_H
+
+#include <linux/list.h>
+#include <linux/nodemask.h>
+
+/* list_lru_walk_cb has to always return one of those */
+enum lru_status {
+        LRU_REMOVED,            /* item removed from list */
+        LRU_ROTATE,             /* item referenced, give another pass */
+        LRU_SKIP,               /* item cannot be locked, skip */
+        LRU_RETRY,              /* item not freeable. May drop the lock
+                                   internally, but has to return locked. */
+};
+
+struct list_lru_node {
+        spinlock_t              lock;
+        struct list_head        list;
+        /* kept as signed so we can catch imbalance bugs */
+        long                    nr_items;
+} ____cacheline_aligned_in_smp;
+
+struct list_lru {
+        struct list_lru_node    *node;
+        nodemask_t              active_nodes;
+};
+
+void list_lru_destroy(struct list_lru *lru);
+int list_lru_init(struct list_lru *lru);
+
+/**
+ * list_lru_add: add an element to the lru list's tail
+ * @list_lru: the lru pointer
+ * @item: the item to be added.
+ *
+ * If the element is already part of a list, this function returns doing
+ * nothing. Therefore the caller does not need to keep state about whether or
+ * not the element already belongs in the list and is allowed to lazy update
+ * it. Note however that this is valid for *a* list, not *this* list. If
+ * the caller organize itself in a way that elements can be in more than
+ * one type of list, it is up to the caller to fully remove the item from
+ * the previous list (with list_lru_del() for instance) before moving it
+ * to @list_lru
+ *
+ * Return value: true if the list was updated, false otherwise
+ */
+bool list_lru_add(struct list_lru *lru, struct list_head *item);
+
+/**
+ * list_lru_del: delete an element to the lru list
+ * @list_lru: the lru pointer
+ * @item: the item to be deleted.
+ *
+ * This function works analogously as list_lru_add in terms of list
+ * manipulation. The comments about an element already pertaining to
+ * a list are also valid for list_lru_del.
+ *
+ * Return value: true if the list was updated, false otherwise
+ */
+bool list_lru_del(struct list_lru *lru, struct list_head *item);
+
+/**
+ * list_lru_count_node: return the number of objects currently held by @lru
+ * @lru: the lru pointer.
+ * @nid: the node id to count from.
+ *
+ * Always return a non-negative number, 0 for empty lists. There is no
+ * guarantee that the list is not updated while the count is being computed.
+ * Callers that want such a guarantee need to provide an outer lock.
+ */
+unsigned long list_lru_count_node(struct list_lru *lru, int nid);
+static inline unsigned long list_lru_count(struct list_lru *lru)
+{
+        long count = 0;
+        int nid;
+
+        for_each_node_mask(nid, lru->active_nodes)
+                count += list_lru_count_node(lru, nid);
+
+        return count;
+}
+
+typedef enum lru_status
+(*list_lru_walk_cb)(struct list_head *item, spinlock_t *lock, void *cb_arg);
+/**
+ * list_lru_walk_node: walk a list_lru, isolating and disposing freeable items.
+ * @lru: the lru pointer.
+ * @nid: the node id to scan from.
+ * @isolate: callback function that is resposible for deciding what to do with
+ *  the item currently being scanned
+ * @cb_arg: opaque type that will be passed to @isolate
+ * @nr_to_walk: how many items to scan.
+ *
+ * This function will scan all elements in a particular list_lru, calling the
+ * @isolate callback for each of those items, along with the current list
+ * spinlock and a caller-provided opaque. The @isolate callback can choose to
+ * drop the lock internally, but *must* return with the lock held. The callback
+ * will return an enum lru_status telling the list_lru infrastructure what to
+ * do with the object being scanned.
+ *
+ * Please note that nr_to_walk does not mean how many objects will be freed,
+ * just how many objects will be scanned.
+ *
+ * Return value: the number of objects effectively removed from the LRU.
+ */
+unsigned long list_lru_walk_node(struct list_lru *lru, int nid,
+                                 list_lru_walk_cb isolate, void *cb_arg,
+                                 unsigned long *nr_to_walk);
+
+static inline unsigned long
+list_lru_walk(struct list_lru *lru, list_lru_walk_cb isolate,
+              void *cb_arg, unsigned long nr_to_walk)
+{
+        long isolated = 0;
+        int nid;
+
+        for_each_node_mask(nid, lru->active_nodes) {
+                isolated += list_lru_walk_node(lru, nid, isolate,
+                                               cb_arg, &nr_to_walk);
+                if (nr_to_walk <= 0)
+                        break;
+        }
+        return isolated;
+}
+#endif /* _LRU_LIST_H */
diff --git a/include/linux/llist.h b/include/linux/llist.h
index a5199f6d0e82..8828a78dec9a 100644
--- a/include/linux/llist.h
+++ b/include/linux/llist.h
@@ -125,6 +125,29 @@ static inline void init_llist_head(struct llist_head *list)
              (pos) = llist_entry((pos)->member.next, typeof(*(pos)), member))
 
 /**
+ * llist_for_each_entry_safe - iterate over some deleted entries of lock-less list of given type
+ *                             safe against removal of list entry
+ * @pos:        the type * to use as a loop cursor.
+ * @n:          another type * to use as temporary storage
+ * @node:       the first entry of deleted list entries.
+ * @member:     the name of the llist_node with the struct.
+ *
+ * In general, some entries of the lock-less list can be traversed
+ * safely only after being removed from list, so start with an entry
+ * instead of list head.
+ *
+ * If being used on entries deleted from lock-less list directly, the
+ * traverse order is from the newest to the oldest added entry.  If
+ * you want to traverse from the oldest to the newest, you must
+ * reverse the order by yourself before traversing.
+ */
+#define llist_for_each_entry_safe(pos, n, node, member)                        \
+        for (pos = llist_entry((node), typeof(*pos), member);                  \
+             &pos->member != NULL &&                                           \
+                (n = llist_entry(pos->member.next, typeof(*n), member), true); \
+             pos = n)
+
+/**
  * llist_empty - tests whether a lock-less list is empty
  * @head:       the list to test
  *
@@ -142,6 +165,9 @@ static inline struct llist_node *llist_next(struct llist_node *node)
         return node->next;
 }
 
+extern bool llist_add_batch(struct llist_node *new_first,
+                            struct llist_node *new_last,
+                            struct llist_head *head);
 /**
  * llist_add - add a new entry
  * @new:        new entry to be added
@@ -151,18 +177,7 @@ static inline struct llist_node *llist_next(struct llist_node *node)
  */
 static inline bool llist_add(struct llist_node *new, struct llist_head *head)
 {
-        struct llist_node *entry, *old_entry;
-
-        entry = head->first;
-        for (;;) {
-                old_entry = entry;
-                new->next = entry;
-                entry = cmpxchg(&head->first, old_entry, new);
-                if (entry == old_entry)
-                        break;
-        }
-
-        return old_entry == NULL;
+        return llist_add_batch(new, new, head);
 }
 
 /**
@@ -178,9 +193,6 @@ static inline struct llist_node *llist_del_all(struct llist_head *head)
         return xchg(&head->first, NULL);
 }
 
-extern bool llist_add_batch(struct llist_node *new_first,
-                            struct llist_node *new_last,
-                            struct llist_head *head);
 extern struct llist_node *llist_del_first(struct llist_head *head);
 
 #endif /* LLIST_H */
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index f1e877b79ed8..cfc2f119779a 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -365,7 +365,7 @@ extern void lockdep_trace_alloc(gfp_t mask);
 
 #define lockdep_recursing(tsk)  ((tsk)->lockdep_recursion)
 
-#else /* !LOCKDEP */
+#else /* !CONFIG_LOCKDEP */
 
 static inline void lockdep_off(void)
 {
@@ -479,82 +479,36 @@ static inline void print_irqtrace_events(struct task_struct *curr)
  * on the per lock-class debug mode:
  */
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# ifdef CONFIG_PROVE_LOCKING
-#  define spin_acquire(l, s, t, i)              lock_acquire(l, s, t, 0, 2, NULL, i)
-#  define spin_acquire_nest(l, s, t, n, i)      lock_acquire(l, s, t, 0, 2, n, i)
-# else
-#  define spin_acquire(l, s, t, i)              lock_acquire(l, s, t, 0, 1, NULL, i)
-#  define spin_acquire_nest(l, s, t, n, i)      lock_acquire(l, s, t, 0, 1, NULL, i)
-# endif
-# define spin_release(l, n, i)                  lock_release(l, n, i)
+#ifdef CONFIG_PROVE_LOCKING
+ #define lock_acquire_exclusive(l, s, t, n, i)          lock_acquire(l, s, t, 0, 2, n, i)
+ #define lock_acquire_shared(l, s, t, n, i)             lock_acquire(l, s, t, 1, 2, n, i)
+ #define lock_acquire_shared_recursive(l, s, t, n, i)   lock_acquire(l, s, t, 2, 2, n, i)
 #else
-# define spin_acquire(l, s, t, i)               do { } while (0)
-# define spin_release(l, n, i)                  do { } while (0)
+ #define lock_acquire_exclusive(l, s, t, n, i)          lock_acquire(l, s, t, 0, 1, n, i)
+ #define lock_acquire_shared(l, s, t, n, i)             lock_acquire(l, s, t, 1, 1, n, i)
+ #define lock_acquire_shared_recursive(l, s, t, n, i)   lock_acquire(l, s, t, 2, 1, n, i)
 #endif
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# ifdef CONFIG_PROVE_LOCKING
-#  define rwlock_acquire(l, s, t, i)            lock_acquire(l, s, t, 0, 2, NULL, i)
-#  define rwlock_acquire_read(l, s, t, i)       lock_acquire(l, s, t, 2, 2, NULL, i)
-# else
-#  define rwlock_acquire(l, s, t, i)            lock_acquire(l, s, t, 0, 1, NULL, i)
-#  define rwlock_acquire_read(l, s, t, i)       lock_acquire(l, s, t, 2, 1, NULL, i)
-# endif
-# define rwlock_release(l, n, i)                lock_release(l, n, i)
-#else
-# define rwlock_acquire(l, s, t, i)             do { } while (0)
-# define rwlock_acquire_read(l, s, t, i)        do { } while (0)
-# define rwlock_release(l, n, i)                do { } while (0)
-#endif
+#define spin_acquire(l, s, t, i)                lock_acquire_exclusive(l, s, t, NULL, i)
+#define spin_acquire_nest(l, s, t, n, i)        lock_acquire_exclusive(l, s, t, n, i)
+#define spin_release(l, n, i)                   lock_release(l, n, i)
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# ifdef CONFIG_PROVE_LOCKING
-#  define mutex_acquire(l, s, t, i)             lock_acquire(l, s, t, 0, 2, NULL, i)
-#  define mutex_acquire_nest(l, s, t, n, i)     lock_acquire(l, s, t, 0, 2, n, i)
-# else
-#  define mutex_acquire(l, s, t, i)             lock_acquire(l, s, t, 0, 1, NULL, i)
-#  define mutex_acquire_nest(l, s, t, n, i)     lock_acquire(l, s, t, 0, 1, n, i)
-# endif
-# define mutex_release(l, n, i)                 lock_release(l, n, i)
-#else
-# define mutex_acquire(l, s, t, i)              do { } while (0)
-# define mutex_acquire_nest(l, s, t, n, i)      do { } while (0)
-# define mutex_release(l, n, i)                 do { } while (0)
-#endif
+#define rwlock_acquire(l, s, t, i)              lock_acquire_exclusive(l, s, t, NULL, i)
+#define rwlock_acquire_read(l, s, t, i)         lock_acquire_shared_recursive(l, s, t, NULL, i)
+#define rwlock_release(l, n, i)                 lock_release(l, n, i)
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# ifdef CONFIG_PROVE_LOCKING
-#  define rwsem_acquire(l, s, t, i)             lock_acquire(l, s, t, 0, 2, NULL, i)
-#  define rwsem_acquire_nest(l, s, t, n, i)     lock_acquire(l, s, t, 0, 2, n, i)
-#  define rwsem_acquire_read(l, s, t, i)        lock_acquire(l, s, t, 1, 2, NULL, i)
-# else
-#  define rwsem_acquire(l, s, t, i)             lock_acquire(l, s, t, 0, 1, NULL, i)
-#  define rwsem_acquire_nest(l, s, t, n, i)     lock_acquire(l, s, t, 0, 1, n, i)
-#  define rwsem_acquire_read(l, s, t, i)        lock_acquire(l, s, t, 1, 1, NULL, i)
-# endif
+#define mutex_acquire(l, s, t, i)               lock_acquire_exclusive(l, s, t, NULL, i)
+#define mutex_acquire_nest(l, s, t, n, i)       lock_acquire_exclusive(l, s, t, n, i)
+#define mutex_release(l, n, i)                  lock_release(l, n, i)
+
+#define rwsem_acquire(l, s, t, i)               lock_acquire_exclusive(l, s, t, NULL, i)
+#define rwsem_acquire_nest(l, s, t, n, i)       lock_acquire_exclusive(l, s, t, n, i)
+#define rwsem_acquire_read(l, s, t, i)          lock_acquire_shared(l, s, t, NULL, i)
 # define rwsem_release(l, n, i)                 lock_release(l, n, i)
-#else
-# define rwsem_acquire(l, s, t, i)              do { } while (0)
-# define rwsem_acquire_nest(l, s, t, n, i)      do { } while (0)
-# define rwsem_acquire_read(l, s, t, i)         do { } while (0)
-# define rwsem_release(l, n, i)                 do { } while (0)
-#endif
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# ifdef CONFIG_PROVE_LOCKING
-#  define lock_map_acquire(l)           lock_acquire(l, 0, 0, 0, 2, NULL, _THIS_IP_)
-#  define lock_map_acquire_read(l)      lock_acquire(l, 0, 0, 2, 2, NULL, _THIS_IP_)
-# else
-#  define lock_map_acquire(l)           lock_acquire(l, 0, 0, 0, 1, NULL, _THIS_IP_)
-#  define lock_map_acquire_read(l)      lock_acquire(l, 0, 0, 2, 1, NULL, _THIS_IP_)
-# endif
+#define lock_map_acquire(l)                     lock_acquire_exclusive(l, 0, 0, NULL, _THIS_IP_)
+#define lock_map_acquire_read(l)                lock_acquire_shared_recursive(l, 0, 0, NULL, _THIS_IP_)
 # define lock_map_release(l)                    lock_release(l, 1, _THIS_IP_)
-#else
-# define lock_map_acquire(l)                    do { } while (0)
-# define lock_map_acquire_read(l)               do { } while (0)
-# define lock_map_release(l)                    do { } while (0)
-#endif
 
 #ifdef CONFIG_PROVE_LOCKING
 # define might_lock(lock)                                               \
diff --git a/include/linux/lockref.h b/include/linux/lockref.h
new file mode 100644
index 000000000000..f279ed9a9163
--- /dev/null
+++ b/include/linux/lockref.h
@@ -0,0 +1,39 @@
+#ifndef __LINUX_LOCKREF_H
+#define __LINUX_LOCKREF_H
+
+/*
+ * Locked reference counts.
+ *
+ * These are different from just plain atomic refcounts in that they
+ * are atomic with respect to the spinlock that goes with them.  In
+ * particular, there can be implementations that don't actually get
+ * the spinlock for the common decrement/increment operations, but they
+ * still have to check that the operation is done semantically as if
+ * the spinlock had been taken (using a cmpxchg operation that covers
+ * both the lock and the count word, or using memory transactions, for
+ * example).
+ */
+
+#include <linux/spinlock.h>
+
+struct lockref {
+        union {
+#ifdef CONFIG_CMPXCHG_LOCKREF
+                aligned_u64 lock_count;
+#endif
+                struct {
+                        spinlock_t lock;
+                        unsigned int count;
+                };
+        };
+};
+
+extern void lockref_get(struct lockref *);
+extern int lockref_get_not_zero(struct lockref *);
+extern int lockref_get_or_lock(struct lockref *);
+extern int lockref_put_or_lock(struct lockref *);
+
+extern void lockref_mark_dead(struct lockref *);
+extern int lockref_get_not_dead(struct lockref *);
+
+#endif /* __LINUX_LOCKREF_H */
diff --git a/include/linux/loop.h b/include/linux/loop.h
deleted file mode 100644
index 460b60fa7adf..000000000000
--- a/include/linux/loop.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * include/linux/loop.h
- *
- * Written by Theodore Ts'o, 3/29/93.
- *
- * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
- * permitted under the GNU General Public License.
- */
-#ifndef _LINUX_LOOP_H
-#define _LINUX_LOOP_H
-
-#include <linux/bio.h>
-#include <linux/blkdev.h>
-#include <linux/spinlock.h>
-#include <linux/mutex.h>
-#include <uapi/linux/loop.h>
-
-/* Possible states of device */
-enum {
-        Lo_unbound,
-        Lo_bound,
-        Lo_rundown,
-};
-
-struct loop_func_table;
-
-struct loop_device {
-        int             lo_number;
-        int             lo_refcnt;
-        loff_t          lo_offset;
-        loff_t          lo_sizelimit;
-        int             lo_flags;
-        int             (*transfer)(struct loop_device *, int cmd,
-                                    struct page *raw_page, unsigned raw_off,
-                                    struct page *loop_page, unsigned loop_off,
-                                    int size, sector_t real_block);
-        char            lo_file_name[LO_NAME_SIZE];
-        char            lo_crypt_name[LO_NAME_SIZE];
-        char            lo_encrypt_key[LO_KEY_SIZE];
-        int             lo_encrypt_key_size;
-        struct loop_func_table *lo_encryption;
-        __u32           lo_init[2];
-        kuid_t          lo_key_owner;   /* Who set the key */
-        int             (*ioctl)(struct loop_device *, int cmd, 
-                                 unsigned long arg); 
-
-        struct file *   lo_backing_file;
-        struct block_device *lo_device;
-        unsigned        lo_blocksize;
-        void            *key_data; 
-
-        gfp_t           old_gfp_mask;
-
-        spinlock_t              lo_lock;
-        struct bio_list         lo_bio_list;
-        unsigned int            lo_bio_count;
-        int                     lo_state;
-        struct mutex            lo_ctl_mutex;
-        struct task_struct      *lo_thread;
-        wait_queue_head_t       lo_event;
-        /* wait queue for incoming requests */
-        wait_queue_head_t       lo_req_wait;
-
-        struct request_queue    *lo_queue;
-        struct gendisk          *lo_disk;
-};
-
-/* Support for loadable transfer modules */
-struct loop_func_table {
-        int number;     /* filter type */ 
-        int (*transfer)(struct loop_device *lo, int cmd,
-                        struct page *raw_page, unsigned raw_off,
-                        struct page *loop_page, unsigned loop_off,
-                        int size, sector_t real_block);
-        int (*init)(struct loop_device *, const struct loop_info64 *); 
-        /* release is called from loop_unregister_transfer or clr_fd */
-        int (*release)(struct loop_device *); 
-        int (*ioctl)(struct loop_device *, int cmd, unsigned long arg);
-        struct module *owner;
-}; 
-
-int loop_register_transfer(struct loop_func_table *funcs);
-int loop_unregister_transfer(int number); 
-
-#endif
diff --git a/include/linux/lz4.h b/include/linux/lz4.h
new file mode 100644
index 000000000000..4356686b0a39
--- /dev/null
+++ b/include/linux/lz4.h
@@ -0,0 +1,87 @@
+#ifndef __LZ4_H__
+#define __LZ4_H__
+/*
+ * LZ4 Kernel Interface
+ *
+ * Copyright (C) 2013, LG Electronics, Kyungsik Lee <kyungsik.lee@lge.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.
+ */
+#define LZ4_MEM_COMPRESS        (4096 * sizeof(unsigned char *))
+#define LZ4HC_MEM_COMPRESS      (65538 * sizeof(unsigned char *))
+
+/*
+ * lz4_compressbound()
+ * Provides the maximum size that LZ4 may output in a "worst case" scenario
+ * (input data not compressible)
+ */
+static inline size_t lz4_compressbound(size_t isize)
+{
+        return isize + (isize / 255) + 16;
+}
+
+/*
+ * lz4_compress()
+ *      src     : source address of the original data
+ *      src_len : size of the original data
+ *      dst     : output buffer address of the compressed data
+ *              This requires 'dst' of size LZ4_COMPRESSBOUND.
+ *      dst_len : is the output size, which is returned after compress done
+ *      workmem : address of the working memory.
+ *              This requires 'workmem' of size LZ4_MEM_COMPRESS.
+ *      return  : Success if return 0
+ *                Error if return (< 0)
+ *      note :  Destination buffer and workmem must be already allocated with
+ *              the defined size.
+ */
+int lz4_compress(const unsigned char *src, size_t src_len,
+                unsigned char *dst, size_t *dst_len, void *wrkmem);
+
+ /*
+  * lz4hc_compress()
+  *      src     : source address of the original data
+  *      src_len : size of the original data
+  *      dst     : output buffer address of the compressed data
+  *             This requires 'dst' of size LZ4_COMPRESSBOUND.
+  *      dst_len : is the output size, which is returned after compress done
+  *      workmem : address of the working memory.
+  *             This requires 'workmem' of size LZ4HC_MEM_COMPRESS.
+  *      return  : Success if return 0
+  *                Error if return (< 0)
+  *      note :  Destination buffer and workmem must be already allocated with
+  *              the defined size.
+  */
+int lz4hc_compress(const unsigned char *src, size_t src_len,
+                unsigned char *dst, size_t *dst_len, void *wrkmem);
+
+/*
+ * lz4_decompress()
+ *      src     : source address of the compressed data
+ *      src_len : is the input size, whcih is returned after decompress done
+ *      dest    : output buffer address of the decompressed data
+ *      actual_dest_len: is the size of uncompressed data, supposing it's known
+ *      return  : Success if return 0
+ *                Error if return (< 0)
+ *      note :  Destination buffer must be already allocated.
+ *              slightly faster than lz4_decompress_unknownoutputsize()
+ */
+int lz4_decompress(const unsigned char *src, size_t *src_len,
+                unsigned char *dest, size_t actual_dest_len);
+
+/*
+ * lz4_decompress_unknownoutputsize()
+ *      src     : source address of the compressed data
+ *      src_len : is the input size, therefore the compressed size
+ *      dest    : output buffer address of the decompressed data
+ *      dest_len: is the max size of the destination buffer, which is
+ *                      returned with actual size of decompressed data after
+ *                      decompress done
+ *      return  : Success if return 0
+ *                Error if return (< 0)
+ *      note :  Destination buffer must be already allocated.
+ */
+int lz4_decompress_unknownoutputsize(const unsigned char *src, size_t src_len,
+                unsigned char *dest, size_t *dest_len);
+#endif
diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h
index dd3c34ebca9a..8e9a029e093d 100644
--- a/include/linux/marvell_phy.h
+++ b/include/linux/marvell_phy.h
@@ -14,6 +14,8 @@
 #define MARVELL_PHY_ID_88E1149R         0x01410e50
 #define MARVELL_PHY_ID_88E1240          0x01410e30
 #define MARVELL_PHY_ID_88E1318S         0x01410e90
+#define MARVELL_PHY_ID_88E1116R         0x01410e40
+#define MARVELL_PHY_ID_88E1510          0x01410dd0
 
 /* struct phy_device dev_flags definitions */
 #define MARVELL_PHY_M1145_FLAGS_RESISTANCE      0x00000001
diff --git a/include/linux/math64.h b/include/linux/math64.h
index b8ba85544721..69ed5f5e9f6e 100644
--- a/include/linux/math64.h
+++ b/include/linux/math64.h
@@ -6,7 +6,8 @@
 
 #if BITS_PER_LONG == 64
 
-#define div64_long(x,y) div64_s64((x),(y))
+#define div64_long(x, y) div64_s64((x), (y))
+#define div64_ul(x, y)   div64_u64((x), (y))
 
 /**
  * div_u64_rem - unsigned 64bit divide with 32bit divisor with remainder
@@ -30,6 +31,15 @@ static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
 }
 
 /**
+ * div64_u64_rem - unsigned 64bit divide with 64bit divisor and remainder
+ */
+static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
+{
+        *remainder = dividend % divisor;
+        return dividend / divisor;
+}
+
+/**
  * div64_u64 - unsigned 64bit divide with 64bit divisor
  */
 static inline u64 div64_u64(u64 dividend, u64 divisor)
@@ -47,7 +57,8 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
 
 #elif BITS_PER_LONG == 32
 
-#define div64_long(x,y) div_s64((x),(y))
+#define div64_long(x, y) div_s64((x), (y))
+#define div64_ul(x, y)   div_u64((x), (y))
 
 #ifndef div_u64_rem
 static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
@@ -61,6 +72,10 @@ static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
 extern s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder);
 #endif
 
+#ifndef div64_u64_rem
+extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
+#endif
+
 #ifndef div64_u64
 extern u64 div64_u64(u64 dividend, u64 divisor);
 #endif
diff --git a/include/linux/mbus.h b/include/linux/mbus.h
index dba482e31a13..345b8c53b897 100644
--- a/include/linux/mbus.h
+++ b/include/linux/mbus.h
@@ -11,6 +11,8 @@
 #ifndef __LINUX_MBUS_H
 #define __LINUX_MBUS_H
 
+struct resource;
+
 struct mbus_dram_target_info
 {
         /*
@@ -59,14 +61,18 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info(void)
 }
 #endif
 
-int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,
-                                      size_t size, phys_addr_t remap,
-                                      unsigned int flags);
-int mvebu_mbus_add_window(const char *devname, phys_addr_t base,
-                          size_t size);
+void mvebu_mbus_get_pcie_mem_aperture(struct resource *res);
+void mvebu_mbus_get_pcie_io_aperture(struct resource *res);
+int mvebu_mbus_add_window_remap_by_id(unsigned int target,
+                                      unsigned int attribute,
+                                      phys_addr_t base, size_t size,
+                                      phys_addr_t remap);
+int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute,
+                                phys_addr_t base, size_t size);
 int mvebu_mbus_del_window(phys_addr_t base, size_t size);
 int mvebu_mbus_init(const char *soc, phys_addr_t mbus_phys_base,
                     size_t mbus_size, phys_addr_t sdram_phys_base,
                     size_t sdram_size);
+int mvebu_mbus_dt_init(void);
 
 #endif /* __LINUX_MBUS_H */
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index f388203db7e8..31e95acddb4d 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -60,6 +60,8 @@ int memblock_reserve(phys_addr_t base, phys_addr_t size);
 void memblock_trim_memory(phys_addr_t align);
 
 #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
+int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn,
+                            unsigned long  *end_pfn);
 void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
                           unsigned long *out_end_pfn, int *out_nid);
 
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index d6183f06d8c1..ecc82b37c4cc 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -30,9 +30,21 @@ struct page;
 struct mm_struct;
 struct kmem_cache;
 
-/* Stats that can be updated by kernel. */
-enum mem_cgroup_page_stat_item {
-        MEMCG_NR_FILE_MAPPED, /* # of pages charged as file rss */
+/*
+ * The corresponding mem_cgroup_stat_names is defined in mm/memcontrol.c,
+ * These two lists should keep in accord with each other.
+ */
+enum mem_cgroup_stat_index {
+        /*
+         * For MEM_CONTAINER_TYPE_ALL, usage = pagecache + rss.
+         */
+        MEM_CGROUP_STAT_CACHE,          /* # of pages charged as cache */
+        MEM_CGROUP_STAT_RSS,            /* # of pages charged as anon rss */
+        MEM_CGROUP_STAT_RSS_HUGE,       /* # of pages charged as anon huge */
+        MEM_CGROUP_STAT_FILE_MAPPED,    /* # of pages charged as file rss */
+        MEM_CGROUP_STAT_WRITEBACK,      /* # of pages under writeback */
+        MEM_CGROUP_STAT_SWAP,           /* # of pages, swapped out */
+        MEM_CGROUP_STAT_NSTATS,
 };
 
 struct mem_cgroup_reclaim_cookie {
@@ -77,14 +89,15 @@ extern void mem_cgroup_uncharge_cache_page(struct page *page);
 
 bool __mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
                                   struct mem_cgroup *memcg);
-int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *memcg);
+bool task_in_mem_cgroup(struct task_struct *task,
+                        const struct mem_cgroup *memcg);
 
 extern struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page);
 extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
 extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);
 
 extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
-extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
+extern struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css);
 
 static inline
 bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
@@ -124,6 +137,48 @@ extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
 extern void mem_cgroup_replace_page_cache(struct page *oldpage,
                                         struct page *newpage);
 
+/**
+ * mem_cgroup_toggle_oom - toggle the memcg OOM killer for the current task
+ * @new: true to enable, false to disable
+ *
+ * Toggle whether a failed memcg charge should invoke the OOM killer
+ * or just return -ENOMEM.  Returns the previous toggle state.
+ *
+ * NOTE: Any path that enables the OOM killer before charging must
+ *       call mem_cgroup_oom_synchronize() afterward to finalize the
+ *       OOM handling and clean up.
+ */
+static inline bool mem_cgroup_toggle_oom(bool new)
+{
+        bool old;
+
+        old = current->memcg_oom.may_oom;
+        current->memcg_oom.may_oom = new;
+
+        return old;
+}
+
+static inline void mem_cgroup_enable_oom(void)
+{
+        bool old = mem_cgroup_toggle_oom(true);
+
+        WARN_ON(old == true);
+}
+
+static inline void mem_cgroup_disable_oom(void)
+{
+        bool old = mem_cgroup_toggle_oom(false);
+
+        WARN_ON(old == false);
+}
+
+static inline bool task_in_memcg_oom(struct task_struct *p)
+{
+        return p->memcg_oom.in_memcg_oom;
+}
+
+bool mem_cgroup_oom_synchronize(void);
+
 #ifdef CONFIG_MEMCG_SWAP
 extern int do_swap_account;
 #endif
@@ -164,17 +219,17 @@ static inline void mem_cgroup_end_update_page_stat(struct page *page,
 }
 
 void mem_cgroup_update_page_stat(struct page *page,
-                                 enum mem_cgroup_page_stat_item idx,
+                                 enum mem_cgroup_stat_index idx,
                                  int val);
 
 static inline void mem_cgroup_inc_page_stat(struct page *page,
-                                            enum mem_cgroup_page_stat_item idx)
+                                            enum mem_cgroup_stat_index idx)
 {
         mem_cgroup_update_page_stat(page, idx, 1);
 }
 
 static inline void mem_cgroup_dec_page_stat(struct page *page,
-                                            enum mem_cgroup_page_stat_item idx)
+                                            enum mem_cgroup_stat_index idx)
 {
         mem_cgroup_update_page_stat(page, idx, -1);
 }
@@ -273,10 +328,10 @@ static inline bool mm_match_cgroup(struct mm_struct *mm,
         return true;
 }
 
-static inline int task_in_mem_cgroup(struct task_struct *task,
-                                     const struct mem_cgroup *memcg)
+static inline bool task_in_mem_cgroup(struct task_struct *task,
+                                      const struct mem_cgroup *memcg)
 {
-        return 1;
+        return true;
 }
 
 static inline struct cgroup_subsys_state
@@ -347,13 +402,36 @@ static inline void mem_cgroup_end_update_page_stat(struct page *page,
 {
 }
 
+static inline bool mem_cgroup_toggle_oom(bool new)
+{
+        return false;
+}
+
+static inline void mem_cgroup_enable_oom(void)
+{
+}
+
+static inline void mem_cgroup_disable_oom(void)
+{
+}
+
+static inline bool task_in_memcg_oom(struct task_struct *p)
+{
+        return false;
+}
+
+static inline bool mem_cgroup_oom_synchronize(void)
+{
+        return false;
+}
+
 static inline void mem_cgroup_inc_page_stat(struct page *page,
-                                            enum mem_cgroup_page_stat_item idx)
+                                            enum mem_cgroup_stat_index idx)
 {
 }
 
 static inline void mem_cgroup_dec_page_stat(struct page *page,
-                                            enum mem_cgroup_page_stat_item idx)
+                                            enum mem_cgroup_stat_index idx)
 {
 }
 
diff --git a/include/linux/memory.h b/include/linux/memory.h
index 85c31a8e2904..9a6bbf76452d 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -25,16 +25,9 @@
 struct memory_block {
         unsigned long start_section_nr;
         unsigned long end_section_nr;
-        unsigned long state;
-        int section_count;
-
-        /*
-         * This serializes all state change requests.  It isn't
-         * held during creation because the control files are
-         * created long after the critical areas during
-         * initialization.
-         */
-        struct mutex state_mutex;
+        unsigned long state;            /* serialized by the dev->lock */
+        int section_count;              /* serialized by mem_sysfs_mutex */
+        int online_type;                /* for passing data to online routine */
         int phys_device;                /* to which fru does this belong? */
         void *hw;                       /* optional pointer to fw/hw data */
         int (*phys_callback)(struct memory_block *);
@@ -125,7 +118,6 @@ extern struct memory_block *find_memory_block_hinted(struct mem_section *,
                                                         struct memory_block *);
 extern struct memory_block *find_memory_block(struct mem_section *);
 #define CONFIG_MEM_BLOCK_SIZE   (PAGES_PER_SECTION<<PAGE_SHIFT)
-enum mem_add_context { BOOT, HOTPLUG };
 #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
 
 #ifdef CONFIG_MEMORY_HOTPLUG
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 3e622c610925..dd38e62b84d2 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -234,6 +234,8 @@ static inline void unlock_memory_hotplug(void) {}
 
 extern int is_mem_section_removable(unsigned long pfn, unsigned long nr_pages);
 extern void try_offline_node(int nid);
+extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
+extern void remove_memory(int nid, u64 start, u64 size);
 
 #else
 static inline int is_mem_section_removable(unsigned long pfn,
@@ -243,15 +245,23 @@ static inline int is_mem_section_removable(unsigned long pfn,
 }
 
 static inline void try_offline_node(int nid) {}
+
+static inline int offline_pages(unsigned long start_pfn, unsigned long nr_pages)
+{
+        return -EINVAL;
+}
+
+static inline void remove_memory(int nid, u64 start, u64 size) {}
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 
+extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
+                void *arg, int (*func)(struct memory_block *, void *));
 extern int mem_online_node(int nid);
 extern int add_memory(int nid, u64 start, u64 size);
 extern int arch_add_memory(int nid, u64 start, u64 size);
 extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
-extern int offline_memory_block(struct memory_block *mem);
 extern bool is_memblock_offlined(struct memory_block *mem);
-extern int remove_memory(int nid, u64 start, u64 size);
+extern void remove_memory(int nid, u64 start, u64 size);
 extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
                                                                 int nr_pages);
 extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms);
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 0d7df39a5885..da6716b9e3fe 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -91,7 +91,6 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
 }
 
 #define vma_policy(vma) ((vma)->vm_policy)
-#define vma_set_policy(vma, pol) ((vma)->vm_policy = (pol))
 
 static inline void mpol_get(struct mempolicy *pol)
 {
@@ -126,6 +125,7 @@ struct shared_policy {
         spinlock_t lock;
 };
 
+int vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst);
 void mpol_shared_policy_init(struct shared_policy *sp, struct mempolicy *mpol);
 int mpol_set_shared_policy(struct shared_policy *info,
                                 struct vm_area_struct *vma,
@@ -173,7 +173,7 @@ extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol);
 /* Check if a vma is migratable */
 static inline int vma_migratable(struct vm_area_struct *vma)
 {
-        if (vma->vm_flags & (VM_IO | VM_HUGETLB | VM_PFNMAP))
+        if (vma->vm_flags & (VM_IO | VM_PFNMAP))
                 return 0;
         /*
          * Migration allocates pages in the highest zone. If we cannot
@@ -240,7 +240,12 @@ mpol_shared_policy_lookup(struct shared_policy *sp, unsigned long idx)
 }
 
 #define vma_policy(vma) NULL
-#define vma_set_policy(vma, pol) do {} while(0)
+
+static inline int
+vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
+{
+        return 0;
+}
 
 static inline void numa_policy_init(void)
 {
diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h
index e94537befabd..97cb283cc8e1 100644
--- a/include/linux/mfd/88pm80x.h
+++ b/include/linux/mfd/88pm80x.h
@@ -17,7 +17,6 @@
 #include <linux/regmap.h>
 #include <linux/atomic.h>
 
-#define PM80X_VERSION_MASK              (0xFF)  /* 80X chip ID mask */
 enum {
         CHIP_INVALID = 0,
         CHIP_PM800,
@@ -299,8 +298,7 @@ struct pm80x_chip {
         struct regmap *regmap;
         struct regmap_irq_chip *regmap_irq_chip;
         struct regmap_irq_chip_data *irq_data;
-        unsigned char version;
-        int id;
+        int type;
         int irq;
         int irq_mode;
         unsigned long wu_flag;
@@ -309,8 +307,14 @@ struct pm80x_chip {
 
 struct pm80x_platform_data {
         struct pm80x_rtc_pdata *rtc;
-        unsigned short power_page_addr; /* power page I2C address */
-        unsigned short gpadc_page_addr; /* gpadc page I2C address */
+        /*
+         * For the regulator not defined, set regulators[not_defined] to be
+         * NULL. num_regulators are the number of regulators supposed to be
+         * initialized. If all regulators are not defined, set num_regulators
+         * to be 0.
+         */
+        struct regulator_init_data *regulators[PM800_ID_RG_MAX];
+        unsigned int num_regulators;
         int irq_mode;           /* Clear interrupt by read/write(0/1) */
         int batt_det;           /* enable/disable */
         int (*plat_config)(struct pm80x_chip *chip,
@@ -363,7 +367,6 @@ static inline int pm80x_dev_resume(struct device *dev)
 }
 #endif
 
-extern int pm80x_init(struct i2c_client *client,
-                      const struct i2c_device_id *id);
+extern int pm80x_init(struct i2c_client *client);
 extern int pm80x_deinit(void);
 #endif /* __LINUX_MFD_88PM80X_H */
diff --git a/include/linux/mfd/abx500/ab8500-sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h
index 990bc93f46e1..adba89d9c660 100644
--- a/include/linux/mfd/abx500/ab8500-sysctrl.h
+++ b/include/linux/mfd/abx500/ab8500-sysctrl.h
@@ -278,8 +278,8 @@ struct ab8500_sysctrl_platform_data {
 
 #define AB9540_SYSCLK12CONFCTRL_PLL26TO38ENA BIT(0)
 #define AB9540_SYSCLK12CONFCTRL_SYSCLK12USBMUXSEL BIT(1)
-#define AB9540_SYSCLK12CONFCTRL_INT384MHZMUXSEL_MASK 0x0C
-#define AB9540_SYSCLK12CONFCTRL_INT384MHZMUXSEL_SHIFT 2
+#define AB9540_SYSCLK12CONFCTRL_INT384MHZMUXSEL0 BIT(2)
+#define AB9540_SYSCLK12CONFCTRL_INT384MHZMUXSEL1 BIT(3)
 #define AB9540_SYSCLK12CONFCTRL_SYSCLK12BUFMUX BIT(4)
 #define AB9540_SYSCLK12CONFCTRL_SYSCLK12PLLMUX BIT(5)
 #define AB9540_SYSCLK12CONFCTRL_SYSCLK2MUXVALID BIT(6)
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 0390d5943ed6..f4acd898dac9 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -291,6 +291,8 @@ enum ab8500_version {
 #define AB8540_INT_FSYNC2R              213
 #define AB8540_INT_BITCLK2F             214
 #define AB8540_INT_BITCLK2R             215
+/* ab8540_irq_regoffset[27] -> IT[Source|Latch|Mask]33 */
+#define AB8540_INT_RTC_1S               216
 
 /*
  * AB8500_AB9540_NR_IRQS is used when configuring the IRQ numbers for the
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h
index cc281368dc55..5cf8b91ce996 100644
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -23,6 +23,7 @@
 enum arizona_type {
         WM5102 = 1,
         WM5110 = 2,
+        WM8997 = 3,
 };
 
 #define ARIZONA_IRQ_GP1                    0
@@ -95,6 +96,8 @@ struct arizona {
 
         struct arizona_pdata pdata;
 
+        unsigned int external_dcvdd:1;
+
         int irq;
         struct irq_domain *virq;
         struct regmap_irq_chip_data *aod_irq_chip;
@@ -119,5 +122,6 @@ int arizona_set_irq_wake(struct arizona *arizona, int irq, int on);
 
 int wm5102_patch(struct arizona *arizona);
 int wm5110_patch(struct arizona *arizona);
+int wm8997_patch(struct arizona *arizona);
 
 #endif
diff --git a/include/linux/mfd/arizona/gpio.h b/include/linux/mfd/arizona/gpio.h
new file mode 100644
index 000000000000..d2146bb74f89
--- /dev/null
+++ b/include/linux/mfd/arizona/gpio.h
@@ -0,0 +1,96 @@
+/*
+ * GPIO configuration for Arizona devices
+ *
+ * Copyright 2013 Wolfson Microelectronics. PLC.
+ *
+ * Author: Charles Keepax <ckeepax@opensource.wolfsonmicro.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 _ARIZONA_GPIO_H
+#define _ARIZONA_GPIO_H
+
+#define ARIZONA_GP_FN_TXLRCLK                    0x00
+#define ARIZONA_GP_FN_GPIO                       0x01
+#define ARIZONA_GP_FN_IRQ1                       0x02
+#define ARIZONA_GP_FN_IRQ2                       0x03
+#define ARIZONA_GP_FN_OPCLK                      0x04
+#define ARIZONA_GP_FN_FLL1_OUT                   0x05
+#define ARIZONA_GP_FN_FLL2_OUT                   0x06
+#define ARIZONA_GP_FN_PWM1                       0x08
+#define ARIZONA_GP_FN_PWM2                       0x09
+#define ARIZONA_GP_FN_SYSCLK_UNDERCLOCKED        0x0A
+#define ARIZONA_GP_FN_ASYNCCLK_UNDERCLOCKED      0x0B
+#define ARIZONA_GP_FN_FLL1_LOCK                  0x0C
+#define ARIZONA_GP_FN_FLL2_LOCK                  0x0D
+#define ARIZONA_GP_FN_FLL1_CLOCK_OK              0x0F
+#define ARIZONA_GP_FN_FLL2_CLOCK_OK              0x10
+#define ARIZONA_GP_FN_HEADPHONE_DET              0x12
+#define ARIZONA_GP_FN_MIC_DET                    0x13
+#define ARIZONA_GP_FN_WSEQ_STATUS                0x15
+#define ARIZONA_GP_FN_CIF_ADDRESS_ERROR          0x16
+#define ARIZONA_GP_FN_ASRC1_LOCK                 0x1A
+#define ARIZONA_GP_FN_ASRC2_LOCK                 0x1B
+#define ARIZONA_GP_FN_ASRC_CONFIG_ERROR          0x1C
+#define ARIZONA_GP_FN_DRC1_SIGNAL_DETECT         0x1D
+#define ARIZONA_GP_FN_DRC1_ANTICLIP              0x1E
+#define ARIZONA_GP_FN_DRC1_DECAY                 0x1F
+#define ARIZONA_GP_FN_DRC1_NOISE                 0x20
+#define ARIZONA_GP_FN_DRC1_QUICK_RELEASE         0x21
+#define ARIZONA_GP_FN_DRC2_SIGNAL_DETECT         0x22
+#define ARIZONA_GP_FN_DRC2_ANTICLIP              0x23
+#define ARIZONA_GP_FN_DRC2_DECAY                 0x24
+#define ARIZONA_GP_FN_DRC2_NOISE                 0x25
+#define ARIZONA_GP_FN_DRC2_QUICK_RELEASE         0x26
+#define ARIZONA_GP_FN_MIXER_DROPPED_SAMPLE       0x27
+#define ARIZONA_GP_FN_AIF1_CONFIG_ERROR          0x28
+#define ARIZONA_GP_FN_AIF2_CONFIG_ERROR          0x29
+#define ARIZONA_GP_FN_AIF3_CONFIG_ERROR          0x2A
+#define ARIZONA_GP_FN_SPK_TEMP_SHUTDOWN          0x2B
+#define ARIZONA_GP_FN_SPK_TEMP_WARNING           0x2C
+#define ARIZONA_GP_FN_UNDERCLOCKED               0x2D
+#define ARIZONA_GP_FN_OVERCLOCKED                0x2E
+#define ARIZONA_GP_FN_DSP_IRQ1                   0x35
+#define ARIZONA_GP_FN_DSP_IRQ2                   0x36
+#define ARIZONA_GP_FN_ASYNC_OPCLK                0x3D
+#define ARIZONA_GP_FN_BOOT_DONE                  0x44
+#define ARIZONA_GP_FN_DSP1_RAM_READY             0x45
+#define ARIZONA_GP_FN_SYSCLK_ENA_STATUS          0x4B
+#define ARIZONA_GP_FN_ASYNCCLK_ENA_STATUS        0x4C
+
+#define ARIZONA_GPN_DIR                          0x8000  /* GPN_DIR */
+#define ARIZONA_GPN_DIR_MASK                     0x8000  /* GPN_DIR */
+#define ARIZONA_GPN_DIR_SHIFT                        15  /* GPN_DIR */
+#define ARIZONA_GPN_DIR_WIDTH                         1  /* GPN_DIR */
+#define ARIZONA_GPN_PU                           0x4000  /* GPN_PU */
+#define ARIZONA_GPN_PU_MASK                      0x4000  /* GPN_PU */
+#define ARIZONA_GPN_PU_SHIFT                         14  /* GPN_PU */
+#define ARIZONA_GPN_PU_WIDTH                          1  /* GPN_PU */
+#define ARIZONA_GPN_PD                           0x2000  /* GPN_PD */
+#define ARIZONA_GPN_PD_MASK                      0x2000  /* GPN_PD */
+#define ARIZONA_GPN_PD_SHIFT                         13  /* GPN_PD */
+#define ARIZONA_GPN_PD_WIDTH                          1  /* GPN_PD */
+#define ARIZONA_GPN_LVL                          0x0800  /* GPN_LVL */
+#define ARIZONA_GPN_LVL_MASK                     0x0800  /* GPN_LVL */
+#define ARIZONA_GPN_LVL_SHIFT                        11  /* GPN_LVL */
+#define ARIZONA_GPN_LVL_WIDTH                         1  /* GPN_LVL */
+#define ARIZONA_GPN_POL                          0x0400  /* GPN_POL */
+#define ARIZONA_GPN_POL_MASK                     0x0400  /* GPN_POL */
+#define ARIZONA_GPN_POL_SHIFT                        10  /* GPN_POL */
+#define ARIZONA_GPN_POL_WIDTH                         1  /* GPN_POL */
+#define ARIZONA_GPN_OP_CFG                       0x0200  /* GPN_OP_CFG */
+#define ARIZONA_GPN_OP_CFG_MASK                  0x0200  /* GPN_OP_CFG */
+#define ARIZONA_GPN_OP_CFG_SHIFT                      9  /* GPN_OP_CFG */
+#define ARIZONA_GPN_OP_CFG_WIDTH                      1  /* GPN_OP_CFG */
+#define ARIZONA_GPN_DB                           0x0100  /* GPN_DB */
+#define ARIZONA_GPN_DB_MASK                      0x0100  /* GPN_DB */
+#define ARIZONA_GPN_DB_SHIFT                          8  /* GPN_DB */
+#define ARIZONA_GPN_DB_WIDTH                          1  /* GPN_DB */
+#define ARIZONA_GPN_FN_MASK                      0x007F  /* GPN_DB */
+#define ARIZONA_GPN_FN_SHIFT                          0  /* GPN_DB */
+#define ARIZONA_GPN_FN_WIDTH                          7  /* GPN_DB */
+
+#endif
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 80dead1f7100..12a5c135c746 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -77,7 +77,7 @@ struct arizona_micbias {
         int mV;                    /** Regulated voltage */
         unsigned int ext_cap:1;    /** External capacitor fitted */
         unsigned int discharge:1;  /** Actively discharge */
-        unsigned int fast_start:1; /** Enable aggressive startup ramp rate */
+        unsigned int soft_start:1; /** Disable aggressive startup ramp rate */
         unsigned int bypass:1;     /** Use bypass mode */
 };
 
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index 715b6ba3d52a..4706d3d46e56 100644
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -215,6 +215,9 @@
 #define ARIZONA_DAC_DIGITAL_VOLUME_6R            0x43D
 #define ARIZONA_DAC_VOLUME_LIMIT_6R              0x43E
 #define ARIZONA_NOISE_GATE_SELECT_6R             0x43F
+#define ARIZONA_DRE_ENABLE                       0x440
+#define ARIZONA_DRE_CONTROL_2                    0x442
+#define ARIZONA_DRE_CONTROL_3                    0x443
 #define ARIZONA_DAC_AEC_CONTROL_1                0x450
 #define ARIZONA_NOISE_GATE_CONTROL               0x458
 #define ARIZONA_PDM_SPK1_CTRL_1                  0x490
@@ -1002,6 +1005,7 @@
 #define ARIZONA_DSP2_CLOCKING_1                  0x1201
 #define ARIZONA_DSP2_STATUS_1                    0x1204
 #define ARIZONA_DSP2_STATUS_2                    0x1205
+#define ARIZONA_DSP2_STATUS_3                    0x1206
 #define ARIZONA_DSP2_SCRATCH_0                   0x1240
 #define ARIZONA_DSP2_SCRATCH_1                   0x1241
 #define ARIZONA_DSP2_SCRATCH_2                   0x1242
@@ -1010,6 +1014,7 @@
 #define ARIZONA_DSP3_CLOCKING_1                  0x1301
 #define ARIZONA_DSP3_STATUS_1                    0x1304
 #define ARIZONA_DSP3_STATUS_2                    0x1305
+#define ARIZONA_DSP3_STATUS_3                    0x1306
 #define ARIZONA_DSP3_SCRATCH_0                   0x1340
 #define ARIZONA_DSP3_SCRATCH_1                   0x1341
 #define ARIZONA_DSP3_SCRATCH_2                   0x1342
@@ -1018,6 +1023,7 @@
 #define ARIZONA_DSP4_CLOCKING_1                  0x1401
 #define ARIZONA_DSP4_STATUS_1                    0x1404
 #define ARIZONA_DSP4_STATUS_2                    0x1405
+#define ARIZONA_DSP4_STATUS_3                    0x1406
 #define ARIZONA_DSP4_SCRATCH_0                   0x1440
 #define ARIZONA_DSP4_SCRATCH_1                   0x1441
 #define ARIZONA_DSP4_SCRATCH_2                   0x1442
@@ -3130,6 +3136,47 @@
 #define ARIZONA_OUT6R_NGATE_SRC_WIDTH                12  /* OUT6R_NGATE_SRC - [11:0] */
 
 /*
+ * R1088 (0x440) - DRE Enable
+ */
+#define ARIZONA_DRE3L_ENA                        0x0010  /* DRE3L_ENA */
+#define ARIZONA_DRE3L_ENA_MASK                   0x0010  /* DRE3L_ENA */
+#define ARIZONA_DRE3L_ENA_SHIFT                       4  /* DRE3L_ENA */
+#define ARIZONA_DRE3L_ENA_WIDTH                       1  /* DRE3L_ENA */
+#define ARIZONA_DRE2R_ENA                        0x0008  /* DRE2R_ENA */
+#define ARIZONA_DRE2R_ENA_MASK                   0x0008  /* DRE2R_ENA */
+#define ARIZONA_DRE2R_ENA_SHIFT                       3  /* DRE2R_ENA */
+#define ARIZONA_DRE2R_ENA_WIDTH                       1  /* DRE2R_ENA */
+#define ARIZONA_DRE2L_ENA                        0x0004  /* DRE2L_ENA */
+#define ARIZONA_DRE2L_ENA_MASK                   0x0004  /* DRE2L_ENA */
+#define ARIZONA_DRE2L_ENA_SHIFT                       2  /* DRE2L_ENA */
+#define ARIZONA_DRE2L_ENA_WIDTH                       1  /* DRE2L_ENA */
+#define ARIZONA_DRE1R_ENA                        0x0002  /* DRE1R_ENA */
+#define ARIZONA_DRE1R_ENA_MASK                   0x0002  /* DRE1R_ENA */
+#define ARIZONA_DRE1R_ENA_SHIFT                       1  /* DRE1R_ENA */
+#define ARIZONA_DRE1R_ENA_WIDTH                       1  /* DRE1R_ENA */
+#define ARIZONA_DRE1L_ENA                        0x0001  /* DRE1L_ENA */
+#define ARIZONA_DRE1L_ENA_MASK                   0x0001  /* DRE1L_ENA */
+#define ARIZONA_DRE1L_ENA_SHIFT                       0  /* DRE1L_ENA */
+#define ARIZONA_DRE1L_ENA_WIDTH                       1  /* DRE1L_ENA */
+
+/*
+ * R1090 (0x442) - DRE Control 2
+ */
+#define ARIZONA_DRE_T_LOW_MASK                   0x3F00  /* DRE_T_LOW - [13:8] */
+#define ARIZONA_DRE_T_LOW_SHIFT                       8  /* DRE_T_LOW - [13:8] */
+#define ARIZONA_DRE_T_LOW_WIDTH                       6  /* DRE_T_LOW - [13:8] */
+
+/*
+ * R1091 (0x443) - DRE Control 3
+ */
+#define ARIZONA_DRE_GAIN_SHIFT_MASK              0xC000  /* DRE_GAIN_SHIFT - [15:14] */
+#define ARIZONA_DRE_GAIN_SHIFT_SHIFT                 14  /* DRE_GAIN_SHIFT - [15:14] */
+#define ARIZONA_DRE_GAIN_SHIFT_WIDTH                  2  /* DRE_GAIN_SHIFT - [15:14] */
+#define ARIZONA_DRE_LOW_LEVEL_ABS_MASK           0x000F  /* LOW_LEVEL_ABS - [3:0] */
+#define ARIZONA_DRE_LOW_LEVEL_ABS_SHIFT               0  /* LOW_LEVEL_ABS - [3:0] */
+#define ARIZONA_DRE_LOW_LEVEL_ABS_WIDTH               4  /* LOW_LEVEL_ABS - [3:0] */
+
+/*
  * R1104 (0x450) - DAC AEC Control 1
  */
 #define ARIZONA_AEC_LOOPBACK_SRC_MASK            0x003C  /* AEC_LOOPBACK_SRC - [5:2] */
diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
new file mode 100644
index 000000000000..2d2a0af675fd
--- /dev/null
+++ b/include/linux/mfd/da9063/core.h
@@ -0,0 +1,93 @@
+/*
+ * Definitions for DA9063 MFD driver
+ *
+ * Copyright 2012 Dialog Semiconductor Ltd.
+ *
+ * Author: Michal Hajduk <michal.hajduk@diasemi.com>
+ *         Krystian Garbaciak <krystian.garbaciak@diasemi.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#ifndef __MFD_DA9063_CORE_H__
+#define __MFD_DA9063_CORE_H__
+
+#include <linux/interrupt.h>
+#include <linux/mfd/da9063/registers.h>
+
+/* DA9063 modules */
+#define DA9063_DRVNAME_CORE             "da9063-core"
+#define DA9063_DRVNAME_REGULATORS       "da9063-regulators"
+#define DA9063_DRVNAME_LEDS             "da9063-leds"
+#define DA9063_DRVNAME_WATCHDOG         "da9063-watchdog"
+#define DA9063_DRVNAME_HWMON            "da9063-hwmon"
+#define DA9063_DRVNAME_ONKEY            "da9063-onkey"
+#define DA9063_DRVNAME_RTC              "da9063-rtc"
+#define DA9063_DRVNAME_VIBRATION        "da9063-vibration"
+
+enum da9063_models {
+        PMIC_DA9063 = 0x61,
+};
+
+/* Interrupts */
+enum da9063_irqs {
+        DA9063_IRQ_ONKEY = 0,
+        DA9063_IRQ_ALARM,
+        DA9063_IRQ_TICK,
+        DA9063_IRQ_ADC_RDY,
+        DA9063_IRQ_SEQ_RDY,
+        DA9063_IRQ_WAKE,
+        DA9063_IRQ_TEMP,
+        DA9063_IRQ_COMP_1V2,
+        DA9063_IRQ_LDO_LIM,
+        DA9063_IRQ_REG_UVOV,
+        DA9063_IRQ_VDD_MON,
+        DA9063_IRQ_WARN,
+        DA9063_IRQ_GPI0,
+        DA9063_IRQ_GPI1,
+        DA9063_IRQ_GPI2,
+        DA9063_IRQ_GPI3,
+        DA9063_IRQ_GPI4,
+        DA9063_IRQ_GPI5,
+        DA9063_IRQ_GPI6,
+        DA9063_IRQ_GPI7,
+        DA9063_IRQ_GPI8,
+        DA9063_IRQ_GPI9,
+        DA9063_IRQ_GPI10,
+        DA9063_IRQ_GPI11,
+        DA9063_IRQ_GPI12,
+        DA9063_IRQ_GPI13,
+        DA9063_IRQ_GPI14,
+        DA9063_IRQ_GPI15,
+};
+
+#define DA9063_IRQ_BASE_OFFSET  0
+#define DA9063_NUM_IRQ          (DA9063_IRQ_GPI15 + 1 - DA9063_IRQ_BASE_OFFSET)
+
+struct da9063 {
+        /* Device */
+        struct device   *dev;
+        unsigned short  model;
+        unsigned short  revision;
+        unsigned int    flags;
+
+        /* Control interface */
+        struct regmap   *regmap;
+
+        /* Interrupts */
+        int             chip_irq;
+        unsigned int    irq_base;
+        struct regmap_irq_chip_data *regmap_irq;
+};
+
+int da9063_device_init(struct da9063 *da9063, unsigned int irq);
+int da9063_irq_init(struct da9063 *da9063);
+
+void da9063_device_exit(struct da9063 *da9063);
+void da9063_irq_exit(struct da9063 *da9063);
+
+#endif /* __MFD_DA9063_CORE_H__ */
diff --git a/include/linux/mfd/da9063/pdata.h b/include/linux/mfd/da9063/pdata.h
new file mode 100644
index 000000000000..95c8742215a7
--- /dev/null
+++ b/include/linux/mfd/da9063/pdata.h
@@ -0,0 +1,111 @@
+/*
+ * Platform configuration options for DA9063
+ *
+ * Copyright 2012 Dialog Semiconductor Ltd.
+ *
+ * Author: Michal Hajduk <michal.hajduk@diasemi.com>
+ * Author: Krystian Garbaciak <krystian.garbaciak@diasemi.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#ifndef __MFD_DA9063_PDATA_H__
+#define __MFD_DA9063_PDATA_H__
+
+#include <linux/regulator/machine.h>
+
+/*
+ * Regulator configuration
+ */
+/* DA9063 regulator IDs */
+enum {
+        /* BUCKs */
+        DA9063_ID_BCORE1,
+        DA9063_ID_BCORE2,
+        DA9063_ID_BPRO,
+        DA9063_ID_BMEM,
+        DA9063_ID_BIO,
+        DA9063_ID_BPERI,
+
+        /* BCORE1 and BCORE2 in merged mode */
+        DA9063_ID_BCORES_MERGED,
+        /* BMEM and BIO in merged mode */
+        DA9063_ID_BMEM_BIO_MERGED,
+        /* When two BUCKs are merged, they cannot be reused separately */
+
+        /* LDOs */
+        DA9063_ID_LDO1,
+        DA9063_ID_LDO2,
+        DA9063_ID_LDO3,
+        DA9063_ID_LDO4,
+        DA9063_ID_LDO5,
+        DA9063_ID_LDO6,
+        DA9063_ID_LDO7,
+        DA9063_ID_LDO8,
+        DA9063_ID_LDO9,
+        DA9063_ID_LDO10,
+        DA9063_ID_LDO11,
+};
+
+/* Regulators platform data */
+struct da9063_regulator_data {
+        int                             id;
+        struct regulator_init_data      *initdata;
+};
+
+struct da9063_regulators_pdata {
+        unsigned                        n_regulators;
+        struct da9063_regulator_data    *regulator_data;
+};
+
+
+/*
+ * RGB LED configuration
+ */
+/* LED IDs for flags in struct led_info. */
+enum {
+        DA9063_GPIO11_LED,
+        DA9063_GPIO14_LED,
+        DA9063_GPIO15_LED,
+
+        DA9063_LED_NUM
+};
+#define DA9063_LED_ID_MASK              0x3
+
+/* LED polarity for flags in struct led_info. */
+#define DA9063_LED_HIGH_LEVEL_ACTIVE    0x0
+#define DA9063_LED_LOW_LEVEL_ACTIVE     0x4
+
+
+/*
+ * General PMIC configuration
+ */
+/* HWMON ADC channels configuration */
+#define DA9063_FLG_FORCE_IN0_MANUAL_MODE        0x0010
+#define DA9063_FLG_FORCE_IN0_AUTO_MODE          0x0020
+#define DA9063_FLG_FORCE_IN1_MANUAL_MODE        0x0040
+#define DA9063_FLG_FORCE_IN1_AUTO_MODE          0x0080
+#define DA9063_FLG_FORCE_IN2_MANUAL_MODE        0x0100
+#define DA9063_FLG_FORCE_IN2_AUTO_MODE          0x0200
+#define DA9063_FLG_FORCE_IN3_MANUAL_MODE        0x0400
+#define DA9063_FLG_FORCE_IN3_AUTO_MODE          0x0800
+
+/* Disable register caching. */
+#define DA9063_FLG_NO_CACHE                     0x0008
+
+struct da9063;
+
+/* DA9063 platform data */
+struct da9063_pdata {
+        int                             (*init)(struct da9063 *da9063);
+        int                             irq_base;
+        unsigned                        flags;
+        struct da9063_regulators_pdata  *regulators_pdata;
+        struct led_platform_data        *leds_pdata;
+};
+
+#endif  /* __MFD_DA9063_PDATA_H__ */
diff --git a/include/linux/mfd/da9063/registers.h b/include/linux/mfd/da9063/registers.h
new file mode 100644
index 000000000000..5834813fb5f3
--- /dev/null
+++ b/include/linux/mfd/da9063/registers.h
@@ -0,0 +1,1028 @@
+/*
+ * Registers definition for DA9063 modules
+ *
+ * Copyright 2012 Dialog Semiconductor Ltd.
+ *
+ * Author: Michal Hajduk <michal.hajduk@diasemi.com>
+ *         Krystian Garbaciak <krystian.garbaciak@diasemi.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#ifndef _DA9063_REG_H
+#define _DA9063_REG_H
+
+#define DA9063_I2C_PAGE_SEL_SHIFT       1
+
+#define DA9063_EVENT_REG_NUM            4
+#define DA9210_EVENT_REG_NUM            2
+#define DA9063_EXT_EVENT_REG_NUM        (DA9063_EVENT_REG_NUM + \
+                                                DA9210_EVENT_REG_NUM)
+
+/* Page selection I2C or SPI always in the begining of any page. */
+/* Page 0 : I2C access 0x000 - 0x0FF    SPI access 0x000 - 0x07F */
+/* Page 1 :                             SPI access 0x080 - 0x0FF */
+/* Page 2 : I2C access 0x100 - 0x1FF    SPI access 0x100 - 0x17F */
+/* Page 3 :                             SPI access 0x180 - 0x1FF */
+#define DA9063_REG_PAGE_CON             0x00
+
+/* System Control and Event Registers */
+#define DA9063_REG_STATUS_A             0x01
+#define DA9063_REG_STATUS_B             0x02
+#define DA9063_REG_STATUS_C             0x03
+#define DA9063_REG_STATUS_D             0x04
+#define DA9063_REG_FAULT_LOG            0x05
+#define DA9063_REG_EVENT_A              0x06
+#define DA9063_REG_EVENT_B              0x07
+#define DA9063_REG_EVENT_C              0x08
+#define DA9063_REG_EVENT_D              0x09
+#define DA9063_REG_IRQ_MASK_A           0x0A
+#define DA9063_REG_IRQ_MASK_B           0x0B
+#define DA9063_REG_IRQ_MASK_C           0x0C
+#define DA9063_REG_IRQ_MASK_D           0x0D
+#define DA9063_REG_CONTROL_A            0x0E
+#define DA9063_REG_CONTROL_B            0x0F
+#define DA9063_REG_CONTROL_C            0x10
+#define DA9063_REG_CONTROL_D            0x11
+#define DA9063_REG_CONTROL_E            0x12
+#define DA9063_REG_CONTROL_F            0x13
+#define DA9063_REG_PD_DIS               0x14
+
+/* GPIO Control Registers */
+#define DA9063_REG_GPIO_0_1             0x15
+#define DA9063_REG_GPIO_2_3             0x16
+#define DA9063_REG_GPIO_4_5             0x17
+#define DA9063_REG_GPIO_6_7             0x18
+#define DA9063_REG_GPIO_8_9             0x19
+#define DA9063_REG_GPIO_10_11           0x1A
+#define DA9063_REG_GPIO_12_13           0x1B
+#define DA9063_REG_GPIO_14_15           0x1C
+#define DA9063_REG_GPIO_MODE_0_7        0x1D
+#define DA9063_REG_GPIO_MODE_8_15       0x1E
+#define DA9063_REG_GPIO_SWITCH_CONT     0x1F
+
+/* Regulator Control Registers */
+#define DA9063_REG_BCORE2_CONT          0x20
+#define DA9063_REG_BCORE1_CONT          0x21
+#define DA9063_REG_BPRO_CONT            0x22
+#define DA9063_REG_BMEM_CONT            0x23
+#define DA9063_REG_BIO_CONT             0x24
+#define DA9063_REG_BPERI_CONT           0x25
+#define DA9063_REG_LDO1_CONT            0x26
+#define DA9063_REG_LDO2_CONT            0x27
+#define DA9063_REG_LDO3_CONT            0x28
+#define DA9063_REG_LDO4_CONT            0x29
+#define DA9063_REG_LDO5_CONT            0x2A
+#define DA9063_REG_LDO6_CONT            0x2B
+#define DA9063_REG_LDO7_CONT            0x2C
+#define DA9063_REG_LDO8_CONT            0x2D
+#define DA9063_REG_LDO9_CONT            0x2E
+#define DA9063_REG_LDO10_CONT           0x2F
+#define DA9063_REG_LDO11_CONT           0x30
+#define DA9063_REG_VIB                  0x31
+#define DA9063_REG_DVC_1                0x32
+#define DA9063_REG_DVC_2                0x33
+
+/* GP-ADC Control Registers */
+#define DA9063_REG_ADC_MAN              0x34
+#define DA9063_REG_ADC_CONT             0x35
+#define DA9063_REG_VSYS_MON             0x36
+#define DA9063_REG_ADC_RES_L            0x37
+#define DA9063_REG_ADC_RES_H            0x38
+#define DA9063_REG_VSYS_RES             0x39
+#define DA9063_REG_ADCIN1_RES           0x3A
+#define DA9063_REG_ADCIN2_RES           0x3B
+#define DA9063_REG_ADCIN3_RES           0x3C
+#define DA9063_REG_MON1_RES             0x3D
+#define DA9063_REG_MON2_RES             0x3E
+#define DA9063_REG_MON3_RES             0x3F
+
+/* RTC Calendar and Alarm Registers */
+#define DA9063_REG_COUNT_S              0x40
+#define DA9063_REG_COUNT_MI             0x41
+#define DA9063_REG_COUNT_H              0x42
+#define DA9063_REG_COUNT_D              0x43
+#define DA9063_REG_COUNT_MO             0x44
+#define DA9063_REG_COUNT_Y              0x45
+#define DA9063_REG_ALARM_MI             0x46
+#define DA9063_REG_ALARM_H              0x47
+#define DA9063_REG_ALARM_D              0x48
+#define DA9063_REG_ALARM_MO             0x49
+#define DA9063_REG_ALARM_Y              0x4A
+#define DA9063_REG_SECOND_A             0x4B
+#define DA9063_REG_SECOND_B             0x4C
+#define DA9063_REG_SECOND_C             0x4D
+#define DA9063_REG_SECOND_D             0x4E
+
+/* Sequencer Control Registers */
+#define DA9063_REG_SEQ                  0x81
+#define DA9063_REG_SEQ_TIMER            0x82
+#define DA9063_REG_ID_2_1               0x83
+#define DA9063_REG_ID_4_3               0x84
+#define DA9063_REG_ID_6_5               0x85
+#define DA9063_REG_ID_8_7               0x86
+#define DA9063_REG_ID_10_9              0x87
+#define DA9063_REG_ID_12_11             0x88
+#define DA9063_REG_ID_14_13             0x89
+#define DA9063_REG_ID_16_15             0x8A
+#define DA9063_REG_ID_18_17             0x8B
+#define DA9063_REG_ID_20_19             0x8C
+#define DA9063_REG_ID_22_21             0x8D
+#define DA9063_REG_ID_24_23             0x8E
+#define DA9063_REG_ID_26_25             0x8F
+#define DA9063_REG_ID_28_27             0x90
+#define DA9063_REG_ID_30_29             0x91
+#define DA9063_REG_ID_32_31             0x92
+#define DA9063_REG_SEQ_A                0x95
+#define DA9063_REG_SEQ_B                0x96
+#define DA9063_REG_WAIT                 0x97
+#define DA9063_REG_EN_32K               0x98
+#define DA9063_REG_RESET                0x99
+
+/* Regulator Setting Registers */
+#define DA9063_REG_BUCK_ILIM_A          0x9A
+#define DA9063_REG_BUCK_ILIM_B          0x9B
+#define DA9063_REG_BUCK_ILIM_C          0x9C
+#define DA9063_REG_BCORE2_CFG           0x9D
+#define DA9063_REG_BCORE1_CFG           0x9E
+#define DA9063_REG_BPRO_CFG             0x9F
+#define DA9063_REG_BIO_CFG              0xA0
+#define DA9063_REG_BMEM_CFG             0xA1
+#define DA9063_REG_BPERI_CFG            0xA2
+#define DA9063_REG_VBCORE2_A            0xA3
+#define DA9063_REG_VBCORE1_A            0xA4
+#define DA9063_REG_VBPRO_A              0xA5
+#define DA9063_REG_VBMEM_A              0xA6
+#define DA9063_REG_VBIO_A               0xA7
+#define DA9063_REG_VBPERI_A             0xA8
+#define DA9063_REG_VLDO1_A              0xA9
+#define DA9063_REG_VLDO2_A              0xAA
+#define DA9063_REG_VLDO3_A              0xAB
+#define DA9063_REG_VLDO4_A              0xAC
+#define DA9063_REG_VLDO5_A              0xAD
+#define DA9063_REG_VLDO6_A              0xAE
+#define DA9063_REG_VLDO7_A              0xAF
+#define DA9063_REG_VLDO8_A              0xB0
+#define DA9063_REG_VLDO9_A              0xB1
+#define DA9063_REG_VLDO10_A             0xB2
+#define DA9063_REG_VLDO11_A             0xB3
+#define DA9063_REG_VBCORE2_B            0xB4
+#define DA9063_REG_VBCORE1_B            0xB5
+#define DA9063_REG_VBPRO_B              0xB6
+#define DA9063_REG_VBMEM_B              0xB7
+#define DA9063_REG_VBIO_B               0xB8
+#define DA9063_REG_VBPERI_B             0xB9
+#define DA9063_REG_VLDO1_B              0xBA
+#define DA9063_REG_VLDO2_B              0xBB
+#define DA9063_REG_VLDO3_B              0xBC
+#define DA9063_REG_VLDO4_B              0xBD
+#define DA9063_REG_VLDO5_B              0xBE
+#define DA9063_REG_VLDO6_B              0xBF
+#define DA9063_REG_VLDO7_B              0xC0
+#define DA9063_REG_VLDO8_B              0xC1
+#define DA9063_REG_VLDO9_B              0xC2
+#define DA9063_REG_VLDO10_B             0xC3
+#define DA9063_REG_VLDO11_B             0xC4
+
+/* Backup Battery Charger Control Register */
+#define DA9063_REG_BBAT_CONT            0xC5
+
+/* GPIO PWM (LED) */
+#define DA9063_REG_GPO11_LED            0xC6
+#define DA9063_REG_GPO14_LED            0xC7
+#define DA9063_REG_GPO15_LED            0xC8
+
+/* GP-ADC Threshold Registers */
+#define DA9063_REG_ADC_CFG              0xC9
+#define DA9063_REG_AUTO1_HIGH           0xCA
+#define DA9063_REG_AUTO1_LOW            0xCB
+#define DA9063_REG_AUTO2_HIGH           0xCC
+#define DA9063_REG_AUTO2_LOW            0xCD
+#define DA9063_REG_AUTO3_HIGH           0xCE
+#define DA9063_REG_AUTO3_LOW            0xCF
+
+/* DA9063 Configuration registers */
+/* OTP */
+#define DA9063_REG_OPT_COUNT            0x101
+#define DA9063_REG_OPT_ADDR             0x102
+#define DA9063_REG_OPT_DATA             0x103
+
+/* Customer Trim and Configuration */
+#define DA9063_REG_T_OFFSET             0x104
+#define DA9063_REG_INTERFACE            0x105
+#define DA9063_REG_CONFIG_A             0x106
+#define DA9063_REG_CONFIG_B             0x107
+#define DA9063_REG_CONFIG_C             0x108
+#define DA9063_REG_CONFIG_D             0x109
+#define DA9063_REG_CONFIG_E             0x10A
+#define DA9063_REG_CONFIG_F             0x10B
+#define DA9063_REG_CONFIG_G             0x10C
+#define DA9063_REG_CONFIG_H             0x10D
+#define DA9063_REG_CONFIG_I             0x10E
+#define DA9063_REG_CONFIG_J             0x10F
+#define DA9063_REG_CONFIG_K             0x110
+#define DA9063_REG_CONFIG_L             0x111
+#define DA9063_REG_MON_REG_1            0x112
+#define DA9063_REG_MON_REG_2            0x113
+#define DA9063_REG_MON_REG_3            0x114
+#define DA9063_REG_MON_REG_4            0x115
+#define DA9063_REG_MON_REG_5            0x116
+#define DA9063_REG_MON_REG_6            0x117
+#define DA9063_REG_TRIM_CLDR            0x118
+
+/* General Purpose Registers */
+#define DA9063_REG_GP_ID_0              0x119
+#define DA9063_REG_GP_ID_1              0x11A
+#define DA9063_REG_GP_ID_2              0x11B
+#define DA9063_REG_GP_ID_3              0x11C
+#define DA9063_REG_GP_ID_4              0x11D
+#define DA9063_REG_GP_ID_5              0x11E
+#define DA9063_REG_GP_ID_6              0x11F
+#define DA9063_REG_GP_ID_7              0x120
+#define DA9063_REG_GP_ID_8              0x121
+#define DA9063_REG_GP_ID_9              0x122
+#define DA9063_REG_GP_ID_10             0x123
+#define DA9063_REG_GP_ID_11             0x124
+#define DA9063_REG_GP_ID_12             0x125
+#define DA9063_REG_GP_ID_13             0x126
+#define DA9063_REG_GP_ID_14             0x127
+#define DA9063_REG_GP_ID_15             0x128
+#define DA9063_REG_GP_ID_16             0x129
+#define DA9063_REG_GP_ID_17             0x12A
+#define DA9063_REG_GP_ID_18             0x12B
+#define DA9063_REG_GP_ID_19             0x12C
+
+/* Chip ID and variant */
+#define DA9063_REG_CHIP_ID              0x181
+#define DA9063_REG_CHIP_VARIANT         0x182
+
+/*
+ * PMIC registers bits
+ */
+/* DA9063_REG_PAGE_CON (addr=0x00) */
+#define DA9063_PEG_PAGE_SHIFT                   0
+#define DA9063_REG_PAGE_MASK                    0x07
+#define         DA9063_REG_PAGE0                0x00
+#define         DA9063_REG_PAGE2                0x02
+#define DA9063_PAGE_WRITE_MODE                  0x00
+#define DA9063_REPEAT_WRITE_MODE                0x40
+#define DA9063_PAGE_REVERT                      0x80
+
+/* DA9063_REG_STATUS_A (addr=0x01) */
+#define DA9063_NONKEY                           0x01
+#define DA9063_WAKE                             0x02
+#define DA9063_DVC_BUSY                         0x04
+#define DA9063_COMP_1V2                         0x08
+
+/* DA9063_REG_STATUS_B (addr=0x02) */
+#define DA9063_GPI0                             0x01
+#define DA9063_GPI1                             0x02
+#define DA9063_GPI2                             0x04
+#define DA9063_GPI3                             0x08
+#define DA9063_GPI4                             0x10
+#define DA9063_GPI5                             0x20
+#define DA9063_GPI6                             0x40
+#define DA9063_GPI7                             0x80
+
+/* DA9063_REG_STATUS_C (addr=0x03) */
+#define DA9063_GPI8                             0x01
+#define DA9063_GPI9                             0x02
+#define DA9063_GPI10                            0x04
+#define DA9063_GPI11                            0x08
+#define DA9063_GPI12                            0x10
+#define DA9063_GPI13                            0x20
+#define DA9063_GPI14                            0x40
+#define DA9063_GPI15                            0x80
+
+/* DA9063_REG_STATUS_D (addr=0x04) */
+#define DA9063_LDO3_LIM                         0x08
+#define DA9063_LDO4_LIM                         0x10
+#define DA9063_LDO7_LIM                         0x20
+#define DA9063_LDO8_LIM                         0x40
+#define DA9063_LDO11_LIM                        0x80
+
+/* DA9063_REG_FAULT_LOG (addr=0x05) */
+#define DA9063_TWD_ERROR                        0x01
+#define DA9063_POR                              0x02
+#define DA9063_VDD_FAULT                        0x04
+#define DA9063_VDD_START                        0x08
+#define DA9063_TEMP_CRIT                        0x10
+#define DA9063_KEY_RESET                        0x20
+#define DA9063_NSHUTDOWN                        0x40
+#define DA9063_WAIT_SHUT                        0x80
+
+/* DA9063_REG_EVENT_A (addr=0x06) */
+#define DA9063_E_NONKEY                         0x01
+#define DA9063_E_ALARM                          0x02
+#define DA9063_E_TICK                           0x04
+#define DA9063_E_ADC_RDY                        0x08
+#define DA9063_E_SEQ_RDY                        0x10
+#define DA9063_EVENTS_B                         0x20
+#define DA9063_EVENTS_C                         0x40
+#define DA9063_EVENTS_D                         0x80
+
+/* DA9063_REG_EVENT_B (addr=0x07) */
+#define DA9063_E_WAKE                           0x01
+#define DA9063_E_TEMP                           0x02
+#define DA9063_E_COMP_1V2                       0x04
+#define DA9063_E_LDO_LIM                        0x08
+#define DA9063_E_REG_UVOV                       0x10
+#define DA9063_E_DVC_RDY                        0x20
+#define DA9063_E_VDD_MON                        0x40
+#define DA9063_E_VDD_WARN                       0x80
+
+/* DA9063_REG_EVENT_C (addr=0x08) */
+#define DA9063_E_GPI0                           0x01
+#define DA9063_E_GPI1                           0x02
+#define DA9063_E_GPI2                           0x04
+#define DA9063_E_GPI3                           0x08
+#define DA9063_E_GPI4                           0x10
+#define DA9063_E_GPI5                           0x20
+#define DA9063_E_GPI6                           0x40
+#define DA9063_E_GPI7                           0x80
+
+/* DA9063_REG_EVENT_D (addr=0x09) */
+#define DA9063_E_GPI8                           0x01
+#define DA9063_E_GPI9                           0x02
+#define DA9063_E_GPI10                          0x04
+#define DA9063_E_GPI11                          0x08
+#define DA9063_E_GPI12                          0x10
+#define DA9063_E_GPI13                          0x20
+#define DA9063_E_GPI14                          0x40
+#define DA9063_E_GPI15                          0x80
+
+/* DA9063_REG_IRQ_MASK_A (addr=0x0A) */
+#define DA9063_M_ONKEY                          0x01
+#define DA9063_M_ALARM                          0x02
+#define DA9063_M_TICK                           0x04
+#define DA9063_M_ADC_RDY                        0x08
+#define DA9063_M_SEQ_RDY                        0x10
+
+/* DA9063_REG_IRQ_MASK_B (addr=0x0B) */
+#define DA9063_M_WAKE                           0x01
+#define DA9063_M_TEMP                           0x02
+#define DA9063_M_COMP_1V2                       0x04
+#define DA9063_M_LDO_LIM                        0x08
+#define DA9063_M_UVOV                           0x10
+#define DA9063_M_DVC_RDY                        0x20
+#define DA9063_M_VDD_MON                        0x40
+#define DA9063_M_VDD_WARN                       0x80
+
+/* DA9063_REG_IRQ_MASK_C (addr=0x0C) */
+#define DA9063_M_GPI0                           0x01
+#define DA9063_M_GPI1                           0x02
+#define DA9063_M_GPI2                           0x04
+#define DA9063_M_GPI3                           0x08
+#define DA9063_M_GPI4                           0x10
+#define DA9063_M_GPI5                           0x20
+#define DA9063_M_GPI6                           0x40
+#define DA9063_M_GPI7                           0x80
+
+/* DA9063_REG_IRQ_MASK_D (addr=0x0D) */
+#define DA9063_M_GPI8                           0x01
+#define DA9063_M_GPI9                           0x02
+#define DA9063_M_GPI10                          0x04
+#define DA9063_M_GPI11                          0x08
+#define DA9063_M_GPI12                          0x10
+#define DA9063_M_GPI13                          0x20
+#define DA9063_M_GPI14                          0x40
+#define DA9063_M_GPI15                          0x80
+
+/* DA9063_REG_CONTROL_A (addr=0x0E) */
+#define DA9063_SYSTEM_EN                        0x01
+#define DA9063_POWER_EN                         0x02
+#define DA9063_POWER1_EN                        0x04
+#define DA9063_STANDBY                          0x08
+#define DA9063_M_SYSTEM_EN                      0x10
+#define DA9063_M_POWER_EN                       0x20
+#define DA9063_M_POWER1_EN                      0x40
+#define DA9063_CP_EN                            0x80
+
+/* DA9063_REG_CONTROL_B (addr=0x0F) */
+#define DA9063_CHG_SEL                          0x01
+#define DA9063_WATCHDOG_PD                      0x02
+#define DA9063_NRES_MODE                        0x08
+#define DA9063_NONKEY_LOCK                      0x10
+
+/* DA9063_REG_CONTROL_C (addr=0x10) */
+#define DA9063_DEBOUNCING_MASK                  0x07
+#define         DA9063_DEBOUNCING_OFF           0x0
+#define         DA9063_DEBOUNCING_0MS1          0x1
+#define         DA9063_DEBOUNCING_1MS           0x2
+#define         DA9063_DEBOUNCING_10MS24        0x3
+#define         DA9063_DEBOUNCING_51MS2         0x4
+#define         DA9063_DEBOUNCING_256MS         0x5
+#define         DA9063_DEBOUNCING_512MS         0x6
+#define         DA9063_DEBOUNCING_1024MS        0x7
+
+#define DA9063_AUTO_BOOT                        0x08
+#define DA9063_OTPREAD_EN                       0x10
+#define DA9063_SLEW_RATE_MASK                   0x60
+#define         DA9063_SLEW_RATE_4US            0x00
+#define         DA9063_SLEW_RATE_3US            0x20
+#define         DA9063_SLEW_RATE_1US            0x40
+#define         DA9063_SLEW_RATE_0US5           0x60
+#define DA9063_DEF_SUPPLY                       0x80
+
+/* DA9063_REG_CONTROL_D (addr=0x11) */
+#define DA9063_TWDSCALE_MASK                    0x07
+#define DA9063_BLINK_FRQ_MASK                   0x38
+#define         DA9063_BLINK_FRQ_OFF            0x00
+#define         DA9063_BLINK_FRQ_1S0            0x08
+#define         DA9063_BLINK_FRQ_2S0            0x10
+#define         DA9063_BLINK_FRQ_4S0            0x18
+#define         DA9063_BLINK_FRQ_0S18           0x20
+#define         DA9063_BLINK_FRQ_2S0_VDD        0x28
+#define         DA9063_BLINK_FRQ_4S0_VDD        0x30
+#define         DA9063_BLINK_FRQ_0S18_VDD       0x38
+
+#define DA9063_BLINK_DUR_MASK                   0xC0
+#define         DA9063_BLINK_DUR_10MS           0x00
+#define         DA9063_BLINK_DUR_20MS           0x40
+#define         DA9063_BLINK_DUR_40MS           0x80
+#define         DA9063_BLINK_DUR_20MSDBL        0xC0
+
+/* DA9063_REG_CONTROL_E (addr=0x12) */
+#define DA9063_RTC_MODE_PD                      0x01
+#define DA9063_RTC_MODE_SD                      0x02
+#define DA9063_RTC_EN                           0x04
+#define DA9063_ECO_MODE                         0x08
+#define DA9063_PM_FB1_PIN                       0x10
+#define DA9063_PM_FB2_PIN                       0x20
+#define DA9063_PM_FB3_PIN                       0x40
+#define DA9063_V_LOCK                           0x80
+
+/* DA9063_REG_CONTROL_F (addr=0x13) */
+#define DA9063_WATCHDOG                         0x01
+#define DA9063_SHUTDOWN                         0x02
+#define DA9063_WAKE_UP                          0x04
+
+/* DA9063_REG_PD_DIS (addr=0x14) */
+#define DA9063_GPI_DIS                          0x01
+#define DA9063_GPADC_PAUSE                      0x02
+#define DA9063_PMIF_DIS                         0x04
+#define DA9063_HS2WIRE_DIS                      0x08
+#define DA9063_BBAT_DIS                         0x20
+#define DA9063_OUT_32K_PAUSE                    0x40
+#define DA9063_PMCONT_DIS                       0x80
+
+/* DA9063_REG_GPIO_0_1 (addr=0x15) */
+#define DA9063_GPIO0_PIN_MASK                   0x03
+#define         DA9063_GPIO0_PIN_ADCIN1         0x00
+#define         DA9063_GPIO0_PIN_GPI            0x01
+#define         DA9063_GPIO0_PIN_GPO_OD         0x02
+#define         DA9063_GPIO0_PIN_GPO            0x03
+#define DA9063_GPIO0_TYPE                       0x04
+#define         DA9063_GPIO0_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO0_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO0_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO0_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO0_NO_WAKEUP                  0x08
+#define DA9063_GPIO1_PIN_MASK                   0x30
+#define         DA9063_GPIO1_PIN_ADCIN2_COMP    0x00
+#define         DA9063_GPIO1_PIN_GPI            0x10
+#define         DA9063_GPIO1_PIN_GPO_OD         0x20
+#define         DA9063_GPIO1_PIN_GPO            0x30
+#define DA9063_GPIO1_TYPE                       0x40
+#define         DA9063_GPIO1_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO1_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO1_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO1_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO1_NO_WAKEUP                  0x80
+
+/* DA9063_REG_GPIO_2_3 (addr=0x16) */
+#define DA9063_GPIO2_PIN_MASK                   0x03
+#define         DA9063_GPIO2_PIN_ADCIN3         0x00
+#define         DA9063_GPIO2_PIN_GPI            0x01
+#define         DA9063_GPIO2_PIN_GPO_PSS        0x02
+#define         DA9063_GPIO2_PIN_GPO            0x03
+#define DA9063_GPIO2_TYPE                       0x04
+#define         DA9063_GPIO2_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO2_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO2_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO2_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO2_NO_WAKEUP                  0x08
+#define DA9063_GPIO3_PIN_MASK                   0x30
+#define         DA9063_GPIO3_PIN_CORE_SW_G      0x00
+#define         DA9063_GPIO3_PIN_GPI            0x10
+#define         DA9063_GPIO3_PIN_GPO_OD         0x20
+#define         DA9063_GPIO3_PIN_GPO            0x30
+#define DA9063_GPIO3_TYPE                       0x40
+#define         DA9063_GPIO3_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO3_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO3_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO3_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO3_NO_WAKEUP                  0x80
+
+/* DA9063_REG_GPIO_4_5 (addr=0x17) */
+#define DA9063_GPIO4_PIN_MASK                   0x03
+#define         DA9063_GPIO4_PIN_CORE_SW_S      0x00
+#define         DA9063_GPIO4_PIN_GPI            0x01
+#define         DA9063_GPIO4_PIN_GPO_OD         0x02
+#define         DA9063_GPIO4_PIN_GPO            0x03
+#define DA9063_GPIO4_TYPE                       0x04
+#define         DA9063_GPIO4_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO4_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO4_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO4_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO4_NO_WAKEUP                  0x08
+#define DA9063_GPIO5_PIN_MASK                   0x30
+#define         DA9063_GPIO5_PIN_PERI_SW_G      0x00
+#define         DA9063_GPIO5_PIN_GPI            0x10
+#define         DA9063_GPIO5_PIN_GPO_OD         0x20
+#define         DA9063_GPIO5_PIN_GPO            0x30
+#define DA9063_GPIO5_TYPE                       0x40
+#define         DA9063_GPIO5_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO5_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO5_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO5_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO5_NO_WAKEUP                  0x80
+
+/* DA9063_REG_GPIO_6_7 (addr=0x18) */
+#define DA9063_GPIO6_PIN_MASK                   0x03
+#define         DA9063_GPIO6_PIN_PERI_SW_S      0x00
+#define         DA9063_GPIO6_PIN_GPI            0x01
+#define         DA9063_GPIO6_PIN_GPO_OD         0x02
+#define         DA9063_GPIO6_PIN_GPO            0x03
+#define DA9063_GPIO6_TYPE                       0x04
+#define         DA9063_GPIO6_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO6_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO6_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO6_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO6_NO_WAKEUP                  0x08
+#define DA9063_GPIO7_PIN_MASK                   0x30
+#define         DA9063_GPIO7_PIN_GPI            0x10
+#define         DA9063_GPIO7_PIN_GPO_PSS        0x20
+#define         DA9063_GPIO7_PIN_GPO            0x30
+#define DA9063_GPIO7_TYPE                       0x40
+#define         DA9063_GPIO7_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO7_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO7_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO7_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO7_NO_WAKEUP                  0x80
+
+/* DA9063_REG_GPIO_8_9 (addr=0x19) */
+#define DA9063_GPIO8_PIN_MASK                   0x03
+#define         DA9063_GPIO8_PIN_GPI_SYS_EN     0x00
+#define         DA9063_GPIO8_PIN_GPI            0x01
+#define         DA9063_GPIO8_PIN_GPO_PSS        0x02
+#define         DA9063_GPIO8_PIN_GPO            0x03
+#define DA9063_GPIO8_TYPE                       0x04
+#define         DA9063_GPIO8_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO8_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO8_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO8_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO8_NO_WAKEUP                  0x08
+#define DA9063_GPIO9_PIN_MASK                   0x30
+#define         DA9063_GPIO9_PIN_GPI_PWR_EN     0x00
+#define         DA9063_GPIO9_PIN_GPI            0x10
+#define         DA9063_GPIO9_PIN_GPO_PSS        0x20
+#define         DA9063_GPIO9_PIN_GPO            0x30
+#define DA9063_GPIO9_TYPE                       0x40
+#define         DA9063_GPIO9_TYPE_GPI_ACT_LOW   0x00
+#define         DA9063_GPIO9_TYPE_GPO_VDD_IO1   0x00
+#define         DA9063_GPIO9_TYPE_GPI_ACT_HIGH  0x04
+#define         DA9063_GPIO9_TYPE_GPO_VDD_IO2   0x04
+#define DA9063_GPIO9_NO_WAKEUP                  0x80
+
+/* DA9063_REG_GPIO_10_11 (addr=0x1A) */
+#define DA9063_GPIO10_PIN_MASK                  0x03
+#define         DA9063_GPIO10_PIN_GPI_PWR1_EN   0x00
+#define         DA9063_GPIO10_PIN_GPI           0x01
+#define         DA9063_GPIO10_PIN_GPO_OD        0x02
+#define         DA9063_GPIO10_PIN_GPO           0x03
+#define DA9063_GPIO10_TYPE                      0x04
+#define         DA9063_GPIO10_TYPE_GPI_ACT_LOW  0x00
+#define         DA9063_GPIO10_TYPE_GPO_VDD_IO1  0x00
+#define         DA9063_GPIO10_TYPE_GPI_ACT_HIGH 0x04
+#define         DA9063_GPIO10_TYPE_GPO_VDD_IO2  0x04
+#define DA9063_GPIO10_NO_WAKEUP                 0x08
+#define DA9063_GPIO11_PIN_MASK                  0x30
+#define         DA9063_GPIO11_PIN_GPO_OD        0x00
+#define         DA9063_GPIO11_PIN_GPI           0x10
+#define         DA9063_GPIO11_PIN_GPO_PSS       0x20
+#define         DA9063_GPIO11_PIN_GPO           0x30
+#define DA9063_GPIO11_TYPE                      0x40
+#define         DA9063_GPIO11_TYPE_GPI_ACT_LOW  0x00
+#define         DA9063_GPIO11_TYPE_GPO_VDD_IO1  0x00
+#define         DA9063_GPIO11_TYPE_GPI_ACT_HIGH 0x04
+#define         DA9063_GPIO11_TYPE_GPO_VDD_IO2  0x04
+#define DA9063_GPIO11_NO_WAKEUP                 0x80
+
+/* DA9063_REG_GPIO_12_13 (addr=0x1B) */
+#define DA9063_GPIO12_PIN_MASK                  0x03
+#define         DA9063_GPIO12_PIN_NVDDFLT_OUT   0x00
+#define         DA9063_GPIO12_PIN_GPI           0x01
+#define         DA9063_GPIO12_PIN_VSYSMON_OUT   0x02
+#define         DA9063_GPIO12_PIN_GPO           0x03
+#define DA9063_GPIO12_TYPE                      0x04
+#define         DA9063_GPIO12_TYPE_GPI_ACT_LOW  0x00
+#define         DA9063_GPIO12_TYPE_GPO_VDD_IO1  0x00
+#define         DA9063_GPIO12_TYPE_GPI_ACT_HIGH 0x04
+#define         DA9063_GPIO12_TYPE_GPO_VDD_IO2  0x04
+#define DA9063_GPIO12_NO_WAKEUP                 0x08
+#define DA9063_GPIO13_PIN_MASK                  0x30
+#define         DA9063_GPIO13_PIN_GPFB1_OUT     0x00
+#define         DA9063_GPIO13_PIN_GPI           0x10
+#define         DA9063_GPIO13_PIN_GPFB1_OUTOD   0x20
+#define         DA9063_GPIO13_PIN_GPO           0x30
+#define DA9063_GPIO13_TYPE                      0x40
+#define         DA9063_GPIO13_TYPE_GPFB1_OUT    0x00
+#define         DA9063_GPIO13_TYPE_GPI          0x00
+#define         DA9063_GPIO13_TYPE_GPFB1_OUTOD  0x04
+#define         DA9063_GPIO13_TYPE_GPO          0x04
+#define DA9063_GPIO13_NO_WAKEUP                 0x80
+
+/* DA9063_REG_GPIO_14_15 (addr=0x1C) */
+#define DA9063_GPIO14_PIN_MASK                  0x03
+#define         DA9063_GPIO14_PIN_GPO_OD        0x00
+#define         DA9063_GPIO14_PIN_GPI           0x01
+#define         DA9063_GPIO14_PIN_HS2DATA       0x02
+#define         DA9063_GPIO14_PIN_GPO           0x03
+#define DA9063_GPIO14_TYPE                      0x04
+#define         DA9063_GPIO14_TYPE_GPI_ACT_LOW  0x00
+#define         DA9063_GPIO14_TYPE_GPO_VDD_IO1  0x00
+#define         DA9063_GPIO14_TYPE_GPI_ACT_HIGH 0x04
+#define         DA9063_GPIO14_TYPE_GPO_VDD_IO2  0x04
+#define DA9063_GPIO14_NO_WAKEUP                 0x08
+#define DA9063_GPIO15_PIN_MASK                  0x30
+#define         DA9063_GPIO15_PIN_GPO_OD        0x00
+#define         DA9063_GPIO15_PIN_GPI           0x10
+#define         DA9063_GPIO15_PIN_GPO           0x30
+#define DA9063_GPIO15_TYPE                      0x40
+#define         DA9063_GPIO15_TYPE_GPFB1_OUT    0x00
+#define         DA9063_GPIO15_TYPE_GPI          0x00
+#define         DA9063_GPIO15_TYPE_GPFB1_OUTOD  0x04
+#define         DA9063_GPIO15_TYPE_GPO          0x04
+#define DA9063_GPIO15_NO_WAKEUP                 0x80
+
+/* DA9063_REG_GPIO_MODE_0_7 (addr=0x1D) */
+#define DA9063_GPIO0_MODE                       0x01
+#define DA9063_GPIO1_MODE                       0x02
+#define DA9063_GPIO2_MODE                       0x04
+#define DA9063_GPIO3_MODE                       0x08
+#define DA9063_GPIO4_MODE                       0x10
+#define DA9063_GPIO5_MODE                       0x20
+#define DA9063_GPIO6_MODE                       0x40
+#define DA9063_GPIO7_MODE                       0x80
+
+/* DA9063_REG_GPIO_MODE_8_15 (addr=0x1E) */
+#define DA9063_GPIO8_MODE                       0x01
+#define DA9063_GPIO9_MODE                       0x02
+#define DA9063_GPIO10_MODE                      0x04
+#define DA9063_GPIO11_MODE                      0x08
+#define         DA9063_GPIO11_MODE_LED_ACT_HIGH 0x00
+#define         DA9063_GPIO11_MODE_LED_ACT_LOW  0x08
+#define DA9063_GPIO12_MODE                      0x10
+#define DA9063_GPIO13_MODE                      0x20
+#define DA9063_GPIO14_MODE                      0x40
+#define         DA9063_GPIO14_MODE_LED_ACT_HIGH 0x00
+#define         DA9063_GPIO14_MODE_LED_ACT_LOW  0x40
+#define DA9063_GPIO15_MODE                      0x80
+#define         DA9063_GPIO15_MODE_LED_ACT_HIGH 0x00
+#define         DA9063_GPIO15_MODE_LED_ACT_LOW  0x80
+
+/* DA9063_REG_SWITCH_CONT (addr=0x1F) */
+#define DA9063_CORE_SW_GPI_MASK                 0x03
+#define         DA9063_CORE_SW_GPI_OFF          0x00
+#define         DA9063_CORE_SW_GPI_GPIO1        0x01
+#define         DA9063_CORE_SW_GPI_GPIO2        0x02
+#define         DA9063_CORE_SW_GPI_GPIO13       0x03
+#define DA9063_PERI_SW_GPI_MASK                 0x0C
+#define         DA9063_PERI_SW_GPI_OFF          0x00
+#define         DA9063_PERI_SW_GPI_GPIO1        0x04
+#define         DA9063_PERI_SW_GPI_GPIO2        0x08
+#define         DA9063_PERI_SW_GPI_GPIO13       0x0C
+#define DA9063_SWITCH_SR_MASK                   0x30
+#define         DA9063_SWITCH_SR_1MV            0x00
+#define         DA9063_SWITCH_SR_5MV            0x10
+#define         DA9063_SWITCH_SR_10MV           0x20
+#define         DA9063_SWITCH_SR_50MV           0x30
+#define DA9063_SWITCH_SR_DIS                    0x40
+#define DA9063_CP_EN_MODE                       0x80
+
+/* DA9063_REGL_Bxxxx_CONT common bits (addr=0x20-0x25) */
+#define DA9063_BUCK_EN                          0x01
+#define DA9063_BUCK_GPI_MASK                    0x06
+#define         DA9063_BUCK_GPI_OFF             0x00
+#define         DA9063_BUCK_GPI_GPIO1           0x02
+#define         DA9063_BUCK_GPI_GPIO2           0x04
+#define         DA9063_BUCK_GPI_GPIO13          0x06
+#define DA9063_BUCK_CONF                        0x08
+#define DA9063_VBUCK_GPI_MASK                   0x60
+#define         DA9063_VBUCK_GPI_OFF            0x00
+#define         DA9063_VBUCK_GPI_GPIO1          0x20
+#define         DA9063_VBUCK_GPI_GPIO2          0x40
+#define         DA9063_VBUCK_GPI_GPIO13         0x60
+
+/* DA9063_REG_BCORE1_CONT specific bits (addr=0x21) */
+#define DA9063_CORE_SW_EN                       0x10
+#define DA9063_CORE_SW_CONF                     0x80
+
+/* DA9063_REG_BPERI_CONT specific bits (addr=0x25) */
+#define DA9063_PERI_SW_EN                       0x10
+#define DA9063_PERI_SW_CONF                     0x80
+
+/* DA9063_REG_LDOx_CONT common bits (addr=0x26-0x30) */
+#define DA9063_LDO_EN                           0x01
+#define DA9063_LDO_GPI_MASK                     0x06
+#define         DA9063_LDO_GPI_OFF              0x00
+#define         DA9063_LDO_GPI_GPIO1            0x02
+#define         DA9063_LDO_GPI_GPIO2            0x04
+#define         DA9063_LDO_GPI_GPIO13           0x06
+#define DA9063_LDO_PD_DIS                       0x08
+#define DA9063_VLDO_GPI_MASK                    0x60
+#define         DA9063_VLDO_GPI_OFF             0x00
+#define         DA9063_VLDO_GPI_GPIO1           0x20
+#define         DA9063_VLDO_GPI_GPIO2           0x40
+#define         DA9063_VLDO_GPI_GPIO13          0x60
+#define DA9063_LDO_CONF                         0x80
+
+/* DA9063_REG_LDO5_CONT specific bits (addr=0x2A) */
+#define DA9063_VLDO5_SEL                        0x10
+
+/* DA9063_REG_LDO6_CONT specific bits (addr=0x2B) */
+#define DA9063_VLDO6_SEL                        0x10
+
+/* DA9063_REG_LDO7_CONT specific bits (addr=0x2C) */
+#define DA9063_VLDO7_SEL                        0x10
+
+/* DA9063_REG_LDO8_CONT specific bits (addr=0x2D) */
+#define DA9063_VLDO8_SEL                        0x10
+
+/* DA9063_REG_LDO9_CONT specific bits (addr=0x2E) */
+#define DA9063_VLDO9_SEL                        0x10
+
+/* DA9063_REG_LDO10_CONT specific bits (addr=0x2F) */
+#define DA9063_VLDO10_SEL                       0x10
+
+/* DA9063_REG_LDO11_CONT specific bits (addr=0x30) */
+#define DA9063_VLDO11_SEL                       0x10
+
+/* DA9063_REG_VIB (addr=0x31) */
+#define DA9063_VIB_SET_MASK                     0x3F
+#define         DA9063_VIB_SET_OFF              0
+#define         DA9063_VIB_SET_MAX              0x3F
+
+/* DA9063_REG_DVC_1 (addr=0x32) */
+#define DA9063_VBCORE1_SEL                      0x01
+#define DA9063_VBCORE2_SEL                      0x02
+#define DA9063_VBPRO_SEL                        0x04
+#define DA9063_VBMEM_SEL                        0x08
+#define DA9063_VBPERI_SEL                       0x10
+#define DA9063_VLDO1_SEL                        0x20
+#define DA9063_VLDO2_SEL                        0x40
+#define DA9063_VLDO3_SEL                        0x80
+
+/* DA9063_REG_DVC_2 (addr=0x33) */
+#define DA9063_VBIO_SEL                         0x01
+#define DA9063_VLDO4_SEL                        0x80
+
+/* DA9063_REG_ADC_MAN (addr=0x34) */
+#define DA9063_ADC_MUX_MASK                     0x0F
+#define         DA9063_ADC_MUX_VSYS             0x00
+#define         DA9063_ADC_MUX_ADCIN1           0x01
+#define         DA9063_ADC_MUX_ADCIN2           0x02
+#define         DA9063_ADC_MUX_ADCIN3           0x03
+#define         DA9063_ADC_MUX_T_SENSE          0x04
+#define         DA9063_ADC_MUX_VBBAT            0x05
+#define         DA9063_ADC_MUX_LDO_G1           0x08
+#define         DA9063_ADC_MUX_LDO_G2           0x09
+#define         DA9063_ADC_MUX_LDO_G3           0x0A
+#define DA9063_ADC_MAN                          0x10
+#define DA9063_ADC_MODE                         0x20
+
+/* DA9063_REG_ADC_CONT (addr=0x35) */
+#define DA9063_ADC_AUTO_VSYS_EN                 0x01
+#define DA9063_ADC_AUTO_AD1_EN                  0x02
+#define DA9063_ADC_AUTO_AD2_EN                  0x04
+#define DA9063_ADC_AUTO_AD3_EN                  0x08
+#define DA9063_ADC_AD1_ISRC_EN                  0x10
+#define DA9063_ADC_AD2_ISRC_EN                  0x20
+#define DA9063_ADC_AD3_ISRC_EN                  0x40
+#define DA9063_COMP1V2_EN                       0x80
+
+/* DA9063_REG_VSYS_MON (addr=0x36) */
+#define DA9063_VSYS_VAL_MASK                    0xFF
+#define DA9063_VSYS_VAL_BASE                    0x00
+
+/* DA9063_REG_ADC_RES_L (addr=0x37) */
+#define DA9063_ADC_RES_L_BITS                   2
+#define DA9063_ADC_RES_L_MASK                   0xC0
+
+/* DA9063_REG_ADC_RES_H (addr=0x38) */
+#define DA9063_ADC_RES_M_BITS                   8
+#define DA9063_ADC_RES_M_MASK                   0xFF
+
+/* DA9063_REG_(xxx_RES/ADC_RES_H) (addr=0x39-0x3F) */
+#define DA9063_ADC_VAL_MASK                     0xFF
+
+/* DA9063_REG_COUNT_S (addr=0x40) */
+#define DA9063_RTC_READ                         0x80
+#define DA9063_COUNT_SEC_MASK                   0x3F
+
+/* DA9063_REG_COUNT_MI (addr=0x41) */
+#define DA9063_COUNT_MIN_MASK                   0x3F
+
+/* DA9063_REG_COUNT_H (addr=0x42) */
+#define DA9063_COUNT_HOUR_MASK                  0x1F
+
+/* DA9063_REG_COUNT_D (addr=0x43) */
+#define DA9063_COUNT_DAY_MASK                   0x1F
+
+/* DA9063_REG_COUNT_MO (addr=0x44) */
+#define DA9063_COUNT_MONTH_MASK                 0x0F
+
+/* DA9063_REG_COUNT_Y (addr=0x45) */
+#define DA9063_COUNT_YEAR_MASK                  0x3F
+#define DA9063_MONITOR                          0x40
+
+/* DA9063_REG_ALARM_MI (addr=0x46) */
+#define DA9063_ALARM_STATUS_ALARM               0x80
+#define DA9063_ALARM_STATUS_TICK                0x40
+#define DA9063_ALARM_MIN_MASK                   0x3F
+
+/* DA9063_REG_ALARM_H (addr=0x47) */
+#define DA9063_ALARM_HOUR_MASK                  0x1F
+
+/* DA9063_REG_ALARM_D (addr=0x48) */
+#define DA9063_ALARM_DAY_MASK                   0x1F
+
+/* DA9063_REG_ALARM_MO (addr=0x49) */
+#define DA9063_TICK_WAKE                        0x20
+#define DA9063_TICK_TYPE                        0x10
+#define         DA9063_TICK_TYPE_SEC            0x00
+#define         DA9063_TICK_TYPE_MIN            0x10
+#define DA9063_ALARM_MONTH_MASK                 0x0F
+
+/* DA9063_REG_ALARM_Y (addr=0x4A) */
+#define DA9063_TICK_ON                          0x80
+#define DA9063_ALARM_ON                         0x40
+#define DA9063_ALARM_YEAR_MASK                  0x3F
+
+/* DA9063_REG_WAIT (addr=0x97)*/
+#define DA9063_REG_WAIT_TIME_MASK               0xF
+#define DA9063_WAIT_TIME_0_US                   0x0
+#define DA9063_WAIT_TIME_512_US                 0x1
+#define DA9063_WAIT_TIME_1_MS                   0x2
+#define DA9063_WAIT_TIME_2_MS                   0x3
+#define DA9063_WAIT_TIME_4_1_MS                 0x4
+#define DA9063_WAIT_TIME_8_2_MS                 0x5
+#define DA9063_WAIT_TIME_16_4_MS                0x6
+#define DA9063_WAIT_TIME_32_8_MS                0x7
+#define DA9063_WAIT_TIME_65_5_MS                0x8
+#define DA9063_WAIT_TIME_128_MS                 0x9
+#define DA9063_WAIT_TIME_256_MS                 0xA
+#define DA9063_WAIT_TIME_512_MS                 0xB
+#define DA9063_WAIT_TIME_1_S                    0xC
+#define DA9063_WAIT_TIME_2_1_S                  0xD
+
+/* DA9063_REG_EN_32K  (addr=0x98)*/
+#define DA9063_STABILIZ_TIME_MASK               0x7
+#define DA9063_CRYSTAL                          0x08
+#define DA9063_DELAY_MODE                       0x10
+#define DA9063_OUT_CLOCK                        0x20
+#define DA9063_RTC_CLOCK                        0x40
+#define DA9063_OUT_32K_EN                       0x80
+
+/* DA9063_REG_CHIP_VARIANT */
+#define DA9063_CHIP_VARIANT_SHIFT               4
+
+/* DA9063_REG_BUCK_ILIM_A (addr=0x9A) */
+#define DA9063_BIO_ILIM_MASK                    0x0F
+#define DA9063_BMEM_ILIM_MASK                   0xF0
+
+/* DA9063_REG_BUCK_ILIM_B (addr=0x9B) */
+#define DA9063_BPRO_ILIM_MASK                   0x0F
+#define DA9063_BPERI_ILIM_MASK                  0xF0
+
+/* DA9063_REG_BUCK_ILIM_C (addr=0x9C) */
+#define DA9063_BCORE1_ILIM_MASK                 0x0F
+#define DA9063_BCORE2_ILIM_MASK                 0xF0
+
+/* DA9063_REG_Bxxxx_CFG common bits (addr=0x9D-0xA2) */
+#define DA9063_BUCK_FB_MASK                     0x07
+#define DA9063_BUCK_PD_DIS_SHIFT                5
+#define DA9063_BUCK_MODE_MASK                   0xC0
+#define         DA9063_BUCK_MODE_MANUAL         0x00
+#define         DA9063_BUCK_MODE_SLEEP          0x40
+#define         DA9063_BUCK_MODE_SYNC           0x80
+#define         DA9063_BUCK_MODE_AUTO           0xC0
+
+/* DA9063_REG_BPRO_CFG (addr=0x9F) */
+#define DA9063_BPRO_VTTR_EN                     0x08
+#define DA9063_BPRO_VTT_EN                      0x10
+
+/* DA9063_REG_VBxxxx_A/B (addr=0xA3-0xA8, 0xB4-0xB9) */
+#define DA9063_VBUCK_MASK                       0x7F
+#define DA9063_VBUCK_BIAS                       0
+#define DA9063_BUCK_SL                          0x80
+
+/* DA9063_REG_VLDOx_A/B (addr=0xA9-0x3, 0xBA-0xC4) */
+#define DA9063_LDO_SL                           0x80
+
+/* DA9063_REG_VLDO1_A/B (addr=0xA9, 0xBA) */
+#define DA9063_VLDO1_MASK                       0x3F
+#define DA9063_VLDO1_BIAS                       0
+
+/* DA9063_REG_VLDO2_A/B (addr=0xAA, 0xBB) */
+#define DA9063_VLDO2_MASK                       0x3F
+#define DA9063_VLDO2_BIAS                       0
+
+/* DA9063_REG_VLDO3_A/B (addr=0xAB, 0xBC) */
+#define DA9063_VLDO3_MASK                       0x7F
+#define DA9063_VLDO3_BIAS                       0
+
+/* DA9063_REG_VLDO4_A/B (addr=0xAC, 0xBD) */
+#define DA9063_VLDO4_MASK                       0x7F
+#define DA9063_VLDO4_BIAS                       0
+
+/* DA9063_REG_VLDO5_A/B (addr=0xAD, 0xBE) */
+#define DA9063_VLDO5_MASK                       0x3F
+#define DA9063_VLDO5_BIAS                       2
+
+/* DA9063_REG_VLDO6_A/B (addr=0xAE, 0xBF) */
+#define DA9063_VLDO6_MASK                       0x3F
+#define DA9063_VLDO6_BIAS                       2
+
+/* DA9063_REG_VLDO7_A/B (addr=0xAF, 0xC0) */
+#define DA9063_VLDO7_MASK                       0x3F
+#define DA9063_VLDO7_BIAS                       2
+
+/* DA9063_REG_VLDO8_A/B (addr=0xB0, 0xC1) */
+#define DA9063_VLDO8_MASK                       0x3F
+#define DA9063_VLDO8_BIAS                       2
+
+/* DA9063_REG_VLDO9_A/B (addr=0xB1, 0xC2) */
+#define DA9063_VLDO9_MASK                       0x3F
+#define DA9063_VLDO9_BIAS                       3
+
+/* DA9063_REG_VLDO10_A/B (addr=0xB2, 0xC3) */
+#define DA9063_VLDO10_MASK                      0x3F
+#define DA9063_VLDO10_BIAS                      2
+
+/* DA9063_REG_VLDO11_A/B (addr=0xB3, 0xC4) */
+#define DA9063_VLDO11_MASK                      0x3F
+#define DA9063_VLDO11_BIAS                      2
+
+/* DA9063_REG_GPO11_LED (addr=0xC6) */
+/* DA9063_REG_GPO14_LED (addr=0xC7) */
+/* DA9063_REG_GPO15_LED (addr=0xC8) */
+#define DA9063_GPIO_DIM                         0x80
+#define DA9063_GPIO_PWM_MASK                    0x7F
+
+/* DA9063_REG_CONFIG_H (addr=0x10D) */
+#define DA9063_PWM_CLK_MASK                     0x01
+#define         DA9063_PWM_CLK_PWM2MHZ          0x00
+#define         DA9063_PWM_CLK_PWM1MHZ          0x01
+#define DA9063_LDO8_MODE_MASK                   0x02
+#define         DA9063_LDO8_MODE_LDO            0
+#define         DA9063_LDO8_MODE_VIBR           0x02
+#define DA9063_MERGE_SENSE_MASK                 0x04
+#define         DA9063_MERGE_SENSE_GP_FB2       0x00
+#define         DA9063_MERGE_SENSE_GPIO4        0x04
+#define DA9063_BCORE_MERGE                      0x08
+#define DA9063_BPRO_OD                          0x10
+#define DA9063_BCORE2_OD                        0x20
+#define DA9063_BCORE1_OD                        0x40
+#define DA9063_BUCK_MERGE                       0x80
+
+/* DA9063_REG_CONFIG_I (addr=0x10E) */
+#define DA9063_NONKEY_PIN_MASK                  0x03
+#define         DA9063_NONKEY_PIN_PORT          0x00
+#define         DA9063_NONKEY_PIN_SWDOWN        0x01
+#define         DA9063_NONKEY_PIN_AUTODOWN      0x02
+#define         DA9063_NONKEY_PIN_AUTOFLPRT     0x03
+
+/* DA9063_REG_MON_REG_5 (addr=0x116) */
+#define DA9063_MON_A8_IDX_MASK                  0x07
+#define         DA9063_MON_A8_IDX_NONE          0x00
+#define         DA9063_MON_A8_IDX_BCORE1        0x01
+#define         DA9063_MON_A8_IDX_BCORE2        0x02
+#define         DA9063_MON_A8_IDX_BPRO          0x03
+#define         DA9063_MON_A8_IDX_LDO3          0x04
+#define         DA9063_MON_A8_IDX_LDO4          0x05
+#define         DA9063_MON_A8_IDX_LDO11         0x06
+#define DA9063_MON_A9_IDX_MASK                  0x70
+#define         DA9063_MON_A9_IDX_NONE          0x00
+#define         DA9063_MON_A9_IDX_BIO           0x01
+#define         DA9063_MON_A9_IDX_BMEM          0x02
+#define         DA9063_MON_A9_IDX_BPERI         0x03
+#define         DA9063_MON_A9_IDX_LDO1          0x04
+#define         DA9063_MON_A9_IDX_LDO2          0x05
+#define         DA9063_MON_A9_IDX_LDO5          0x06
+
+/* DA9063_REG_MON_REG_6 (addr=0x117) */
+#define DA9063_MON_A10_IDX_MASK                 0x07
+#define         DA9063_MON_A10_IDX_NONE         0x00
+#define         DA9063_MON_A10_IDX_LDO6         0x01
+#define         DA9063_MON_A10_IDX_LDO7         0x02
+#define         DA9063_MON_A10_IDX_LDO8         0x03
+#define         DA9063_MON_A10_IDX_LDO9         0x04
+#define         DA9063_MON_A10_IDX_LDO10        0x05
+
+#endif /* _DA9063_REG_H */
diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h
index 0ab61320ffa8..5166935ce66d 100644
--- a/include/linux/mfd/davinci_voicecodec.h
+++ b/include/linux/mfd/davinci_voicecodec.h
@@ -26,8 +26,11 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
+#include <linux/platform_data/edma.h>
 
-#include <mach/edma.h>
+#include <mach/hardware.h>
+
+struct regmap;
 
 /*
  * Register values.
@@ -112,8 +115,7 @@ struct davinci_vc {
 
         /* Memory resources */
         void __iomem *base;
-        resource_size_t pbase;
-        size_t base_size;
+        struct regmap *regmap;
 
         /* MFD cells */
         struct mfd_cell cells[DAVINCI_VC_CELLS];
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index 689e6a0d9c99..ca0790fba2f5 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -134,6 +134,11 @@ enum prcmu_clock {
         PRCMU_SIACLK,
         PRCMU_SVACLK,
         PRCMU_ACLK,
+        PRCMU_HVACLK, /* Ux540 only */
+        PRCMU_G1CLK, /* Ux540 only */
+        PRCMU_SDMMCHCLK,
+        PRCMU_CAMCLK,
+        PRCMU_BML8580CLK,
         PRCMU_NUM_REG_CLOCKS,
         PRCMU_SYSCLK = PRCMU_NUM_REG_CLOCKS,
         PRCMU_CDCLK,
@@ -148,6 +153,13 @@ enum prcmu_clock {
         PRCMU_DSI0ESCCLK,
         PRCMU_DSI1ESCCLK,
         PRCMU_DSI2ESCCLK,
+        /* LCD DSI PLL - Ux540 only */
+        PRCMU_PLLDSI_LCD,
+        PRCMU_DSI0CLK_LCD,
+        PRCMU_DSI1CLK_LCD,
+        PRCMU_DSI0ESCCLK_LCD,
+        PRCMU_DSI1ESCCLK_LCD,
+        PRCMU_DSI2ESCCLK_LCD,
 };
 
 /**
diff --git a/include/linux/mfd/kempld.h b/include/linux/mfd/kempld.h
new file mode 100644
index 000000000000..b911ef3add03
--- /dev/null
+++ b/include/linux/mfd/kempld.h
@@ -0,0 +1,125 @@
+/*
+ * Kontron PLD driver definitions
+ *
+ * Copyright (c) 2010-2012 Kontron Europe GmbH
+ * Author: Michael Brunner <michael.brunner@kontron.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef _LINUX_MFD_KEMPLD_H_
+#define _LINUX_MFD_KEMPLD_H_
+
+/* kempld register definitions */
+#define KEMPLD_IOINDEX                  0xa80
+#define KEMPLD_IODATA                   0xa81
+#define KEMPLD_MUTEX_KEY                0x80
+#define KEMPLD_VERSION                  0x00
+#define KEMPLD_VERSION_LSB              0x00
+#define KEMPLD_VERSION_MSB              0x01
+#define KEMPLD_VERSION_GET_MINOR(x)     (x & 0x1f)
+#define KEMPLD_VERSION_GET_MAJOR(x)     ((x >> 5) & 0x1f)
+#define KEMPLD_VERSION_GET_NUMBER(x)    ((x >> 10) & 0xf)
+#define KEMPLD_VERSION_GET_TYPE(x)      ((x >> 14) & 0x3)
+#define KEMPLD_BUILDNR                  0x02
+#define KEMPLD_BUILDNR_LSB              0x02
+#define KEMPLD_BUILDNR_MSB              0x03
+#define KEMPLD_FEATURE                  0x04
+#define KEMPLD_FEATURE_LSB              0x04
+#define KEMPLD_FEATURE_MSB              0x05
+#define KEMPLD_FEATURE_BIT_I2C          (1 << 0)
+#define KEMPLD_FEATURE_BIT_WATCHDOG     (1 << 1)
+#define KEMPLD_FEATURE_BIT_GPIO         (1 << 2)
+#define KEMPLD_FEATURE_MASK_UART        (7 << 3)
+#define KEMPLD_FEATURE_BIT_NMI          (1 << 8)
+#define KEMPLD_FEATURE_BIT_SMI          (1 << 9)
+#define KEMPLD_FEATURE_BIT_SCI          (1 << 10)
+#define KEMPLD_SPEC                     0x06
+#define KEMPLD_SPEC_GET_MINOR(x)        (x & 0x0f)
+#define KEMPLD_SPEC_GET_MAJOR(x)        ((x >> 4) & 0x0f)
+#define KEMPLD_IRQ_GPIO                 0x35
+#define KEMPLD_IRQ_I2C                  0x36
+#define KEMPLD_CFG                      0x37
+#define KEMPLD_CFG_GPIO_I2C_MUX         (1 << 0)
+#define KEMPLD_CFG_BIOS_WP              (1 << 7)
+
+#define KEMPLD_CLK                      33333333
+
+#define KEMPLD_TYPE_RELEASE             0x0
+#define KEMPLD_TYPE_DEBUG               0x1
+#define KEMPLD_TYPE_CUSTOM              0x2
+
+/**
+ * struct kempld_info - PLD device information structure
+ * @major:      PLD major revision
+ * @minor:      PLD minor revision
+ * @buildnr:    PLD build number
+ * @number:     PLD board specific index
+ * @type:       PLD type
+ * @spec_major: PLD FW specification major revision
+ * @spec_minor: PLD FW specification minor revision
+ */
+struct kempld_info {
+        unsigned int major;
+        unsigned int minor;
+        unsigned int buildnr;
+        unsigned int number;
+        unsigned int type;
+        unsigned int spec_major;
+        unsigned int spec_minor;
+};
+
+/**
+ * struct kempld_device_data - Internal representation of the PLD device
+ * @io_base:            Pointer to the IO memory
+ * @io_index:           Pointer to the IO index register
+ * @io_data:            Pointer to the IO data register
+ * @pld_clock:          PLD clock frequency
+ * @feature_mask:       PLD feature mask
+ * @dev:                Pointer to kernel device structure
+ * @info:               KEMPLD info structure
+ * @lock:               PLD mutex
+ */
+struct kempld_device_data {
+        void __iomem            *io_base;
+        void __iomem            *io_index;
+        void __iomem            *io_data;
+        u32                     pld_clock;
+        u32                     feature_mask;
+        struct device           *dev;
+        struct kempld_info      info;
+        struct mutex            lock;
+};
+
+/**
+ * struct kempld_platform_data - PLD hardware configuration structure
+ * @pld_clock:                  PLD clock frequency
+ * @gpio_base                   GPIO base pin number
+ * @ioresource:                 IO addresses of the PLD
+ * @get_mutex:                  PLD specific get_mutex callback
+ * @release_mutex:              PLD specific release_mutex callback
+ * @get_info:                   PLD specific get_info callback
+ * @register_cells:             PLD specific register_cells callback
+ */
+struct kempld_platform_data {
+        u32                             pld_clock;
+        int                             gpio_base;
+        struct resource                 *ioresource;
+        void (*get_hardware_mutex)      (struct kempld_device_data *);
+        void (*release_hardware_mutex)  (struct kempld_device_data *);
+        int (*get_info)                 (struct kempld_device_data *);
+        int (*register_cells)           (struct kempld_device_data *);
+};
+
+extern void kempld_get_mutex(struct kempld_device_data *pld);
+extern void kempld_release_mutex(struct kempld_device_data *pld);
+extern u8 kempld_read8(struct kempld_device_data *pld, u8 index);
+extern void kempld_write8(struct kempld_device_data *pld, u8 index, u8 data);
+extern u16 kempld_read16(struct kempld_device_data *pld, u8 index);
+extern void kempld_write16(struct kempld_device_data *pld, u8 index, u16 data);
+extern u32 kempld_read32(struct kempld_device_data *pld, u8 index);
+extern void kempld_write32(struct kempld_device_data *pld, u8 index, u32 data);
+
+#endif /* _LINUX_MFD_KEMPLD_H_ */
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 1aa4f13cdfa6..244fb0d51589 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -85,6 +85,19 @@ enum max77693_pmic_reg {
         MAX77693_PMIC_REG_END,
 };
 
+/* MAX77693 CHG_CNFG_00 register */
+#define CHG_CNFG_00_CHG_MASK            0x1
+#define CHG_CNFG_00_BUCK_MASK           0x4
+
+/* MAX77693 CHG_CNFG_09 Register */
+#define CHG_CNFG_09_CHGIN_ILIM_MASK     0x7F
+
+/* MAX77693 CHG_CTRL Register */
+#define SAFEOUT_CTRL_SAFEOUT1_MASK      0x3
+#define SAFEOUT_CTRL_SAFEOUT2_MASK      0xC
+#define SAFEOUT_CTRL_ENSAFEOUT1_MASK    0x40
+#define SAFEOUT_CTRL_ENSAFEOUT2_MASK    0x80
+
 /* Slave addr = 0x4A: MUIC */
 enum max77693_muic_reg {
         MAX77693_MUIC_REG_ID            = 0x00,
diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h
index 3109a6c5c948..676f0f388992 100644
--- a/include/linux/mfd/max77693.h
+++ b/include/linux/mfd/max77693.h
@@ -30,6 +30,20 @@
 #ifndef __LINUX_MFD_MAX77693_H
 #define __LINUX_MFD_MAX77693_H
 
+/* MAX77686 regulator IDs */
+enum max77693_regulators {
+        MAX77693_ESAFEOUT1 = 0,
+        MAX77693_ESAFEOUT2,
+        MAX77693_CHARGER,
+        MAX77693_REG_MAX,
+};
+
+struct max77693_regulator_data {
+        int id;
+        struct regulator_init_data *initdata;
+        struct device_node *of_node;
+};
+
 struct max77693_reg_data {
         u8 addr;
         u8 data;
@@ -52,6 +66,10 @@ struct max77693_muic_platform_data {
 struct max77693_platform_data {
         int wakeup;
 
+        /* regulator data */
+        struct max77693_regulator_data *regulators;
+        int num_regulators;
+
         /* muic data */
         struct max77693_muic_platform_data *muic_data;
 };
diff --git a/include/linux/mfd/max8998-private.h b/include/linux/mfd/max8998-private.h
index effa5d3b96ae..84844e0a5704 100644
--- a/include/linux/mfd/max8998-private.h
+++ b/include/linux/mfd/max8998-private.h
@@ -132,9 +132,12 @@ enum {
 
 #define MAX8998_ENRAMP                  (1 << 4)
 
+struct irq_domain;
+
 /**
  * struct max8998_dev - max8998 master device for sub-drivers
  * @dev: master device of the chip (can be used to access platform data)
+ * @pdata: platform data for the driver and subdrivers
  * @i2c: i2c client private data for regulator
  * @rtc: i2c client private data for rtc
  * @iolock: mutex for serializing io access
@@ -148,12 +151,14 @@ enum {
  */
 struct max8998_dev {
         struct device *dev;
+        struct max8998_platform_data *pdata;
         struct i2c_client *i2c;
         struct i2c_client *rtc;
         struct mutex iolock;
         struct mutex irqlock;
 
-        int irq_base;
+        unsigned int irq_base;
+        struct irq_domain *irq_domain;
         int irq;
         int ono;
         u8 irq_masks_cur[MAX8998_NUM_IRQ_REGS];
diff --git a/include/linux/mfd/max8998.h b/include/linux/mfd/max8998.h
index 6823548d0c0a..e3956a654cbc 100644
--- a/include/linux/mfd/max8998.h
+++ b/include/linux/mfd/max8998.h
@@ -58,10 +58,12 @@ enum {
  * max8998_regulator_data - regulator data
  * @id: regulator id
  * @initdata: regulator init data (contraints, supplies, ...)
+ * @reg_node: DT node of regulator (unused on non-DT platforms)
  */
 struct max8998_regulator_data {
         int                             id;
         struct regulator_init_data      *initdata;
+        struct device_node              *reg_node;
 };
 
 /**
@@ -73,12 +75,8 @@ struct max8998_regulator_data {
  * @buck_voltage_lock: Do NOT change the values of the following six
  *   registers set by buck?_voltage?. The voltage of BUCK1/2 cannot
  *   be other than the preset values.
- * @buck1_voltage1: BUCK1 DVS mode 1 voltage register
- * @buck1_voltage2: BUCK1 DVS mode 2 voltage register
- * @buck1_voltage3: BUCK1 DVS mode 3 voltage register
- * @buck1_voltage4: BUCK1 DVS mode 4 voltage register
- * @buck2_voltage1: BUCK2 DVS mode 1 voltage register
- * @buck2_voltage2: BUCK2 DVS mode 2 voltage register
+ * @buck1_voltage: BUCK1 DVS mode 1 voltage registers
+ * @buck2_voltage: BUCK2 DVS mode 2 voltage registers
  * @buck1_set1: BUCK1 gpio pin 1 to set output voltage
  * @buck1_set2: BUCK1 gpio pin 2 to set output voltage
  * @buck1_default_idx: Default for BUCK1 gpio pin 1, 2
@@ -100,15 +98,11 @@ struct max8998_regulator_data {
 struct max8998_platform_data {
         struct max8998_regulator_data   *regulators;
         int                             num_regulators;
-        int                             irq_base;
+        unsigned int                    irq_base;
         int                             ono;
         bool                            buck_voltage_lock;
-        int                             buck1_voltage1;
-        int                             buck1_voltage2;
-        int                             buck1_voltage3;
-        int                             buck1_voltage4;
-        int                             buck2_voltage1;
-        int                             buck2_voltage2;
+        int                             buck1_voltage[4];
+        int                             buck2_voltage[2];
         int                             buck1_set1;
         int                             buck1_set2;
         int                             buck1_default_idx;
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index bf070755982e..41ed59276c00 100644
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -78,20 +78,30 @@ struct mc13xxx_regulator_platform_data {
         struct mc13xxx_regulator_init_data *regulators;
 };
 
+enum {
+        /* MC13783 LED IDs */
+        MC13783_LED_MD,
+        MC13783_LED_AD,
+        MC13783_LED_KP,
+        MC13783_LED_R1,
+        MC13783_LED_G1,
+        MC13783_LED_B1,
+        MC13783_LED_R2,
+        MC13783_LED_G2,
+        MC13783_LED_B2,
+        MC13783_LED_R3,
+        MC13783_LED_G3,
+        MC13783_LED_B3,
+        /* MC13892 LED IDs */
+        MC13892_LED_MD,
+        MC13892_LED_AD,
+        MC13892_LED_KP,
+        MC13892_LED_R,
+        MC13892_LED_G,
+        MC13892_LED_B,
+};
+
 struct mc13xxx_led_platform_data {
-#define MC13783_LED_MD          0
-#define MC13783_LED_AD          1
-#define MC13783_LED_KP          2
-#define MC13783_LED_R1          3
-#define MC13783_LED_G1          4
-#define MC13783_LED_B1          5
-#define MC13783_LED_R2          6
-#define MC13783_LED_G2          7
-#define MC13783_LED_B2          8
-#define MC13783_LED_R3          9
-#define MC13783_LED_G3          10
-#define MC13783_LED_B3          11
-#define MC13783_LED_MAX MC13783_LED_B3
         int id;
         const char *name;
         const char *default_trigger;
@@ -100,46 +110,36 @@ struct mc13xxx_led_platform_data {
         char max_current;
 };
 
+#define MAX_LED_CONTROL_REGS    6
+
 struct mc13xxx_leds_platform_data {
-        int num_leds;
         struct mc13xxx_led_platform_data *led;
+        int num_leds;
 
-#define MC13783_LED_TRIODE_MD   (1 << 0)
-#define MC13783_LED_TRIODE_AD   (1 << 1)
-#define MC13783_LED_TRIODE_KP   (1 << 2)
-#define MC13783_LED_BOOST_EN    (1 << 3)
-#define MC13783_LED_TC1HALF     (1 << 4)
-#define MC13783_LED_SLEWLIMTC   (1 << 5)
-#define MC13783_LED_SLEWLIMBL   (1 << 6)
-#define MC13783_LED_TRIODE_TC1  (1 << 7)
-#define MC13783_LED_TRIODE_TC2  (1 << 8)
-#define MC13783_LED_TRIODE_TC3  (1 << 9)
-        int flags;
-
-#define MC13783_LED_AB_DISABLED         0
-#define MC13783_LED_AB_MD1              1
-#define MC13783_LED_AB_MD12             2
-#define MC13783_LED_AB_MD123            3
-#define MC13783_LED_AB_MD1234           4
-#define MC13783_LED_AB_MD1234_AD1       5
-#define MC13783_LED_AB_MD1234_AD12      6
-#define MC13783_LED_AB_MD1_AD           7
-        char abmode;
-
-#define MC13783_LED_ABREF_200MV 0
-#define MC13783_LED_ABREF_400MV 1
-#define MC13783_LED_ABREF_600MV 2
-#define MC13783_LED_ABREF_800MV 3
-        char abref;
-
-#define MC13783_LED_PERIOD_10MS         0
-#define MC13783_LED_PERIOD_100MS        1
-#define MC13783_LED_PERIOD_500MS        2
-#define MC13783_LED_PERIOD_2S           3
-        char bl_period;
-        char tc1_period;
-        char tc2_period;
-        char tc3_period;
+/* LED Control 0 */
+#define MC13783_LED_C0_ENABLE           (1 << 0)
+#define MC13783_LED_C0_TRIODE_MD        (1 << 7)
+#define MC13783_LED_C0_TRIODE_AD        (1 << 8)
+#define MC13783_LED_C0_TRIODE_KP        (1 << 9)
+#define MC13783_LED_C0_BOOST            (1 << 10)
+#define MC13783_LED_C0_ABMODE(x)        (((x) & 0x7) << 11)
+#define MC13783_LED_C0_ABREF(x)         (((x) & 0x3) << 14)
+/* LED Control 1 */
+#define MC13783_LED_C1_TC1HALF          (1 << 18)
+#define MC13783_LED_C1_SLEWLIM          (1 << 23)
+/* LED Control 2 */
+#define MC13783_LED_C2_PERIOD(x)        (((x) & 0x3) << 21)
+#define MC13783_LED_C2_SLEWLIM          (1 << 23)
+/* LED Control 3 */
+#define MC13783_LED_C3_PERIOD(x)        (((x) & 0x3) << 21)
+#define MC13783_LED_C3_TRIODE_TC1       (1 << 23)
+/* LED Control 4 */
+#define MC13783_LED_C4_PERIOD(x)        (((x) & 0x3) << 21)
+#define MC13783_LED_C4_TRIODE_TC2       (1 << 23)
+/* LED Control 5 */
+#define MC13783_LED_C5_PERIOD(x)        (((x) & 0x3) << 21)
+#define MC13783_LED_C5_TRIODE_TC3       (1 << 23)
+        u32 led_control[MAX_LED_CONTROL_REGS];
 };
 
 struct mc13xxx_buttons_platform_data {
diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h
index a9e8bd157673..f682953043ba 100644
--- a/include/linux/mfd/mcp.h
+++ b/include/linux/mfd/mcp.h
@@ -10,6 +10,8 @@
 #ifndef MCP_H
 #define MCP_H
 
+#include <linux/device.h>
+
 struct mcp_ops;
 
 struct mcp {
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 8f21daf62fb5..9974e387e483 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -20,6 +20,8 @@
 #include <linux/leds.h>
 #include <linux/regmap.h>
 #include <linux/regulator/driver.h>
+#include <linux/extcon.h>
+#include <linux/usb/phy_companion.h>
 
 #define PALMAS_NUM_CLIENTS              3
 
@@ -32,11 +34,30 @@
                         ((a) == PALMAS_CHIP_ID))
 #define is_palmas_charger(a) ((a) == PALMAS_CHIP_CHARGER_ID)
 
+/**
+ * Palmas PMIC feature types
+ *
+ * PALMAS_PMIC_FEATURE_SMPS10_BOOST - used when the PMIC provides SMPS10_BOOST
+ *      regulator.
+ *
+ * PALMAS_PMIC_HAS(b, f) - macro to check if a bandgap device is capable of a
+ *      specific feature (above) or not. Return non-zero, if yes.
+ */
+#define PALMAS_PMIC_FEATURE_SMPS10_BOOST        BIT(0)
+#define PALMAS_PMIC_HAS(b, f)                   \
+                        ((b)->features & PALMAS_PMIC_FEATURE_ ## f)
+
 struct palmas_pmic;
 struct palmas_gpadc;
 struct palmas_resource;
 struct palmas_usb;
 
+enum palmas_usb_state {
+        PALMAS_USB_STATE_DISCONNECT,
+        PALMAS_USB_STATE_VBUS,
+        PALMAS_USB_STATE_ID,
+};
+
 struct palmas {
         struct device *dev;
 
@@ -46,6 +67,7 @@ struct palmas {
         /* Stored chip id */
         int id;
 
+        unsigned int features;
         /* IRQ Data */
         int irq;
         u32 irq_mask;
@@ -138,7 +160,8 @@ enum palmas_regulators {
         PALMAS_REG_SMPS7,
         PALMAS_REG_SMPS8,
         PALMAS_REG_SMPS9,
-        PALMAS_REG_SMPS10,
+        PALMAS_REG_SMPS10_OUT2,
+        PALMAS_REG_SMPS10_OUT1,
         /* LDO regulators */
         PALMAS_REG_LDO1,
         PALMAS_REG_LDO2,
@@ -161,6 +184,50 @@ enum palmas_regulators {
         PALMAS_NUM_REGS,
 };
 
+/* External controll signal name */
+enum {
+        PALMAS_EXT_CONTROL_ENABLE1      = 0x1,
+        PALMAS_EXT_CONTROL_ENABLE2      = 0x2,
+        PALMAS_EXT_CONTROL_NSLEEP       = 0x4,
+};
+
+/*
+ * Palmas device resources can be controlled externally for
+ * enabling/disabling it rather than register write through i2c.
+ * Add the external controlled requestor ID for different resources.
+ */
+enum palmas_external_requestor_id {
+        PALMAS_EXTERNAL_REQSTR_ID_REGEN1,
+        PALMAS_EXTERNAL_REQSTR_ID_REGEN2,
+        PALMAS_EXTERNAL_REQSTR_ID_SYSEN1,
+        PALMAS_EXTERNAL_REQSTR_ID_SYSEN2,
+        PALMAS_EXTERNAL_REQSTR_ID_CLK32KG,
+        PALMAS_EXTERNAL_REQSTR_ID_CLK32KGAUDIO,
+        PALMAS_EXTERNAL_REQSTR_ID_REGEN3,
+        PALMAS_EXTERNAL_REQSTR_ID_SMPS12,
+        PALMAS_EXTERNAL_REQSTR_ID_SMPS3,
+        PALMAS_EXTERNAL_REQSTR_ID_SMPS45,
+        PALMAS_EXTERNAL_REQSTR_ID_SMPS6,
+        PALMAS_EXTERNAL_REQSTR_ID_SMPS7,
+        PALMAS_EXTERNAL_REQSTR_ID_SMPS8,
+        PALMAS_EXTERNAL_REQSTR_ID_SMPS9,
+        PALMAS_EXTERNAL_REQSTR_ID_SMPS10,
+        PALMAS_EXTERNAL_REQSTR_ID_LDO1,
+        PALMAS_EXTERNAL_REQSTR_ID_LDO2,
+        PALMAS_EXTERNAL_REQSTR_ID_LDO3,
+        PALMAS_EXTERNAL_REQSTR_ID_LDO4,
+        PALMAS_EXTERNAL_REQSTR_ID_LDO5,
+        PALMAS_EXTERNAL_REQSTR_ID_LDO6,
+        PALMAS_EXTERNAL_REQSTR_ID_LDO7,
+        PALMAS_EXTERNAL_REQSTR_ID_LDO8,
+        PALMAS_EXTERNAL_REQSTR_ID_LDO9,
+        PALMAS_EXTERNAL_REQSTR_ID_LDOLN,
+        PALMAS_EXTERNAL_REQSTR_ID_LDOUSB,
+
+        /* Last entry */
+        PALMAS_EXTERNAL_REQSTR_ID_MAX,
+};
+
 struct palmas_pmic_platform_data {
         /* An array of pointers to regulator init data indexed by regulator
          * ID
@@ -180,9 +247,6 @@ struct palmas_pmic_platform_data {
 };
 
 struct palmas_usb_platform_data {
-        /* Set this if platform wishes its own vbus control */
-        int no_control_vbus;
-
         /* Do we enable the wakeup comparator on probe */
         int wakeup;
 };
@@ -239,6 +303,7 @@ struct palmas_platform_data {
          */
         int mux_from_pdata;
         u8 pad1, pad2;
+        bool pm_off;
 
         struct palmas_pmic_platform_data *pmic_pdata;
         struct palmas_gpadc_platform_data *gpadc_pdata;
@@ -336,9 +401,9 @@ struct palmas_pmic {
         int smps123;
         int smps457;
 
-        int range[PALMAS_REG_SMPS10];
-        unsigned int ramp_delay[PALMAS_REG_SMPS10];
-        unsigned int current_reg_mode[PALMAS_REG_SMPS10];
+        int range[PALMAS_REG_SMPS10_OUT1];
+        unsigned int ramp_delay[PALMAS_REG_SMPS10_OUT1];
+        unsigned int current_reg_mode[PALMAS_REG_SMPS10_OUT1];
 };
 
 struct palmas_resource {
@@ -350,22 +415,17 @@ struct palmas_usb {
         struct palmas *palmas;
         struct device *dev;
 
-        /* for vbus reporting with irqs disabled */
-        spinlock_t lock;
-
-        struct regulator *vbus_reg;
-
-        /* used to set vbus, in atomic path */
-        struct work_struct set_vbus_work;
+        struct extcon_dev edev;
 
-        int irq1;
-        int irq2;
-        int irq3;
-        int irq4;
+        int id_otg_irq;
+        int id_irq;
+        int vbus_otg_irq;
+        int vbus_irq;
 
-        int vbus_enable;
-
-        u8 linkstat;
+        enum palmas_usb_state linkstat;
+        int wakeup;
+        bool enable_vbus_detection;
+        bool enable_id_detection;
 };
 
 #define comparator_to_palmas(x) container_of((x), struct palmas_usb, comparator)
@@ -433,7 +493,7 @@ enum usb_irq_events {
 #define PALMAS_DVFS_BASE                                        0x180
 #define PALMAS_PMU_CONTROL_BASE                                 0x1A0
 #define PALMAS_RESOURCE_BASE                                    0x1D4
-#define PALMAS_PU_PD_OD_BASE                                    0x1F4
+#define PALMAS_PU_PD_OD_BASE                                    0x1F0
 #define PALMAS_LED_BASE                                         0x200
 #define PALMAS_INTERRUPT_BASE                                   0x210
 #define PALMAS_USB_OTG_BASE                                     0x250
@@ -1718,16 +1778,20 @@ enum usb_irq_events {
 #define PALMAS_REGEN3_CTRL_MODE_ACTIVE_SHIFT                    0
 
 /* Registers for function PAD_CONTROL */
-#define PALMAS_PU_PD_INPUT_CTRL1                                0x0
-#define PALMAS_PU_PD_INPUT_CTRL2                                0x1
-#define PALMAS_PU_PD_INPUT_CTRL3                                0x2
-#define PALMAS_OD_OUTPUT_CTRL                                   0x4
-#define PALMAS_POLARITY_CTRL                                    0x5
-#define PALMAS_PRIMARY_SECONDARY_PAD1                           0x6
-#define PALMAS_PRIMARY_SECONDARY_PAD2                           0x7
-#define PALMAS_I2C_SPI                                          0x8
-#define PALMAS_PU_PD_INPUT_CTRL4                                0x9
-#define PALMAS_PRIMARY_SECONDARY_PAD3                           0xA
+#define PALMAS_OD_OUTPUT_CTRL2                                  0x2
+#define PALMAS_POLARITY_CTRL2                                   0x3
+#define PALMAS_PU_PD_INPUT_CTRL1                                0x4
+#define PALMAS_PU_PD_INPUT_CTRL2                                0x5
+#define PALMAS_PU_PD_INPUT_CTRL3                                0x6
+#define PALMAS_PU_PD_INPUT_CTRL5                                0x7
+#define PALMAS_OD_OUTPUT_CTRL                                   0x8
+#define PALMAS_POLARITY_CTRL                                    0x9
+#define PALMAS_PRIMARY_SECONDARY_PAD1                           0xA
+#define PALMAS_PRIMARY_SECONDARY_PAD2                           0xB
+#define PALMAS_I2C_SPI                                          0xC
+#define PALMAS_PU_PD_INPUT_CTRL4                                0xD
+#define PALMAS_PRIMARY_SECONDARY_PAD3                           0xE
+#define PALMAS_PRIMARY_SECONDARY_PAD4                           0xF
 
 /* Bit definitions for PU_PD_INPUT_CTRL1 */
 #define PALMAS_PU_PD_INPUT_CTRL1_RESET_IN_PD                    0x40
@@ -2485,6 +2549,15 @@ enum usb_irq_events {
 #define PALMAS_PU_PD_GPIO_CTRL1                                 0x6
 #define PALMAS_PU_PD_GPIO_CTRL2                                 0x7
 #define PALMAS_OD_OUTPUT_GPIO_CTRL                              0x8
+#define PALMAS_GPIO_DATA_IN2                                    0x9
+#define PALMAS_GPIO_DATA_DIR2                                   0x0A
+#define PALMAS_GPIO_DATA_OUT2                                   0x0B
+#define PALMAS_GPIO_DEBOUNCE_EN2                                0x0C
+#define PALMAS_GPIO_CLEAR_DATA_OUT2                             0x0D
+#define PALMAS_GPIO_SET_DATA_OUT2                               0x0E
+#define PALMAS_PU_PD_GPIO_CTRL3                                 0x0F
+#define PALMAS_PU_PD_GPIO_CTRL4                                 0x10
+#define PALMAS_OD_OUTPUT_GPIO_CTRL2                             0x11
 
 /* Bit definitions for GPIO_DATA_IN */
 #define PALMAS_GPIO_DATA_IN_GPIO_7_IN                           0x80
@@ -2850,4 +2923,9 @@ static inline int palmas_irq_get_virq(struct palmas *palmas, int irq)
         return regmap_irq_get_virq(palmas->irq_data, irq);
 }
 
+
+int palmas_ext_control_req_config(struct palmas *palmas,
+        enum palmas_external_requestor_id ext_control_req_id,
+        int ext_ctrl, bool enable);
+
 #endif /*  __LINUX_MFD_PALMAS_H */
diff --git a/include/linux/mfd/rtsx_common.h b/include/linux/mfd/rtsx_common.h
index 2b13970596f5..443176ee1ab0 100644
--- a/include/linux/mfd/rtsx_common.h
+++ b/include/linux/mfd/rtsx_common.h
@@ -1,6 +1,6 @@
 /* Driver for Realtek driver-based card reader
  *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
+ * Copyright(c) 2009-2013 Realtek Semiconductor Corp. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,7 +17,6 @@
  *
  * Author:
  *   Wei WANG <wei_wang@realsil.com.cn>
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
  */
 
 #ifndef __RTSX_COMMON_H
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
index 86bc635f8385..d1382dfbeff0 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/mfd/rtsx_pci.h
@@ -1,6 +1,6 @@
 /* Driver for Realtek PCI-Express card reader
  *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
+ * Copyright(c) 2009-2013 Realtek Semiconductor Corp. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,7 +17,6 @@
  *
  * Author:
  *   Wei WANG <wei_wang@realsil.com.cn>
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
  */
 
 #ifndef __RTSX_PCI_H
@@ -25,8 +24,7 @@
 
 #include <linux/sched.h>
 #include <linux/pci.h>
-
-#include "rtsx_common.h"
+#include <linux/mfd/rtsx_common.h>
 
 #define MAX_RW_REG_CNT                  1024
 
@@ -184,11 +182,26 @@
 #define CARD_SHARE_BAROSSA_SD           0x01
 #define CARD_SHARE_BAROSSA_MS           0x02
 
+/* CARD_DRIVE_SEL */
+#define MS_DRIVE_8mA                    (0x01 << 6)
+#define MMC_DRIVE_8mA                   (0x01 << 4)
+#define XD_DRIVE_8mA                    (0x01 << 2)
+#define GPIO_DRIVE_8mA                  0x01
+#define RTS5209_CARD_DRIVE_DEFAULT      (MS_DRIVE_8mA | MMC_DRIVE_8mA |\
+                                                XD_DRIVE_8mA | GPIO_DRIVE_8mA)
+#define RTL8411_CARD_DRIVE_DEFAULT      (MS_DRIVE_8mA | MMC_DRIVE_8mA |\
+                                                XD_DRIVE_8mA)
+#define RTSX_CARD_DRIVE_DEFAULT         (MS_DRIVE_8mA | GPIO_DRIVE_8mA)
+
 /* SD30_DRIVE_SEL */
 #define DRIVER_TYPE_A                   0x05
 #define DRIVER_TYPE_B                   0x03
 #define DRIVER_TYPE_C                   0x02
 #define DRIVER_TYPE_D                   0x01
+#define CFG_DRIVER_TYPE_A               0x02
+#define CFG_DRIVER_TYPE_B               0x03
+#define CFG_DRIVER_TYPE_C               0x01
+#define CFG_DRIVER_TYPE_D               0x00
 
 /* FPDCTL */
 #define SSC_POWER_DOWN                  0x01
@@ -521,6 +534,10 @@
 #define SAMPLE_VAR_CLK0                 (0x01 << 4)
 #define SAMPLE_VAR_CLK1                 (0x02 << 4)
 
+/* HOST_SLEEP_STATE */
+#define HOST_ENTER_S1                   1
+#define HOST_ENTER_S3                   2
+
 #define MS_CFG                          0xFD40
 #define MS_TPC                          0xFD41
 #define MS_TRANS_CFG                    0xFD42
@@ -575,6 +592,7 @@
 
 #define CARD_PWR_CTL                    0xFD50
 #define CARD_CLK_SWITCH                 0xFD51
+#define RTL8411B_PACKAGE_MODE           0xFD51
 #define CARD_SHARE_MODE                 0xFD52
 #define CARD_DRIVE_SEL                  0xFD53
 #define CARD_STOP                       0xFD54
@@ -668,6 +686,7 @@
 #define PME_FORCE_CTL                   0xFE56
 #define ASPM_FORCE_CTL                  0xFE57
 #define PM_CLK_FORCE_CTL                0xFE58
+#define FUNC_FORCE_CTL                  0xFE59
 #define PERST_GLITCH_WIDTH              0xFE5C
 #define CHANGE_LINK_STATE               0xFE5B
 #define RESET_LOAD_REG                  0xFE5E
@@ -683,6 +702,13 @@
 
 #define DUMMY_REG_RESET_0               0xFE90
 
+#define AUTOLOAD_CFG_BASE               0xFF00
+
+#define PM_CTRL1                        0xFF44
+#define PM_CTRL2                        0xFF45
+#define PM_CTRL3                        0xFF46
+#define PM_CTRL4                        0xFF47
+
 /* Memory mapping */
 #define SRAM_BASE                       0xE600
 #define RBUF_BASE                       0xF400
@@ -725,6 +751,11 @@
 #define PHY_FLD4                        0x1E
 #define PHY_DUM_REG                     0x1F
 
+#define LCTLR                           0x80
+#define PCR_SETTING_REG1                0x724
+#define PCR_SETTING_REG2                0x814
+#define PCR_SETTING_REG3                0x747
+
 #define rtsx_pci_init_cmd(pcr)          ((pcr)->ci = 0)
 
 struct rtsx_pcr;
@@ -746,6 +777,8 @@ struct pcr_ops {
                                                 u8 voltage);
         unsigned int    (*cd_deglitch)(struct rtsx_pcr *pcr);
         int             (*conv_clk_and_div_n)(int clk, int dir);
+        void            (*fetch_vendor_settings)(struct rtsx_pcr *pcr);
+        void            (*force_power_down)(struct rtsx_pcr *pcr, u8 pm_state);
 };
 
 enum PDEV_STAT  {PDEV_STAT_IDLE, PDEV_STAT_RUN};
@@ -787,7 +820,6 @@ struct rtsx_pcr {
         struct completion               *finish_me;
 
         unsigned int                    cur_clock;
-        bool                            ms_pmos;
         bool                            remove_pci;
         bool                            msi_en;
 
@@ -805,6 +837,19 @@ struct rtsx_pcr {
 #define IC_VER_D                        3
         u8                              ic_version;
 
+        u8                              sd30_drive_sel_1v8;
+        u8                              sd30_drive_sel_3v3;
+        u8                              card_drive_sel;
+#define ASPM_L1_EN                      0x02
+        u8                              aspm_en;
+
+#define PCR_MS_PMOS                     (1 << 0)
+#define PCR_REVERSE_SOCKET              (1 << 1)
+        u32                             flags;
+
+        u32                             tx_initial_phase;
+        u32                             rx_initial_phase;
+
         const u32                       *sd_pull_ctl_enable_tbl;
         const u32                       *sd_pull_ctl_disable_tbl;
         const u32                       *ms_pull_ctl_enable_tbl;
@@ -821,6 +866,18 @@ struct rtsx_pcr {
 #define PCI_VID(pcr)                    ((pcr)->pci->vendor)
 #define PCI_PID(pcr)                    ((pcr)->pci->device)
 
+#define SDR104_PHASE(val)               ((val) & 0xFF)
+#define SDR50_PHASE(val)                (((val) >> 8) & 0xFF)
+#define DDR50_PHASE(val)                (((val) >> 16) & 0xFF)
+#define SDR104_TX_PHASE(pcr)            SDR104_PHASE((pcr)->tx_initial_phase)
+#define SDR50_TX_PHASE(pcr)             SDR50_PHASE((pcr)->tx_initial_phase)
+#define DDR50_TX_PHASE(pcr)             DDR50_PHASE((pcr)->tx_initial_phase)
+#define SDR104_RX_PHASE(pcr)            SDR104_PHASE((pcr)->rx_initial_phase)
+#define SDR50_RX_PHASE(pcr)             SDR50_PHASE((pcr)->rx_initial_phase)
+#define DDR50_RX_PHASE(pcr)             DDR50_PHASE((pcr)->rx_initial_phase)
+#define SET_CLOCK_PHASE(sdr104, sdr50, ddr50)   \
+                                (((ddr50) << 16) | ((sdr50) << 8) | (sdr104))
+
 void rtsx_pci_start_run(struct rtsx_pcr *pcr);
 int rtsx_pci_write_register(struct rtsx_pcr *pcr, u16 addr, u8 mask, u8 data);
 int rtsx_pci_read_register(struct rtsx_pcr *pcr, u16 addr, u8 *data);
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index f0f4de3b4ccc..378ae8a04c6a 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -14,8 +14,6 @@
 #ifndef __LINUX_MFD_SEC_CORE_H
 #define __LINUX_MFD_SEC_CORE_H
 
-#define NUM_IRQ_REGS    4
-
 enum sec_device_type {
         S5M8751X,
         S5M8763X,
@@ -44,8 +42,6 @@ struct sec_pmic_dev {
         struct regmap *regmap;
         struct i2c_client *i2c;
         struct i2c_client *rtc;
-        struct mutex iolock;
-        struct mutex irqlock;
 
         int device_type;
         int irq_base;
@@ -53,8 +49,6 @@ struct sec_pmic_dev {
         struct regmap_irq_chip_data *irq_data;
 
         int ono;
-        u8 irq_masks_cur[NUM_IRQ_REGS];
-        u8 irq_masks_cache[NUM_IRQ_REGS];
         int type;
         bool wakeup;
 };
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
index ad2252f239d7..b3ddf98dec37 100644
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@ -167,11 +167,8 @@ enum s2mps11_regulators {
         S2MPS11_BUCK8,
         S2MPS11_BUCK9,
         S2MPS11_BUCK10,
-        S2MPS11_AP_EN32KHZ,
-        S2MPS11_CP_EN32KHZ,
-        S2MPS11_BT_EN32KHZ,
 
-        S2MPS11_REG_MAX,
+        S2MPS11_REGULATOR_MAX,
 };
 
 #define S2MPS11_BUCK_MIN1       600000
@@ -189,8 +186,19 @@ enum s2mps11_regulators {
 #define S2MPS11_ENABLE_SHIFT    0x06
 #define S2MPS11_LDO_N_VOLTAGES  (S2MPS11_LDO_VSEL_MASK + 1)
 #define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1)
+#define S2MPS11_RAMP_DELAY      25000           /* uV/us */
 
+
+#define S2MPS11_BUCK2_RAMP_SHIFT        6
+#define S2MPS11_BUCK34_RAMP_SHIFT       4
+#define S2MPS11_BUCK5_RAMP_SHIFT        6
+#define S2MPS11_BUCK16_RAMP_SHIFT       4
+#define S2MPS11_BUCK7810_RAMP_SHIFT     2
+#define S2MPS11_BUCK9_RAMP_SHIFT        0
+#define S2MPS11_BUCK2_RAMP_EN_SHIFT     3
+#define S2MPS11_BUCK3_RAMP_EN_SHIFT     2
+#define S2MPS11_BUCK4_RAMP_EN_SHIFT     1
+#define S2MPS11_BUCK6_RAMP_EN_SHIFT     0
 #define S2MPS11_PMIC_EN_SHIFT   6
-#define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3)
 
 #endif /*  __LINUX_MFD_S2MPS11_H */
diff --git a/include/linux/mfd/syscon/clps711x.h b/include/linux/mfd/syscon/clps711x.h
new file mode 100644
index 000000000000..26355abae515
--- /dev/null
+++ b/include/linux/mfd/syscon/clps711x.h
@@ -0,0 +1,94 @@
+/*
+ *  CLPS711X system register bits definitions
+ *
+ *  Copyright (C) 2013 Alexander Shiyan <shc_work@mail.ru>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _LINUX_MFD_SYSCON_CLPS711X_H_
+#define _LINUX_MFD_SYSCON_CLPS711X_H_
+
+#define SYSCON_OFFSET           (0x00)
+#define SYSFLG_OFFSET           (0x40)
+
+#define SYSCON1_KBDSCAN(x)      ((x) & 15)
+#define SYSCON1_KBDSCAN_MASK    (15)
+#define SYSCON1_TC1M            (1 << 4)
+#define SYSCON1_TC1S            (1 << 5)
+#define SYSCON1_TC2M            (1 << 6)
+#define SYSCON1_TC2S            (1 << 7)
+#define SYSCON1_BZTOG           (1 << 9)
+#define SYSCON1_BZMOD           (1 << 10)
+#define SYSCON1_DBGEN           (1 << 11)
+#define SYSCON1_LCDEN           (1 << 12)
+#define SYSCON1_CDENTX          (1 << 13)
+#define SYSCON1_CDENRX          (1 << 14)
+#define SYSCON1_SIREN           (1 << 15)
+#define SYSCON1_ADCKSEL(x)      (((x) & 3) << 16)
+#define SYSCON1_ADCKSEL_MASK    (3 << 16)
+#define SYSCON1_EXCKEN          (1 << 18)
+#define SYSCON1_WAKEDIS         (1 << 19)
+#define SYSCON1_IRTXM           (1 << 20)
+
+#define SYSCON2_SERSEL          (1 << 0)
+#define SYSCON2_KBD6            (1 << 1)
+#define SYSCON2_DRAMZ           (1 << 2)
+#define SYSCON2_KBWEN           (1 << 3)
+#define SYSCON2_SS2TXEN         (1 << 4)
+#define SYSCON2_PCCARD1         (1 << 5)
+#define SYSCON2_PCCARD2         (1 << 6)
+#define SYSCON2_SS2RXEN         (1 << 7)
+#define SYSCON2_SS2MAEN         (1 << 9)
+#define SYSCON2_OSTB            (1 << 12)
+#define SYSCON2_CLKENSL         (1 << 13)
+#define SYSCON2_BUZFREQ         (1 << 14)
+
+#define SYSCON3_ADCCON          (1 << 0)
+#define SYSCON3_CLKCTL0         (1 << 1)
+#define SYSCON3_CLKCTL1         (1 << 2)
+#define SYSCON3_DAISEL          (1 << 3)
+#define SYSCON3_ADCCKNSEN       (1 << 4)
+#define SYSCON3_VERSN(x)        (((x) >> 5) & 7)
+#define SYSCON3_VERSN_MASK      (7 << 5)
+#define SYSCON3_FASTWAKE        (1 << 8)
+#define SYSCON3_DAIEN           (1 << 9)
+#define SYSCON3_128FS           SYSCON3_DAIEN
+#define SYSCON3_ENPD67          (1 << 10)
+
+#define SYSCON_UARTEN           (1 << 8)
+
+#define SYSFLG1_MCDR            (1 << 0)
+#define SYSFLG1_DCDET           (1 << 1)
+#define SYSFLG1_WUDR            (1 << 2)
+#define SYSFLG1_WUON            (1 << 3)
+#define SYSFLG1_CTS             (1 << 8)
+#define SYSFLG1_DSR             (1 << 9)
+#define SYSFLG1_DCD             (1 << 10)
+#define SYSFLG1_NBFLG           (1 << 12)
+#define SYSFLG1_RSTFLG          (1 << 13)
+#define SYSFLG1_PFFLG           (1 << 14)
+#define SYSFLG1_CLDFLG          (1 << 15)
+#define SYSFLG1_CRXFE           (1 << 24)
+#define SYSFLG1_CTXFF           (1 << 25)
+#define SYSFLG1_SSIBUSY         (1 << 26)
+#define SYSFLG1_ID              (1 << 29)
+#define SYSFLG1_VERID(x)        (((x) >> 30) & 3)
+#define SYSFLG1_VERID_MASK      (3 << 30)
+
+#define SYSFLG2_SSRXOF          (1 << 0)
+#define SYSFLG2_RESVAL          (1 << 1)
+#define SYSFLG2_RESFRM          (1 << 2)
+#define SYSFLG2_SS2RXFE         (1 << 3)
+#define SYSFLG2_SS2TXFF         (1 << 4)
+#define SYSFLG2_SS2TXUF         (1 << 5)
+#define SYSFLG2_CKMODE          (1 << 6)
+
+#define SYSFLG_UBUSY            (1 << 11)
+#define SYSFLG_URXFE            (1 << 22)
+#define SYSFLG_UTXFF            (1 << 23)
+
+#endif
diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
index dab34a1deb2c..b6bdcd66c07d 100644
--- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
@@ -103,15 +103,15 @@
 #define IMX6Q_GPR1_EXC_MON_MASK                 BIT(22)
 #define IMX6Q_GPR1_EXC_MON_OKAY                 0x0
 #define IMX6Q_GPR1_EXC_MON_SLVE                 BIT(22)
-#define IMX6Q_GPR1_MIPI_IPU2_SEL_MASK           BIT(21)
-#define IMX6Q_GPR1_MIPI_IPU2_SEL_GASKET         0x0
-#define IMX6Q_GPR1_MIPI_IPU2_SEL_IOMUX          BIT(21)
-#define IMX6Q_GPR1_MIPI_IPU1_MUX_MASK           BIT(20)
-#define IMX6Q_GPR1_MIPI_IPU1_MUX_GASKET         0x0
-#define IMX6Q_GPR1_MIPI_IPU1_MUX_IOMUX          BIT(20)
-#define IMX6Q_GPR1_MIPI_IPU2_MUX_MASK           BIT(19)
+#define IMX6Q_GPR1_ENET_CLK_SEL_MASK            BIT(21)
+#define IMX6Q_GPR1_ENET_CLK_SEL_PAD             0
+#define IMX6Q_GPR1_ENET_CLK_SEL_ANATOP          BIT(21)
+#define IMX6Q_GPR1_MIPI_IPU2_MUX_MASK           BIT(20)
 #define IMX6Q_GPR1_MIPI_IPU2_MUX_GASKET         0x0
-#define IMX6Q_GPR1_MIPI_IPU2_MUX_IOMUX          BIT(19)
+#define IMX6Q_GPR1_MIPI_IPU2_MUX_IOMUX          BIT(20)
+#define IMX6Q_GPR1_MIPI_IPU1_MUX_MASK           BIT(19)
+#define IMX6Q_GPR1_MIPI_IPU1_MUX_GASKET         0x0
+#define IMX6Q_GPR1_MIPI_IPU1_MUX_IOMUX          BIT(19)
 #define IMX6Q_GPR1_PCIE_TEST_PD                 BIT(18)
 #define IMX6Q_GPR1_IPU_VPU_MUX_MASK             BIT(17)
 #define IMX6Q_GPR1_IPU_VPU_MUX_IPU1             0x0
@@ -279,41 +279,88 @@
 #define IMX6Q_GPR13_CAN2_STOP_REQ               BIT(29)
 #define IMX6Q_GPR13_CAN1_STOP_REQ               BIT(28)
 #define IMX6Q_GPR13_ENET_STOP_REQ               BIT(27)
-#define IMX6Q_GPR13_SATA_PHY_8_MASK             (0x7 << 24)
-#define IMX6Q_GPR13_SATA_PHY_8_0_5_DB           (0x0 << 24)
-#define IMX6Q_GPR13_SATA_PHY_8_1_0_DB           (0x1 << 24)
-#define IMX6Q_GPR13_SATA_PHY_8_1_5_DB           (0x2 << 24)
-#define IMX6Q_GPR13_SATA_PHY_8_2_0_DB           (0x3 << 24)
-#define IMX6Q_GPR13_SATA_PHY_8_2_5_DB           (0x4 << 24)
-#define IMX6Q_GPR13_SATA_PHY_8_3_0_DB           (0x5 << 24)
-#define IMX6Q_GPR13_SATA_PHY_8_3_5_DB           (0x6 << 24)
-#define IMX6Q_GPR13_SATA_PHY_8_4_0_DB           (0x7 << 24)
-#define IMX6Q_GPR13_SATA_PHY_7_MASK             (0x1f << 19)
-#define IMX6Q_GPR13_SATA_PHY_7_SATA1I           (0x10 << 19)
-#define IMX6Q_GPR13_SATA_PHY_7_SATA1M           (0x10 << 19)
-#define IMX6Q_GPR13_SATA_PHY_7_SATA1X           (0x1a << 19)
-#define IMX6Q_GPR13_SATA_PHY_7_SATA2I           (0x12 << 19)
-#define IMX6Q_GPR13_SATA_PHY_7_SATA2M           (0x12 << 19)
-#define IMX6Q_GPR13_SATA_PHY_7_SATA2X           (0x1a << 19)
-#define IMX6Q_GPR13_SATA_PHY_6_MASK             (0x7 << 16)
-#define IMX6Q_GPR13_SATA_SPEED_MASK             BIT(15)
-#define IMX6Q_GPR13_SATA_SPEED_1P5G             0x0
-#define IMX6Q_GPR13_SATA_SPEED_3P0G             BIT(15)
-#define IMX6Q_GPR13_SATA_PHY_5                  BIT(14)
-#define IMX6Q_GPR13_SATA_PHY_4_MASK             (0x7 << 11)
-#define IMX6Q_GPR13_SATA_PHY_4_16_16            (0x0 << 11)
-#define IMX6Q_GPR13_SATA_PHY_4_14_16            (0x1 << 11)
-#define IMX6Q_GPR13_SATA_PHY_4_12_16            (0x2 << 11)
-#define IMX6Q_GPR13_SATA_PHY_4_10_16            (0x3 << 11)
-#define IMX6Q_GPR13_SATA_PHY_4_9_16             (0x4 << 11)
-#define IMX6Q_GPR13_SATA_PHY_4_8_16             (0x5 << 11)
-#define IMX6Q_GPR13_SATA_PHY_3_MASK             (0xf << 7)
-#define IMX6Q_GPR13_SATA_PHY_3_OFF              0x7
-#define IMX6Q_GPR13_SATA_PHY_2_MASK             (0x1f << 2)
-#define IMX6Q_GPR13_SATA_PHY_2_OFF              0x2
-#define IMX6Q_GPR13_SATA_PHY_1_MASK             (0x3 << 0)
-#define IMX6Q_GPR13_SATA_PHY_1_FAST             (0x0 << 0)
-#define IMX6Q_GPR13_SATA_PHY_1_MED              (0x1 << 0)
-#define IMX6Q_GPR13_SATA_PHY_1_SLOW             (0x2 << 0)
-
+#define IMX6Q_GPR13_SATA_RX_EQ_VAL_MASK         (0x7 << 24)
+#define IMX6Q_GPR13_SATA_RX_EQ_VAL_0_5_DB       (0x0 << 24)
+#define IMX6Q_GPR13_SATA_RX_EQ_VAL_1_0_DB       (0x1 << 24)
+#define IMX6Q_GPR13_SATA_RX_EQ_VAL_1_5_DB       (0x2 << 24)
+#define IMX6Q_GPR13_SATA_RX_EQ_VAL_2_0_DB       (0x3 << 24)
+#define IMX6Q_GPR13_SATA_RX_EQ_VAL_2_5_DB       (0x4 << 24)
+#define IMX6Q_GPR13_SATA_RX_EQ_VAL_3_0_DB       (0x5 << 24)
+#define IMX6Q_GPR13_SATA_RX_EQ_VAL_3_5_DB       (0x6 << 24)
+#define IMX6Q_GPR13_SATA_RX_EQ_VAL_4_0_DB       (0x7 << 24)
+#define IMX6Q_GPR13_SATA_RX_LOS_LVL_MASK        (0x1f << 19)
+#define IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA1I      (0x10 << 19)
+#define IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA1M      (0x10 << 19)
+#define IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA1X      (0x1a << 19)
+#define IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2I      (0x12 << 19)
+#define IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2M      (0x12 << 19)
+#define IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2X      (0x1a << 19)
+#define IMX6Q_GPR13_SATA_RX_DPLL_MODE_MASK      (0x7 << 16)
+#define IMX6Q_GPR13_SATA_RX_DPLL_MODE_1P_1F     (0x0 << 16)
+#define IMX6Q_GPR13_SATA_RX_DPLL_MODE_2P_2F     (0x1 << 16)
+#define IMX6Q_GPR13_SATA_RX_DPLL_MODE_1P_4F     (0x2 << 16)
+#define IMX6Q_GPR13_SATA_RX_DPLL_MODE_2P_4F     (0x3 << 16)
+#define IMX6Q_GPR13_SATA_SPD_MODE_MASK          BIT(15)
+#define IMX6Q_GPR13_SATA_SPD_MODE_1P5G          0x0
+#define IMX6Q_GPR13_SATA_SPD_MODE_3P0G          BIT(15)
+#define IMX6Q_GPR13_SATA_MPLL_SS_EN             BIT(14)
+#define IMX6Q_GPR13_SATA_TX_ATTEN_MASK          (0x7 << 11)
+#define IMX6Q_GPR13_SATA_TX_ATTEN_16_16         (0x0 << 11)
+#define IMX6Q_GPR13_SATA_TX_ATTEN_14_16         (0x1 << 11)
+#define IMX6Q_GPR13_SATA_TX_ATTEN_12_16         (0x2 << 11)
+#define IMX6Q_GPR13_SATA_TX_ATTEN_10_16         (0x3 << 11)
+#define IMX6Q_GPR13_SATA_TX_ATTEN_9_16          (0x4 << 11)
+#define IMX6Q_GPR13_SATA_TX_ATTEN_8_16          (0x5 << 11)
+#define IMX6Q_GPR13_SATA_TX_BOOST_MASK          (0xf << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_0_00_DB       (0x0 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_0_37_DB       (0x1 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_0_74_DB       (0x2 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_1_11_DB       (0x3 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_1_48_DB       (0x4 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_1_85_DB       (0x5 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_2_22_DB       (0x6 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_2_59_DB       (0x7 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_2_96_DB       (0x8 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_3_33_DB       (0x9 << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_3_70_DB       (0xa << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_4_07_DB       (0xb << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_4_44_DB       (0xc << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_4_81_DB       (0xd << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_5_28_DB       (0xe << 7)
+#define IMX6Q_GPR13_SATA_TX_BOOST_5_75_DB       (0xf << 7)
+#define IMX6Q_GPR13_SATA_TX_LVL_MASK            (0x1f << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_0_937_V         (0x00 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_0_947_V         (0x01 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_0_957_V         (0x02 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_0_966_V         (0x03 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_0_976_V         (0x04 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_0_986_V         (0x05 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_0_996_V         (0x06 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_005_V         (0x07 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_015_V         (0x08 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_025_V         (0x09 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_035_V         (0x0a << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_045_V         (0x0b << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_054_V         (0x0c << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_064_V         (0x0d << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_074_V         (0x0e << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_084_V         (0x0f << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_094_V         (0x10 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_104_V         (0x11 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_113_V         (0x12 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_123_V         (0x13 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_133_V         (0x14 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_143_V         (0x15 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_152_V         (0x16 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_162_V         (0x17 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_172_V         (0x18 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_182_V         (0x19 << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_191_V         (0x1a << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_201_V         (0x1b << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_211_V         (0x1c << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_221_V         (0x1d << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_230_V         (0x1e << 2)
+#define IMX6Q_GPR13_SATA_TX_LVL_1_240_V         (0x1f << 2)
+#define IMX6Q_GPR13_SATA_MPLL_CLK_EN            BIT(1)
+#define IMX6Q_GPR13_SATA_TX_EDGE_RATE           BIT(0)
 #endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index c79ad5d2f271..25f2c611ab01 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -30,8 +30,8 @@
 #define REG_IDLECONFIG          0x058
 #define REG_CHARGECONFIG        0x05C
 #define REG_CHARGEDELAY         0x060
-#define REG_STEPCONFIG(n)       (0x64 + ((n - 1) * 8))
-#define REG_STEPDELAY(n)        (0x68 + ((n - 1) * 8))
+#define REG_STEPCONFIG(n)       (0x64 + ((n) * 8))
+#define REG_STEPDELAY(n)        (0x68 + ((n) * 8))
 #define REG_FIFO0CNT            0xE4
 #define REG_FIFO0THR            0xE8
 #define REG_FIFO1CNT            0xF0
@@ -46,8 +46,6 @@
 /* Step Enable */
 #define STEPENB_MASK            (0x1FFFF << 0)
 #define STEPENB(val)            ((val) << 0)
-#define STPENB_STEPENB          STEPENB(0x1FFFF)
-#define STPENB_STEPENB_TC       STEPENB(0x1FFF)
 
 /* IRQ enable */
 #define IRQENB_HW_PEN           BIT(0)
@@ -73,8 +71,6 @@
 #define STEPCONFIG_INM_ADCREFM  STEPCONFIG_INM(8)
 #define STEPCONFIG_INP_MASK     (0xF << 19)
 #define STEPCONFIG_INP(val)     ((val) << 19)
-#define STEPCONFIG_INP_AN2      STEPCONFIG_INP(2)
-#define STEPCONFIG_INP_AN3      STEPCONFIG_INP(3)
 #define STEPCONFIG_INP_AN4      STEPCONFIG_INP(4)
 #define STEPCONFIG_INP_ADCREFM  STEPCONFIG_INP(8)
 #define STEPCONFIG_FIFO1        BIT(26)
@@ -96,7 +92,6 @@
 #define STEPCHARGE_INM_AN1      STEPCHARGE_INM(1)
 #define STEPCHARGE_INP_MASK     (0xF << 19)
 #define STEPCHARGE_INP(val)     ((val) << 19)
-#define STEPCHARGE_INP_AN1      STEPCHARGE_INP(1)
 #define STEPCHARGE_RFM_MASK     (3 << 23)
 #define STEPCHARGE_RFM(val)     ((val) << 23)
 #define STEPCHARGE_RFM_XNUR     STEPCHARGE_RFM(1)
@@ -118,29 +113,39 @@
 #define CNTRLREG_8WIRE          CNTRLREG_AFE_CTRL(3)
 #define CNTRLREG_TSCENB         BIT(7)
 
+/* FIFO READ Register */
+#define FIFOREAD_DATA_MASK (0xfff << 0)
+#define FIFOREAD_CHNLID_MASK (0xf << 16)
+
+/* Sequencer Status */
+#define SEQ_STATUS BIT(5)
+
 #define ADC_CLK                 3000000
-#define MAX_CLK_DIV             7
 #define TOTAL_STEPS             16
 #define TOTAL_CHANNELS          8
 
-#define TSCADC_CELLS            2
-
-enum tscadc_cells {
-        TSC_CELL,
-        ADC_CELL,
-};
+/*
+* ADC runs at 3MHz, and it takes
+* 15 cycles to latch one data output.
+* Hence the idle time for ADC to
+* process one sample data would be
+* around 5 micro seconds.
+*/
+#define IDLE_TIMEOUT 5 /* microsec */
 
-struct mfd_tscadc_board {
-        struct tsc_data *tsc_init;
-        struct adc_data *adc_init;
-};
+#define TSCADC_CELLS            2
 
 struct ti_tscadc_dev {
         struct device *dev;
         struct regmap *regmap_tscadc;
         void __iomem *tscadc_base;
         int irq;
+        int used_cells; /* 1-2 */
+        int tsc_cell;   /* -1 if not used */
+        int adc_cell;   /* -1 if not used */
         struct mfd_cell cells[TSCADC_CELLS];
+        u32 reg_se_cache;
+        spinlock_t reg_lock;
 
         /* tsc device */
         struct titsc *tsc;
@@ -149,4 +154,15 @@ struct ti_tscadc_dev {
         struct adc_device *adc;
 };
 
+static inline struct ti_tscadc_dev *ti_tscadc_dev_get(struct platform_device *p)
+{
+        struct ti_tscadc_dev **tscadc_dev = p->dev.platform_data;
+
+        return *tscadc_dev;
+}
+
+void am335x_tsc_se_update(struct ti_tscadc_dev *tsadc);
+void am335x_tsc_se_set(struct ti_tscadc_dev *tsadc, u32 val);
+void am335x_tsc_se_clr(struct ti_tscadc_dev *tsadc, u32 val);
+
 #endif
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index 99bf3e665997..b22883d60500 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -81,10 +81,15 @@ int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);
 void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);
 void tmio_core_mmc_clk_div(void __iomem *cnf, int shift, int state);
 
+struct dma_chan;
+
 struct tmio_mmc_dma {
         void *chan_priv_tx;
         void *chan_priv_rx;
+        int slave_id_tx;
+        int slave_id_rx;
         int alignment_shift;
+        bool (*filter)(struct dma_chan *chan, void *arg);
 };
 
 struct tmio_mmc_host;
@@ -103,7 +108,6 @@ struct tmio_mmc_data {
         unsigned int                    cd_gpio;
         void (*set_pwr)(struct platform_device *host, int state);
         void (*set_clk_div)(struct platform_device *host, int state);
-        int (*get_cd)(struct platform_device *host);
         int (*write16_hook)(struct tmio_mmc_host *host, int addr);
         /* clock management callbacks */
         int (*clk_enable)(struct platform_device *pdev, unsigned int *f);
diff --git a/include/linux/mfd/tps65217.h b/include/linux/mfd/tps65217.h
index 29eab2bd3dfa..a5a7f0130e96 100644
--- a/include/linux/mfd/tps65217.h
+++ b/include/linux/mfd/tps65217.h
@@ -244,24 +244,6 @@ struct tps65217_board {
 };
 
 /**
- * struct tps_info - packages regulator constraints
- * @name:               Voltage regulator name
- * @min_uV:             minimum micro volts
- * @max_uV:             minimum micro volts
- * @vsel_to_uv:         Function pointer to get voltage from selector
- * @uv_to_vsel:         Function pointer to get selector from voltage
- *
- * This data is used to check the regualtor voltage limits while setting.
- */
-struct tps_info {
-        const char *name;
-        int min_uV;
-        int max_uV;
-        int (*vsel_to_uv)(unsigned int vsel);
-        int (*uv_to_vsel)(int uV, unsigned int *vsel);
-};
-
-/**
  * struct tps65217 - tps65217 sub-driver chip access routines
  *
  * Device data may be used to access the TPS65217 chip
@@ -273,7 +255,6 @@ struct tps65217 {
         unsigned int id;
         struct regulator_desc desc[TPS65217_NUM_REGULATOR];
         struct regulator_dev *rdev[TPS65217_NUM_REGULATOR];
-        struct tps_info *info[TPS65217_NUM_REGULATOR];
         struct regmap *regmap;
 };
 
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 94ac944d12f0..81f639bc1ae6 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -125,8 +125,15 @@
 
 #define TWL6040_HSDACENA                (1 << 0)
 #define TWL6040_HSDACMODE               (1 << 1)
+#define TWL6040_HSDRVENA                (1 << 2)
 #define TWL6040_HSDRVMODE               (1 << 3)
 
+/* HFLCTL/R (0x14/0x16) fields */
+
+#define TWL6040_HFDACENA                (1 << 0)
+#define TWL6040_HFPGAENA                (1 << 1)
+#define TWL6040_HFDRVENA                (1 << 4)
+
 /* VIBCTLL/R (0x18/0x1A) fields */
 
 #define TWL6040_VIBENA                  (1 << 0)
@@ -178,6 +185,7 @@
 
 #define TWL6040_GPO_MAX 3
 
+/* TODO: All platform data struct can be removed */
 struct twl6040_codec_data {
         u16 hs_left_step;
         u16 hs_right_step;
@@ -222,7 +230,6 @@ struct twl6040 {
         int audpwron;
         int power_count;
         int rev;
-        u8 vibra_ctrl_cache[2];
 
         /* PLL configuration */
         int pll;
diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h
index 28af41756360..88f90cbf8e6a 100644
--- a/include/linux/mfd/ucb1x00.h
+++ b/include/linux/mfd/ucb1x00.h
@@ -10,6 +10,7 @@
 #ifndef UCB1200_H
 #define UCB1200_H
 
+#include <linux/device.h>
 #include <linux/mfd/mcp.h>
 #include <linux/gpio.h>
 #include <linux/mutex.h>
diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h
index ae5c249530b4..40854ac0ba3d 100644
--- a/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@ -29,6 +29,7 @@ enum wm8994_type {
 
 struct regulator_dev;
 struct regulator_bulk_data;
+struct irq_domain;
 
 #define WM8994_NUM_GPIO_REGS 11
 #define WM8994_NUM_LDO_REGS   2
@@ -73,6 +74,7 @@ struct wm8994 {
 
         int irq;
         struct regmap_irq_chip_data *irq_data;
+        struct irq_domain *edge_irq;
 
         /* Used over suspend/resume */
         bool suspended;
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 68e776594889..90c60524a496 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -182,6 +182,11 @@ struct wm8994_pdata {
          */
         int micdet_delay;
 
+        /* Delay between microphone detect completing and reporting on
+         * insert (specified in ms)
+         */
+        int mic_id_delay;
+
         /* IRQ for microphone detection if brought out directly as a
          * signal.
          */
@@ -223,6 +228,11 @@ struct wm8994_pdata {
          * lines is mastered.
          */
         int max_channels_clocked[WM8994_NUM_AIF];
+
+        /**
+         * GPIO for the IRQ pin if host only supports edge triggering
+         */
+        int irq_gpio;
 };
 
 #endif
diff --git a/include/linux/mfd/wm8994/registers.h b/include/linux/mfd/wm8994/registers.h
index 053548961c15..db8cef3d5321 100644
--- a/include/linux/mfd/wm8994/registers.h
+++ b/include/linux/mfd/wm8994/registers.h
@@ -2668,6 +2668,10 @@
 /*
  * R772 (0x304) - AIF1ADC LRCLK
  */
+#define WM8958_AIF1_LRCLK_INV                   0x1000  /* AIF1_LRCLK_INV */
+#define WM8958_AIF1_LRCLK_INV_MASK              0x1000  /* AIF1_LRCLK_INV */
+#define WM8958_AIF1_LRCLK_INV_SHIFT                 12  /* AIF1_LRCLK_INV */
+#define WM8958_AIF1_LRCLK_INV_WIDTH                  1  /* AIF1_LRCLK_INV */
 #define WM8994_AIF1ADC_LRCLK_DIR                0x0800  /* AIF1ADC_LRCLK_DIR */
 #define WM8994_AIF1ADC_LRCLK_DIR_MASK           0x0800  /* AIF1ADC_LRCLK_DIR */
 #define WM8994_AIF1ADC_LRCLK_DIR_SHIFT              11  /* AIF1ADC_LRCLK_DIR */
@@ -2679,6 +2683,10 @@
 /*
  * R773 (0x305) - AIF1DAC LRCLK
  */
+#define WM8958_AIF1_LRCLK_INV                   0x1000  /* AIF1_LRCLK_INV */
+#define WM8958_AIF1_LRCLK_INV_MASK              0x1000  /* AIF1_LRCLK_INV */
+#define WM8958_AIF1_LRCLK_INV_SHIFT                 12  /* AIF1_LRCLK_INV */
+#define WM8958_AIF1_LRCLK_INV_WIDTH                  1  /* AIF1_LRCLK_INV */
 #define WM8994_AIF1DAC_LRCLK_DIR                0x0800  /* AIF1DAC_LRCLK_DIR */
 #define WM8994_AIF1DAC_LRCLK_DIR_MASK           0x0800  /* AIF1DAC_LRCLK_DIR */
 #define WM8994_AIF1DAC_LRCLK_DIR_SHIFT              11  /* AIF1DAC_LRCLK_DIR */
diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h
index 8752dbbc6135..ad05ce60c1c9 100644
--- a/include/linux/micrel_phy.h
+++ b/include/linux/micrel_phy.h
@@ -17,6 +17,7 @@
 
 #define PHY_ID_KSZ8873MLL       0x000e7237
 #define PHY_ID_KSZ9021          0x00221610
+#define PHY_ID_KSZ9021RLRN      0x00221611
 #define PHY_ID_KS8737           0x00221720
 #define PHY_ID_KSZ8021          0x00221555
 #define PHY_ID_KSZ8031          0x00221556
@@ -35,4 +36,9 @@
 /* struct phy_device dev_flags definitions */
 #define MICREL_PHY_50MHZ_CLK    0x00000001
 
+#define MICREL_KSZ9021_EXTREG_CTRL      0xB
+#define MICREL_KSZ9021_EXTREG_DATA_WRITE        0xC
+#define MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW  0x104
+#define MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW   0x105
+
 #endif /* _MICREL_PHY_H */
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index a405d3dc0f61..8d3c57fdf221 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -41,8 +41,6 @@ extern int migrate_page(struct address_space *,
                         struct page *, struct page *, enum migrate_mode);
 extern int migrate_pages(struct list_head *l, new_page_t x,
                 unsigned long private, enum migrate_mode mode, int reason);
-extern int migrate_huge_page(struct page *, new_page_t x,
-                unsigned long private, enum migrate_mode mode);
 
 extern int fail_migrate_page(struct address_space *,
                         struct page *, struct page *);
@@ -55,6 +53,9 @@ extern int migrate_vmas(struct mm_struct *mm,
 extern void migrate_page_copy(struct page *newpage, struct page *page);
 extern int migrate_huge_page_move_mapping(struct address_space *mapping,
                                   struct page *newpage, struct page *page);
+extern int migrate_page_move_mapping(struct address_space *mapping,
+                struct page *newpage, struct page *page,
+                struct buffer_head *head, enum migrate_mode mode);
 #else
 
 static inline void putback_lru_pages(struct list_head *l) {}
@@ -62,9 +63,6 @@ static inline void putback_movable_pages(struct list_head *l) {}
 static inline int migrate_pages(struct list_head *l, new_page_t x,
                 unsigned long private, enum migrate_mode mode, int reason)
         { return -ENOSYS; }
-static inline int migrate_huge_page(struct page *page, new_page_t x,
-                unsigned long private, enum migrate_mode mode)
-        { return -ENOSYS; }
 
 static inline int migrate_prep(void) { return -ENOSYS; }
 static inline int migrate_prep_local(void) { return -ENOSYS; }
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index adf6e0648f20..cd1fdf75103b 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -69,6 +69,7 @@ enum {
         MLX4_CMD_SET_ICM_SIZE    = 0xffd,
         /*master notify fw on finish for slave's flr*/
         MLX4_CMD_INFORM_FLR_DONE = 0x5b,
+        MLX4_CMD_GET_OP_REQ      = 0x59,
 
         /* TPT commands */
         MLX4_CMD_SW2HW_MPT       = 0xd,
@@ -111,6 +112,7 @@ enum {
         MLX4_CMD_INIT2INIT_QP    = 0x2d,
         MLX4_CMD_SUSPEND_QP      = 0x32,
         MLX4_CMD_UNSUSPEND_QP    = 0x33,
+        MLX4_CMD_UPDATE_QP       = 0x61,
         /* special QP and management commands */
         MLX4_CMD_CONF_SPECIAL_QP = 0x23,
         MLX4_CMD_MAD_IFC         = 0x24,
@@ -237,7 +239,7 @@ int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac);
 int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos);
 int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting);
 int mlx4_get_vf_config(struct mlx4_dev *dev, int port, int vf, struct ifla_vf_info *ivf);
-
+int mlx4_set_vf_link_state(struct mlx4_dev *dev, int port, int vf, int link_state);
 
 #define MLX4_COMM_GET_IF_REV(cmd_chan_ver) (u8)((cmd_chan_ver) >> 8)
 
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index a51b0134ce18..24ce6bdd540e 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -33,6 +33,7 @@
 #ifndef MLX4_DEVICE_H
 #define MLX4_DEVICE_H
 
+#include <linux/if_ether.h>
 #include <linux/pci.h>
 #include <linux/completion.h>
 #include <linux/radix-tree.h>
@@ -157,7 +158,8 @@ enum {
         MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN     = 1LL <<  4,
         MLX4_DEV_CAP_FLAG2_TS                   = 1LL <<  5,
         MLX4_DEV_CAP_FLAG2_VLAN_CONTROL         = 1LL <<  6,
-        MLX4_DEV_CAP_FLAG2_FSM                  = 1LL <<  7
+        MLX4_DEV_CAP_FLAG2_FSM                  = 1LL <<  7,
+        MLX4_DEV_CAP_FLAG2_UPDATE_QP            = 1LL <<  8
 };
 
 enum {
@@ -206,6 +208,7 @@ enum mlx4_event {
         MLX4_EVENT_TYPE_CMD                = 0x0a,
         MLX4_EVENT_TYPE_VEP_UPDATE         = 0x19,
         MLX4_EVENT_TYPE_COMM_CHANNEL       = 0x18,
+        MLX4_EVENT_TYPE_OP_REQUIRED        = 0x1a,
         MLX4_EVENT_TYPE_FATAL_WARNING      = 0x1b,
         MLX4_EVENT_TYPE_FLR_EVENT          = 0x1c,
         MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT = 0x1d,
@@ -618,7 +621,7 @@ struct mlx4_eth_av {
         u8              dgid[16];
         u32             reserved4[2];
         __be16          vlan;
-        u8              mac[6];
+        u8              mac[ETH_ALEN];
 };
 
 union mlx4_ext_av {
@@ -912,10 +915,10 @@ enum mlx4_net_trans_promisc_mode {
 };
 
 struct mlx4_spec_eth {
-        u8      dst_mac[6];
-        u8      dst_mac_msk[6];
-        u8      src_mac[6];
-        u8      src_mac_msk[6];
+        u8      dst_mac[ETH_ALEN];
+        u8      dst_mac_msk[ETH_ALEN];
+        u8      src_mac[ETH_ALEN];
+        u8      src_mac_msk[ETH_ALEN];
         u8      ether_type_enable;
         __be16  ether_type;
         __be16  vlan_id_msk;
@@ -1051,11 +1054,6 @@ struct _rule_hw {
         };
 };
 
-/* translating DMFS verbs sniffer rule to the FW API would need two reg IDs */
-struct mlx4_flow_handle {
-        u64 reg_id[2];
-};
-
 int mlx4_flow_steer_promisc_add(struct mlx4_dev *dev, u8 port, u32 qpn,
                                 enum mlx4_net_trans_promisc_mode mode);
 int mlx4_flow_steer_promisc_remove(struct mlx4_dev *dev, u8 port,
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 352eec9df1b8..6d351473c292 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -34,6 +34,7 @@
 #define MLX4_QP_H
 
 #include <linux/types.h>
+#include <linux/if_ether.h>
 
 #include <linux/mlx4/device.h>
 
@@ -143,7 +144,7 @@ struct mlx4_qp_path {
         u8                      feup;
         u8                      fvl_rx;
         u8                      reserved4[2];
-        u8                      dmac[6];
+        u8                      dmac[ETH_ALEN];
 };
 
 enum { /* fl */
@@ -152,6 +153,8 @@ enum { /* fl */
 };
 enum { /* vlan_control */
         MLX4_VLAN_CTRL_ETH_TX_BLOCK_TAGGED      = 1 << 6,
+        MLX4_VLAN_CTRL_ETH_TX_BLOCK_PRIO_TAGGED = 1 << 5, /* 802.1p priority tag */
+        MLX4_VLAN_CTRL_ETH_TX_BLOCK_UNTAGGED    = 1 << 4,
         MLX4_VLAN_CTRL_ETH_RX_BLOCK_TAGGED      = 1 << 2,
         MLX4_VLAN_CTRL_ETH_RX_BLOCK_PRIO_TAGGED = 1 << 1, /* 802.1p priority tag */
         MLX4_VLAN_CTRL_ETH_RX_BLOCK_UNTAGGED    = 1 << 0
@@ -206,6 +209,40 @@ struct mlx4_qp_context {
         u32                     reserved5[10];
 };
 
+struct mlx4_update_qp_context {
+        __be64                  qp_mask;
+        __be64                  primary_addr_path_mask;
+        __be64                  secondary_addr_path_mask;
+        u64                     reserved1;
+        struct mlx4_qp_context  qp_context;
+        u64                     reserved2[58];
+};
+
+enum {
+        MLX4_UPD_QP_MASK_PM_STATE       = 32,
+        MLX4_UPD_QP_MASK_VSD            = 33,
+};
+
+enum {
+        MLX4_UPD_QP_PATH_MASK_PKEY_INDEX                = 0 + 32,
+        MLX4_UPD_QP_PATH_MASK_FSM                       = 1 + 32,
+        MLX4_UPD_QP_PATH_MASK_MAC_INDEX                 = 2 + 32,
+        MLX4_UPD_QP_PATH_MASK_FVL                       = 3 + 32,
+        MLX4_UPD_QP_PATH_MASK_CV                        = 4 + 32,
+        MLX4_UPD_QP_PATH_MASK_VLAN_INDEX                = 5 + 32,
+        MLX4_UPD_QP_PATH_MASK_ETH_HIDE_CQE_VLAN         = 6 + 32,
+        MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_UNTAGGED     = 7 + 32,
+        MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_1P           = 8 + 32,
+        MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_TAGGED       = 9 + 32,
+        MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_UNTAGGED     = 10 + 32,
+        MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_1P           = 11 + 32,
+        MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_TAGGED       = 12 + 32,
+        MLX4_UPD_QP_PATH_MASK_FEUP                      = 13 + 32,
+        MLX4_UPD_QP_PATH_MASK_SCHED_QUEUE               = 14 + 32,
+        MLX4_UPD_QP_PATH_MASK_IF_COUNTER_INDEX          = 15 + 32,
+        MLX4_UPD_QP_PATH_MASK_FVL_RX                    = 16 + 32,
+};
+
 enum { /* param3 */
         MLX4_STRIP_VLAN = 1 << 30
 };
@@ -282,7 +319,7 @@ struct mlx4_wqe_datagram_seg {
         __be32                  dqpn;
         __be32                  qkey;
         __be16                  vlan;
-        u8                      mac[6];
+        u8                      mac[ETH_ALEN];
 };
 
 struct mlx4_wqe_lso_seg {
diff --git a/include/linux/mlx5/cmd.h b/include/linux/mlx5/cmd.h
new file mode 100644
index 000000000000..2826a4b6071e
--- /dev/null
+++ b/include/linux/mlx5/cmd.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX5_CMD_H
+#define MLX5_CMD_H
+
+#include <linux/types.h>
+
+struct manage_pages_layout {
+        u64     ptr;
+        u32     reserved;
+        u16     num_entries;
+        u16     func_id;
+};
+
+
+struct mlx5_cmd_alloc_uar_imm_out {
+        u32     rsvd[3];
+        u32     uarn;
+};
+
+#endif /* MLX5_CMD_H */
diff --git a/include/linux/mlx5/cq.h b/include/linux/mlx5/cq.h
new file mode 100644
index 000000000000..3db67f73d96d
--- /dev/null
+++ b/include/linux/mlx5/cq.h
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX5_CORE_CQ_H
+#define MLX5_CORE_CQ_H
+
+#include <rdma/ib_verbs.h>
+#include <linux/mlx5/driver.h>
+
+
+struct mlx5_core_cq {
+        u32                     cqn;
+        int                     cqe_sz;
+        __be32                 *set_ci_db;
+        __be32                 *arm_db;
+        atomic_t                refcount;
+        struct completion       free;
+        unsigned                vector;
+        int                     irqn;
+        void (*comp)            (struct mlx5_core_cq *);
+        void (*event)           (struct mlx5_core_cq *, enum mlx5_event);
+        struct mlx5_uar        *uar;
+        u32                     cons_index;
+        unsigned                arm_sn;
+        struct mlx5_rsc_debug   *dbg;
+        int                     pid;
+};
+
+
+enum {
+        MLX5_CQE_SYNDROME_LOCAL_LENGTH_ERR              = 0x01,
+        MLX5_CQE_SYNDROME_LOCAL_QP_OP_ERR               = 0x02,
+        MLX5_CQE_SYNDROME_LOCAL_PROT_ERR                = 0x04,
+        MLX5_CQE_SYNDROME_WR_FLUSH_ERR                  = 0x05,
+        MLX5_CQE_SYNDROME_MW_BIND_ERR                   = 0x06,
+        MLX5_CQE_SYNDROME_BAD_RESP_ERR                  = 0x10,
+        MLX5_CQE_SYNDROME_LOCAL_ACCESS_ERR              = 0x11,
+        MLX5_CQE_SYNDROME_REMOTE_INVAL_REQ_ERR          = 0x12,
+        MLX5_CQE_SYNDROME_REMOTE_ACCESS_ERR             = 0x13,
+        MLX5_CQE_SYNDROME_REMOTE_OP_ERR                 = 0x14,
+        MLX5_CQE_SYNDROME_TRANSPORT_RETRY_EXC_ERR       = 0x15,
+        MLX5_CQE_SYNDROME_RNR_RETRY_EXC_ERR             = 0x16,
+        MLX5_CQE_SYNDROME_REMOTE_ABORTED_ERR            = 0x22,
+};
+
+enum {
+        MLX5_CQE_OWNER_MASK     = 1,
+        MLX5_CQE_REQ            = 0,
+        MLX5_CQE_RESP_WR_IMM    = 1,
+        MLX5_CQE_RESP_SEND      = 2,
+        MLX5_CQE_RESP_SEND_IMM  = 3,
+        MLX5_CQE_RESP_SEND_INV  = 4,
+        MLX5_CQE_RESIZE_CQ      = 0xff, /* TBD */
+        MLX5_CQE_REQ_ERR        = 13,
+        MLX5_CQE_RESP_ERR       = 14,
+};
+
+enum {
+        MLX5_CQ_MODIFY_RESEIZE = 0,
+        MLX5_CQ_MODIFY_MODER = 1,
+        MLX5_CQ_MODIFY_MAPPING = 2,
+};
+
+struct mlx5_cq_modify_params {
+        int     type;
+        union {
+                struct {
+                        u32     page_offset;
+                        u8      log_cq_size;
+                } resize;
+
+                struct {
+                } moder;
+
+                struct {
+                } mapping;
+        } params;
+};
+
+enum {
+        CQE_SIZE_64 = 0,
+        CQE_SIZE_128 = 1,
+};
+
+static inline int cqe_sz_to_mlx_sz(u8 size)
+{
+        return size == 64 ? CQE_SIZE_64 : CQE_SIZE_128;
+}
+
+static inline void mlx5_cq_set_ci(struct mlx5_core_cq *cq)
+{
+        *cq->set_ci_db = cpu_to_be32(cq->cons_index & 0xffffff);
+}
+
+enum {
+        MLX5_CQ_DB_REQ_NOT_SOL          = 1 << 24,
+        MLX5_CQ_DB_REQ_NOT              = 0 << 24
+};
+
+static inline void mlx5_cq_arm(struct mlx5_core_cq *cq, u32 cmd,
+                               void __iomem *uar_page,
+                               spinlock_t *doorbell_lock)
+{
+        __be32 doorbell[2];
+        u32 sn;
+        u32 ci;
+
+        sn = cq->arm_sn & 3;
+        ci = cq->cons_index & 0xffffff;
+
+        *cq->arm_db = cpu_to_be32(sn << 28 | cmd | ci);
+
+        /* Make sure that the doorbell record in host memory is
+         * written before ringing the doorbell via PCI MMIO.
+         */
+        wmb();
+
+        doorbell[0] = cpu_to_be32(sn << 28 | cmd | ci);
+        doorbell[1] = cpu_to_be32(cq->cqn);
+
+        mlx5_write64(doorbell, uar_page + MLX5_CQ_DOORBELL, doorbell_lock);
+}
+
+int mlx5_init_cq_table(struct mlx5_core_dev *dev);
+void mlx5_cleanup_cq_table(struct mlx5_core_dev *dev);
+int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,
+                        struct mlx5_create_cq_mbox_in *in, int inlen);
+int mlx5_core_destroy_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq);
+int mlx5_core_query_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,
+                       struct mlx5_query_cq_mbox_out *out);
+int mlx5_core_modify_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,
+                        int type, struct mlx5_cq_modify_params *params);
+int mlx5_debug_cq_add(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq);
+void mlx5_debug_cq_remove(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq);
+
+#endif /* MLX5_CORE_CQ_H */
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
new file mode 100644
index 000000000000..68029b30c3dc
--- /dev/null
+++ b/include/linux/mlx5/device.h
@@ -0,0 +1,911 @@
+/*
+ * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX5_DEVICE_H
+#define MLX5_DEVICE_H
+
+#include <linux/types.h>
+#include <rdma/ib_verbs.h>
+
+#if defined(__LITTLE_ENDIAN)
+#define MLX5_SET_HOST_ENDIANNESS        0
+#elif defined(__BIG_ENDIAN)
+#define MLX5_SET_HOST_ENDIANNESS        0x80
+#else
+#error Host endianness not defined
+#endif
+
+enum {
+        MLX5_MAX_COMMANDS               = 32,
+        MLX5_CMD_DATA_BLOCK_SIZE        = 512,
+        MLX5_PCI_CMD_XPORT              = 7,
+};
+
+enum {
+        MLX5_EXTENDED_UD_AV             = 0x80000000,
+};
+
+enum {
+        MLX5_CQ_STATE_ARMED             = 9,
+        MLX5_CQ_STATE_ALWAYS_ARMED      = 0xb,
+        MLX5_CQ_STATE_FIRED             = 0xa,
+};
+
+enum {
+        MLX5_STAT_RATE_OFFSET   = 5,
+};
+
+enum {
+        MLX5_INLINE_SEG = 0x80000000,
+};
+
+enum {
+        MLX5_PERM_LOCAL_READ    = 1 << 2,
+        MLX5_PERM_LOCAL_WRITE   = 1 << 3,
+        MLX5_PERM_REMOTE_READ   = 1 << 4,
+        MLX5_PERM_REMOTE_WRITE  = 1 << 5,
+        MLX5_PERM_ATOMIC        = 1 << 6,
+        MLX5_PERM_UMR_EN        = 1 << 7,
+};
+
+enum {
+        MLX5_PCIE_CTRL_SMALL_FENCE      = 1 << 0,
+        MLX5_PCIE_CTRL_RELAXED_ORDERING = 1 << 2,
+        MLX5_PCIE_CTRL_NO_SNOOP         = 1 << 3,
+        MLX5_PCIE_CTRL_TLP_PROCE_EN     = 1 << 6,
+        MLX5_PCIE_CTRL_TPH_MASK         = 3 << 4,
+};
+
+enum {
+        MLX5_ACCESS_MODE_PA     = 0,
+        MLX5_ACCESS_MODE_MTT    = 1,
+        MLX5_ACCESS_MODE_KLM    = 2
+};
+
+enum {
+        MLX5_MKEY_REMOTE_INVAL  = 1 << 24,
+        MLX5_MKEY_FLAG_SYNC_UMR = 1 << 29,
+        MLX5_MKEY_BSF_EN        = 1 << 30,
+        MLX5_MKEY_LEN64         = 1 << 31,
+};
+
+enum {
+        MLX5_EN_RD      = (u64)1,
+        MLX5_EN_WR      = (u64)2
+};
+
+enum {
+        MLX5_BF_REGS_PER_PAGE   = 4,
+        MLX5_MAX_UAR_PAGES      = 1 << 8,
+        MLX5_MAX_UUARS          = MLX5_MAX_UAR_PAGES * MLX5_BF_REGS_PER_PAGE,
+};
+
+enum {
+        MLX5_MKEY_MASK_LEN              = 1ull << 0,
+        MLX5_MKEY_MASK_PAGE_SIZE        = 1ull << 1,
+        MLX5_MKEY_MASK_START_ADDR       = 1ull << 6,
+        MLX5_MKEY_MASK_PD               = 1ull << 7,
+        MLX5_MKEY_MASK_EN_RINVAL        = 1ull << 8,
+        MLX5_MKEY_MASK_BSF_EN           = 1ull << 12,
+        MLX5_MKEY_MASK_KEY              = 1ull << 13,
+        MLX5_MKEY_MASK_QPN              = 1ull << 14,
+        MLX5_MKEY_MASK_LR               = 1ull << 17,
+        MLX5_MKEY_MASK_LW               = 1ull << 18,
+        MLX5_MKEY_MASK_RR               = 1ull << 19,
+        MLX5_MKEY_MASK_RW               = 1ull << 20,
+        MLX5_MKEY_MASK_A                = 1ull << 21,
+        MLX5_MKEY_MASK_SMALL_FENCE      = 1ull << 23,
+        MLX5_MKEY_MASK_FREE             = 1ull << 29,
+};
+
+enum mlx5_event {
+        MLX5_EVENT_TYPE_COMP               = 0x0,
+
+        MLX5_EVENT_TYPE_PATH_MIG           = 0x01,
+        MLX5_EVENT_TYPE_COMM_EST           = 0x02,
+        MLX5_EVENT_TYPE_SQ_DRAINED         = 0x03,
+        MLX5_EVENT_TYPE_SRQ_LAST_WQE       = 0x13,
+        MLX5_EVENT_TYPE_SRQ_RQ_LIMIT       = 0x14,
+
+        MLX5_EVENT_TYPE_CQ_ERROR           = 0x04,
+        MLX5_EVENT_TYPE_WQ_CATAS_ERROR     = 0x05,
+        MLX5_EVENT_TYPE_PATH_MIG_FAILED    = 0x07,
+        MLX5_EVENT_TYPE_WQ_INVAL_REQ_ERROR = 0x10,
+        MLX5_EVENT_TYPE_WQ_ACCESS_ERROR    = 0x11,
+        MLX5_EVENT_TYPE_SRQ_CATAS_ERROR    = 0x12,
+
+        MLX5_EVENT_TYPE_INTERNAL_ERROR     = 0x08,
+        MLX5_EVENT_TYPE_PORT_CHANGE        = 0x09,
+        MLX5_EVENT_TYPE_GPIO_EVENT         = 0x15,
+        MLX5_EVENT_TYPE_REMOTE_CONFIG      = 0x19,
+
+        MLX5_EVENT_TYPE_DB_BF_CONGESTION   = 0x1a,
+        MLX5_EVENT_TYPE_STALL_EVENT        = 0x1b,
+
+        MLX5_EVENT_TYPE_CMD                = 0x0a,
+        MLX5_EVENT_TYPE_PAGE_REQUEST       = 0xb,
+};
+
+enum {
+        MLX5_PORT_CHANGE_SUBTYPE_DOWN           = 1,
+        MLX5_PORT_CHANGE_SUBTYPE_ACTIVE         = 4,
+        MLX5_PORT_CHANGE_SUBTYPE_INITIALIZED    = 5,
+        MLX5_PORT_CHANGE_SUBTYPE_LID            = 6,
+        MLX5_PORT_CHANGE_SUBTYPE_PKEY           = 7,
+        MLX5_PORT_CHANGE_SUBTYPE_GUID           = 8,
+        MLX5_PORT_CHANGE_SUBTYPE_CLIENT_REREG   = 9,
+};
+
+enum {
+        MLX5_DEV_CAP_FLAG_RC            = 1LL <<  0,
+        MLX5_DEV_CAP_FLAG_UC            = 1LL <<  1,
+        MLX5_DEV_CAP_FLAG_UD            = 1LL <<  2,
+        MLX5_DEV_CAP_FLAG_XRC           = 1LL <<  3,
+        MLX5_DEV_CAP_FLAG_SRQ           = 1LL <<  6,
+        MLX5_DEV_CAP_FLAG_BAD_PKEY_CNTR = 1LL <<  8,
+        MLX5_DEV_CAP_FLAG_BAD_QKEY_CNTR = 1LL <<  9,
+        MLX5_DEV_CAP_FLAG_APM           = 1LL << 17,
+        MLX5_DEV_CAP_FLAG_ATOMIC        = 1LL << 18,
+        MLX5_DEV_CAP_FLAG_ON_DMND_PG    = 1LL << 24,
+        MLX5_DEV_CAP_FLAG_RESIZE_SRQ    = 1LL << 32,
+        MLX5_DEV_CAP_FLAG_REMOTE_FENCE  = 1LL << 38,
+        MLX5_DEV_CAP_FLAG_TLP_HINTS     = 1LL << 39,
+        MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40,
+        MLX5_DEV_CAP_FLAG_DCT           = 1LL << 41,
+        MLX5_DEV_CAP_FLAG_CMDIF_CSUM    = 1LL << 46,
+};
+
+enum {
+        MLX5_OPCODE_NOP                 = 0x00,
+        MLX5_OPCODE_SEND_INVAL          = 0x01,
+        MLX5_OPCODE_RDMA_WRITE          = 0x08,
+        MLX5_OPCODE_RDMA_WRITE_IMM      = 0x09,
+        MLX5_OPCODE_SEND                = 0x0a,
+        MLX5_OPCODE_SEND_IMM            = 0x0b,
+        MLX5_OPCODE_RDMA_READ           = 0x10,
+        MLX5_OPCODE_ATOMIC_CS           = 0x11,
+        MLX5_OPCODE_ATOMIC_FA           = 0x12,
+        MLX5_OPCODE_ATOMIC_MASKED_CS    = 0x14,
+        MLX5_OPCODE_ATOMIC_MASKED_FA    = 0x15,
+        MLX5_OPCODE_BIND_MW             = 0x18,
+        MLX5_OPCODE_CONFIG_CMD          = 0x1f,
+
+        MLX5_RECV_OPCODE_RDMA_WRITE_IMM = 0x00,
+        MLX5_RECV_OPCODE_SEND           = 0x01,
+        MLX5_RECV_OPCODE_SEND_IMM       = 0x02,
+        MLX5_RECV_OPCODE_SEND_INVAL     = 0x03,
+
+        MLX5_CQE_OPCODE_ERROR           = 0x1e,
+        MLX5_CQE_OPCODE_RESIZE          = 0x16,
+
+        MLX5_OPCODE_SET_PSV             = 0x20,
+        MLX5_OPCODE_GET_PSV             = 0x21,
+        MLX5_OPCODE_CHECK_PSV           = 0x22,
+        MLX5_OPCODE_RGET_PSV            = 0x26,
+        MLX5_OPCODE_RCHECK_PSV          = 0x27,
+
+        MLX5_OPCODE_UMR                 = 0x25,
+
+};
+
+enum {
+        MLX5_SET_PORT_RESET_QKEY        = 0,
+        MLX5_SET_PORT_GUID0             = 16,
+        MLX5_SET_PORT_NODE_GUID         = 17,
+        MLX5_SET_PORT_SYS_GUID          = 18,
+        MLX5_SET_PORT_GID_TABLE         = 19,
+        MLX5_SET_PORT_PKEY_TABLE        = 20,
+};
+
+enum {
+        MLX5_MAX_PAGE_SHIFT             = 31
+};
+
+struct mlx5_inbox_hdr {
+        __be16          opcode;
+        u8              rsvd[4];
+        __be16          opmod;
+};
+
+struct mlx5_outbox_hdr {
+        u8              status;
+        u8              rsvd[3];
+        __be32          syndrome;
+};
+
+struct mlx5_cmd_query_adapter_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_cmd_query_adapter_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd0[24];
+        u8                      intapin;
+        u8                      rsvd1[13];
+        __be16                  vsd_vendor_id;
+        u8                      vsd[208];
+        u8                      vsd_psid[16];
+};
+
+struct mlx5_hca_cap {
+        u8      rsvd1[16];
+        u8      log_max_srq_sz;
+        u8      log_max_qp_sz;
+        u8      rsvd2;
+        u8      log_max_qp;
+        u8      log_max_strq_sz;
+        u8      log_max_srqs;
+        u8      rsvd4[2];
+        u8      rsvd5;
+        u8      log_max_cq_sz;
+        u8      rsvd6;
+        u8      log_max_cq;
+        u8      log_max_eq_sz;
+        u8      log_max_mkey;
+        u8      rsvd7;
+        u8      log_max_eq;
+        u8      max_indirection;
+        u8      log_max_mrw_sz;
+        u8      log_max_bsf_list_sz;
+        u8      log_max_klm_list_sz;
+        u8      rsvd_8_0;
+        u8      log_max_ra_req_dc;
+        u8      rsvd_8_1;
+        u8      log_max_ra_res_dc;
+        u8      rsvd9;
+        u8      log_max_ra_req_qp;
+        u8      rsvd10;
+        u8      log_max_ra_res_qp;
+        u8      rsvd11[4];
+        __be16  max_qp_count;
+        __be16  rsvd12;
+        u8      rsvd13;
+        u8      local_ca_ack_delay;
+        u8      rsvd14;
+        u8      num_ports;
+        u8      log_max_msg;
+        u8      rsvd15[3];
+        __be16  stat_rate_support;
+        u8      rsvd16[2];
+        __be64  flags;
+        u8      rsvd17;
+        u8      uar_sz;
+        u8      rsvd18;
+        u8      log_pg_sz;
+        __be16  bf_log_bf_reg_size;
+        u8      rsvd19[4];
+        __be16  max_desc_sz_sq;
+        u8      rsvd20[2];
+        __be16  max_desc_sz_rq;
+        u8      rsvd21[2];
+        __be16  max_desc_sz_sq_dc;
+        __be32  max_qp_mcg;
+        u8      rsvd22[3];
+        u8      log_max_mcg;
+        u8      rsvd23;
+        u8      log_max_pd;
+        u8      rsvd24;
+        u8      log_max_xrcd;
+        u8      rsvd25[42];
+        __be16  log_uar_page_sz;
+        u8      rsvd26[28];
+        u8      log_msx_atomic_size_qp;
+        u8      rsvd27[2];
+        u8      log_msx_atomic_size_dc;
+        u8      rsvd28[76];
+};
+
+
+struct mlx5_cmd_query_hca_cap_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd[8];
+};
+
+
+struct mlx5_cmd_query_hca_cap_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd0[8];
+        struct mlx5_hca_cap     hca_cap;
+};
+
+
+struct mlx5_cmd_set_hca_cap_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd[8];
+        struct mlx5_hca_cap     hca_cap;
+};
+
+
+struct mlx5_cmd_set_hca_cap_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd0[8];
+};
+
+
+struct mlx5_cmd_init_hca_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd0[2];
+        __be16                  profile;
+        u8                      rsvd1[4];
+};
+
+struct mlx5_cmd_init_hca_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_cmd_teardown_hca_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd0[2];
+        __be16                  profile;
+        u8                      rsvd1[4];
+};
+
+struct mlx5_cmd_teardown_hca_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_cmd_layout {
+        u8              type;
+        u8              rsvd0[3];
+        __be32          inlen;
+        __be64          in_ptr;
+        __be32          in[4];
+        __be32          out[4];
+        __be64          out_ptr;
+        __be32          outlen;
+        u8              token;
+        u8              sig;
+        u8              rsvd1;
+        u8              status_own;
+};
+
+
+struct health_buffer {
+        __be32          assert_var[5];
+        __be32          rsvd0[3];
+        __be32          assert_exit_ptr;
+        __be32          assert_callra;
+        __be32          rsvd1[2];
+        __be32          fw_ver;
+        __be32          hw_id;
+        __be32          rsvd2;
+        u8              irisc_index;
+        u8              synd;
+        __be16          ext_sync;
+};
+
+struct mlx5_init_seg {
+        __be32                  fw_rev;
+        __be32                  cmdif_rev_fw_sub;
+        __be32                  rsvd0[2];
+        __be32                  cmdq_addr_h;
+        __be32                  cmdq_addr_l_sz;
+        __be32                  cmd_dbell;
+        __be32                  rsvd1[121];
+        struct health_buffer    health;
+        __be32                  rsvd2[884];
+        __be32                  health_counter;
+        __be32                  rsvd3[1023];
+        __be64                  ieee1588_clk;
+        __be32                  ieee1588_clk_type;
+        __be32                  clr_intx;
+};
+
+struct mlx5_eqe_comp {
+        __be32  reserved[6];
+        __be32  cqn;
+};
+
+struct mlx5_eqe_qp_srq {
+        __be32  reserved[6];
+        __be32  qp_srq_n;
+};
+
+struct mlx5_eqe_cq_err {
+        __be32  cqn;
+        u8      reserved1[7];
+        u8      syndrome;
+};
+
+struct mlx5_eqe_dropped_packet {
+};
+
+struct mlx5_eqe_port_state {
+        u8      reserved0[8];
+        u8      port;
+};
+
+struct mlx5_eqe_gpio {
+        __be32  reserved0[2];
+        __be64  gpio_event;
+};
+
+struct mlx5_eqe_congestion {
+        u8      type;
+        u8      rsvd0;
+        u8      congestion_level;
+};
+
+struct mlx5_eqe_stall_vl {
+        u8      rsvd0[3];
+        u8      port_vl;
+};
+
+struct mlx5_eqe_cmd {
+        __be32  vector;
+        __be32  rsvd[6];
+};
+
+struct mlx5_eqe_page_req {
+        u8              rsvd0[2];
+        __be16          func_id;
+        __be32          num_pages;
+        __be32          rsvd1[5];
+};
+
+union ev_data {
+        __be32                          raw[7];
+        struct mlx5_eqe_cmd             cmd;
+        struct mlx5_eqe_comp            comp;
+        struct mlx5_eqe_qp_srq          qp_srq;
+        struct mlx5_eqe_cq_err          cq_err;
+        struct mlx5_eqe_dropped_packet  dp;
+        struct mlx5_eqe_port_state      port;
+        struct mlx5_eqe_gpio            gpio;
+        struct mlx5_eqe_congestion      cong;
+        struct mlx5_eqe_stall_vl        stall_vl;
+        struct mlx5_eqe_page_req        req_pages;
+} __packed;
+
+struct mlx5_eqe {
+        u8              rsvd0;
+        u8              type;
+        u8              rsvd1;
+        u8              sub_type;
+        __be32          rsvd2[7];
+        union ev_data   data;
+        __be16          rsvd3;
+        u8              signature;
+        u8              owner;
+} __packed;
+
+struct mlx5_cmd_prot_block {
+        u8              data[MLX5_CMD_DATA_BLOCK_SIZE];
+        u8              rsvd0[48];
+        __be64          next;
+        __be32          block_num;
+        u8              rsvd1;
+        u8              token;
+        u8              ctrl_sig;
+        u8              sig;
+};
+
+struct mlx5_err_cqe {
+        u8      rsvd0[32];
+        __be32  srqn;
+        u8      rsvd1[18];
+        u8      vendor_err_synd;
+        u8      syndrome;
+        __be32  s_wqe_opcode_qpn;
+        __be16  wqe_counter;
+        u8      signature;
+        u8      op_own;
+};
+
+struct mlx5_cqe64 {
+        u8              rsvd0[17];
+        u8              ml_path;
+        u8              rsvd20[4];
+        __be16          slid;
+        __be32          flags_rqpn;
+        u8              rsvd28[4];
+        __be32          srqn;
+        __be32          imm_inval_pkey;
+        u8              rsvd40[4];
+        __be32          byte_cnt;
+        __be64          timestamp;
+        __be32          sop_drop_qpn;
+        __be16          wqe_counter;
+        u8              signature;
+        u8              op_own;
+};
+
+struct mlx5_wqe_srq_next_seg {
+        u8                      rsvd0[2];
+        __be16                  next_wqe_index;
+        u8                      signature;
+        u8                      rsvd1[11];
+};
+
+union mlx5_ext_cqe {
+        struct ib_grh   grh;
+        u8              inl[64];
+};
+
+struct mlx5_cqe128 {
+        union mlx5_ext_cqe      inl_grh;
+        struct mlx5_cqe64       cqe64;
+};
+
+struct mlx5_srq_ctx {
+        u8                      state_log_sz;
+        u8                      rsvd0[3];
+        __be32                  flags_xrcd;
+        __be32                  pgoff_cqn;
+        u8                      rsvd1[4];
+        u8                      log_pg_sz;
+        u8                      rsvd2[7];
+        __be32                  pd;
+        __be16                  lwm;
+        __be16                  wqe_cnt;
+        u8                      rsvd3[8];
+        __be64                  db_record;
+};
+
+struct mlx5_create_srq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  input_srqn;
+        u8                      rsvd0[4];
+        struct mlx5_srq_ctx     ctx;
+        u8                      rsvd1[208];
+        __be64                  pas[0];
+};
+
+struct mlx5_create_srq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        __be32                  srqn;
+        u8                      rsvd[4];
+};
+
+struct mlx5_destroy_srq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  srqn;
+        u8                      rsvd[4];
+};
+
+struct mlx5_destroy_srq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_query_srq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  srqn;
+        u8                      rsvd0[4];
+};
+
+struct mlx5_query_srq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd0[8];
+        struct mlx5_srq_ctx     ctx;
+        u8                      rsvd1[32];
+        __be64                  pas[0];
+};
+
+struct mlx5_arm_srq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  srqn;
+        __be16                  rsvd;
+        __be16                  lwm;
+};
+
+struct mlx5_arm_srq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_cq_context {
+        u8                      status;
+        u8                      cqe_sz_flags;
+        u8                      st;
+        u8                      rsvd3;
+        u8                      rsvd4[6];
+        __be16                  page_offset;
+        __be32                  log_sz_usr_page;
+        __be16                  cq_period;
+        __be16                  cq_max_count;
+        __be16                  rsvd20;
+        __be16                  c_eqn;
+        u8                      log_pg_sz;
+        u8                      rsvd25[7];
+        __be32                  last_notified_index;
+        __be32                  solicit_producer_index;
+        __be32                  consumer_counter;
+        __be32                  producer_counter;
+        u8                      rsvd48[8];
+        __be64                  db_record_addr;
+};
+
+struct mlx5_create_cq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  input_cqn;
+        u8                      rsvdx[4];
+        struct mlx5_cq_context  ctx;
+        u8                      rsvd6[192];
+        __be64                  pas[0];
+};
+
+struct mlx5_create_cq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        __be32                  cqn;
+        u8                      rsvd0[4];
+};
+
+struct mlx5_destroy_cq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  cqn;
+        u8                      rsvd0[4];
+};
+
+struct mlx5_destroy_cq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd0[8];
+};
+
+struct mlx5_query_cq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  cqn;
+        u8                      rsvd0[4];
+};
+
+struct mlx5_query_cq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd0[8];
+        struct mlx5_cq_context  ctx;
+        u8                      rsvd6[16];
+        __be64                  pas[0];
+};
+
+struct mlx5_enable_hca_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_enable_hca_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_disable_hca_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_disable_hca_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_eq_context {
+        u8                      status;
+        u8                      ec_oi;
+        u8                      st;
+        u8                      rsvd2[7];
+        __be16                  page_pffset;
+        __be32                  log_sz_usr_page;
+        u8                      rsvd3[7];
+        u8                      intr;
+        u8                      log_page_size;
+        u8                      rsvd4[15];
+        __be32                  consumer_counter;
+        __be32                  produser_counter;
+        u8                      rsvd5[16];
+};
+
+struct mlx5_create_eq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd0[3];
+        u8                      input_eqn;
+        u8                      rsvd1[4];
+        struct mlx5_eq_context  ctx;
+        u8                      rsvd2[8];
+        __be64                  events_mask;
+        u8                      rsvd3[176];
+        __be64                  pas[0];
+};
+
+struct mlx5_create_eq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd0[3];
+        u8                      eq_number;
+        u8                      rsvd1[4];
+};
+
+struct mlx5_destroy_eq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd0[3];
+        u8                      eqn;
+        u8                      rsvd1[4];
+};
+
+struct mlx5_destroy_eq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_map_eq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be64                  mask;
+        u8                      mu;
+        u8                      rsvd0[2];
+        u8                      eqn;
+        u8                      rsvd1[24];
+};
+
+struct mlx5_map_eq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_query_eq_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd0[3];
+        u8                      eqn;
+        u8                      rsvd1[4];
+};
+
+struct mlx5_query_eq_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+        struct mlx5_eq_context  ctx;
+};
+
+struct mlx5_mkey_seg {
+        /* This is a two bit field occupying bits 31-30.
+         * bit 31 is always 0,
+         * bit 30 is zero for regular MRs and 1 (e.g free) for UMRs that do not have tanslation
+         */
+        u8              status;
+        u8              pcie_control;
+        u8              flags;
+        u8              version;
+        __be32          qpn_mkey7_0;
+        u8              rsvd1[4];
+        __be32          flags_pd;
+        __be64          start_addr;
+        __be64          len;
+        __be32          bsfs_octo_size;
+        u8              rsvd2[16];
+        __be32          xlt_oct_size;
+        u8              rsvd3[3];
+        u8              log2_page_size;
+        u8              rsvd4[4];
+};
+
+struct mlx5_query_special_ctxs_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_query_special_ctxs_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        __be32                  dump_fill_mkey;
+        __be32                  reserved_lkey;
+};
+
+struct mlx5_create_mkey_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  input_mkey_index;
+        u8                      rsvd0[4];
+        struct mlx5_mkey_seg    seg;
+        u8                      rsvd1[16];
+        __be32                  xlat_oct_act_size;
+        __be32                  bsf_coto_act_size;
+        u8                      rsvd2[168];
+        __be64                  pas[0];
+};
+
+struct mlx5_create_mkey_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        __be32                  mkey;
+        u8                      rsvd[4];
+};
+
+struct mlx5_destroy_mkey_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  mkey;
+        u8                      rsvd[4];
+};
+
+struct mlx5_destroy_mkey_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_query_mkey_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  mkey;
+};
+
+struct mlx5_query_mkey_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        __be64                  pas[0];
+};
+
+struct mlx5_modify_mkey_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  mkey;
+        __be64                  pas[0];
+};
+
+struct mlx5_modify_mkey_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+};
+
+struct mlx5_dump_mkey_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+};
+
+struct mlx5_dump_mkey_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        __be32                  mkey;
+};
+
+struct mlx5_mad_ifc_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be16                  remote_lid;
+        u8                      rsvd0;
+        u8                      port;
+        u8                      rsvd1[4];
+        u8                      data[256];
+};
+
+struct mlx5_mad_ifc_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+        u8                      data[256];
+};
+
+struct mlx5_access_reg_mbox_in {
+        struct mlx5_inbox_hdr           hdr;
+        u8                              rsvd0[2];
+        __be16                          register_id;
+        __be32                          arg;
+        __be32                          data[0];
+};
+
+struct mlx5_access_reg_mbox_out {
+        struct mlx5_outbox_hdr          hdr;
+        u8                              rsvd[8];
+        __be32                          data[0];
+};
+
+#define MLX5_ATTR_EXTENDED_PORT_INFO    cpu_to_be16(0xff90)
+
+enum {
+        MLX_EXT_PORT_CAP_FLAG_EXTENDED_PORT_INFO        = 1 <<  0
+};
+
+#endif /* MLX5_DEVICE_H */
diff --git a/include/linux/mlx5/doorbell.h b/include/linux/mlx5/doorbell.h
new file mode 100644
index 000000000000..163a818411e7
--- /dev/null
+++ b/include/linux/mlx5/doorbell.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX5_DOORBELL_H
+#define MLX5_DOORBELL_H
+
+#define MLX5_BF_OFFSET        0x800
+#define MLX5_CQ_DOORBELL      0x20
+
+#if BITS_PER_LONG == 64
+/* Assume that we can just write a 64-bit doorbell atomically.  s390
+ * actually doesn't have writeq() but S/390 systems don't even have
+ * PCI so we won't worry about it.
+ */
+
+#define MLX5_DECLARE_DOORBELL_LOCK(name)
+#define MLX5_INIT_DOORBELL_LOCK(ptr)    do { } while (0)
+#define MLX5_GET_DOORBELL_LOCK(ptr)      (NULL)
+
+static inline void mlx5_write64(__be32 val[2], void __iomem *dest,
+                                spinlock_t *doorbell_lock)
+{
+        __raw_writeq(*(u64 *)val, dest);
+}
+
+#else
+
+/* Just fall back to a spinlock to protect the doorbell if
+ * BITS_PER_LONG is 32 -- there's no portable way to do atomic 64-bit
+ * MMIO writes.
+ */
+
+#define MLX5_DECLARE_DOORBELL_LOCK(name) spinlock_t name;
+#define MLX5_INIT_DOORBELL_LOCK(ptr)     spin_lock_init(ptr)
+#define MLX5_GET_DOORBELL_LOCK(ptr)      (ptr)
+
+static inline void mlx5_write64(__be32 val[2], void __iomem *dest,
+                                spinlock_t *doorbell_lock)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(doorbell_lock, flags);
+        __raw_writel((__force u32) val[0], dest);
+        __raw_writel((__force u32) val[1], dest + 4);
+        spin_unlock_irqrestore(doorbell_lock, flags);
+}
+
+#endif
+
+#endif /* MLX5_DOORBELL_H */
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
new file mode 100644
index 000000000000..8888381fc150
--- /dev/null
+++ b/include/linux/mlx5/driver.h
@@ -0,0 +1,768 @@
+/*
+ * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX5_DRIVER_H
+#define MLX5_DRIVER_H
+
+#include <linux/kernel.h>
+#include <linux/completion.h>
+#include <linux/pci.h>
+#include <linux/spinlock_types.h>
+#include <linux/semaphore.h>
+#include <linux/vmalloc.h>
+#include <linux/radix-tree.h>
+#include <linux/mlx5/device.h>
+#include <linux/mlx5/doorbell.h>
+
+enum {
+        MLX5_BOARD_ID_LEN = 64,
+        MLX5_MAX_NAME_LEN = 16,
+};
+
+enum {
+        /* one minute for the sake of bringup. Generally, commands must always
+         * complete and we may need to increase this timeout value
+         */
+        MLX5_CMD_TIMEOUT_MSEC   = 7200 * 1000,
+        MLX5_CMD_WQ_MAX_NAME    = 32,
+};
+
+enum {
+        CMD_OWNER_SW            = 0x0,
+        CMD_OWNER_HW            = 0x1,
+        CMD_STATUS_SUCCESS      = 0,
+};
+
+enum mlx5_sqp_t {
+        MLX5_SQP_SMI            = 0,
+        MLX5_SQP_GSI            = 1,
+        MLX5_SQP_IEEE_1588      = 2,
+        MLX5_SQP_SNIFFER        = 3,
+        MLX5_SQP_SYNC_UMR       = 4,
+};
+
+enum {
+        MLX5_MAX_PORTS  = 2,
+};
+
+enum {
+        MLX5_EQ_VEC_PAGES        = 0,
+        MLX5_EQ_VEC_CMD          = 1,
+        MLX5_EQ_VEC_ASYNC        = 2,
+        MLX5_EQ_VEC_COMP_BASE,
+};
+
+enum {
+        MLX5_MAX_EQ_NAME        = 20
+};
+
+enum {
+        MLX5_ATOMIC_MODE_IB_COMP        = 1 << 16,
+        MLX5_ATOMIC_MODE_CX             = 2 << 16,
+        MLX5_ATOMIC_MODE_8B             = 3 << 16,
+        MLX5_ATOMIC_MODE_16B            = 4 << 16,
+        MLX5_ATOMIC_MODE_32B            = 5 << 16,
+        MLX5_ATOMIC_MODE_64B            = 6 << 16,
+        MLX5_ATOMIC_MODE_128B           = 7 << 16,
+        MLX5_ATOMIC_MODE_256B           = 8 << 16,
+};
+
+enum {
+        MLX5_CMD_OP_QUERY_HCA_CAP               = 0x100,
+        MLX5_CMD_OP_QUERY_ADAPTER               = 0x101,
+        MLX5_CMD_OP_INIT_HCA                    = 0x102,
+        MLX5_CMD_OP_TEARDOWN_HCA                = 0x103,
+        MLX5_CMD_OP_ENABLE_HCA                  = 0x104,
+        MLX5_CMD_OP_DISABLE_HCA                 = 0x105,
+        MLX5_CMD_OP_QUERY_PAGES                 = 0x107,
+        MLX5_CMD_OP_MANAGE_PAGES                = 0x108,
+        MLX5_CMD_OP_SET_HCA_CAP                 = 0x109,
+
+        MLX5_CMD_OP_CREATE_MKEY                 = 0x200,
+        MLX5_CMD_OP_QUERY_MKEY                  = 0x201,
+        MLX5_CMD_OP_DESTROY_MKEY                = 0x202,
+        MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS      = 0x203,
+
+        MLX5_CMD_OP_CREATE_EQ                   = 0x301,
+        MLX5_CMD_OP_DESTROY_EQ                  = 0x302,
+        MLX5_CMD_OP_QUERY_EQ                    = 0x303,
+
+        MLX5_CMD_OP_CREATE_CQ                   = 0x400,
+        MLX5_CMD_OP_DESTROY_CQ                  = 0x401,
+        MLX5_CMD_OP_QUERY_CQ                    = 0x402,
+        MLX5_CMD_OP_MODIFY_CQ                   = 0x403,
+
+        MLX5_CMD_OP_CREATE_QP                   = 0x500,
+        MLX5_CMD_OP_DESTROY_QP                  = 0x501,
+        MLX5_CMD_OP_RST2INIT_QP                 = 0x502,
+        MLX5_CMD_OP_INIT2RTR_QP                 = 0x503,
+        MLX5_CMD_OP_RTR2RTS_QP                  = 0x504,
+        MLX5_CMD_OP_RTS2RTS_QP                  = 0x505,
+        MLX5_CMD_OP_SQERR2RTS_QP                = 0x506,
+        MLX5_CMD_OP_2ERR_QP                     = 0x507,
+        MLX5_CMD_OP_RTS2SQD_QP                  = 0x508,
+        MLX5_CMD_OP_SQD2RTS_QP                  = 0x509,
+        MLX5_CMD_OP_2RST_QP                     = 0x50a,
+        MLX5_CMD_OP_QUERY_QP                    = 0x50b,
+        MLX5_CMD_OP_CONF_SQP                    = 0x50c,
+        MLX5_CMD_OP_MAD_IFC                     = 0x50d,
+        MLX5_CMD_OP_INIT2INIT_QP                = 0x50e,
+        MLX5_CMD_OP_SUSPEND_QP                  = 0x50f,
+        MLX5_CMD_OP_UNSUSPEND_QP                = 0x510,
+        MLX5_CMD_OP_SQD2SQD_QP                  = 0x511,
+        MLX5_CMD_OP_ALLOC_QP_COUNTER_SET        = 0x512,
+        MLX5_CMD_OP_DEALLOC_QP_COUNTER_SET      = 0x513,
+        MLX5_CMD_OP_QUERY_QP_COUNTER_SET        = 0x514,
+
+        MLX5_CMD_OP_CREATE_PSV                  = 0x600,
+        MLX5_CMD_OP_DESTROY_PSV                 = 0x601,
+        MLX5_CMD_OP_QUERY_PSV                   = 0x602,
+        MLX5_CMD_OP_QUERY_SIG_RULE_TABLE        = 0x603,
+        MLX5_CMD_OP_QUERY_BLOCK_SIZE_TABLE      = 0x604,
+
+        MLX5_CMD_OP_CREATE_SRQ                  = 0x700,
+        MLX5_CMD_OP_DESTROY_SRQ                 = 0x701,
+        MLX5_CMD_OP_QUERY_SRQ                   = 0x702,
+        MLX5_CMD_OP_ARM_RQ                      = 0x703,
+        MLX5_CMD_OP_RESIZE_SRQ                  = 0x704,
+
+        MLX5_CMD_OP_ALLOC_PD                    = 0x800,
+        MLX5_CMD_OP_DEALLOC_PD                  = 0x801,
+        MLX5_CMD_OP_ALLOC_UAR                   = 0x802,
+        MLX5_CMD_OP_DEALLOC_UAR                 = 0x803,
+
+        MLX5_CMD_OP_ATTACH_TO_MCG               = 0x806,
+        MLX5_CMD_OP_DETACH_FROM_MCG             = 0x807,
+
+
+        MLX5_CMD_OP_ALLOC_XRCD                  = 0x80e,
+        MLX5_CMD_OP_DEALLOC_XRCD                = 0x80f,
+
+        MLX5_CMD_OP_ACCESS_REG                  = 0x805,
+        MLX5_CMD_OP_MAX                         = 0x810,
+};
+
+enum {
+        MLX5_REG_PCAP            = 0x5001,
+        MLX5_REG_PMTU            = 0x5003,
+        MLX5_REG_PTYS            = 0x5004,
+        MLX5_REG_PAOS            = 0x5006,
+        MLX5_REG_PMAOS           = 0x5012,
+        MLX5_REG_PUDE            = 0x5009,
+        MLX5_REG_PMPE            = 0x5010,
+        MLX5_REG_PELC            = 0x500e,
+        MLX5_REG_PMLP            = 0, /* TBD */
+        MLX5_REG_NODE_DESC       = 0x6001,
+        MLX5_REG_HOST_ENDIANNESS = 0x7004,
+};
+
+enum dbg_rsc_type {
+        MLX5_DBG_RSC_QP,
+        MLX5_DBG_RSC_EQ,
+        MLX5_DBG_RSC_CQ,
+};
+
+struct mlx5_field_desc {
+        struct dentry          *dent;
+        int                     i;
+};
+
+struct mlx5_rsc_debug {
+        struct mlx5_core_dev   *dev;
+        void                   *object;
+        enum dbg_rsc_type       type;
+        struct dentry          *root;
+        struct mlx5_field_desc  fields[0];
+};
+
+enum mlx5_dev_event {
+        MLX5_DEV_EVENT_SYS_ERROR,
+        MLX5_DEV_EVENT_PORT_UP,
+        MLX5_DEV_EVENT_PORT_DOWN,
+        MLX5_DEV_EVENT_PORT_INITIALIZED,
+        MLX5_DEV_EVENT_LID_CHANGE,
+        MLX5_DEV_EVENT_PKEY_CHANGE,
+        MLX5_DEV_EVENT_GUID_CHANGE,
+        MLX5_DEV_EVENT_CLIENT_REREG,
+};
+
+struct mlx5_uuar_info {
+        struct mlx5_uar        *uars;
+        int                     num_uars;
+        int                     num_low_latency_uuars;
+        unsigned long          *bitmap;
+        unsigned int           *count;
+        struct mlx5_bf         *bfs;
+
+        /*
+         * protect uuar allocation data structs
+         */
+        struct mutex            lock;
+};
+
+struct mlx5_bf {
+        void __iomem           *reg;
+        void __iomem           *regreg;
+        int                     buf_size;
+        struct mlx5_uar        *uar;
+        unsigned long           offset;
+        int                     need_lock;
+        /* protect blue flame buffer selection when needed
+         */
+        spinlock_t              lock;
+
+        /* serialize 64 bit writes when done as two 32 bit accesses
+         */
+        spinlock_t              lock32;
+        int                     uuarn;
+};
+
+struct mlx5_cmd_first {
+        __be32          data[4];
+};
+
+struct mlx5_cmd_msg {
+        struct list_head                list;
+        struct cache_ent               *cache;
+        u32                             len;
+        struct mlx5_cmd_first           first;
+        struct mlx5_cmd_mailbox        *next;
+};
+
+struct mlx5_cmd_debug {
+        struct dentry          *dbg_root;
+        struct dentry          *dbg_in;
+        struct dentry          *dbg_out;
+        struct dentry          *dbg_outlen;
+        struct dentry          *dbg_status;
+        struct dentry          *dbg_run;
+        void                   *in_msg;
+        void                   *out_msg;
+        u8                      status;
+        u16                     inlen;
+        u16                     outlen;
+};
+
+struct cache_ent {
+        /* protect block chain allocations
+         */
+        spinlock_t              lock;
+        struct list_head        head;
+};
+
+struct cmd_msg_cache {
+        struct cache_ent        large;
+        struct cache_ent        med;
+
+};
+
+struct mlx5_cmd_stats {
+        u64             sum;
+        u64             n;
+        struct dentry  *root;
+        struct dentry  *avg;
+        struct dentry  *count;
+        /* protect command average calculations */
+        spinlock_t      lock;
+};
+
+struct mlx5_cmd {
+        void           *cmd_buf;
+        dma_addr_t      dma;
+        u16             cmdif_rev;
+        u8              log_sz;
+        u8              log_stride;
+        int             max_reg_cmds;
+        int             events;
+        u32 __iomem    *vector;
+
+        /* protect command queue allocations
+         */
+        spinlock_t      alloc_lock;
+
+        /* protect token allocations
+         */
+        spinlock_t      token_lock;
+        u8              token;
+        unsigned long   bitmask;
+        char            wq_name[MLX5_CMD_WQ_MAX_NAME];
+        struct workqueue_struct *wq;
+        struct semaphore sem;
+        struct semaphore pages_sem;
+        int     mode;
+        struct mlx5_cmd_work_ent *ent_arr[MLX5_MAX_COMMANDS];
+        struct pci_pool *pool;
+        struct mlx5_cmd_debug dbg;
+        struct cmd_msg_cache cache;
+        int checksum_disabled;
+        struct mlx5_cmd_stats stats[MLX5_CMD_OP_MAX];
+};
+
+struct mlx5_port_caps {
+        int     gid_table_len;
+        int     pkey_table_len;
+};
+
+struct mlx5_caps {
+        u8      log_max_eq;
+        u8      log_max_cq;
+        u8      log_max_qp;
+        u8      log_max_mkey;
+        u8      log_max_pd;
+        u8      log_max_srq;
+        u32     max_cqes;
+        int     max_wqes;
+        int     max_sq_desc_sz;
+        int     max_rq_desc_sz;
+        u64     flags;
+        u16     stat_rate_support;
+        int     log_max_msg;
+        int     num_ports;
+        int     max_ra_res_qp;
+        int     max_ra_req_qp;
+        int     max_srq_wqes;
+        int     bf_reg_size;
+        int     bf_regs_per_page;
+        struct mlx5_port_caps   port[MLX5_MAX_PORTS];
+        u8                      ext_port_cap[MLX5_MAX_PORTS];
+        int     max_vf;
+        u32     reserved_lkey;
+        u8      local_ca_ack_delay;
+        u8      log_max_mcg;
+        u32     max_qp_mcg;
+        int     min_page_sz;
+};
+
+struct mlx5_cmd_mailbox {
+        void           *buf;
+        dma_addr_t      dma;
+        struct mlx5_cmd_mailbox *next;
+};
+
+struct mlx5_buf_list {
+        void                   *buf;
+        dma_addr_t              map;
+};
+
+struct mlx5_buf {
+        struct mlx5_buf_list    direct;
+        struct mlx5_buf_list   *page_list;
+        int                     nbufs;
+        int                     npages;
+        int                     page_shift;
+        int                     size;
+};
+
+struct mlx5_eq {
+        struct mlx5_core_dev   *dev;
+        __be32 __iomem         *doorbell;
+        u32                     cons_index;
+        struct mlx5_buf         buf;
+        int                     size;
+        u8                      irqn;
+        u8                      eqn;
+        int                     nent;
+        u64                     mask;
+        char                    name[MLX5_MAX_EQ_NAME];
+        struct list_head        list;
+        int                     index;
+        struct mlx5_rsc_debug   *dbg;
+};
+
+
+struct mlx5_core_mr {
+        u64                     iova;
+        u64                     size;
+        u32                     key;
+        u32                     pd;
+        u32                     access;
+};
+
+struct mlx5_core_srq {
+        u32             srqn;
+        int             max;
+        int             max_gs;
+        int             max_avail_gather;
+        int             wqe_shift;
+        void (*event)   (struct mlx5_core_srq *, enum mlx5_event);
+
+        atomic_t                refcount;
+        struct completion       free;
+};
+
+struct mlx5_eq_table {
+        void __iomem           *update_ci;
+        void __iomem           *update_arm_ci;
+        struct list_head       *comp_eq_head;
+        struct mlx5_eq          pages_eq;
+        struct mlx5_eq          async_eq;
+        struct mlx5_eq          cmd_eq;
+        struct msix_entry       *msix_arr;
+        int                     num_comp_vectors;
+        /* protect EQs list
+         */
+        spinlock_t              lock;
+};
+
+struct mlx5_uar {
+        u32                     index;
+        struct list_head        bf_list;
+        unsigned                free_bf_bmap;
+        void __iomem           *wc_map;
+        void __iomem           *map;
+};
+
+
+struct mlx5_core_health {
+        struct health_buffer __iomem   *health;
+        __be32 __iomem                 *health_counter;
+        struct timer_list               timer;
+        struct list_head                list;
+        u32                             prev;
+        int                             miss_counter;
+};
+
+struct mlx5_cq_table {
+        /* protect radix tree
+         */
+        spinlock_t              lock;
+        struct radix_tree_root  tree;
+};
+
+struct mlx5_qp_table {
+        /* protect radix tree
+         */
+        spinlock_t              lock;
+        struct radix_tree_root  tree;
+};
+
+struct mlx5_srq_table {
+        /* protect radix tree
+         */
+        spinlock_t              lock;
+        struct radix_tree_root  tree;
+};
+
+struct mlx5_priv {
+        char                    name[MLX5_MAX_NAME_LEN];
+        struct mlx5_eq_table    eq_table;
+        struct mlx5_uuar_info   uuari;
+        MLX5_DECLARE_DOORBELL_LOCK(cq_uar_lock);
+
+        /* pages stuff */
+        struct workqueue_struct *pg_wq;
+        struct rb_root          page_root;
+        int                     fw_pages;
+        int                     reg_pages;
+
+        struct mlx5_core_health health;
+
+        struct mlx5_srq_table   srq_table;
+
+        /* start: qp staff */
+        struct mlx5_qp_table    qp_table;
+        struct dentry          *qp_debugfs;
+        struct dentry          *eq_debugfs;
+        struct dentry          *cq_debugfs;
+        struct dentry          *cmdif_debugfs;
+        /* end: qp staff */
+
+        /* start: cq staff */
+        struct mlx5_cq_table    cq_table;
+        /* end: cq staff */
+
+        /* start: alloc staff */
+        struct mutex            pgdir_mutex;
+        struct list_head        pgdir_list;
+        /* end: alloc staff */
+        struct dentry          *dbg_root;
+
+        /* protect mkey key part */
+        spinlock_t              mkey_lock;
+        u8                      mkey_key;
+};
+
+struct mlx5_core_dev {
+        struct pci_dev         *pdev;
+        u8                      rev_id;
+        char                    board_id[MLX5_BOARD_ID_LEN];
+        struct mlx5_cmd         cmd;
+        struct mlx5_caps        caps;
+        phys_addr_t             iseg_base;
+        struct mlx5_init_seg __iomem *iseg;
+        void                    (*event) (struct mlx5_core_dev *dev,
+                                          enum mlx5_dev_event event,
+                                          void *data);
+        struct mlx5_priv        priv;
+        struct mlx5_profile     *profile;
+        atomic_t                num_qps;
+};
+
+struct mlx5_db {
+        __be32                  *db;
+        union {
+                struct mlx5_db_pgdir            *pgdir;
+                struct mlx5_ib_user_db_page     *user_page;
+        }                       u;
+        dma_addr_t              dma;
+        int                     index;
+};
+
+enum {
+        MLX5_DB_PER_PAGE = PAGE_SIZE / L1_CACHE_BYTES,
+};
+
+enum {
+        MLX5_COMP_EQ_SIZE = 1024,
+};
+
+struct mlx5_db_pgdir {
+        struct list_head        list;
+        DECLARE_BITMAP(bitmap, MLX5_DB_PER_PAGE);
+        __be32                 *db_page;
+        dma_addr_t              db_dma;
+};
+
+typedef void (*mlx5_cmd_cbk_t)(int status, void *context);
+
+struct mlx5_cmd_work_ent {
+        struct mlx5_cmd_msg    *in;
+        struct mlx5_cmd_msg    *out;
+        mlx5_cmd_cbk_t          callback;
+        void                   *context;
+        int idx;
+        struct completion       done;
+        struct mlx5_cmd        *cmd;
+        struct work_struct      work;
+        struct mlx5_cmd_layout *lay;
+        int                     ret;
+        int                     page_queue;
+        u8                      status;
+        u8                      token;
+        struct timespec         ts1;
+        struct timespec         ts2;
+};
+
+struct mlx5_pas {
+        u64     pa;
+        u8      log_sz;
+};
+
+static inline void *mlx5_buf_offset(struct mlx5_buf *buf, int offset)
+{
+        if (likely(BITS_PER_LONG == 64 || buf->nbufs == 1))
+                return buf->direct.buf + offset;
+        else
+                return buf->page_list[offset >> PAGE_SHIFT].buf +
+                        (offset & (PAGE_SIZE - 1));
+}
+
+extern struct workqueue_struct *mlx5_core_wq;
+
+#define STRUCT_FIELD(header, field) \
+        .struct_offset_bytes = offsetof(struct ib_unpacked_ ## header, field),      \
+        .struct_size_bytes   = sizeof((struct ib_unpacked_ ## header *)0)->field
+
+struct ib_field {
+        size_t struct_offset_bytes;
+        size_t struct_size_bytes;
+        int    offset_bits;
+        int    size_bits;
+};
+
+static inline struct mlx5_core_dev *pci2mlx5_core_dev(struct pci_dev *pdev)
+{
+        return pci_get_drvdata(pdev);
+}
+
+extern struct dentry *mlx5_debugfs_root;
+
+static inline u16 fw_rev_maj(struct mlx5_core_dev *dev)
+{
+        return ioread32be(&dev->iseg->fw_rev) & 0xffff;
+}
+
+static inline u16 fw_rev_min(struct mlx5_core_dev *dev)
+{
+        return ioread32be(&dev->iseg->fw_rev) >> 16;
+}
+
+static inline u16 fw_rev_sub(struct mlx5_core_dev *dev)
+{
+        return ioread32be(&dev->iseg->cmdif_rev_fw_sub) & 0xffff;
+}
+
+static inline u16 cmdif_rev(struct mlx5_core_dev *dev)
+{
+        return ioread32be(&dev->iseg->cmdif_rev_fw_sub) >> 16;
+}
+
+static inline void *mlx5_vzalloc(unsigned long size)
+{
+        void *rtn;
+
+        rtn = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
+        if (!rtn)
+                rtn = vzalloc(size);
+        return rtn;
+}
+
+static inline void mlx5_vfree(const void *addr)
+{
+        if (addr && is_vmalloc_addr(addr))
+                vfree(addr);
+        else
+                kfree(addr);
+}
+
+int mlx5_dev_init(struct mlx5_core_dev *dev, struct pci_dev *pdev);
+void mlx5_dev_cleanup(struct mlx5_core_dev *dev);
+int mlx5_cmd_init(struct mlx5_core_dev *dev);
+void mlx5_cmd_cleanup(struct mlx5_core_dev *dev);
+void mlx5_cmd_use_events(struct mlx5_core_dev *dev);
+void mlx5_cmd_use_polling(struct mlx5_core_dev *dev);
+int mlx5_cmd_status_to_err(struct mlx5_outbox_hdr *hdr);
+int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
+                  int out_size);
+int mlx5_cmd_alloc_uar(struct mlx5_core_dev *dev, u32 *uarn);
+int mlx5_cmd_free_uar(struct mlx5_core_dev *dev, u32 uarn);
+int mlx5_alloc_uuars(struct mlx5_core_dev *dev, struct mlx5_uuar_info *uuari);
+int mlx5_free_uuars(struct mlx5_core_dev *dev, struct mlx5_uuar_info *uuari);
+void mlx5_health_cleanup(void);
+void  __init mlx5_health_init(void);
+void mlx5_start_health_poll(struct mlx5_core_dev *dev);
+void mlx5_stop_health_poll(struct mlx5_core_dev *dev);
+int mlx5_buf_alloc(struct mlx5_core_dev *dev, int size, int max_direct,
+                   struct mlx5_buf *buf);
+void mlx5_buf_free(struct mlx5_core_dev *dev, struct mlx5_buf *buf);
+struct mlx5_cmd_mailbox *mlx5_alloc_cmd_mailbox_chain(struct mlx5_core_dev *dev,
+                                                      gfp_t flags, int npages);
+void mlx5_free_cmd_mailbox_chain(struct mlx5_core_dev *dev,
+                                 struct mlx5_cmd_mailbox *head);
+int mlx5_core_create_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
+                         struct mlx5_create_srq_mbox_in *in, int inlen);
+int mlx5_core_destroy_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq);
+int mlx5_core_query_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
+                        struct mlx5_query_srq_mbox_out *out);
+int mlx5_core_arm_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
+                      u16 lwm, int is_srq);
+int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
+                          struct mlx5_create_mkey_mbox_in *in, int inlen);
+int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr);
+int mlx5_core_query_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
+                         struct mlx5_query_mkey_mbox_out *out, int outlen);
+int mlx5_core_dump_fill_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
+                             u32 *mkey);
+int mlx5_core_alloc_pd(struct mlx5_core_dev *dev, u32 *pdn);
+int mlx5_core_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn);
+int mlx5_core_mad_ifc(struct mlx5_core_dev *dev, void *inb, void *outb,
+                      u16 opmod, int port);
+void mlx5_pagealloc_init(struct mlx5_core_dev *dev);
+void mlx5_pagealloc_cleanup(struct mlx5_core_dev *dev);
+int mlx5_pagealloc_start(struct mlx5_core_dev *dev);
+void mlx5_pagealloc_stop(struct mlx5_core_dev *dev);
+void mlx5_core_req_pages_handler(struct mlx5_core_dev *dev, u16 func_id,
+                                 s32 npages);
+int mlx5_satisfy_startup_pages(struct mlx5_core_dev *dev, int boot);
+int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev);
+void mlx5_register_debugfs(void);
+void mlx5_unregister_debugfs(void);
+int mlx5_eq_init(struct mlx5_core_dev *dev);
+void mlx5_eq_cleanup(struct mlx5_core_dev *dev);
+void mlx5_fill_page_array(struct mlx5_buf *buf, __be64 *pas);
+void mlx5_cq_completion(struct mlx5_core_dev *dev, u32 cqn);
+void mlx5_qp_event(struct mlx5_core_dev *dev, u32 qpn, int event_type);
+void mlx5_srq_event(struct mlx5_core_dev *dev, u32 srqn, int event_type);
+struct mlx5_core_srq *mlx5_core_get_srq(struct mlx5_core_dev *dev, u32 srqn);
+void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, unsigned long vector);
+void mlx5_cq_event(struct mlx5_core_dev *dev, u32 cqn, int event_type);
+int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx,
+                       int nent, u64 mask, const char *name, struct mlx5_uar *uar);
+int mlx5_destroy_unmap_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq);
+int mlx5_start_eqs(struct mlx5_core_dev *dev);
+int mlx5_stop_eqs(struct mlx5_core_dev *dev);
+int mlx5_core_attach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, u32 qpn);
+int mlx5_core_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, u32 qpn);
+
+int mlx5_qp_debugfs_init(struct mlx5_core_dev *dev);
+void mlx5_qp_debugfs_cleanup(struct mlx5_core_dev *dev);
+int mlx5_core_access_reg(struct mlx5_core_dev *dev, void *data_in,
+                         int size_in, void *data_out, int size_out,
+                         u16 reg_num, int arg, int write);
+int mlx5_set_port_caps(struct mlx5_core_dev *dev, int port_num, u32 caps);
+
+int mlx5_debug_eq_add(struct mlx5_core_dev *dev, struct mlx5_eq *eq);
+void mlx5_debug_eq_remove(struct mlx5_core_dev *dev, struct mlx5_eq *eq);
+int mlx5_core_eq_query(struct mlx5_core_dev *dev, struct mlx5_eq *eq,
+                       struct mlx5_query_eq_mbox_out *out, int outlen);
+int mlx5_eq_debugfs_init(struct mlx5_core_dev *dev);
+void mlx5_eq_debugfs_cleanup(struct mlx5_core_dev *dev);
+int mlx5_cq_debugfs_init(struct mlx5_core_dev *dev);
+void mlx5_cq_debugfs_cleanup(struct mlx5_core_dev *dev);
+int mlx5_db_alloc(struct mlx5_core_dev *dev, struct mlx5_db *db);
+void mlx5_db_free(struct mlx5_core_dev *dev, struct mlx5_db *db);
+
+const char *mlx5_command_str(int command);
+int mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev);
+void mlx5_cmdif_debugfs_cleanup(struct mlx5_core_dev *dev);
+
+static inline u32 mlx5_mkey_to_idx(u32 mkey)
+{
+        return mkey >> 8;
+}
+
+static inline u32 mlx5_idx_to_mkey(u32 mkey_idx)
+{
+        return mkey_idx << 8;
+}
+
+enum {
+        MLX5_PROF_MASK_QP_SIZE          = (u64)1 << 0,
+        MLX5_PROF_MASK_CMDIF_CSUM       = (u64)1 << 1,
+        MLX5_PROF_MASK_MR_CACHE         = (u64)1 << 2,
+};
+
+enum {
+        MAX_MR_CACHE_ENTRIES    = 16,
+};
+
+struct mlx5_profile {
+        u64     mask;
+        u32     log_max_qp;
+        int     cmdif_csum;
+        struct {
+                int     size;
+                int     limit;
+        } mr_cache[MAX_MR_CACHE_ENTRIES];
+};
+
+#endif /* MLX5_DRIVER_H */
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
new file mode 100644
index 000000000000..d9e3eacb3a7f
--- /dev/null
+++ b/include/linux/mlx5/qp.h
@@ -0,0 +1,467 @@
+/*
+ * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX5_QP_H
+#define MLX5_QP_H
+
+#include <linux/mlx5/device.h>
+#include <linux/mlx5/driver.h>
+
+#define MLX5_INVALID_LKEY       0x100
+
+enum mlx5_qp_optpar {
+        MLX5_QP_OPTPAR_ALT_ADDR_PATH            = 1 << 0,
+        MLX5_QP_OPTPAR_RRE                      = 1 << 1,
+        MLX5_QP_OPTPAR_RAE                      = 1 << 2,
+        MLX5_QP_OPTPAR_RWE                      = 1 << 3,
+        MLX5_QP_OPTPAR_PKEY_INDEX               = 1 << 4,
+        MLX5_QP_OPTPAR_Q_KEY                    = 1 << 5,
+        MLX5_QP_OPTPAR_RNR_TIMEOUT              = 1 << 6,
+        MLX5_QP_OPTPAR_PRIMARY_ADDR_PATH        = 1 << 7,
+        MLX5_QP_OPTPAR_SRA_MAX                  = 1 << 8,
+        MLX5_QP_OPTPAR_RRA_MAX                  = 1 << 9,
+        MLX5_QP_OPTPAR_PM_STATE                 = 1 << 10,
+        MLX5_QP_OPTPAR_RETRY_COUNT              = 1 << 12,
+        MLX5_QP_OPTPAR_RNR_RETRY                = 1 << 13,
+        MLX5_QP_OPTPAR_ACK_TIMEOUT              = 1 << 14,
+        MLX5_QP_OPTPAR_PRI_PORT                 = 1 << 16,
+        MLX5_QP_OPTPAR_SRQN                     = 1 << 18,
+        MLX5_QP_OPTPAR_CQN_RCV                  = 1 << 19,
+        MLX5_QP_OPTPAR_DC_HS                    = 1 << 20,
+        MLX5_QP_OPTPAR_DC_KEY                   = 1 << 21,
+};
+
+enum mlx5_qp_state {
+        MLX5_QP_STATE_RST                       = 0,
+        MLX5_QP_STATE_INIT                      = 1,
+        MLX5_QP_STATE_RTR                       = 2,
+        MLX5_QP_STATE_RTS                       = 3,
+        MLX5_QP_STATE_SQER                      = 4,
+        MLX5_QP_STATE_SQD                       = 5,
+        MLX5_QP_STATE_ERR                       = 6,
+        MLX5_QP_STATE_SQ_DRAINING               = 7,
+        MLX5_QP_STATE_SUSPENDED                 = 9,
+        MLX5_QP_NUM_STATE
+};
+
+enum {
+        MLX5_QP_ST_RC                           = 0x0,
+        MLX5_QP_ST_UC                           = 0x1,
+        MLX5_QP_ST_UD                           = 0x2,
+        MLX5_QP_ST_XRC                          = 0x3,
+        MLX5_QP_ST_MLX                          = 0x4,
+        MLX5_QP_ST_DCI                          = 0x5,
+        MLX5_QP_ST_DCT                          = 0x6,
+        MLX5_QP_ST_QP0                          = 0x7,
+        MLX5_QP_ST_QP1                          = 0x8,
+        MLX5_QP_ST_RAW_ETHERTYPE                = 0x9,
+        MLX5_QP_ST_RAW_IPV6                     = 0xa,
+        MLX5_QP_ST_SNIFFER                      = 0xb,
+        MLX5_QP_ST_SYNC_UMR                     = 0xe,
+        MLX5_QP_ST_PTP_1588                     = 0xd,
+        MLX5_QP_ST_REG_UMR                      = 0xc,
+        MLX5_QP_ST_MAX
+};
+
+enum {
+        MLX5_QP_PM_MIGRATED                     = 0x3,
+        MLX5_QP_PM_ARMED                        = 0x0,
+        MLX5_QP_PM_REARM                        = 0x1
+};
+
+enum {
+        MLX5_NON_ZERO_RQ        = 0 << 24,
+        MLX5_SRQ_RQ             = 1 << 24,
+        MLX5_CRQ_RQ             = 2 << 24,
+        MLX5_ZERO_LEN_RQ        = 3 << 24
+};
+
+enum {
+        /* params1 */
+        MLX5_QP_BIT_SRE                         = 1 << 15,
+        MLX5_QP_BIT_SWE                         = 1 << 14,
+        MLX5_QP_BIT_SAE                         = 1 << 13,
+        /* params2 */
+        MLX5_QP_BIT_RRE                         = 1 << 15,
+        MLX5_QP_BIT_RWE                         = 1 << 14,
+        MLX5_QP_BIT_RAE                         = 1 << 13,
+        MLX5_QP_BIT_RIC                         = 1 <<  4,
+};
+
+enum {
+        MLX5_WQE_CTRL_CQ_UPDATE         = 2 << 2,
+        MLX5_WQE_CTRL_SOLICITED         = 1 << 1,
+};
+
+enum {
+        MLX5_SEND_WQE_BB        = 64,
+};
+
+enum {
+        MLX5_WQE_FMR_PERM_LOCAL_READ    = 1 << 27,
+        MLX5_WQE_FMR_PERM_LOCAL_WRITE   = 1 << 28,
+        MLX5_WQE_FMR_PERM_REMOTE_READ   = 1 << 29,
+        MLX5_WQE_FMR_PERM_REMOTE_WRITE  = 1 << 30,
+        MLX5_WQE_FMR_PERM_ATOMIC        = 1 << 31
+};
+
+enum {
+        MLX5_FENCE_MODE_NONE                    = 0 << 5,
+        MLX5_FENCE_MODE_INITIATOR_SMALL         = 1 << 5,
+        MLX5_FENCE_MODE_STRONG_ORDERING         = 3 << 5,
+        MLX5_FENCE_MODE_SMALL_AND_FENCE         = 4 << 5,
+};
+
+enum {
+        MLX5_QP_LAT_SENSITIVE   = 1 << 28,
+        MLX5_QP_ENABLE_SIG      = 1 << 31,
+};
+
+enum {
+        MLX5_RCV_DBR    = 0,
+        MLX5_SND_DBR    = 1,
+};
+
+struct mlx5_wqe_fmr_seg {
+        __be32                  flags;
+        __be32                  mem_key;
+        __be64                  buf_list;
+        __be64                  start_addr;
+        __be64                  reg_len;
+        __be32                  offset;
+        __be32                  page_size;
+        u32                     reserved[2];
+};
+
+struct mlx5_wqe_ctrl_seg {
+        __be32                  opmod_idx_opcode;
+        __be32                  qpn_ds;
+        u8                      signature;
+        u8                      rsvd[2];
+        u8                      fm_ce_se;
+        __be32                  imm;
+};
+
+struct mlx5_wqe_xrc_seg {
+        __be32                  xrc_srqn;
+        u8                      rsvd[12];
+};
+
+struct mlx5_wqe_masked_atomic_seg {
+        __be64                  swap_add;
+        __be64                  compare;
+        __be64                  swap_add_mask;
+        __be64                  compare_mask;
+};
+
+struct mlx5_av {
+        union {
+                struct {
+                        __be32  qkey;
+                        __be32  reserved;
+                } qkey;
+                __be64  dc_key;
+        } key;
+        __be32  dqp_dct;
+        u8      stat_rate_sl;
+        u8      fl_mlid;
+        __be16  rlid;
+        u8      reserved0[10];
+        u8      tclass;
+        u8      hop_limit;
+        __be32  grh_gid_fl;
+        u8      rgid[16];
+};
+
+struct mlx5_wqe_datagram_seg {
+        struct mlx5_av  av;
+};
+
+struct mlx5_wqe_raddr_seg {
+        __be64                  raddr;
+        __be32                  rkey;
+        u32                     reserved;
+};
+
+struct mlx5_wqe_atomic_seg {
+        __be64                  swap_add;
+        __be64                  compare;
+};
+
+struct mlx5_wqe_data_seg {
+        __be32                  byte_count;
+        __be32                  lkey;
+        __be64                  addr;
+};
+
+struct mlx5_wqe_umr_ctrl_seg {
+        u8              flags;
+        u8              rsvd0[3];
+        __be16          klm_octowords;
+        __be16          bsf_octowords;
+        __be64          mkey_mask;
+        u8              rsvd1[32];
+};
+
+struct mlx5_seg_set_psv {
+        __be32          psv_num;
+        __be16          syndrome;
+        __be16          status;
+        __be32          transient_sig;
+        __be32          ref_tag;
+};
+
+struct mlx5_seg_get_psv {
+        u8              rsvd[19];
+        u8              num_psv;
+        __be32          l_key;
+        __be64          va;
+        __be32          psv_index[4];
+};
+
+struct mlx5_seg_check_psv {
+        u8              rsvd0[2];
+        __be16          err_coalescing_op;
+        u8              rsvd1[2];
+        __be16          xport_err_op;
+        u8              rsvd2[2];
+        __be16          xport_err_mask;
+        u8              rsvd3[7];
+        u8              num_psv;
+        __be32          l_key;
+        __be64          va;
+        __be32          psv_index[4];
+};
+
+struct mlx5_rwqe_sig {
+        u8      rsvd0[4];
+        u8      signature;
+        u8      rsvd1[11];
+};
+
+struct mlx5_wqe_signature_seg {
+        u8      rsvd0[4];
+        u8      signature;
+        u8      rsvd1[11];
+};
+
+struct mlx5_wqe_inline_seg {
+        __be32  byte_count;
+};
+
+struct mlx5_core_qp {
+        void (*event)           (struct mlx5_core_qp *, int);
+        int                     qpn;
+        atomic_t                refcount;
+        struct completion       free;
+        struct mlx5_rsc_debug   *dbg;
+        int                     pid;
+};
+
+struct mlx5_qp_path {
+        u8                      fl;
+        u8                      rsvd3;
+        u8                      free_ar;
+        u8                      pkey_index;
+        u8                      rsvd0;
+        u8                      grh_mlid;
+        __be16                  rlid;
+        u8                      ackto_lt;
+        u8                      mgid_index;
+        u8                      static_rate;
+        u8                      hop_limit;
+        __be32                  tclass_flowlabel;
+        u8                      rgid[16];
+        u8                      rsvd1[4];
+        u8                      sl;
+        u8                      port;
+        u8                      rsvd2[6];
+};
+
+struct mlx5_qp_context {
+        __be32                  flags;
+        __be32                  flags_pd;
+        u8                      mtu_msgmax;
+        u8                      rq_size_stride;
+        __be16                  sq_crq_size;
+        __be32                  qp_counter_set_usr_page;
+        __be32                  wire_qpn;
+        __be32                  log_pg_sz_remote_qpn;
+        struct                  mlx5_qp_path pri_path;
+        struct                  mlx5_qp_path alt_path;
+        __be32                  params1;
+        u8                      reserved2[4];
+        __be32                  next_send_psn;
+        __be32                  cqn_send;
+        u8                      reserved3[8];
+        __be32                  last_acked_psn;
+        __be32                  ssn;
+        __be32                  params2;
+        __be32                  rnr_nextrecvpsn;
+        __be32                  xrcd;
+        __be32                  cqn_recv;
+        __be64                  db_rec_addr;
+        __be32                  qkey;
+        __be32                  rq_type_srqn;
+        __be32                  rmsn;
+        __be16                  hw_sq_wqe_counter;
+        __be16                  sw_sq_wqe_counter;
+        __be16                  hw_rcyclic_byte_counter;
+        __be16                  hw_rq_counter;
+        __be16                  sw_rcyclic_byte_counter;
+        __be16                  sw_rq_counter;
+        u8                      rsvd0[5];
+        u8                      cgs;
+        u8                      cs_req;
+        u8                      cs_res;
+        __be64                  dc_access_key;
+        u8                      rsvd1[24];
+};
+
+struct mlx5_create_qp_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  input_qpn;
+        u8                      rsvd0[4];
+        __be32                  opt_param_mask;
+        u8                      rsvd1[4];
+        struct mlx5_qp_context  ctx;
+        u8                      rsvd3[16];
+        __be64                  pas[0];
+};
+
+struct mlx5_create_qp_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        __be32                  qpn;
+        u8                      rsvd0[4];
+};
+
+struct mlx5_destroy_qp_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  qpn;
+        u8                      rsvd0[4];
+};
+
+struct mlx5_destroy_qp_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd0[8];
+};
+
+struct mlx5_modify_qp_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  qpn;
+        u8                      rsvd1[4];
+        __be32                  optparam;
+        u8                      rsvd0[4];
+        struct mlx5_qp_context  ctx;
+};
+
+struct mlx5_modify_qp_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd0[8];
+};
+
+struct mlx5_query_qp_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  qpn;
+        u8                      rsvd[4];
+};
+
+struct mlx5_query_qp_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd1[8];
+        __be32                  optparam;
+        u8                      rsvd0[4];
+        struct mlx5_qp_context  ctx;
+        u8                      rsvd2[16];
+        __be64                  pas[0];
+};
+
+struct mlx5_conf_sqp_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  qpn;
+        u8                      rsvd[3];
+        u8                      type;
+};
+
+struct mlx5_conf_sqp_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_alloc_xrcd_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        u8                      rsvd[8];
+};
+
+struct mlx5_alloc_xrcd_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        __be32                  xrcdn;
+        u8                      rsvd[4];
+};
+
+struct mlx5_dealloc_xrcd_mbox_in {
+        struct mlx5_inbox_hdr   hdr;
+        __be32                  xrcdn;
+        u8                      rsvd[4];
+};
+
+struct mlx5_dealloc_xrcd_mbox_out {
+        struct mlx5_outbox_hdr  hdr;
+        u8                      rsvd[8];
+};
+
+static inline struct mlx5_core_qp *__mlx5_qp_lookup(struct mlx5_core_dev *dev, u32 qpn)
+{
+        return radix_tree_lookup(&dev->priv.qp_table.tree, qpn);
+}
+
+int mlx5_core_create_qp(struct mlx5_core_dev *dev,
+                        struct mlx5_core_qp *qp,
+                        struct mlx5_create_qp_mbox_in *in,
+                        int inlen);
+int mlx5_core_qp_modify(struct mlx5_core_dev *dev, enum mlx5_qp_state cur_state,
+                        enum mlx5_qp_state new_state,
+                        struct mlx5_modify_qp_mbox_in *in, int sqd_event,
+                        struct mlx5_core_qp *qp);
+int mlx5_core_destroy_qp(struct mlx5_core_dev *dev,
+                         struct mlx5_core_qp *qp);
+int mlx5_core_qp_query(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp,
+                       struct mlx5_query_qp_mbox_out *out, int outlen);
+
+int mlx5_core_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn);
+int mlx5_core_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn);
+void mlx5_init_qp_table(struct mlx5_core_dev *dev);
+void mlx5_cleanup_qp_table(struct mlx5_core_dev *dev);
+int mlx5_debug_qp_add(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp);
+void mlx5_debug_qp_remove(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp);
+
+#endif /* MLX5_QP_H */
diff --git a/include/linux/mlx5/srq.h b/include/linux/mlx5/srq.h
new file mode 100644
index 000000000000..e1a363a33663
--- /dev/null
+++ b/include/linux/mlx5/srq.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, Mellanox Technologies inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX5_SRQ_H
+#define MLX5_SRQ_H
+
+#include <linux/mlx5/driver.h>
+
+void mlx5_init_srq_table(struct mlx5_core_dev *dev);
+void mlx5_cleanup_srq_table(struct mlx5_core_dev *dev);
+
+#endif /* MLX5_SRQ_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index e0c8528a41a4..8b6e55ee8855 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -25,11 +25,17 @@ struct file_ra_state;
 struct user_struct;
 struct writeback_control;
 
-#ifndef CONFIG_DISCONTIGMEM          /* Don't use mapnrs, do it properly */
+#ifndef CONFIG_NEED_MULTIPLE_NODES      /* Don't use mapnrs, do it properly */
 extern unsigned long max_mapnr;
+
+static inline void set_max_mapnr(unsigned long limit)
+{
+        max_mapnr = limit;
+}
+#else
+static inline void set_max_mapnr(unsigned long limit) { }
 #endif
 
-extern unsigned long num_physpages;
 extern unsigned long totalram_pages;
 extern void * high_memory;
 extern int page_cluster;
@@ -52,6 +58,9 @@ extern unsigned long sysctl_admin_reserve_kbytes;
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
 
+/* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */
+#define PAGE_ALIGNED(addr)      IS_ALIGNED((unsigned long)addr, PAGE_SIZE)
+
 /*
  * Linux kernel virtual memory manager primitives.
  * The idea being to have a "virtual" mm in the same way
@@ -106,6 +115,12 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_ARCH_1       0x01000000      /* Architecture-specific flag */
 #define VM_DONTDUMP     0x04000000      /* Do not include in the core dump */
 
+#ifdef CONFIG_MEM_SOFT_DIRTY
+# define VM_SOFTDIRTY   0x08000000      /* Not soft dirty clean area */
+#else
+# define VM_SOFTDIRTY   0
+#endif
+
 #define VM_MIXEDMAP     0x10000000      /* Can contain "struct page" and pure PFN pages */
 #define VM_HUGEPAGE     0x20000000      /* MADV_HUGEPAGE marked this vma */
 #define VM_NOHUGEPAGE   0x40000000      /* MADV_NOHUGEPAGE marked this vma */
@@ -142,12 +157,6 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_STACK_FLAGS  (VM_GROWSDOWN | VM_STACK_DEFAULT_FLAGS | VM_ACCOUNT)
 #endif
 
-#define VM_READHINTMASK                 (VM_SEQ_READ | VM_RAND_READ)
-#define VM_ClearReadHint(v)             (v)->vm_flags &= ~VM_READHINTMASK
-#define VM_NormalReadHint(v)            (!((v)->vm_flags & VM_READHINTMASK))
-#define VM_SequentialReadHint(v)        ((v)->vm_flags & VM_SEQ_READ)
-#define VM_RandomReadHint(v)            ((v)->vm_flags & VM_RAND_READ)
-
 /*
  * Special vmas that are non-mergable, non-mlock()able.
  * Note: mm/huge_memory.c VM_NO_THP depends on this definition.
@@ -167,6 +176,7 @@ extern pgprot_t protection_map[16];
 #define FAULT_FLAG_RETRY_NOWAIT 0x10    /* Don't drop mmap_sem and wait when retrying */
 #define FAULT_FLAG_KILLABLE     0x20    /* The fault task is in SIGKILL killable region */
 #define FAULT_FLAG_TRIED        0x40    /* second try */
+#define FAULT_FLAG_USER         0x80    /* The fault originated in userspace */
 
 /*
  * vm_fault is filled by the the pagefault handler and passed to the vma's
@@ -486,20 +496,6 @@ static inline int compound_order(struct page *page)
         return (unsigned long)page[1].lru.prev;
 }
 
-static inline int compound_trans_order(struct page *page)
-{
-        int order;
-        unsigned long flags;
-
-        if (!PageHead(page))
-                return 0;
-
-        flags = compound_lock_irqsave(page);
-        order = compound_order(page);
-        compound_unlock_irqrestore(page, flags);
-        return order;
-}
-
 static inline void set_compound_order(struct page *page, unsigned long order)
 {
         page[1].lru.prev = (void *)order;
@@ -634,12 +630,12 @@ static inline enum zone_type page_zonenum(const struct page *page)
 #endif
 
 /*
- * The identification function is only used by the buddy allocator for
- * determining if two pages could be buddies. We are not really
- * identifying a zone since we could be using a the section number
- * id if we have not node id available in page flags.
- * We guarantee only that it will return the same value for two
- * combinable pages in a zone.
+ * The identification function is mainly used by the buddy allocator for
+ * determining if two pages could be buddies. We are not really identifying
+ * the zone since we could be using the section number id if we do not have
+ * node id available in page flags.
+ * We only guarantee that it will return the same value for two combinable
+ * pages in a zone.
  */
 static inline int page_zone_id(struct page *page)
 {
@@ -881,11 +877,12 @@ static inline int page_mapped(struct page *page)
 #define VM_FAULT_NOPAGE 0x0100  /* ->fault installed the pte, not return page */
 #define VM_FAULT_LOCKED 0x0200  /* ->fault locked the returned page */
 #define VM_FAULT_RETRY  0x0400  /* ->fault blocked, must retry */
+#define VM_FAULT_FALLBACK 0x0800        /* huge page fault failed, fall back to small */
 
 #define VM_FAULT_HWPOISON_LARGE_MASK 0xf000 /* encodes hpage index for large hwpoison */
 
 #define VM_FAULT_ERROR  (VM_FAULT_OOM | VM_FAULT_SIGBUS | VM_FAULT_HWPOISON | \
-                         VM_FAULT_HWPOISON_LARGE)
+                         VM_FAULT_FALLBACK | VM_FAULT_HWPOISON_LARGE)
 
 /* Encode hstate index for a hwpoisoned large page */
 #define VM_FAULT_SET_HINDEX(x) ((x) << 12)
@@ -989,7 +986,7 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
         unmap_mapping_range(mapping, holebegin, holelen, 0);
 }
 
-extern void truncate_pagecache(struct inode *inode, loff_t old, loff_t new);
+extern void truncate_pagecache(struct inode *inode, loff_t new);
 extern void truncate_setsize(struct inode *inode, loff_t newsize);
 void truncate_pagecache_range(struct inode *inode, loff_t offset, loff_t end);
 int truncate_inode_page(struct address_space *mapping, struct page *page);
@@ -1041,7 +1038,8 @@ int get_kernel_page(unsigned long start, int write, struct page **pages);
 struct page *get_dump_page(unsigned long addr);
 
 extern int try_to_release_page(struct page * page, gfp_t gfp_mask);
-extern void do_invalidatepage(struct page *page, unsigned long offset);
+extern void do_invalidatepage(struct page *page, unsigned int offset,
+                              unsigned int length);
 
 int __set_page_dirty_nobuffers(struct page *page);
 int __set_page_dirty_no_writeback(struct page *page);
@@ -1304,11 +1302,12 @@ extern void free_initmem(void);
 /*
  * Free reserved pages within range [PAGE_ALIGN(start), end & PAGE_MASK)
  * into the buddy system. The freed pages will be poisoned with pattern
- * "poison" if it's non-zero.
+ * "poison" if it's within range [0, UCHAR_MAX].
  * Return pages freed into the buddy system.
  */
-extern unsigned long free_reserved_area(unsigned long start, unsigned long end,
+extern unsigned long free_reserved_area(void *start, void *end,
                                         int poison, char *s);
+
 #ifdef  CONFIG_HIGHMEM
 /*
  * Free a highmem page into the buddy system, adjusting totalhigh_pages
@@ -1317,10 +1316,8 @@ extern unsigned long free_reserved_area(unsigned long start, unsigned long end,
 extern void free_highmem_page(struct page *page);
 #endif
 
-static inline void adjust_managed_page_count(struct page *page, long count)
-{
-        totalram_pages += count;
-}
+extern void adjust_managed_page_count(struct page *page, long count);
+extern void mem_init_print_info(const char *str);
 
 /* Free the reserved page into the buddy system, so it gets managed. */
 static inline void __free_reserved_page(struct page *page)
@@ -1344,18 +1341,29 @@ static inline void mark_page_reserved(struct page *page)
 
 /*
  * Default method to free all the __init memory into the buddy system.
- * The freed pages will be poisoned with pattern "poison" if it is
- * non-zero. Return pages freed into the buddy system.
+ * The freed pages will be poisoned with pattern "poison" if it's within
+ * range [0, UCHAR_MAX].
+ * Return pages freed into the buddy system.
  */
 static inline unsigned long free_initmem_default(int poison)
 {
         extern char __init_begin[], __init_end[];
 
-        return free_reserved_area(PAGE_ALIGN((unsigned long)&__init_begin) ,
-                                  ((unsigned long)&__init_end) & PAGE_MASK,
+        return free_reserved_area(&__init_begin, &__init_end,
                                   poison, "unused kernel");
 }
 
+static inline unsigned long get_num_physpages(void)
+{
+        int nid;
+        unsigned long phys_pages = 0;
+
+        for_each_online_node(nid)
+                phys_pages += node_present_pages(nid);
+
+        return phys_pages;
+}
+
 #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
 /*
  * With CONFIG_HAVE_MEMBLOCK_NODE_MAP set, an architecture may initialise its
@@ -1784,6 +1792,7 @@ enum mf_flags {
         MF_COUNT_INCREASED = 1 << 0,
         MF_ACTION_REQUIRED = 1 << 1,
         MF_MUST_KILL = 1 << 2,
+        MF_SOFT_OFFLINE = 1 << 3,
 };
 extern int memory_failure(unsigned long pfn, int trapno, int flags);
 extern void memory_failure_queue(unsigned long pfn, int trapno, int flags);
diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 1397ccf81e91..cf55945c83fb 100644
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -2,6 +2,7 @@
 #define LINUX_MM_INLINE_H
 
 #include <linux/huge_mm.h>
+#include <linux/swap.h>
 
 /**
  * page_is_file_cache - should the page be on a file LRU or anon LRU?
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index ace9a5f01c64..d9851eeb6e1d 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -322,6 +322,7 @@ struct mm_rss_stat {
         atomic_long_t count[NR_MM_COUNTERS];
 };
 
+struct kioctx_table;
 struct mm_struct {
         struct vm_area_struct * mmap;           /* list of VMAs */
         struct rb_root mm_rb;
@@ -330,12 +331,10 @@ struct mm_struct {
         unsigned long (*get_unmapped_area) (struct file *filp,
                                 unsigned long addr, unsigned long len,
                                 unsigned long pgoff, unsigned long flags);
-        void (*unmap_area) (struct mm_struct *mm, unsigned long addr);
 #endif
         unsigned long mmap_base;                /* base of mmap area */
+        unsigned long mmap_legacy_base;         /* base of mmap area in bottom-up allocations */
         unsigned long task_size;                /* size of task vm space */
-        unsigned long cached_hole_size;         /* if non-zero, the largest hole below free_area_cache */
-        unsigned long free_area_cache;          /* first hole of size cached_hole_size or larger */
         unsigned long highest_vm_end;           /* highest vma end address */
         pgd_t * pgd;
         atomic_t mm_users;                      /* How many users with user space? */
@@ -385,8 +384,8 @@ struct mm_struct {
 
         struct core_state *core_state; /* coredumping support */
 #ifdef CONFIG_AIO
-        spinlock_t              ioctx_lock;
-        struct hlist_head       ioctx_list;
+        spinlock_t                      ioctx_lock;
+        struct kioctx_table __rcu       *ioctx_table;
 #endif
 #ifdef CONFIG_MM_OWNER
         /*
diff --git a/include/linux/mman.h b/include/linux/mman.h
index 9aa863da287f..92dc257251e4 100644
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -11,11 +11,17 @@ extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
 extern struct percpu_counter vm_committed_as;
 
+#ifdef CONFIG_SMP
+extern s32 vm_committed_as_batch;
+#else
+#define vm_committed_as_batch 0
+#endif
+
 unsigned long vm_memory_committed(void);
 
 static inline void vm_acct_memory(long pages)
 {
-        percpu_counter_add(&vm_committed_as, pages);
+        __percpu_counter_add(&vm_committed_as, pages, vm_committed_as_batch);
 }
 
 static inline void vm_unacct_memory(long pages)
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index f31725ba49f3..842de3e21e70 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -94,7 +94,11 @@ struct mmc_ext_csd {
         u8                      raw_ext_csd_structure;  /* 194 */
         u8                      raw_card_type;          /* 196 */
         u8                      out_of_int_time;        /* 198 */
-        u8                      raw_s_a_timeout;                /* 217 */
+        u8                      raw_pwr_cl_52_195;      /* 200 */
+        u8                      raw_pwr_cl_26_195;      /* 201 */
+        u8                      raw_pwr_cl_52_360;      /* 202 */
+        u8                      raw_pwr_cl_26_360;      /* 203 */
+        u8                      raw_s_a_timeout;        /* 217 */
         u8                      raw_hc_erase_gap_size;  /* 221 */
         u8                      raw_erase_timeout_mult; /* 223 */
         u8                      raw_hc_erase_grp_size;  /* 224 */
@@ -102,6 +106,10 @@ struct mmc_ext_csd {
         u8                      raw_sec_erase_mult;     /* 230 */
         u8                      raw_sec_feature_support;/* 231 */
         u8                      raw_trim_mult;          /* 232 */
+        u8                      raw_pwr_cl_200_195;     /* 236 */
+        u8                      raw_pwr_cl_200_360;     /* 237 */
+        u8                      raw_pwr_cl_ddr_52_195;  /* 238 */
+        u8                      raw_pwr_cl_ddr_52_360;  /* 239 */
         u8                      raw_bkops_status;       /* 246 */
         u8                      raw_sectors[4];         /* 212 - 4 bytes */
 
@@ -512,6 +520,7 @@ struct mmc_driver {
         void (*remove)(struct mmc_card *);
         int (*suspend)(struct mmc_card *);
         int (*resume)(struct mmc_card *);
+        void (*shutdown)(struct mmc_card *);
 };
 
 extern int mmc_register_driver(struct mmc_driver *);
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 39613b9a6fc5..da51bec578c3 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -96,6 +96,8 @@ struct mmc_command {
  */
 
         unsigned int            cmd_timeout_ms; /* in milliseconds */
+        /* Set this flag only for blocking sanitize request */
+        bool                    sanitize_busy;
 
         struct mmc_data         *data;          /* data segment associated with cmd */
         struct mmc_request      *mrq;           /* associated request */
@@ -188,6 +190,9 @@ extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
 extern void mmc_release_host(struct mmc_host *host);
 extern int mmc_try_claim_host(struct mmc_host *host);
 
+extern void mmc_get_card(struct mmc_card *card);
+extern void mmc_put_card(struct mmc_card *card);
+
 extern int mmc_flush_cache(struct mmc_card *);
 
 extern int mmc_detect_card_removed(struct mmc_host *host);
@@ -203,6 +208,8 @@ static inline void mmc_claim_host(struct mmc_host *host)
         __mmc_claim_host(host, NULL);
 }
 
+struct device_node;
 extern u32 mmc_vddrange_to_ocrmask(int vdd_min, int vdd_max);
+extern int mmc_of_parse_voltage(struct device_node *np, u32 *mask);
 
 #endif /* LINUX_MMC_CORE_H */
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index e326ae2882a0..3b0c33ae13e1 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -239,7 +239,7 @@ struct mmc_host {
 #define MMC_CAP_SPI             (1 << 4)        /* Talks only SPI protocols */
 #define MMC_CAP_NEEDS_POLL      (1 << 5)        /* Needs polling for card-detection */
 #define MMC_CAP_8_BIT_DATA      (1 << 6)        /* Can the host do 8 bit transfers */
-
+#define MMC_CAP_AGGRESSIVE_PM   (1 << 7)        /* Suspend (e)MMC/SD at idle  */
 #define MMC_CAP_NONREMOVABLE    (1 << 8)        /* Nonremovable e.g. eMMC */
 #define MMC_CAP_WAIT_WHILE_BUSY (1 << 9)        /* Waits while card is busy */
 #define MMC_CAP_ERASE           (1 << 10)       /* Allow erase/trim commands */
@@ -264,7 +264,7 @@ struct mmc_host {
 
 #define MMC_CAP2_BOOTPART_NOACC (1 << 0)        /* Boot partition no access */
 #define MMC_CAP2_CACHE_CTRL     (1 << 1)        /* Allow cache control */
-#define MMC_CAP2_POWEROFF_NOTIFY (1 << 2)       /* Notify poweroff supported */
+#define MMC_CAP2_FULL_PWR_CYCLE (1 << 2)        /* Can do full power cycle */
 #define MMC_CAP2_NO_MULTI_READ  (1 << 3)        /* Multiblock reads don't work */
 #define MMC_CAP2_NO_SLEEP_CMD   (1 << 4)        /* Don't allow sleep command */
 #define MMC_CAP2_HS200_1_8V_SDR (1 << 5)        /* can support */
@@ -272,7 +272,6 @@ struct mmc_host {
 #define MMC_CAP2_HS200          (MMC_CAP2_HS200_1_8V_SDR | \
                                  MMC_CAP2_HS200_1_2V_SDR)
 #define MMC_CAP2_BROKEN_VOLTAGE (1 << 7)        /* Use the broken voltage */
-#define MMC_CAP2_DETECT_ON_ERR  (1 << 8)        /* On I/O err check card removal */
 #define MMC_CAP2_HC_ERASE_SZ    (1 << 9)        /* High-capacity erase size */
 #define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10)       /* Card-detect signal active high */
 #define MMC_CAP2_RO_ACTIVE_HIGH (1 << 11)       /* Write-protect signal active high */
@@ -281,6 +280,7 @@ struct mmc_host {
 #define MMC_CAP2_PACKED_CMD     (MMC_CAP2_PACKED_RD | \
                                  MMC_CAP2_PACKED_WR)
 #define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14)   /* Don't power up before scan */
+#define MMC_CAP2_SANITIZE       (1 << 15)               /* Support Sanitize */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
 
@@ -369,7 +369,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *);
 int mmc_add_host(struct mmc_host *);
 void mmc_remove_host(struct mmc_host *);
 void mmc_free_host(struct mmc_host *);
-void mmc_of_parse(struct mmc_host *host);
+int mmc_of_parse(struct mmc_host *host);
 
 static inline void *mmc_priv(struct mmc_host *host)
 {
@@ -425,10 +425,6 @@ static inline int mmc_regulator_get_supply(struct mmc_host *mmc)
 }
 #endif
 
-int mmc_card_awake(struct mmc_host *host);
-int mmc_card_sleep(struct mmc_host *host);
-int mmc_card_can_sleep(struct mmc_host *host);
-
 int mmc_pm_notify(struct notifier_block *notify_block, unsigned long, void *);
 
 /* Module parameter */
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index b838ffc49e4a..3e781b8c0be7 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -95,6 +95,9 @@ struct sdhci_host {
 /* The system physically doesn't support 1.8v, even if the host does */
 #define SDHCI_QUIRK2_NO_1_8_V                           (1<<2)
 #define SDHCI_QUIRK2_PRESET_VALUE_BROKEN                (1<<3)
+#define SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON               (1<<4)
+/* Controller has a non-standard host control register */
+#define SDHCI_QUIRK2_BROKEN_HOST_CONTROL                (1<<5)
 
         int irq;                /* Device IRQ */
         void __iomem *ioaddr;   /* Mapped address */
@@ -126,7 +129,7 @@ struct sdhci_host {
 #define SDHCI_AUTO_CMD23        (1<<7)  /* Auto CMD23 support */
 #define SDHCI_PV_ENABLED        (1<<8)  /* Preset value enabled */
 #define SDHCI_SDIO_IRQ_ENABLED  (1<<9)  /* SDIO irq enabled */
-#define SDHCI_HS200_NEEDS_TUNING (1<<10)        /* HS200 needs tuning */
+#define SDHCI_SDR104_NEEDS_TUNING (1<<10)       /* SDR104/HS200 needs tuning */
 #define SDHCI_USING_RETUNING_TIMER (1<<11)      /* Host is using a retuning timer for the card */
 
         unsigned int version;   /* SDHCI spec. version */
@@ -139,6 +142,7 @@ struct sdhci_host {
         u8 pwr;                 /* Current voltage */
 
         bool runtime_suspended; /* Host is runtime suspended */
+        bool bus_on;            /* Bus power prevents runtime suspend */
 
         struct mmc_request *mrq;        /* Current request */
         struct mmc_command *cmd;        /* Current command */
@@ -167,6 +171,7 @@ struct sdhci_host {
         unsigned int            ocr_avail_sdio; /* OCR bit masks */
         unsigned int            ocr_avail_sd;
         unsigned int            ocr_avail_mmc;
+        u32 ocr_mask;           /* available voltages */
 
         wait_queue_head_t       buf_ready_int;  /* Waitqueue for Buffer Read Ready interrupt */
         unsigned int            tuning_done;    /* Condition flag set when CMD19 succeeds */
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index e7d5dd67bb74..ccd8fb2cad52 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -16,7 +16,6 @@
 
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <linux/sh_dma.h>
 
 /*
  * MMCIF : CE_CLK_CTRL [19:16]
@@ -33,12 +32,12 @@
  */
 
 struct sh_mmcif_plat_data {
-        void (*set_pwr)(struct platform_device *pdev, int state);
-        void (*down_pwr)(struct platform_device *pdev);
         int (*get_cd)(struct platform_device *pdef);
         unsigned int            slave_id_tx;    /* embedded slave_id_[tr]x */
         unsigned int            slave_id_rx;
         bool                    use_cd_gpio : 1;
+        bool                    ccs_unsupported : 1;
+        bool                    clk_ctrl2_present : 1;
         unsigned int            cd_gpio;
         u8                      sup_pclk;       /* 1 :SH7757, 0: SH7724/SH7372 */
         unsigned long           caps;
@@ -62,6 +61,7 @@ struct sh_mmcif_plat_data {
 #define MMCIF_CE_INT_MASK       0x00000044
 #define MMCIF_CE_HOST_STS1      0x00000048
 #define MMCIF_CE_HOST_STS2      0x0000004C
+#define MMCIF_CE_CLK_CTRL2      0x00000070
 #define MMCIF_CE_VERSION        0x0000007C
 
 /* CE_BUF_ACC */
diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h
index b76bcf0621f6..68927ae50845 100644
--- a/include/linux/mmc/sh_mobile_sdhi.h
+++ b/include/linux/mmc/sh_mobile_sdhi.h
@@ -25,8 +25,6 @@ struct sh_mobile_sdhi_info {
         unsigned long tmio_caps2;
         u32 tmio_ocr_mask;      /* available MMC voltages */
         unsigned int cd_gpio;
-        void (*set_pwr)(struct platform_device *pdev, int state);
-        int (*get_cd)(struct platform_device *pdev);
 
         /* callbacks for board specific setup code */
         int (*init)(struct platform_device *pdev,
diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h
index 7d88d27bfafa..b0c73e4cacea 100644
--- a/include/linux/mmc/slot-gpio.h
+++ b/include/linux/mmc/slot-gpio.h
@@ -18,7 +18,8 @@ int mmc_gpio_request_ro(struct mmc_host *host, unsigned int gpio);
 void mmc_gpio_free_ro(struct mmc_host *host);
 
 int mmc_gpio_get_cd(struct mmc_host *host);
-int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio);
+int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio,
+                        unsigned int debounce);
 void mmc_gpio_free_cd(struct mmc_host *host);
 
 #endif
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 5c76737d836b..bd791e452ad7 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -105,6 +105,7 @@ struct zone_padding {
 enum zone_stat_item {
         /* First 128 byte cacheline (assuming 64 bit words) */
         NR_FREE_PAGES,
+        NR_ALLOC_BATCH,
         NR_LRU_BASE,
         NR_INACTIVE_ANON = NR_LRU_BASE, /* must match order of LRU_[IN]ACTIVE */
         NR_ACTIVE_ANON,         /*  "     "     "   "       "         */
@@ -352,7 +353,6 @@ struct zone {
          * free areas of different sizes
          */
         spinlock_t              lock;
-        int                     all_unreclaimable; /* All pages pinned */
 #if defined CONFIG_COMPACTION || defined CONFIG_CMA
         /* Set to true when the PG_migrate_skip bits should be cleared */
         bool                    compact_blockskip_flush;
@@ -474,10 +474,16 @@ struct zone {
          * frequently read in proximity to zone->lock.  It's good to
          * give them a chance of being in the same cacheline.
          *
-         * Write access to present_pages and managed_pages at runtime should
-         * be protected by lock_memory_hotplug()/unlock_memory_hotplug().
-         * Any reader who can't tolerant drift of present_pages and
-         * managed_pages should hold memory hotplug lock to get a stable value.
+         * Write access to present_pages at runtime should be protected by
+         * lock_memory_hotplug()/unlock_memory_hotplug().  Any reader who can't
+         * tolerant drift of present_pages should hold memory hotplug lock to
+         * get a stable value.
+         *
+         * Read access to managed_pages should be safe because it's unsigned
+         * long. Write access to zone->managed_pages and totalram_pages are
+         * protected by managed_page_count_lock at runtime. Idealy only
+         * adjust_managed_page_count() should be used instead of directly
+         * touching zone->managed_pages and totalram_pages.
          */
         unsigned long           spanned_pages;
         unsigned long           present_pages;
@@ -495,6 +501,13 @@ typedef enum {
         ZONE_CONGESTED,                 /* zone has many dirty pages backed by
                                          * a congested BDI
                                          */
+        ZONE_TAIL_LRU_DIRTY,            /* reclaim scanning has recently found
+                                         * many dirty file pages at the tail
+                                         * of the LRU.
+                                         */
+        ZONE_WRITEBACK,                 /* reclaim scanning has recently found
+                                         * many pages under writeback
+                                         */
 } zone_flags_t;
 
 static inline void zone_set_flag(struct zone *zone, zone_flags_t flag)
@@ -517,6 +530,16 @@ static inline int zone_is_reclaim_congested(const struct zone *zone)
         return test_bit(ZONE_CONGESTED, &zone->flags);
 }
 
+static inline int zone_is_reclaim_dirty(const struct zone *zone)
+{
+        return test_bit(ZONE_TAIL_LRU_DIRTY, &zone->flags);
+}
+
+static inline int zone_is_reclaim_writeback(const struct zone *zone)
+{
+        return test_bit(ZONE_WRITEBACK, &zone->flags);
+}
+
 static inline int zone_is_reclaim_locked(const struct zone *zone)
 {
         return test_bit(ZONE_RECLAIM_LOCKED, &zone->flags);
@@ -716,7 +739,10 @@ typedef struct pglist_data {
          * or node_spanned_pages stay constant.  Holding this will also
          * guarantee that any pfn_valid() stays that way.
          *
-         * Nests above zone->lock and zone->size_seqlock.
+         * pgdat_resize_lock() and pgdat_resize_unlock() are provided to
+         * manipulate node_size_lock without checking for CONFIG_MEMORY_HOTPLUG.
+         *
+         * Nests above zone->lock and zone->span_seqlock
          */
         spinlock_t node_size_lock;
 #endif
@@ -843,11 +869,6 @@ static inline int is_highmem_idx(enum zone_type idx)
 #endif
 }
 
-static inline int is_normal_idx(enum zone_type idx)
-{
-        return (idx == ZONE_NORMAL);
-}
-
 /**
  * is_highmem - helper function to quickly check if a struct zone is a 
  *              highmem zone or not.  This is an attempt to keep references
@@ -866,29 +887,6 @@ static inline int is_highmem(struct zone *zone)
 #endif
 }
 
-static inline int is_normal(struct zone *zone)
-{
-        return zone == zone->zone_pgdat->node_zones + ZONE_NORMAL;
-}
-
-static inline int is_dma32(struct zone *zone)
-{
-#ifdef CONFIG_ZONE_DMA32
-        return zone == zone->zone_pgdat->node_zones + ZONE_DMA32;
-#else
-        return 0;
-#endif
-}
-
-static inline int is_dma(struct zone *zone)
-{
-#ifdef CONFIG_ZONE_DMA
-        return zone == zone->zone_pgdat->node_zones + ZONE_DMA;
-#else
-        return 0;
-#endif
-}
-
 /* These two functions are used to setup the per zone pages min values */
 struct ctl_table;
 int min_free_kbytes_sysctl_handler(struct ctl_table *, int,
@@ -1111,6 +1109,10 @@ struct mem_section {
         struct page_cgroup *page_cgroup;
         unsigned long pad;
 #endif
+        /*
+         * WARNING: mem_section must be a power-of-2 in size for the
+         * calculation and use of SECTION_ROOT_MASK to make sense.
+         */
 };
 
 #ifdef CONFIG_SPARSEMEM_EXTREME
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index b508016fb76d..45e921401b06 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -361,7 +361,8 @@ struct ssb_device_id {
         __u16   vendor;
         __u16   coreid;
         __u8    revision;
-};
+        __u8    __pad;
+} __attribute__((packed, aligned(2)));
 #define SSB_DEVICE(_vendor, _coreid, _revision)  \
         { .vendor = _vendor, .coreid = _coreid, .revision = _revision, }
 #define SSB_DEVTABLE_END  \
@@ -377,7 +378,7 @@ struct bcma_device_id {
         __u16   id;
         __u8    rev;
         __u8    class;
-};
+} __attribute__((packed,aligned(2)));
 #define BCMA_CORE(_manuf, _id, _rev, _class)  \
         { .manuf = _manuf, .id = _id, .rev = _rev, .class = _class, }
 #define BCMA_CORETABLE_END  \
@@ -456,7 +457,8 @@ enum dmi_field {
 };
 
 struct dmi_strmatch {
-        unsigned char slot;
+        unsigned char slot:7;
+        unsigned char exact_match:1;
         char substr[79];
 };
 
@@ -474,7 +476,8 @@ struct dmi_system_id {
  */
 #define dmi_device_id dmi_system_id
 
-#define DMI_MATCH(a, b) { a, b }
+#define DMI_MATCH(a, b) { .slot = a, .substr = b }
+#define DMI_EXACT_MATCH(a, b)   { .slot = a, .substr = b, .exact_match = 1 }
 
 #define PLATFORM_NAME_SIZE      20
 #define PLATFORM_MODULE_PREFIX  "platform:"
@@ -577,4 +580,23 @@ struct mei_cl_device_id {
         kernel_ulong_t driver_info;
 };
 
+/* RapidIO */
+
+#define RIO_ANY_ID      0xffff
+
+/**
+ * struct rio_device_id - RIO device identifier
+ * @did: RapidIO device ID
+ * @vid: RapidIO vendor ID
+ * @asm_did: RapidIO assembly device ID
+ * @asm_vid: RapidIO assembly vendor ID
+ *
+ * Identifies a RapidIO device based on both the device/vendor IDs and
+ * the assembly device/vendor IDs.
+ */
+struct rio_device_id {
+        __u16 did, vid;
+        __u16 asm_did, asm_vid;
+};
+
 #endif /* LINUX_MOD_DEVICETABLE_H */
diff --git a/include/linux/module.h b/include/linux/module.h
index 46f1ea01e6f6..05f2447f8c15 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -42,6 +42,7 @@ struct module_kobject {
         struct module *mod;
         struct kobject *drivers_dir;
         struct module_param_attrs *mp;
+        struct completion *kobj_completion;
 };
 
 struct module_attribute {
@@ -97,6 +98,11 @@ extern const struct gtype##_id __mod_##gtype##_table		\
 /* For userspace: you can also call me... */
 #define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
 
+/* Soft module dependencies. See man modprobe.d for details.
+ * Example: MODULE_SOFTDEP("pre: module-foo module-bar post: module-baz")
+ */
+#define MODULE_SOFTDEP(_softdep) MODULE_INFO(softdep, _softdep)
+
 /*
  * The following license idents are currently accepted as indicating free
  * software modules
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 137b4198fc03..c3eb102a9cc8 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -36,7 +36,18 @@ static const char __UNIQUE_ID(name)[]					  \
 
 struct kernel_param;
 
+/*
+ * Flags available for kernel_param_ops
+ *
+ * NOARG - the parameter allows for no argument (foo instead of foo=1)
+ */
+enum {
+        KERNEL_PARAM_FL_NOARG = (1 << 0)
+};
+
 struct kernel_param_ops {
+        /* How the ops should behave */
+        unsigned int flags;
         /* Returns 0, or -errno.  arg is in kp->arg. */
         int (*set)(const char *val, const struct kernel_param *kp);
         /* Returns length written or -errno.  Buffer is 4k (ie. be short!) */
@@ -187,7 +198,7 @@ struct kparam_array
 /* Obsolete - use module_param_cb() */
 #define module_param_call(name, set, get, arg, perm)                    \
         static struct kernel_param_ops __param_ops_##name =             \
-                 { (void *)set, (void *)get };                          \
+                { 0, (void *)set, (void *)get };                        \
         __module_param_call(MODULE_PARAM_PREFIX,                        \
                             name, &__param_ops_##name, arg,             \
                             (perm) + sizeof(__check_old_set_param(set))*0, -1)
@@ -439,7 +450,7 @@ extern struct kernel_param_ops param_ops_string;
 extern int param_set_copystring(const char *val, const struct kernel_param *);
 extern int param_get_string(char *buffer, const struct kernel_param *kp);
 
-/* for exporting parameters in /sys/parameters */
+/* for exporting parameters in /sys/module/.../parameters */
 
 struct module;
 
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 73005f9957ea..38cd98f112a0 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -48,6 +48,7 @@ struct mnt_namespace;
 #define MNT_INTERNAL    0x4000
 
 #define MNT_LOCK_READONLY       0x400000
+#define MNT_LOCKED              0x800000
 
 struct vfsmount {
         struct dentry *mnt_root;        /* root of the mounted tree */
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 20c2d6dd5d25..b17ead818aec 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -35,6 +35,7 @@ struct msi_desc {
 
         u32 masked;                     /* mask bits */
         unsigned int irq;
+        unsigned int nvec_used;         /* number of messages */
         struct list_head list;
 
         union {
@@ -50,12 +51,31 @@ struct msi_desc {
 };
 
 /*
- * The arch hook for setup up msi irqs
+ * The arch hooks to setup up msi irqs. Those functions are
+ * implemented as weak symbols so that they /can/ be overriden by
+ * architecture specific code if needed.
  */
 int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc);
 void arch_teardown_msi_irq(unsigned int irq);
 int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
 void arch_teardown_msi_irqs(struct pci_dev *dev);
 int arch_msi_check_device(struct pci_dev* dev, int nvec, int type);
+void arch_restore_msi_irqs(struct pci_dev *dev, int irq);
+
+void default_teardown_msi_irqs(struct pci_dev *dev);
+void default_restore_msi_irqs(struct pci_dev *dev, int irq);
+
+struct msi_chip {
+        struct module *owner;
+        struct device *dev;
+        struct device_node *of_node;
+        struct list_head list;
+
+        int (*setup_irq)(struct msi_chip *chip, struct pci_dev *dev,
+                         struct msi_desc *desc);
+        void (*teardown_irq)(struct msi_chip *chip, unsigned int irq);
+        int (*check_device)(struct msi_chip *chip, struct pci_dev *dev,
+                            int nvec, int type);
+};
 
 #endif /* LINUX_MSI_H */
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h
index 211ff67e8b0d..95fc482cef36 100644
--- a/include/linux/mtd/bbm.h
+++ b/include/linux/mtd/bbm.h
@@ -93,8 +93,6 @@ struct nand_bbt_descr {
 #define NAND_BBT_CREATE_EMPTY   0x00000400
 /* Search good / bad pattern through all pages of a block */
 #define NAND_BBT_SCANALLPAGES   0x00000800
-/* Scan block empty during good / bad block scan */
-#define NAND_BBT_SCANEMPTY      0x00001000
 /* Write bbt if neccecary */
 #define NAND_BBT_WRITE          0x00002000
 /* Read and write back block contents when writing bbt */
diff --git a/include/linux/mtd/fsmc.h b/include/linux/mtd/fsmc.h
index d6ed61ef451d..c8be32e9fc49 100644
--- a/include/linux/mtd/fsmc.h
+++ b/include/linux/mtd/fsmc.h
@@ -137,6 +137,7 @@ enum access_mode {
 
 /**
  * fsmc_nand_platform_data - platform specific NAND controller config
+ * @nand_timings: timing setup for the physical NAND interface
  * @partitions: partition table for the platform, use a default fallback
  * if this is NULL
  * @nr_partitions: the number of partitions in the previous entry
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index a5cf4e8d6818..f9bfe526d310 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -173,6 +173,9 @@ struct mtd_info {
         /* ECC layout structure pointer - read only! */
         struct nand_ecclayout *ecclayout;
 
+        /* the ecc step size. */
+        unsigned int ecc_step_size;
+
         /* max number of correctible bit errors per ecc step */
         unsigned int ecc_strength;
 
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index ab6363443ce8..ac8e89d5a792 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -56,7 +56,7 @@ extern int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);
  * is supported now. If you add a chip with bigger oobsize/page
  * adjust this accordingly.
  */
-#define NAND_MAX_OOBSIZE        640
+#define NAND_MAX_OOBSIZE        744
 #define NAND_MAX_PAGESIZE       8192
 
 /*
@@ -202,6 +202,10 @@ typedef enum {
 /* Keep gcc happy */
 struct nand_chip;
 
+/* ONFI features */
+#define ONFI_FEATURE_16_BIT_BUS         (1 << 0)
+#define ONFI_FEATURE_EXT_PARAM_PAGE     (1 << 7)
+
 /* ONFI timing mode, used in both asynchronous and synchronous mode */
 #define ONFI_TIMING_MODE_0              (1 << 0)
 #define ONFI_TIMING_MODE_1              (1 << 1)
@@ -217,6 +221,9 @@ struct nand_chip;
 /* ONFI subfeature parameters length */
 #define ONFI_SUBFEATURE_PARAM_LEN       4
 
+/* ONFI optional commands SET/GET FEATURES supported? */
+#define ONFI_OPT_CMD_SET_GET_FEATURES   (1 << 2)
+
 struct nand_onfi_params {
         /* rev info and features block */
         /* 'O' 'N' 'F' 'I'  */
@@ -224,7 +231,10 @@ struct nand_onfi_params {
         __le16 revision;
         __le16 features;
         __le16 opt_cmd;
-        u8 reserved[22];
+        u8 reserved0[2];
+        __le16 ext_param_page_length; /* since ONFI 2.1 */
+        u8 num_of_param_pages;        /* since ONFI 2.1 */
+        u8 reserved1[17];
 
         /* manufacturer information block */
         char manufacturer[12];
@@ -281,6 +291,40 @@ struct nand_onfi_params {
 
 #define ONFI_CRC_BASE   0x4F4E
 
+/* Extended ECC information Block Definition (since ONFI 2.1) */
+struct onfi_ext_ecc_info {
+        u8 ecc_bits;
+        u8 codeword_size;
+        __le16 bb_per_lun;
+        __le16 block_endurance;
+        u8 reserved[2];
+} __packed;
+
+#define ONFI_SECTION_TYPE_0     0       /* Unused section. */
+#define ONFI_SECTION_TYPE_1     1       /* for additional sections. */
+#define ONFI_SECTION_TYPE_2     2       /* for ECC information. */
+struct onfi_ext_section {
+        u8 type;
+        u8 length;
+} __packed;
+
+#define ONFI_EXT_SECTION_MAX 8
+
+/* Extended Parameter Page Definition (since ONFI 2.1) */
+struct onfi_ext_param_page {
+        __le16 crc;
+        u8 sig[4];             /* 'E' 'P' 'P' 'S' */
+        u8 reserved0[10];
+        struct onfi_ext_section sections[ONFI_EXT_SECTION_MAX];
+
+        /*
+         * The actual size of the Extended Parameter Page is in
+         * @ext_param_page_length of nand_onfi_params{}.
+         * The following are the variable length sections.
+         * So we do not add any fields below. Please see the ONFI spec.
+         */
+} __packed;
+
 /**
  * struct nand_hw_control - Control structure for hardware controller (e.g ECC generator) shared among independent devices
  * @lock:               protection lock
@@ -390,8 +434,8 @@ struct nand_buffers {
  * @write_buf:          [REPLACEABLE] write data from the buffer to the chip
  * @read_buf:           [REPLACEABLE] read data from the chip into the buffer
  * @select_chip:        [REPLACEABLE] select chip nr
- * @block_bad:          [REPLACEABLE] check, if the block is bad
- * @block_markbad:      [REPLACEABLE] mark the block bad
+ * @block_bad:          [REPLACEABLE] check if a block is bad, using OOB markers
+ * @block_markbad:      [REPLACEABLE] mark a block bad
  * @cmd_ctrl:           [BOARDSPECIFIC] hardwarespecific function for controlling
  *                      ALE/CLE/nCE. Also used to write command and address
  * @init_size:          [BOARDSPECIFIC] hardwarespecific function for setting
@@ -434,6 +478,12 @@ struct nand_buffers {
  *                      bad block marker position; i.e., BBM == 11110111b is
  *                      not bad when badblockbits == 7
  * @cellinfo:           [INTERN] MLC/multichip data from chip ident
+ * @ecc_strength_ds:    [INTERN] ECC correctability from the datasheet.
+ *                      Minimum amount of bit errors per @ecc_step_ds guaranteed
+ *                      to be correctable. If unknown, set to zero.
+ * @ecc_step_ds:        [INTERN] ECC step required by the @ecc_strength_ds,
+ *                      also from the datasheet. It is the recommended ECC step
+ *                      size, if known; if unknown, set to zero.
  * @numchips:           [INTERN] number of physical chips
  * @chipsize:           [INTERN] the size of one chip for multichip arrays
  * @pagemask:           [INTERN] page number mask = number of (pages / chip) - 1
@@ -510,6 +560,8 @@ struct nand_chip {
         unsigned int pagebuf_bitflips;
         int subpagesize;
         uint8_t cellinfo;
+        uint16_t ecc_strength_ds;
+        uint16_t ecc_step_ds;
         int badblockpos;
         int badblockbits;
 
@@ -576,6 +628,11 @@ struct nand_chip {
         { .name = (nm), {{ .dev_id = (devid) }}, .chipsize = (chipsz), \
           .options = (opts) }
 
+#define NAND_ECC_INFO(_strength, _step) \
+                        { .strength_ds = (_strength), .step_ds = (_step) }
+#define NAND_ECC_STRENGTH(type)         ((type)->ecc.strength_ds)
+#define NAND_ECC_STEP(type)             ((type)->ecc.step_ds)
+
 /**
  * struct nand_flash_dev - NAND Flash Device ID Structure
  * @name: a human-readable name of the NAND chip
@@ -593,6 +650,12 @@ struct nand_chip {
  * @options: stores various chip bit options
  * @id_len: The valid length of the @id.
  * @oobsize: OOB size
+ * @ecc.strength_ds: The ECC correctability from the datasheet, same as the
+ *                   @ecc_strength_ds in nand_chip{}.
+ * @ecc.step_ds: The ECC step required by the @ecc.strength_ds, same as the
+ *               @ecc_step_ds in nand_chip{}, also from the datasheet.
+ *               For example, the "4bit ECC for each 512Byte" can be set with
+ *               NAND_ECC_INFO(4, 512).
  */
 struct nand_flash_dev {
         char *name;
@@ -609,6 +672,10 @@ struct nand_flash_dev {
         unsigned int options;
         uint16_t id_len;
         uint16_t oobsize;
+        struct {
+                uint16_t strength_ds;
+                uint16_t step_ds;
+        } ecc;
 };
 
 /**
@@ -625,8 +692,8 @@ extern struct nand_flash_dev nand_flash_ids[];
 extern struct nand_manufacturers nand_manuf_ids[];
 
 extern int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd);
-extern int nand_update_bbt(struct mtd_info *mtd, loff_t offs);
 extern int nand_default_bbt(struct mtd_info *mtd);
+extern int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);
 extern int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt);
 extern int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
                            int allowbbt);
@@ -708,6 +775,12 @@ struct platform_nand_chip *get_platform_nandchip(struct mtd_info *mtd)
         return chip->priv;
 }
 
+/* return the supported features. */
+static inline int onfi_feature(struct nand_chip *chip)
+{
+        return chip->onfi_version ? le16_to_cpu(chip->onfi_params.features) : 0;
+}
+
 /* return the supported asynchronous timing mode. */
 static inline int onfi_get_async_timing_mode(struct nand_chip *chip)
 {
diff --git a/include/linux/mutex-debug.h b/include/linux/mutex-debug.h
index 731d77d6e155..4ac8b1977b73 100644
--- a/include/linux/mutex-debug.h
+++ b/include/linux/mutex-debug.h
@@ -3,6 +3,7 @@
 
 #include <linux/linkage.h>
 #include <linux/lockdep.h>
+#include <linux/debug_locks.h>
 
 /*
  * Mutexes - debugging helpers:
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 433da8a1a426..bab49da8a0f0 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -10,12 +10,13 @@
 #ifndef __LINUX_MUTEX_H
 #define __LINUX_MUTEX_H
 
+#include <asm/current.h>
 #include <linux/list.h>
 #include <linux/spinlock_types.h>
 #include <linux/linkage.h>
 #include <linux/lockdep.h>
-
 #include <linux/atomic.h>
+#include <asm/processor.h>
 
 /*
  * Simple, straightforward mutexes with strict semantics:
@@ -136,6 +137,7 @@ static inline int mutex_is_locked(struct mutex *lock)
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 extern void mutex_lock_nested(struct mutex *lock, unsigned int subclass);
 extern void _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest_lock);
+
 extern int __must_check mutex_lock_interruptible_nested(struct mutex *lock,
                                         unsigned int subclass);
 extern int __must_check mutex_lock_killable_nested(struct mutex *lock,
@@ -147,7 +149,7 @@ extern int __must_check mutex_lock_killable_nested(struct mutex *lock,
 
 #define mutex_lock_nest_lock(lock, nest_lock)                           \
 do {                                                                    \
-        typecheck(struct lockdep_map *, &(nest_lock)->dep_map);         \
+        typecheck(struct lockdep_map *, &(nest_lock)->dep_map); \
         _mutex_lock_nest_lock(lock, &(nest_lock)->dep_map);             \
 } while (0)
 
@@ -170,10 +172,11 @@ extern int __must_check mutex_lock_killable(struct mutex *lock);
  */
 extern int mutex_trylock(struct mutex *lock);
 extern void mutex_unlock(struct mutex *lock);
+
 extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
 
-#ifndef CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX
-#define arch_mutex_cpu_relax()  cpu_relax()
+#ifndef arch_mutex_cpu_relax
+# define arch_mutex_cpu_relax() cpu_relax()
 #endif
 
 #endif
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index 141d395bbb5f..61a0da38d0cb 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -6,6 +6,7 @@
 #define __LINUX_MV643XX_ETH_H
 
 #include <linux/mbus.h>
+#include <linux/if_ether.h>
 
 #define MV643XX_ETH_SHARED_NAME         "mv643xx_eth"
 #define MV643XX_ETH_NAME                "mv643xx_eth_port"
@@ -30,6 +31,7 @@ struct mv643xx_eth_shared_platform_data {
 #define MV643XX_ETH_PHY_ADDR(x)         (0x80 | (x))
 #define MV643XX_ETH_PHY_NONE            0xff
 
+struct device_node;
 struct mv643xx_eth_platform_data {
         /*
          * Pointer back to our parent instance, and our port number.
@@ -41,12 +43,13 @@ struct mv643xx_eth_platform_data {
          * Whether a PHY is present, and if yes, at which address.
          */
         int                     phy_addr;
+        struct device_node      *phy_node;
 
         /*
          * Use this MAC address if it is valid, overriding the
          * address that is already in the hardware.
          */
-        u8                      mac_addr[6];
+        u8                      mac_addr[ETH_ALEN];
 
         /*
          * If speed is 0, autonegotiation is enabled.
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 5a5ff57ceed4..8e47bc7a1665 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -70,8 +70,7 @@ extern struct dentry *kern_path_create(int, const char *, struct path *, unsigne
 extern struct dentry *user_path_create(int, const char __user *, struct path *, unsigned int);
 extern void done_path_create(struct path *, struct dentry *);
 extern struct dentry *kern_path_locked(const char *, struct path *);
-extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
-                           const char *, unsigned int, struct path *);
+extern int kern_path_mountpoint(int, const char *, struct path *, unsigned int);
 
 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
 
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index 4871170a04a0..ae4981ebd18e 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -41,6 +41,7 @@ struct nbd_device {
         u64 bytesize;
         pid_t pid; /* pid of nbd-client, if attached */
         int xmit_timeout;
+        int disconnect; /* a disconnect has been requested by user */
 };
 
 #endif
diff --git a/include/linux/net.h b/include/linux/net.h
index 99c9f0c103c2..4f27575ce1d6 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -79,9 +79,9 @@ enum sock_type {
 #endif /* ARCH_HAS_SOCKET_TYPES */
 
 enum sock_shutdown_cmd {
-        SHUT_RD         = 0,
-        SHUT_WR         = 1,
-        SHUT_RDWR       = 2,
+        SHUT_RD,
+        SHUT_WR,
+        SHUT_RDWR,
 };
 
 struct socket_wq {
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index 09906b7ca47d..a2a89a5c7be5 100644
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -43,8 +43,9 @@ enum {
         NETIF_F_FSO_BIT,                /* ... FCoE segmentation */
         NETIF_F_GSO_GRE_BIT,            /* ... GRE with TSO */
         NETIF_F_GSO_UDP_TUNNEL_BIT,     /* ... UDP TUNNEL with TSO */
+        NETIF_F_GSO_MPLS_BIT,           /* ... MPLS segmentation */
         /**/NETIF_F_GSO_LAST =          /* last bit, see GSO_MASK */
-                NETIF_F_GSO_UDP_TUNNEL_BIT,
+                NETIF_F_GSO_MPLS_BIT,
 
         NETIF_F_FCOE_CRC_BIT,           /* FCoE CRC32 */
         NETIF_F_SCTP_CSUM_BIT,          /* SCTP checksum offload */
@@ -107,6 +108,7 @@ enum {
 #define NETIF_F_RXALL           __NETIF_F(RXALL)
 #define NETIF_F_GSO_GRE         __NETIF_F(GSO_GRE)
 #define NETIF_F_GSO_UDP_TUNNEL  __NETIF_F(GSO_UDP_TUNNEL)
+#define NETIF_F_GSO_MPLS        __NETIF_F(GSO_MPLS)
 #define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER)
 #define NETIF_F_HW_VLAN_STAG_RX __NETIF_F(HW_VLAN_STAG_RX)
 #define NETIF_F_HW_VLAN_STAG_TX __NETIF_F(HW_VLAN_STAG_TX)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 60584b185a0c..3de49aca4519 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -324,12 +324,15 @@ struct napi_struct {
         struct sk_buff          *gro_list;
         struct sk_buff          *skb;
         struct list_head        dev_list;
+        struct hlist_node       napi_hash_node;
+        unsigned int            napi_id;
 };
 
 enum {
         NAPI_STATE_SCHED,       /* Poll is scheduled */
         NAPI_STATE_DISABLE,     /* Disable pending */
         NAPI_STATE_NPSVC,       /* Netpoll - don't dequeue from poll_list */
+        NAPI_STATE_HASHED,      /* In NAPI hash */
 };
 
 enum gro_result {
@@ -446,6 +449,32 @@ extern void __napi_complete(struct napi_struct *n);
 extern void napi_complete(struct napi_struct *n);
 
 /**
+ *      napi_by_id - lookup a NAPI by napi_id
+ *      @napi_id: hashed napi_id
+ *
+ * lookup @napi_id in napi_hash table
+ * must be called under rcu_read_lock()
+ */
+extern struct napi_struct *napi_by_id(unsigned int napi_id);
+
+/**
+ *      napi_hash_add - add a NAPI to global hashtable
+ *      @napi: napi context
+ *
+ * generate a new napi_id and store a @napi under it in napi_hash
+ */
+extern void napi_hash_add(struct napi_struct *napi);
+
+/**
+ *      napi_hash_del - remove a NAPI from global table
+ *      @napi: napi context
+ *
+ * Warning: caller must observe rcu grace period
+ * before freeing memory containing @napi
+ */
+extern void napi_hash_del(struct napi_struct *napi);
+
+/**
  *      napi_disable - prevent NAPI from scheduling
  *      @n: napi context
  *
@@ -699,6 +728,16 @@ struct netdev_fcoe_hbainfo {
 };
 #endif
 
+#define MAX_PHYS_PORT_ID_LEN 32
+
+/* This structure holds a unique identifier to identify the
+ * physical port used by a netdevice.
+ */
+struct netdev_phys_port_id {
+        unsigned char id[MAX_PHYS_PORT_ID_LEN];
+        unsigned char id_len;
+};
+
 /*
  * This structure defines the management hooks for network devices.
  * The following hooks can be defined; unless noted otherwise, they are
@@ -800,6 +839,7 @@ struct netdev_fcoe_hbainfo {
  * int (*ndo_set_vf_spoofchk)(struct net_device *dev, int vf, bool setting);
  * int (*ndo_get_vf_config)(struct net_device *dev,
  *                          int vf, struct ifla_vf_info *ivf);
+ * int (*ndo_set_vf_link_state)(struct net_device *dev, int vf, int link_state);
  * int (*ndo_set_vf_port)(struct net_device *dev, int vf,
  *                        struct nlattr *port[]);
  * int (*ndo_get_vf_port)(struct net_device *dev, int vf, struct sk_buff *skb);
@@ -902,6 +942,25 @@ struct netdev_fcoe_hbainfo {
  *      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.
+ *
+ * int (*ndo_get_phys_port_id)(struct net_device *dev,
+ *                             struct netdev_phys_port_id *ppid);
+ *      Called to get ID of physical port of this device. If driver does
+ *      not implement this, it is assumed that the hw is not able to have
+ *      multiple net devices on single physical port.
+ *
+ * void (*ndo_add_vxlan_port)(struct  net_device *dev,
+ *                            sa_family_t sa_family, __be16 port);
+ *      Called by vxlan to notiy a driver about the UDP port and socket
+ *      address family that vxlan is listnening to. It is called only when
+ *      a new port starts listening. The operation is protected by the
+ *      vxlan_net->sock_lock.
+ *
+ * void (*ndo_del_vxlan_port)(struct  net_device *dev,
+ *                            sa_family_t sa_family, __be16 port);
+ *      Called by vxlan to notify the driver about a UDP port and socket
+ *      address family that vxlan is not listening to anymore. The operation
+ *      is protected by the vxlan_net->sock_lock.
  */
 struct net_device_ops {
         int                     (*ndo_init)(struct net_device *dev);
@@ -943,6 +1002,9 @@ struct net_device_ops {
                                                      gfp_t gfp);
         void                    (*ndo_netpoll_cleanup)(struct net_device *dev);
 #endif
+#ifdef CONFIG_NET_RX_BUSY_POLL
+        int                     (*ndo_busy_poll)(struct napi_struct *dev);
+#endif
         int                     (*ndo_set_vf_mac)(struct net_device *dev,
                                                   int queue, u8 *mac);
         int                     (*ndo_set_vf_vlan)(struct net_device *dev,
@@ -954,6 +1016,8 @@ struct net_device_ops {
         int                     (*ndo_get_vf_config)(struct net_device *dev,
                                                      int vf,
                                                      struct ifla_vf_info *ivf);
+        int                     (*ndo_set_vf_link_state)(struct net_device *dev,
+                                                         int vf, int link_state);
         int                     (*ndo_set_vf_port)(struct net_device *dev,
                                                    int vf,
                                                    struct nlattr *port[]);
@@ -1025,6 +1089,14 @@ struct net_device_ops {
                                                       struct nlmsghdr *nlh);
         int                     (*ndo_change_carrier)(struct net_device *dev,
                                                       bool new_carrier);
+        int                     (*ndo_get_phys_port_id)(struct net_device *dev,
+                                                        struct netdev_phys_port_id *ppid);
+        void                    (*ndo_add_vxlan_port)(struct  net_device *dev,
+                                                      sa_family_t sa_family,
+                                                      __be16 port);
+        void                    (*ndo_del_vxlan_port)(struct  net_device *dev,
+                                                      sa_family_t sa_family,
+                                                      __be16 port);
 };
 
 /*
@@ -1072,6 +1144,7 @@ struct net_device {
         struct list_head        napi_list;
         struct list_head        unreg_list;
         struct list_head        upper_dev_list; /* List of upper devices */
+        struct list_head        lower_dev_list;
 
 
         /* currently active device features */
@@ -1088,6 +1161,8 @@ struct net_device {
          * need to set them appropriately.
          */
         netdev_features_t       hw_enc_features;
+        /* mask of fetures inheritable by MPLS */
+        netdev_features_t       mpls_features;
 
         /* Interface index. Unique device identifier    */
         int                     ifindex;
@@ -1140,8 +1215,10 @@ struct net_device {
         unsigned char           addr_assign_type; /* hw address assignment type */
         unsigned char           addr_len;       /* hardware address length      */
         unsigned char           neigh_priv_len;
-        unsigned short          dev_id;         /* for shared network cards */
-
+        unsigned short          dev_id;         /* Used to differentiate devices
+                                                 * that share the same link
+                                                 * layer address
+                                                 */
         spinlock_t              addr_list_lock;
         struct netdev_hw_addr_list      uc;     /* Unicast mac addresses */
         struct netdev_hw_addr_list      mc;     /* Multicast mac addresses */
@@ -1593,17 +1670,40 @@ struct packet_offload {
 #define NETDEV_RELEASE          0x0012
 #define NETDEV_NOTIFY_PEERS     0x0013
 #define NETDEV_JOIN             0x0014
+#define NETDEV_CHANGEUPPER      0x0015
+#define NETDEV_RESEND_IGMP      0x0016
 
 extern int register_netdevice_notifier(struct notifier_block *nb);
 extern int unregister_netdevice_notifier(struct notifier_block *nb);
-extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
 
+struct netdev_notifier_info {
+        struct net_device *dev;
+};
 
-extern rwlock_t                         dev_base_lock;          /* Device list lock */
+struct netdev_notifier_change_info {
+        struct netdev_notifier_info info; /* must be first */
+        unsigned int flags_changed;
+};
 
-extern seqcount_t       devnet_rename_seq;      /* Device rename seq */
+static inline void netdev_notifier_info_init(struct netdev_notifier_info *info,
+                                             struct net_device *dev)
+{
+        info->dev = dev;
+}
+
+static inline struct net_device *
+netdev_notifier_info_to_dev(const struct netdev_notifier_info *info)
+{
+        return info->dev;
+}
+
+extern int call_netdevice_notifiers_info(unsigned long val, struct net_device *dev,
+                                         struct netdev_notifier_info *info);
+extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
 
 
+extern rwlock_t                         dev_base_lock;          /* Device list lock */
+
 #define for_each_netdev(net, d)         \
                 list_for_each_entry(d, &(net)->dev_base_head, dev_list)
 #define for_each_netdev_reverse(net, d) \
@@ -1695,6 +1795,7 @@ extern int		init_dummy_netdev(struct net_device *dev);
 extern struct net_device        *dev_get_by_index(struct net *net, int ifindex);
 extern struct net_device        *__dev_get_by_index(struct net *net, int ifindex);
 extern struct net_device        *dev_get_by_index_rcu(struct net *net, int ifindex);
+extern int              netdev_get_name(struct net *net, char *name, int ifindex);
 extern int              dev_restart(struct net_device *dev);
 #ifdef CONFIG_NETPOLL_TRAP
 extern int              netpoll_trap(void);
@@ -1778,6 +1879,19 @@ static inline int unregister_gifconf(unsigned int family)
         return register_gifconf(family, NULL);
 }
 
+#ifdef CONFIG_NET_FLOW_LIMIT
+#define FLOW_LIMIT_HISTORY      (1 << 7)  /* must be ^2 and !overflow buckets */
+struct sd_flow_limit {
+        u64                     count;
+        unsigned int            num_buckets;
+        unsigned int            history_head;
+        u16                     history[FLOW_LIMIT_HISTORY];
+        u8                      buckets[];
+};
+
+extern int netdev_flow_limit_table_len;
+#endif /* CONFIG_NET_FLOW_LIMIT */
+
 /*
  * Incoming packets are placed on per-cpu queues
  */
@@ -1807,6 +1921,10 @@ struct softnet_data {
         unsigned int            dropped;
         struct sk_buff_head     input_pkt_queue;
         struct napi_struct      backlog;
+
+#ifdef CONFIG_NET_FLOW_LIMIT
+        struct sd_flow_limit __rcu *flow_limit;
+#endif
 };
 
 static inline void input_queue_head_incr(struct softnet_data *sd)
@@ -1983,6 +2101,15 @@ static inline void netdev_tx_sent_queue(struct netdev_queue *dev_queue,
 #endif
 }
 
+/**
+ *      netdev_sent_queue - report the number of bytes queued to hardware
+ *      @dev: network device
+ *      @bytes: number of bytes queued to the hardware device queue
+ *
+ *      Report the number of bytes queued for sending/completion to the network
+ *      device hardware queue. @bytes should be a good approximation and should
+ *      exactly match netdev_completed_queue() @bytes
+ */
 static inline void netdev_sent_queue(struct net_device *dev, unsigned int bytes)
 {
         netdev_tx_sent_queue(netdev_get_tx_queue(dev, 0), bytes);
@@ -2012,6 +2139,16 @@ static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue,
 #endif
 }
 
+/**
+ *      netdev_completed_queue - report bytes and packets completed by device
+ *      @dev: network device
+ *      @pkts: actual number of packets sent over the medium
+ *      @bytes: actual number of bytes sent over the medium
+ *
+ *      Report the number of bytes and packets transmitted by the network device
+ *      hardware queue over the physical medium, @bytes must exactly match the
+ *      @bytes amount passed to netdev_sent_queue()
+ */
 static inline void netdev_completed_queue(struct net_device *dev,
                                           unsigned int pkts, unsigned int bytes)
 {
@@ -2026,6 +2163,13 @@ static inline void netdev_tx_reset_queue(struct netdev_queue *q)
 #endif
 }
 
+/**
+ *      netdev_reset_queue - reset the packets and bytes count of a network device
+ *      @dev_queue: network device
+ *
+ *      Reset the bytes and packet count of a network device and clear the
+ *      software flow control OFF bit for this network device
+ */
 static inline void netdev_reset_queue(struct net_device *dev_queue)
 {
         netdev_tx_reset_queue(netdev_get_tx_queue(dev_queue, 0));
@@ -2235,6 +2379,8 @@ 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_get_phys_port_id(struct net_device *dev,
+                                             struct netdev_phys_port_id *ppid);
 extern int              dev_hard_start_xmit(struct sk_buff *skb,
                                             struct net_device *dev,
                                             struct netdev_queue *txq);
@@ -2667,6 +2813,16 @@ extern int		bpf_jit_enable;
 extern bool netdev_has_upper_dev(struct net_device *dev,
                                  struct net_device *upper_dev);
 extern bool netdev_has_any_upper_dev(struct net_device *dev);
+extern struct net_device *netdev_upper_get_next_dev_rcu(struct net_device *dev,
+                                                        struct list_head **iter);
+
+/* iterate through upper list, must be called under RCU read lock */
+#define netdev_for_each_upper_dev_rcu(dev, upper, iter) \
+        for (iter = &(dev)->upper_dev_list, \
+             upper = netdev_upper_get_next_dev_rcu(dev, &(iter)); \
+             upper; \
+             upper = netdev_upper_get_next_dev_rcu(dev, &(iter)))
+
 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,
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 0060fde3160e..708fe72ab913 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -35,7 +35,7 @@ static inline void nf_inet_addr_mask(const union nf_inet_addr *a1,
         result->all[3] = a1->all[3] & mask->all[3];
 }
 
-extern void netfilter_init(void);
+extern int netfilter_init(void);
 
 /* Largest hook number + 1 */
 #define NF_MAX_HOOKS 8
@@ -314,25 +314,24 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)
 #endif /*CONFIG_NETFILTER*/
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
-extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *) __rcu;
-extern void nf_ct_attach(struct sk_buff *, struct sk_buff *);
+extern void (*ip_ct_attach)(struct sk_buff *, const struct sk_buff *) __rcu;
+extern void nf_ct_attach(struct sk_buff *, const struct sk_buff *);
 extern void (*nf_ct_destroy)(struct nf_conntrack *) __rcu;
 
 struct nf_conn;
+enum ip_conntrack_info;
 struct nlattr;
 
 struct nfq_ct_hook {
         size_t (*build_size)(const struct nf_conn *ct);
         int (*build)(struct sk_buff *skb, struct nf_conn *ct);
         int (*parse)(const struct nlattr *attr, struct nf_conn *ct);
-};
-extern struct nfq_ct_hook __rcu *nfq_ct_hook;
-
-struct nfq_ct_nat_hook {
+        int (*attach_expect)(const struct nlattr *attr, struct nf_conn *ct,
+                             u32 portid, u32 report);
         void (*seq_adjust)(struct sk_buff *skb, struct nf_conn *ct,
-                           u32 ctinfo, int off);
+                           enum ip_conntrack_info ctinfo, s32 off);
 };
-extern struct nfq_ct_nat_hook __rcu *nfq_ct_nat_hook;
+extern struct nfq_ct_hook __rcu *nfq_ct_hook;
 #else
 static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {}
 #endif
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index d80e2753847c..9ac9fbde7b61 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -296,10 +296,12 @@ ip_set_eexist(int ret, u32 flags)
 
 /* Match elements marked with nomatch */
 static inline bool
-ip_set_enomatch(int ret, u32 flags, enum ipset_adt adt)
+ip_set_enomatch(int ret, u32 flags, enum ipset_adt adt, struct ip_set *set)
 {
         return adt == IPSET_TEST &&
-               ret == -ENOTEMPTY && ((flags >> 16) & IPSET_FLAG_NOMATCH);
+               (set->type->features & IPSET_TYPE_NOMATCH) &&
+               ((flags >> 16) & IPSET_FLAG_NOMATCH) &&
+               (ret > 0 || ret == -ENOTEMPTY);
 }
 
 /* Check the NLA_F_NET_BYTEORDER flag */
diff --git a/include/linux/netfilter/xt_HMARK.h b/include/linux/netfilter/xt_HMARK.h
deleted file mode 100644
index 826fc5807577..000000000000
--- a/include/linux/netfilter/xt_HMARK.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef XT_HMARK_H_
-#define XT_HMARK_H_
-
-#include <linux/types.h>
-
-enum {
-        XT_HMARK_SADDR_MASK,
-        XT_HMARK_DADDR_MASK,
-        XT_HMARK_SPI,
-        XT_HMARK_SPI_MASK,
-        XT_HMARK_SPORT,
-        XT_HMARK_DPORT,
-        XT_HMARK_SPORT_MASK,
-        XT_HMARK_DPORT_MASK,
-        XT_HMARK_PROTO_MASK,
-        XT_HMARK_RND,
-        XT_HMARK_MODULUS,
-        XT_HMARK_OFFSET,
-        XT_HMARK_CT,
-        XT_HMARK_METHOD_L3,
-        XT_HMARK_METHOD_L3_4,
-};
-#define XT_HMARK_FLAG(flag)     (1 << flag)
-
-union hmark_ports {
-        struct {
-                __u16   src;
-                __u16   dst;
-        } p16;
-        struct {
-                __be16  src;
-                __be16  dst;
-        } b16;
-        __u32   v32;
-        __be32  b32;
-};
-
-struct xt_hmark_info {
-        union nf_inet_addr      src_mask;
-        union nf_inet_addr      dst_mask;
-        union hmark_ports       port_mask;
-        union hmark_ports       port_set;
-        __u32                   flags;
-        __u16                   proto_mask;
-        __u32                   hashrnd;
-        __u32                   hmodulus;
-        __u32                   hoffset;        /* Mark offset to start from */
-};
-
-#endif /* XT_HMARK_H_ */
diff --git a/include/linux/netfilter/xt_rpfilter.h b/include/linux/netfilter/xt_rpfilter.h
deleted file mode 100644
index 8358d4f71952..000000000000
--- a/include/linux/netfilter/xt_rpfilter.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _XT_RPATH_H
-#define _XT_RPATH_H
-
-#include <linux/types.h>
-
-enum {
-        XT_RPFILTER_LOOSE = 1 << 0,
-        XT_RPFILTER_VALID_MARK = 1 << 1,
-        XT_RPFILTER_ACCEPT_LOCAL = 1 << 2,
-        XT_RPFILTER_INVERT = 1 << 3,
-#ifdef __KERNEL__
-        XT_RPFILTER_OPTION_MASK = XT_RPFILTER_LOOSE |
-                                  XT_RPFILTER_VALID_MARK |
-                                  XT_RPFILTER_ACCEPT_LOCAL |
-                                  XT_RPFILTER_INVERT,
-#endif
-};
-
-struct xt_rpfilter_info {
-        __u8 flags;
-};
-
-#endif
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 6358da5eeee8..7a6c396a263b 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -46,6 +46,7 @@ struct netlink_kernel_cfg {
         void            (*input)(struct sk_buff *skb);
         struct mutex    *cb_mutex;
         void            (*bind)(int group);
+        bool            (*compare)(struct net *net, struct sock *sk);
 };
 
 extern struct sock *__netlink_kernel_create(struct net *net, int unit,
@@ -84,6 +85,22 @@ int netlink_attachskb(struct sock *sk, struct sk_buff *skb,
 void netlink_detachskb(struct sock *sk, struct sk_buff *skb);
 int netlink_sendskb(struct sock *sk, struct sk_buff *skb);
 
+static inline struct sk_buff *
+netlink_skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
+{
+        struct sk_buff *nskb;
+
+        nskb = skb_clone(skb, gfp_mask);
+        if (!nskb)
+                return NULL;
+
+        /* This is a large skb, set destructor callback to release head */
+        if (is_vmalloc_addr(skb->head))
+                nskb->destructor = skb->destructor;
+
+        return nskb;
+}
+
 /*
  *      skb should fit one page. This choice is good for headerless malloc.
  *      But we should limit to 8K so that userspace does not have to
@@ -144,4 +161,14 @@ static inline int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
         return __netlink_dump_start(ssk, skb, nlh, control);
 }
 
+struct netlink_tap {
+        struct net_device *dev;
+        struct module *module;
+        struct list_head list;
+};
+
+extern int netlink_add_tap(struct netlink_tap *nt);
+extern int __netlink_remove_tap(struct netlink_tap *nt);
+extern int netlink_remove_tap(struct netlink_tap *nt);
+
 #endif  /* __LINUX_NETLINK_H */
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index fa2cb76a7029..f3c7c24bec1c 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -53,10 +53,10 @@ struct netpoll_info {
 };
 
 #ifdef CONFIG_NETPOLL
-extern int netpoll_rx_disable(struct net_device *dev);
+extern void 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_disable(struct net_device *dev) { return; }
 static inline void netpoll_rx_enable(struct net_device *dev) { return; }
 #endif
 
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 7b8fc73810ad..e36dee52f224 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -32,6 +32,15 @@ struct nfs4_acl {
         struct nfs4_ace aces[0];
 };
 
+#define NFS4_MAXLABELLEN        2048
+
+struct nfs4_label {
+        uint32_t        lfs;
+        uint32_t        pi;
+        u32             len;
+        char    *label;
+};
+
 typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;
 
 struct nfs_stateid4 {
@@ -219,6 +228,14 @@ enum nfsstat4 {
         NFS4ERR_REJECT_DELEG    = 10085,        /* on callback */
         NFS4ERR_RETURNCONFLICT  = 10086,        /* outstanding layoutreturn */
         NFS4ERR_DELEG_REVOKED   = 10087,        /* deleg./layout revoked */
+
+        /* nfs42 */
+        NFS4ERR_PARTNER_NOTSUPP = 10088,
+        NFS4ERR_PARTNER_NO_AUTH = 10089,
+        NFS4ERR_METADATA_NOTSUPP = 10090,
+        NFS4ERR_OFFLOAD_DENIED = 10091,
+        NFS4ERR_WRONG_LFS = 10092,
+        NFS4ERR_BADLABEL = 10093,
 };
 
 static inline bool seqid_mutating_err(u32 err)
@@ -378,6 +395,7 @@ enum lock_type4 {
 #define FATTR4_WORD1_FS_LAYOUT_TYPES    (1UL << 30)
 #define FATTR4_WORD2_LAYOUT_BLKSIZE     (1UL << 1)
 #define FATTR4_WORD2_MDSTHRESHOLD       (1UL << 4)
+#define FATTR4_WORD2_SECURITY_LABEL     (1UL << 17)
 
 /* MDS threshold bitmap bits */
 #define THRESHOLD_RD                    (1UL << 0)
@@ -390,11 +408,15 @@ enum lock_type4 {
 #define NFS4_VERSION 4
 #define NFS4_MINOR_VERSION 0
 
+#if defined(CONFIG_NFS_V4_2)
+#define NFS4_MAX_MINOR_VERSION 2
+#else
 #if defined(CONFIG_NFS_V4_1)
 #define NFS4_MAX_MINOR_VERSION 1
 #else
 #define NFS4_MAX_MINOR_VERSION 0
 #endif /* CONFIG_NFS_V4_1 */
+#endif /* CONFIG_NFS_V4_2 */
 
 #define NFS4_DEBUG 1
 
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index fc01d5cb4cf1..3ea4cde8701c 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -207,6 +207,7 @@ struct nfs_inode {
 #define NFS_INO_INVALID_ACL     0x0010          /* cached acls are invalid */
 #define NFS_INO_REVAL_PAGECACHE 0x0020          /* must revalidate pagecache */
 #define NFS_INO_REVAL_FORCED    0x0040          /* force revalidation ignoring a delegation */
+#define NFS_INO_INVALID_LABEL   0x0080          /* cached label is invalid */
 
 /*
  * Bit offsets in flags field
@@ -336,7 +337,7 @@ extern void nfs_zap_mapping(struct inode *inode, struct address_space *mapping);
 extern void nfs_zap_caches(struct inode *);
 extern void nfs_invalidate_atime(struct inode *);
 extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *,
-                                struct nfs_fattr *);
+                                struct nfs_fattr *, struct nfs4_label *);
 extern int nfs_refresh_inode(struct inode *, struct nfs_fattr *);
 extern int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr);
 extern int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fattr *fattr);
@@ -347,15 +348,19 @@ extern int nfs_permission(struct inode *, int);
 extern int nfs_open(struct inode *, struct file *);
 extern int nfs_release(struct inode *, struct file *);
 extern int nfs_attribute_timeout(struct inode *inode);
+extern int nfs_attribute_cache_expired(struct inode *inode);
 extern int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode);
 extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);
 extern int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping);
 extern int nfs_setattr(struct dentry *, struct iattr *);
 extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr);
+extern void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr,
+                                struct nfs4_label *label);
 extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
 extern void put_nfs_open_context(struct nfs_open_context *ctx);
 extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, fmode_t mode);
 extern struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, fmode_t f_mode);
+extern void nfs_inode_attach_open_context(struct nfs_open_context *ctx);
 extern void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx);
 extern struct nfs_lock_context *nfs_get_lock_context(struct nfs_open_context *ctx);
 extern void nfs_put_lock_context(struct nfs_lock_context *l_ctx);
@@ -468,7 +473,8 @@ extern const struct file_operations nfs_dir_operations;
 extern const struct dentry_operations nfs_dentry_operations;
 
 extern void nfs_force_lookup_revalidate(struct inode *dir);
-extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh, struct nfs_fattr *fattr);
+extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh,
+                        struct nfs_fattr *fattr, struct nfs4_label *label);
 extern int nfs_may_open(struct inode *inode, struct rpc_cred *cred, int openflags);
 extern void nfs_access_zap_cache(struct inode *inode);
 
@@ -497,9 +503,28 @@ extern int nfs_mountpoint_expiry_timeout;
 extern void nfs_release_automount_timer(void);
 
 /*
+ * linux/fs/nfs/nfs4proc.c
+ */
+#ifdef CONFIG_NFS_V4_SECURITY_LABEL
+extern struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags);
+static inline void nfs4_label_free(struct nfs4_label *label)
+{
+        if (label) {
+                kfree(label->label);
+                kfree(label);
+        }
+        return;
+}
+#else
+static inline struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) { return NULL; }
+static inline void nfs4_label_free(void *label) {}
+#endif
+
+/*
  * linux/fs/nfs/unlink.c
  */
 extern void nfs_complete_unlink(struct dentry *dentry, struct inode *);
+extern void nfs_wait_on_sillyrename(struct dentry *dentry);
 extern void nfs_block_sillyrename(struct dentry *dentry);
 extern void nfs_unblock_sillyrename(struct dentry *dentry);
 extern int  nfs_sillyrename(struct inode *dir, struct dentry *dentry);
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 3b7fa2abecca..b8cedced50c9 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -56,6 +56,7 @@ struct nfs_client {
         struct rpc_cred         *cl_machine_cred;
 
 #if IS_ENABLED(CONFIG_NFS_V4)
+        struct list_head        cl_ds_clients; /* auth flavor data servers */
         u64                     cl_clientid;    /* constant */
         nfs4_verifier           cl_confirm;     /* Clientid verifier */
         unsigned long           cl_state;
@@ -78,6 +79,9 @@ struct nfs_client {
         u32                     cl_cb_ident;    /* v4.0 callback identifier */
         const struct nfs4_minor_version_ops *cl_mvops;
 
+        /* NFSv4.0 transport blocking */
+        struct nfs4_slot_table  *cl_slot_tbl;
+
         /* The sequence id to use for the next CREATE_SESSION */
         u32                     cl_seqid;
         /* The flags used for obtaining the clientid during EXCHANGE_ID */
@@ -87,6 +91,15 @@ struct nfs_client {
         struct nfs41_server_owner *cl_serverowner;
         struct nfs41_server_scope *cl_serverscope;
         struct nfs41_impl_id    *cl_implid;
+        /* nfs 4.1+ state protection modes: */
+        unsigned long           cl_sp4_flags;
+#define NFS_SP4_MACH_CRED_MINIMAL  1    /* Minimal sp4_mach_cred - state ops
+                                         * must use machine cred */
+#define NFS_SP4_MACH_CRED_CLEANUP  2    /* CLOSE and LOCKU */
+#define NFS_SP4_MACH_CRED_SECINFO  3    /* SECINFO and SECINFO_NO_NAME */
+#define NFS_SP4_MACH_CRED_STATEID  4    /* TEST_STATEID and FREE_STATEID */
+#define NFS_SP4_MACH_CRED_WRITE    5    /* WRITE */
+#define NFS_SP4_MACH_CRED_COMMIT   6    /* COMMIT */
 #endif /* CONFIG_NFS_V4 */
 
 #ifdef CONFIG_NFS_FSCACHE
@@ -146,7 +159,12 @@ struct nfs_server {
         u32                     attr_bitmask[3];/* V4 bitmask representing the set
                                                    of attributes supported on this
                                                    filesystem */
-        u32                     cache_consistency_bitmask[2];
+        u32                     attr_bitmask_nl[3];
+                                                /* V4 bitmask representing the
+                                                   set of attributes supported
+                                                   on this filesystem excluding
+                                                   the label support bit. */
+        u32                     cache_consistency_bitmask[3];
                                                 /* V4 bitmask representing the subset
                                                    of change attribute, size, ctime
                                                    and mtime attributes supported by
@@ -200,5 +218,6 @@ struct nfs_server {
 #define NFS_CAP_UIDGID_NOMAP    (1U << 15)
 #define NFS_CAP_STATEID_NFSV41  (1U << 16)
 #define NFS_CAP_ATOMIC_OPEN_V1  (1U << 17)
+#define NFS_CAP_SECURITY_LABEL  (1U << 18)
 
 #endif
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 104b62f23ee0..49f52c8f4422 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -101,6 +101,7 @@ struct nfs_fattr {
 #define NFS_ATTR_FATTR_MOUNTED_ON_FILEID (1U << 22)
 #define NFS_ATTR_FATTR_OWNER_NAME       (1U << 23)
 #define NFS_ATTR_FATTR_GROUP_NAME       (1U << 24)
+#define NFS_ATTR_FATTR_V4_SECURITY_LABEL (1U << 25)
 
 #define NFS_ATTR_FATTR (NFS_ATTR_FATTR_TYPE \
                 | NFS_ATTR_FATTR_MODE \
@@ -120,7 +121,8 @@ struct nfs_fattr {
 #define NFS_ATTR_FATTR_V3 (NFS_ATTR_FATTR \
                 | NFS_ATTR_FATTR_SPACE_USED)
 #define NFS_ATTR_FATTR_V4 (NFS_ATTR_FATTR \
-                | NFS_ATTR_FATTR_SPACE_USED)
+                | NFS_ATTR_FATTR_SPACE_USED \
+                | NFS_ATTR_FATTR_V4_SECURITY_LABEL)
 
 /*
  * Info on the file system
@@ -246,6 +248,7 @@ struct nfs4_layoutget_res {
 struct nfs4_layoutget {
         struct nfs4_layoutget_args args;
         struct nfs4_layoutget_res res;
+        struct rpc_cred *cred;
         gfp_t gfp_flags;
 };
 
@@ -347,6 +350,7 @@ struct nfs_openargs {
         const u32 *             open_bitmap;
         __u32                   claim;
         enum createmode4        createmode;
+        const struct nfs4_label *label;
 };
 
 struct nfs_openres {
@@ -356,6 +360,7 @@ struct nfs_openres {
         struct nfs4_change_info cinfo;
         __u32                   rflags;
         struct nfs_fattr *      f_attr;
+        struct nfs4_label       *f_label;
         struct nfs_seqid *      seqid;
         const struct nfs_server *server;
         fmode_t                 delegation_type;
@@ -598,6 +603,7 @@ struct nfs_entry {
         int                     eof;
         struct nfs_fh *         fh;
         struct nfs_fattr *      fattr;
+        struct nfs4_label  *label;
         unsigned char           d_type;
         struct nfs_server *     server;
 };
@@ -630,6 +636,7 @@ struct nfs_setattrargs {
         struct iattr *                  iap;
         const struct nfs_server *       server; /* Needed for name mapping */
         const u32 *                     bitmask;
+        const struct nfs4_label         *label;
 };
 
 struct nfs_setaclargs {
@@ -665,6 +672,7 @@ struct nfs_getaclres {
 struct nfs_setattrres {
         struct nfs4_sequence_res        seq_res;
         struct nfs_fattr *              fattr;
+        struct nfs4_label               *label;
         const struct nfs_server *       server;
 };
 
@@ -862,6 +870,7 @@ struct nfs4_create_arg {
         const struct iattr *            attrs;
         const struct nfs_fh *           dir_fh;
         const u32 *                     bitmask;
+        const struct nfs4_label         *label;
 };
 
 struct nfs4_create_res {
@@ -869,6 +878,7 @@ struct nfs4_create_res {
         const struct nfs_server *       server;
         struct nfs_fh *                 fh;
         struct nfs_fattr *              fattr;
+        struct nfs4_label               *label;
         struct nfs4_change_info         dir_cinfo;
 };
 
@@ -893,6 +903,7 @@ struct nfs4_getattr_res {
         struct nfs4_sequence_res        seq_res;
         const struct nfs_server *       server;
         struct nfs_fattr *              fattr;
+        struct nfs4_label               *label;
 };
 
 struct nfs4_link_arg {
@@ -907,6 +918,7 @@ struct nfs4_link_res {
         struct nfs4_sequence_res        seq_res;
         const struct nfs_server *       server;
         struct nfs_fattr *              fattr;
+        struct nfs4_label               *label;
         struct nfs4_change_info         cinfo;
         struct nfs_fattr *              dir_attr;
 };
@@ -924,6 +936,7 @@ struct nfs4_lookup_res {
         const struct nfs_server *       server;
         struct nfs_fattr *              fattr;
         struct nfs_fh *                 fh;
+        struct nfs4_label               *label;
 };
 
 struct nfs4_lookup_root_arg {
@@ -1094,6 +1107,23 @@ struct pnfs_ds_commit_info {
         struct pnfs_commit_bucket *buckets;
 };
 
+#define NFS4_OP_MAP_NUM_LONGS \
+        DIV_ROUND_UP(LAST_NFS4_OP, 8 * sizeof(unsigned long))
+#define NFS4_OP_MAP_NUM_WORDS \
+        (NFS4_OP_MAP_NUM_LONGS * sizeof(unsigned long) / sizeof(u32))
+struct nfs4_op_map {
+        union {
+                unsigned long longs[NFS4_OP_MAP_NUM_LONGS];
+                u32 words[NFS4_OP_MAP_NUM_WORDS];
+        } u;
+};
+
+struct nfs41_state_protection {
+        u32 how;
+        struct nfs4_op_map enforce;
+        struct nfs4_op_map allow;
+};
+
 #define NFS4_EXCHANGE_ID_LEN    (48)
 struct nfs41_exchange_id_args {
         struct nfs_client               *client;
@@ -1101,6 +1131,7 @@ struct nfs41_exchange_id_args {
         unsigned int                    id_len;
         char                            id[NFS4_EXCHANGE_ID_LEN];
         u32                             flags;
+        struct nfs41_state_protection   state_protect;
 };
 
 struct nfs41_server_owner {
@@ -1133,6 +1164,7 @@ struct nfs41_exchange_id_res {
         struct nfs41_server_owner       *server_owner;
         struct nfs41_server_scope       *server_scope;
         struct nfs41_impl_id            *impl_id;
+        struct nfs41_state_protection   state_protect;
 };
 
 struct nfs41_create_session_args {
@@ -1366,11 +1398,12 @@ struct nfs_rpc_ops {
         struct dentry *(*try_mount) (int, const char *, struct nfs_mount_info *,
                                      struct nfs_subversion *);
         int     (*getattr) (struct nfs_server *, struct nfs_fh *,
-                            struct nfs_fattr *);
+                            struct nfs_fattr *, struct nfs4_label *);
         int     (*setattr) (struct dentry *, struct nfs_fattr *,
                             struct iattr *);
         int     (*lookup)  (struct inode *, struct qstr *,
-                            struct nfs_fh *, struct nfs_fattr *);
+                            struct nfs_fh *, struct nfs_fattr *,
+                            struct nfs4_label *);
         int     (*access)  (struct inode *, struct nfs_access_entry *);
         int     (*readlink)(struct inode *, struct page *, unsigned int,
                             unsigned int);
@@ -1405,12 +1438,12 @@ struct nfs_rpc_ops {
         void    (*read_setup)   (struct nfs_read_data *, struct rpc_message *);
         void    (*read_pageio_init)(struct nfs_pageio_descriptor *, struct inode *,
                                     const struct nfs_pgio_completion_ops *);
-        void    (*read_rpc_prepare)(struct rpc_task *, struct nfs_read_data *);
+        int     (*read_rpc_prepare)(struct rpc_task *, struct nfs_read_data *);
         int     (*read_done)  (struct rpc_task *, struct nfs_read_data *);
         void    (*write_setup)  (struct nfs_write_data *, struct rpc_message *);
         void    (*write_pageio_init)(struct nfs_pageio_descriptor *, struct inode *, int,
                                      const struct nfs_pgio_completion_ops *);
-        void    (*write_rpc_prepare)(struct rpc_task *, struct nfs_write_data *);
+        int     (*write_rpc_prepare)(struct rpc_task *, struct nfs_write_data *);
         int     (*write_done)  (struct rpc_task *, struct nfs_write_data *);
         void    (*commit_setup) (struct nfs_commit_data *, struct rpc_message *);
         void    (*commit_rpc_prepare)(struct rpc_task *, struct nfs_commit_data *);
@@ -1422,13 +1455,14 @@ struct nfs_rpc_ops {
         struct inode * (*open_context) (struct inode *dir,
                                 struct nfs_open_context *ctx,
                                 int open_flags,
-                                struct iattr *iattr);
+                                struct iattr *iattr,
+                                int *);
         int (*have_delegation)(struct inode *, fmode_t);
         int (*return_delegation)(struct inode *);
         struct nfs_client *(*alloc_client) (const struct nfs_client_initdata *);
         struct nfs_client *
                 (*init_client) (struct nfs_client *, const struct rpc_timeout *,
-                                const char *, rpc_authflavor_t);
+                                const char *);
         void    (*free_client) (struct nfs_client *);
         struct nfs_server *(*create_server)(struct nfs_mount_info *, struct nfs_subversion *);
         struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *,
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index db50840e6355..6a45fb583ff1 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -46,7 +46,7 @@ static inline bool trigger_all_cpu_backtrace(void)
 #ifdef CONFIG_LOCKUP_DETECTOR
 int hw_nmi_is_cpu_stuck(struct pt_regs *);
 u64 hw_nmi_get_sample_period(int watchdog_thresh);
-extern int watchdog_enabled;
+extern int watchdog_user_enabled;
 extern int watchdog_thresh;
 struct ctl_table;
 extern int proc_dowatchdog(struct ctl_table *, int ,
diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index 4e2cbfa640b7..58b9a02c38d2 100644
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -98,8 +98,17 @@
 typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t;
 extern nodemask_t _unused_nodemask_arg_;
 
+/*
+ * The inline keyword gives the compiler room to decide to inline, or
+ * not inline a function as it sees best.  However, as these functions
+ * are called in both __init and non-__init functions, if they are not
+ * inlined we will end up with a section mis-match error (of the type of
+ * freeable items not being freed).  So we must use __always_inline here
+ * to fix the problem.  If other functions in the future also end up in
+ * this situation they will also need to be annotated as __always_inline
+ */
 #define node_set(node, dst) __node_set((node), &(dst))
-static inline void __node_set(int node, volatile nodemask_t *dstp)
+static __always_inline void __node_set(int node, volatile nodemask_t *dstp)
 {
         set_bit(node, dstp->bits);
 }
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index 10e5947491c7..b4ec59d159ac 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -14,6 +14,10 @@ struct fs_struct;
  * A structure to contain pointers to all per-process
  * namespaces - fs (mount), uts, network, sysvipc, etc.
  *
+ * The pid namespace is an exception -- it's accessed using
+ * task_active_pid_ns.  The pid namespace here is the
+ * namespace that children will use.
+ *
  * 'count' is the number of tasks holding a reference.
  * The count for each namespace, then, will be the number
  * of nsproxies pointing to it, not the number of tasks.
@@ -27,7 +31,7 @@ struct nsproxy {
         struct uts_namespace *uts_ns;
         struct ipc_namespace *ipc_ns;
         struct mnt_namespace *mnt_ns;
-        struct pid_namespace *pid_ns;
+        struct pid_namespace *pid_ns_for_children;
         struct net           *net_ns;
 };
 extern struct nsproxy init_nsproxy;
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index f451c8d6e231..26ebcf41c213 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -1,6 +1,6 @@
 /*
  * Definitions for the NVM Express interface
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011-2013, Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -19,7 +19,10 @@
 #ifndef _LINUX_NVME_H
 #define _LINUX_NVME_H
 
-#include <linux/types.h>
+#include <uapi/linux/nvme.h>
+#include <linux/pci.h>
+#include <linux/miscdevice.h>
+#include <linux/kref.h>
 
 struct nvme_bar {
         __u64                   cap;    /* Controller Capabilities */
@@ -50,6 +53,7 @@ enum {
         NVME_CC_SHN_NONE        = 0 << 14,
         NVME_CC_SHN_NORMAL      = 1 << 14,
         NVME_CC_SHN_ABRUPT      = 2 << 14,
+        NVME_CC_SHN_MASK        = 3 << 14,
         NVME_CC_IOSQES          = 6 << 16,
         NVME_CC_IOCQES          = 4 << 20,
         NVME_CSTS_RDY           = 1 << 0,
@@ -57,462 +61,11 @@ enum {
         NVME_CSTS_SHST_NORMAL   = 0 << 2,
         NVME_CSTS_SHST_OCCUR    = 1 << 2,
         NVME_CSTS_SHST_CMPLT    = 2 << 2,
-};
-
-struct nvme_id_power_state {
-        __le16                  max_power;      /* centiwatts */
-        __u16                   rsvd2;
-        __le32                  entry_lat;      /* microseconds */
-        __le32                  exit_lat;       /* microseconds */
-        __u8                    read_tput;
-        __u8                    read_lat;
-        __u8                    write_tput;
-        __u8                    write_lat;
-        __u8                    rsvd16[16];
+        NVME_CSTS_SHST_MASK     = 3 << 2,
 };
 
 #define NVME_VS(major, minor)   (major << 16 | minor)
 
-struct nvme_id_ctrl {
-        __le16                  vid;
-        __le16                  ssvid;
-        char                    sn[20];
-        char                    mn[40];
-        char                    fr[8];
-        __u8                    rab;
-        __u8                    ieee[3];
-        __u8                    mic;
-        __u8                    mdts;
-        __u8                    rsvd78[178];
-        __le16                  oacs;
-        __u8                    acl;
-        __u8                    aerl;
-        __u8                    frmw;
-        __u8                    lpa;
-        __u8                    elpe;
-        __u8                    npss;
-        __u8                    rsvd264[248];
-        __u8                    sqes;
-        __u8                    cqes;
-        __u8                    rsvd514[2];
-        __le32                  nn;
-        __le16                  oncs;
-        __le16                  fuses;
-        __u8                    fna;
-        __u8                    vwc;
-        __le16                  awun;
-        __le16                  awupf;
-        __u8                    rsvd530[1518];
-        struct nvme_id_power_state      psd[32];
-        __u8                    vs[1024];
-};
-
-enum {
-        NVME_CTRL_ONCS_COMPARE                  = 1 << 0,
-        NVME_CTRL_ONCS_WRITE_UNCORRECTABLE      = 1 << 1,
-        NVME_CTRL_ONCS_DSM                      = 1 << 2,
-};
-
-struct nvme_lbaf {
-        __le16                  ms;
-        __u8                    ds;
-        __u8                    rp;
-};
-
-struct nvme_id_ns {
-        __le64                  nsze;
-        __le64                  ncap;
-        __le64                  nuse;
-        __u8                    nsfeat;
-        __u8                    nlbaf;
-        __u8                    flbas;
-        __u8                    mc;
-        __u8                    dpc;
-        __u8                    dps;
-        __u8                    rsvd30[98];
-        struct nvme_lbaf        lbaf[16];
-        __u8                    rsvd192[192];
-        __u8                    vs[3712];
-};
-
-enum {
-        NVME_NS_FEAT_THIN       = 1 << 0,
-        NVME_LBAF_RP_BEST       = 0,
-        NVME_LBAF_RP_BETTER     = 1,
-        NVME_LBAF_RP_GOOD       = 2,
-        NVME_LBAF_RP_DEGRADED   = 3,
-};
-
-struct nvme_smart_log {
-        __u8                    critical_warning;
-        __u8                    temperature[2];
-        __u8                    avail_spare;
-        __u8                    spare_thresh;
-        __u8                    percent_used;
-        __u8                    rsvd6[26];
-        __u8                    data_units_read[16];
-        __u8                    data_units_written[16];
-        __u8                    host_reads[16];
-        __u8                    host_writes[16];
-        __u8                    ctrl_busy_time[16];
-        __u8                    power_cycles[16];
-        __u8                    power_on_hours[16];
-        __u8                    unsafe_shutdowns[16];
-        __u8                    media_errors[16];
-        __u8                    num_err_log_entries[16];
-        __u8                    rsvd192[320];
-};
-
-enum {
-        NVME_SMART_CRIT_SPARE           = 1 << 0,
-        NVME_SMART_CRIT_TEMPERATURE     = 1 << 1,
-        NVME_SMART_CRIT_RELIABILITY     = 1 << 2,
-        NVME_SMART_CRIT_MEDIA           = 1 << 3,
-        NVME_SMART_CRIT_VOLATILE_MEMORY = 1 << 4,
-};
-
-struct nvme_lba_range_type {
-        __u8                    type;
-        __u8                    attributes;
-        __u8                    rsvd2[14];
-        __u64                   slba;
-        __u64                   nlb;
-        __u8                    guid[16];
-        __u8                    rsvd48[16];
-};
-
-enum {
-        NVME_LBART_TYPE_FS      = 0x01,
-        NVME_LBART_TYPE_RAID    = 0x02,
-        NVME_LBART_TYPE_CACHE   = 0x03,
-        NVME_LBART_TYPE_SWAP    = 0x04,
-
-        NVME_LBART_ATTRIB_TEMP  = 1 << 0,
-        NVME_LBART_ATTRIB_HIDE  = 1 << 1,
-};
-
-/* I/O commands */
-
-enum nvme_opcode {
-        nvme_cmd_flush          = 0x00,
-        nvme_cmd_write          = 0x01,
-        nvme_cmd_read           = 0x02,
-        nvme_cmd_write_uncor    = 0x04,
-        nvme_cmd_compare        = 0x05,
-        nvme_cmd_dsm            = 0x09,
-};
-
-struct nvme_common_command {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __le32                  cdw2[2];
-        __le64                  metadata;
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  cdw10[6];
-};
-
-struct nvme_rw_command {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2;
-        __le64                  metadata;
-        __le64                  prp1;
-        __le64                  prp2;
-        __le64                  slba;
-        __le16                  length;
-        __le16                  control;
-        __le32                  dsmgmt;
-        __le32                  reftag;
-        __le16                  apptag;
-        __le16                  appmask;
-};
-
-enum {
-        NVME_RW_LR                      = 1 << 15,
-        NVME_RW_FUA                     = 1 << 14,
-        NVME_RW_DSM_FREQ_UNSPEC         = 0,
-        NVME_RW_DSM_FREQ_TYPICAL        = 1,
-        NVME_RW_DSM_FREQ_RARE           = 2,
-        NVME_RW_DSM_FREQ_READS          = 3,
-        NVME_RW_DSM_FREQ_WRITES         = 4,
-        NVME_RW_DSM_FREQ_RW             = 5,
-        NVME_RW_DSM_FREQ_ONCE           = 6,
-        NVME_RW_DSM_FREQ_PREFETCH       = 7,
-        NVME_RW_DSM_FREQ_TEMP           = 8,
-        NVME_RW_DSM_LATENCY_NONE        = 0 << 4,
-        NVME_RW_DSM_LATENCY_IDLE        = 1 << 4,
-        NVME_RW_DSM_LATENCY_NORM        = 2 << 4,
-        NVME_RW_DSM_LATENCY_LOW         = 3 << 4,
-        NVME_RW_DSM_SEQ_REQ             = 1 << 6,
-        NVME_RW_DSM_COMPRESSED          = 1 << 7,
-};
-
-struct nvme_dsm_cmd {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2[2];
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  nr;
-        __le32                  attributes;
-        __u32                   rsvd12[4];
-};
-
-enum {
-        NVME_DSMGMT_IDR         = 1 << 0,
-        NVME_DSMGMT_IDW         = 1 << 1,
-        NVME_DSMGMT_AD          = 1 << 2,
-};
-
-struct nvme_dsm_range {
-        __le32                  cattr;
-        __le32                  nlb;
-        __le64                  slba;
-};
-
-/* Admin commands */
-
-enum nvme_admin_opcode {
-        nvme_admin_delete_sq            = 0x00,
-        nvme_admin_create_sq            = 0x01,
-        nvme_admin_get_log_page         = 0x02,
-        nvme_admin_delete_cq            = 0x04,
-        nvme_admin_create_cq            = 0x05,
-        nvme_admin_identify             = 0x06,
-        nvme_admin_abort_cmd            = 0x08,
-        nvme_admin_set_features         = 0x09,
-        nvme_admin_get_features         = 0x0a,
-        nvme_admin_async_event          = 0x0c,
-        nvme_admin_activate_fw          = 0x10,
-        nvme_admin_download_fw          = 0x11,
-        nvme_admin_format_nvm           = 0x80,
-        nvme_admin_security_send        = 0x81,
-        nvme_admin_security_recv        = 0x82,
-};
-
-enum {
-        NVME_QUEUE_PHYS_CONTIG  = (1 << 0),
-        NVME_CQ_IRQ_ENABLED     = (1 << 1),
-        NVME_SQ_PRIO_URGENT     = (0 << 1),
-        NVME_SQ_PRIO_HIGH       = (1 << 1),
-        NVME_SQ_PRIO_MEDIUM     = (2 << 1),
-        NVME_SQ_PRIO_LOW        = (3 << 1),
-        NVME_FEAT_ARBITRATION   = 0x01,
-        NVME_FEAT_POWER_MGMT    = 0x02,
-        NVME_FEAT_LBA_RANGE     = 0x03,
-        NVME_FEAT_TEMP_THRESH   = 0x04,
-        NVME_FEAT_ERR_RECOVERY  = 0x05,
-        NVME_FEAT_VOLATILE_WC   = 0x06,
-        NVME_FEAT_NUM_QUEUES    = 0x07,
-        NVME_FEAT_IRQ_COALESCE  = 0x08,
-        NVME_FEAT_IRQ_CONFIG    = 0x09,
-        NVME_FEAT_WRITE_ATOMIC  = 0x0a,
-        NVME_FEAT_ASYNC_EVENT   = 0x0b,
-        NVME_FEAT_SW_PROGRESS   = 0x0c,
-        NVME_FWACT_REPL         = (0 << 3),
-        NVME_FWACT_REPL_ACTV    = (1 << 3),
-        NVME_FWACT_ACTV         = (2 << 3),
-};
-
-struct nvme_identify {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2[2];
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  cns;
-        __u32                   rsvd11[5];
-};
-
-struct nvme_features {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2[2];
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  fid;
-        __le32                  dword11;
-        __u32                   rsvd12[4];
-};
-
-struct nvme_create_cq {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __u32                   rsvd1[5];
-        __le64                  prp1;
-        __u64                   rsvd8;
-        __le16                  cqid;
-        __le16                  qsize;
-        __le16                  cq_flags;
-        __le16                  irq_vector;
-        __u32                   rsvd12[4];
-};
-
-struct nvme_create_sq {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __u32                   rsvd1[5];
-        __le64                  prp1;
-        __u64                   rsvd8;
-        __le16                  sqid;
-        __le16                  qsize;
-        __le16                  sq_flags;
-        __le16                  cqid;
-        __u32                   rsvd12[4];
-};
-
-struct nvme_delete_queue {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __u32                   rsvd1[9];
-        __le16                  qid;
-        __u16                   rsvd10;
-        __u32                   rsvd11[5];
-};
-
-struct nvme_download_firmware {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __u32                   rsvd1[5];
-        __le64                  prp1;
-        __le64                  prp2;
-        __le32                  numd;
-        __le32                  offset;
-        __u32                   rsvd12[4];
-};
-
-struct nvme_format_cmd {
-        __u8                    opcode;
-        __u8                    flags;
-        __u16                   command_id;
-        __le32                  nsid;
-        __u64                   rsvd2[4];
-        __le32                  cdw10;
-        __u32                   rsvd11[5];
-};
-
-struct nvme_command {
-        union {
-                struct nvme_common_command common;
-                struct nvme_rw_command rw;
-                struct nvme_identify identify;
-                struct nvme_features features;
-                struct nvme_create_cq create_cq;
-                struct nvme_create_sq create_sq;
-                struct nvme_delete_queue delete_queue;
-                struct nvme_download_firmware dlfw;
-                struct nvme_format_cmd format;
-                struct nvme_dsm_cmd dsm;
-        };
-};
-
-enum {
-        NVME_SC_SUCCESS                 = 0x0,
-        NVME_SC_INVALID_OPCODE          = 0x1,
-        NVME_SC_INVALID_FIELD           = 0x2,
-        NVME_SC_CMDID_CONFLICT          = 0x3,
-        NVME_SC_DATA_XFER_ERROR         = 0x4,
-        NVME_SC_POWER_LOSS              = 0x5,
-        NVME_SC_INTERNAL                = 0x6,
-        NVME_SC_ABORT_REQ               = 0x7,
-        NVME_SC_ABORT_QUEUE             = 0x8,
-        NVME_SC_FUSED_FAIL              = 0x9,
-        NVME_SC_FUSED_MISSING           = 0xa,
-        NVME_SC_INVALID_NS              = 0xb,
-        NVME_SC_CMD_SEQ_ERROR           = 0xc,
-        NVME_SC_LBA_RANGE               = 0x80,
-        NVME_SC_CAP_EXCEEDED            = 0x81,
-        NVME_SC_NS_NOT_READY            = 0x82,
-        NVME_SC_CQ_INVALID              = 0x100,
-        NVME_SC_QID_INVALID             = 0x101,
-        NVME_SC_QUEUE_SIZE              = 0x102,
-        NVME_SC_ABORT_LIMIT             = 0x103,
-        NVME_SC_ABORT_MISSING           = 0x104,
-        NVME_SC_ASYNC_LIMIT             = 0x105,
-        NVME_SC_FIRMWARE_SLOT           = 0x106,
-        NVME_SC_FIRMWARE_IMAGE          = 0x107,
-        NVME_SC_INVALID_VECTOR          = 0x108,
-        NVME_SC_INVALID_LOG_PAGE        = 0x109,
-        NVME_SC_INVALID_FORMAT          = 0x10a,
-        NVME_SC_BAD_ATTRIBUTES          = 0x180,
-        NVME_SC_WRITE_FAULT             = 0x280,
-        NVME_SC_READ_ERROR              = 0x281,
-        NVME_SC_GUARD_CHECK             = 0x282,
-        NVME_SC_APPTAG_CHECK            = 0x283,
-        NVME_SC_REFTAG_CHECK            = 0x284,
-        NVME_SC_COMPARE_FAILED          = 0x285,
-        NVME_SC_ACCESS_DENIED           = 0x286,
-};
-
-struct nvme_completion {
-        __le32  result;         /* Used by admin commands to return data */
-        __u32   rsvd;
-        __le16  sq_head;        /* how much of this queue may be reclaimed */
-        __le16  sq_id;          /* submission queue that generated this entry */
-        __u16   command_id;     /* of the command which completed */
-        __le16  status;         /* did the command fail, and if so, why? */
-};
-
-struct nvme_user_io {
-        __u8    opcode;
-        __u8    flags;
-        __u16   control;
-        __u16   nblocks;
-        __u16   rsvd;
-        __u64   metadata;
-        __u64   addr;
-        __u64   slba;
-        __u32   dsmgmt;
-        __u32   reftag;
-        __u16   apptag;
-        __u16   appmask;
-};
-
-struct nvme_admin_cmd {
-        __u8    opcode;
-        __u8    flags;
-        __u16   rsvd1;
-        __u32   nsid;
-        __u32   cdw2;
-        __u32   cdw3;
-        __u64   metadata;
-        __u64   addr;
-        __u32   metadata_len;
-        __u32   data_len;
-        __u32   cdw10;
-        __u32   cdw11;
-        __u32   cdw12;
-        __u32   cdw13;
-        __u32   cdw14;
-        __u32   cdw15;
-        __u32   timeout_ms;
-        __u32   result;
-};
-
-#define NVME_IOCTL_ID           _IO('N', 0x40)
-#define NVME_IOCTL_ADMIN_CMD    _IOWR('N', 0x41, struct nvme_admin_cmd)
-#define NVME_IOCTL_SUBMIT_IO    _IOW('N', 0x42, struct nvme_user_io)
-
-#ifdef __KERNEL__
-#include <linux/pci.h>
-#include <linux/miscdevice.h>
-#include <linux/kref.h>
-
 #define NVME_IO_TIMEOUT (5 * HZ)
 
 /*
@@ -553,7 +106,7 @@ struct nvme_ns {
         struct request_queue *queue;
         struct gendisk *disk;
 
-        int ns_id;
+        unsigned ns_id;
         int lba_shift;
         int ms;
         u64 mode_select_num_blocks;
@@ -572,6 +125,7 @@ struct nvme_iod {
         int offset;             /* Of PRP list */
         int nents;              /* Used in scatterlist */
         int length;             /* Of data, in bytes */
+        unsigned long start_time;
         dma_addr_t first_dma;
         struct scatterlist sg[0];
 };
@@ -613,6 +167,4 @@ struct sg_io_hdr;
 int nvme_sg_io(struct nvme_ns *ns, struct sg_io_hdr __user *u_hdr);
 int nvme_sg_get_version_num(int __user *ip);
 
-#endif
-
 #endif /* _LINUX_NVME_H */
diff --git a/include/linux/of.h b/include/linux/of.h
index 1fd08ca23106..f95aee391e30 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -266,6 +266,7 @@ extern int of_device_is_available(const struct device_node *device);
 extern const void *of_get_property(const struct device_node *node,
                                 const char *name,
                                 int *lenp);
+extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
 #define for_each_property_of_node(dn, pp) \
         for (pp = dn->properties; pp != NULL; pp = pp->next)
 
@@ -280,6 +281,9 @@ 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_parse_phandle_with_fixed_args(const struct device_node *np,
+        const char *list_name, int cells_count, 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);
 
@@ -323,12 +327,6 @@ extern int of_detach_node(struct device_node *);
  */
 const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
                                u32 *pu);
-#define of_property_for_each_u32(np, propname, prop, p, u)      \
-        for (prop = of_find_property(np, propname, NULL),       \
-                p = of_prop_next_u32(prop, NULL, &u);           \
-                p;                                              \
-                p = of_prop_next_u32(prop, p, &u))
-
 /*
  * struct property *prop;
  * const char *s;
@@ -337,11 +335,8 @@ const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
  *         printk("String value: %s\n", s);
  */
 const char *of_prop_next_string(struct property *prop, const char *cur);
-#define of_property_for_each_string(np, propname, prop, s)      \
-        for (prop = of_find_property(np, propname, NULL),       \
-                s = of_prop_next_string(prop, NULL);            \
-                s;                                              \
-                s = of_prop_next_string(prop, s))
+
+int of_device_is_stdout_path(struct device_node *dn);
 
 #else /* CONFIG_OF */
 
@@ -459,6 +454,12 @@ static inline const void *of_get_property(const struct device_node *node,
         return NULL;
 }
 
+static inline struct device_node *of_get_cpu_node(int cpu,
+                                        unsigned int *thread)
+{
+        return NULL;
+}
+
 static inline int of_property_read_u64(const struct device_node *np,
                                        const char *propname, u64 *out_value)
 {
@@ -488,6 +489,13 @@ static inline int of_parse_phandle_with_args(struct device_node *np,
         return -ENOSYS;
 }
 
+static inline int of_parse_phandle_with_fixed_args(const struct device_node *np,
+        const char *list_name, int cells_count, int index,
+        struct of_phandle_args *out_args)
+{
+        return -ENOSYS;
+}
+
 static inline int of_count_phandle_with_args(struct device_node *np,
                                              const char *list_name,
                                              const char *cells_name)
@@ -505,12 +513,25 @@ static inline int of_machine_is_compatible(const char *compat)
         return 0;
 }
 
+static inline int of_device_is_stdout_path(struct device_node *dn)
+{
+        return 0;
+}
+
+static inline const __be32 *of_prop_next_u32(struct property *prop,
+                const __be32 *cur, u32 *pu)
+{
+        return NULL;
+}
+
+static inline const char *of_prop_next_string(struct property *prop,
+                const char *cur)
+{
+        return NULL;
+}
+
 #define of_match_ptr(_ptr)      NULL
 #define of_match_node(_matches, _node)  NULL
-#define of_property_for_each_u32(np, propname, prop, p, u) \
-        while (0)
-#define of_property_for_each_string(np, propname, prop, s) \
-        while (0)
 #endif /* CONFIG_OF */
 
 #ifndef of_node_to_nid
@@ -559,6 +580,18 @@ static inline int of_property_read_u32(const struct device_node *np,
         return of_property_read_u32_array(np, propname, out_value, 1);
 }
 
+#define of_property_for_each_u32(np, propname, prop, p, u)      \
+        for (prop = of_find_property(np, propname, NULL),       \
+                p = of_prop_next_u32(prop, NULL, &u);           \
+                p;                                              \
+                p = of_prop_next_u32(prop, p, &u))
+
+#define of_property_for_each_string(np, propname, prop, s)      \
+        for (prop = of_find_property(np, propname, NULL),       \
+                s = of_prop_next_string(prop, NULL);            \
+                s;                                              \
+                s = of_prop_next_string(prop, s))
+
 #if defined(CONFIG_PROC_FS) && defined(CONFIG_PROC_DEVICETREE)
 extern void proc_device_tree_add_node(struct device_node *, struct proc_dir_entry *);
 extern void proc_device_tree_add_prop(struct proc_dir_entry *pde, struct property *prop);
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 0506eb53519b..4c2e6f26432c 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -4,6 +4,36 @@
 #include <linux/errno.h>
 #include <linux/of.h>
 
+struct of_pci_range_parser {
+        struct device_node *node;
+        const __be32 *range;
+        const __be32 *end;
+        int np;
+        int pna;
+};
+
+struct of_pci_range {
+        u32 pci_space;
+        u64 pci_addr;
+        u64 cpu_addr;
+        u64 size;
+        u32 flags;
+};
+
+#define for_each_of_pci_range(parser, range) \
+        for (; of_pci_range_parser_one(parser, range);)
+
+static inline void of_pci_range_to_resource(struct of_pci_range *range,
+                                            struct device_node *np,
+                                            struct resource *res)
+{
+        res->flags = range->flags;
+        res->start = range->cpu_addr;
+        res->end = range->cpu_addr + range->size - 1;
+        res->parent = res->child = res->sibling = NULL;
+        res->name = np->full_name;
+}
+
 #ifdef CONFIG_OF_ADDRESS
 extern u64 of_translate_address(struct device_node *np, const __be32 *addr);
 extern bool of_can_translate_address(struct device_node *dev);
@@ -27,6 +57,11 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; }
 #define pci_address_to_pio pci_address_to_pio
 #endif
 
+extern int of_pci_range_parser_init(struct of_pci_range_parser *parser,
+                        struct device_node *node);
+extern struct of_pci_range *of_pci_range_parser_one(
+                                        struct of_pci_range_parser *parser,
+                                        struct of_pci_range *range);
 #else /* CONFIG_OF_ADDRESS */
 #ifndef of_address_to_resource
 static inline int of_address_to_resource(struct device_node *dev, int index,
@@ -53,6 +88,19 @@ static inline const __be32 *of_get_address(struct device_node *dev, int index,
 {
         return NULL;
 }
+
+static inline int of_pci_range_parser_init(struct of_pci_range_parser *parser,
+                        struct device_node *node)
+{
+        return -1;
+}
+
+static inline struct of_pci_range *of_pci_range_parser_one(
+                                        struct of_pci_range_parser *parser,
+                                        struct of_pci_range *range)
+{
+        return NULL;
+}
 #endif /* CONFIG_OF_ADDRESS */
 
 
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 901b7435e890..82ce324fdce7 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -1,15 +1,16 @@
 #ifndef _LINUX_OF_DEVICE_H
 #define _LINUX_OF_DEVICE_H
 
+#include <linux/cpu.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h> /* temporary until merge */
 
-#ifdef CONFIG_OF_DEVICE
 #include <linux/of.h>
 #include <linux/mod_devicetable.h>
 
 struct device;
 
+#ifdef CONFIG_OF
 extern const struct of_device_id *of_match_device(
         const struct of_device_id *matches, const struct device *dev);
 extern void of_device_make_bus_id(struct device *dev);
@@ -43,7 +44,16 @@ static inline void of_device_node_put(struct device *dev)
         of_node_put(dev->of_node);
 }
 
-#else /* CONFIG_OF_DEVICE */
+static inline struct device_node *of_cpu_device_node_get(int cpu)
+{
+        struct device *cpu_dev;
+        cpu_dev = get_cpu_device(cpu);
+        if (!cpu_dev)
+                return NULL;
+        return of_node_get(cpu_dev->of_node);
+}
+
+#else /* CONFIG_OF */
 
 static inline int of_driver_match_device(struct device *dev,
                                          struct device_driver *drv)
@@ -67,6 +77,11 @@ static inline const struct of_device_id *of_match_device(
 {
         return NULL;
 }
-#endif /* CONFIG_OF_DEVICE */
+
+static inline struct device_node *of_cpu_device_node_get(int cpu)
+{
+        return NULL;
+}
+#endif /* CONFIG_OF */
 
 #endif /* _LINUX_OF_DEVICE_H */
diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
index 364dda734877..ae36298ba076 100644
--- a/include/linux/of_dma.h
+++ b/include/linux/of_dma.h
@@ -21,7 +21,6 @@ struct device_node;
 struct of_dma {
         struct list_head        of_dma_controllers;
         struct device_node      *of_node;
-        int                     of_dma_nbcells;
         struct dma_chan         *(*of_dma_xlate)
                                 (struct of_phandle_args *, struct of_dma *);
         void                    *of_dma_data;
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index ed136ad698ce..a478c62a2aab 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -90,6 +90,9 @@ extern void *of_get_flat_dt_prop(unsigned long node, const char *name,
 extern int of_flat_dt_is_compatible(unsigned long node, const char *name);
 extern int of_flat_dt_match(unsigned long node, const char *const *matches);
 extern unsigned long of_get_flat_dt_root(void);
+extern int of_scan_flat_dt_by_path(const char *path,
+        int (*it)(unsigned long node, const char *name, int depth, void *data),
+        void *data);
 
 extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
                                      int depth, void *data);
@@ -106,8 +109,7 @@ extern u64 dt_mem_next_cell(int s, __be32 **cellp);
  * physical addresses.
  */
 #ifdef CONFIG_BLK_DEV_INITRD
-extern void early_init_dt_setup_initrd_arch(unsigned long start,
-                                            unsigned long end);
+extern void early_init_dt_setup_initrd_arch(u64 start, u64 end);
 #endif
 
 /* Early flat tree scan hooks */
diff --git a/include/linux/of_i2c.h b/include/linux/of_i2c.h
deleted file mode 100644
index cfb545cd86b5..000000000000
--- a/include/linux/of_i2c.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Generic I2C API implementation for PowerPC.
- *
- * Copyright (c) 2008 Jochen Friedrich <jochen@scram.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __LINUX_OF_I2C_H
-#define __LINUX_OF_I2C_H
-
-#if defined(CONFIG_OF_I2C) || defined(CONFIG_OF_I2C_MODULE)
-#include <linux/i2c.h>
-
-extern void of_i2c_register_devices(struct i2c_adapter *adap);
-
-/* must call put_device() when done with returned i2c_client device */
-extern struct i2c_client *of_find_i2c_device_by_node(struct device_node *node);
-
-/* must call put_device() when done with returned i2c_adapter device */
-extern struct i2c_adapter *of_find_i2c_adapter_by_node(
-                                                struct device_node *node);
-
-#else
-static inline void of_i2c_register_devices(struct i2c_adapter *adap)
-{
-        return;
-}
-
-static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)
-{
-        return NULL;
-}
-
-/* must call put_device() when done with returned i2c_adapter device */
-static inline struct i2c_adapter *of_find_i2c_adapter_by_node(
-                                                struct device_node *node)
-{
-        return NULL;
-}
-#endif /* CONFIG_OF_I2C */
-
-#endif /* __LINUX_OF_I2C_H */
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index 535cecf1e02f..fcd63baee5f2 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -1,8 +1,6 @@
 #ifndef __OF_IRQ_H
 #define __OF_IRQ_H
 
-#if defined(CONFIG_OF)
-struct of_irq;
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/irq.h>
@@ -10,14 +8,6 @@ struct of_irq;
 #include <linux/ioport.h>
 #include <linux/of.h>
 
-/*
- * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
- * implements it differently.  However, the prototype is the same for all,
- * so declare it here regardless of the CONFIG_OF_IRQ setting.
- */
-extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
-
-#if defined(CONFIG_OF_IRQ)
 /**
  * of_irq - container for device_node/irq_specifier pair for an irq controller
  * @controller: pointer to interrupt controller device tree node
@@ -71,11 +61,17 @@ extern int of_irq_to_resource(struct device_node *dev, int index,
 extern int of_irq_count(struct device_node *dev);
 extern int of_irq_to_resource_table(struct device_node *dev,
                 struct resource *res, int nr_irqs);
-extern struct device_node *of_irq_find_parent(struct device_node *child);
 
 extern void of_irq_init(const struct of_device_id *matches);
 
-#endif /* CONFIG_OF_IRQ */
+#if defined(CONFIG_OF)
+/*
+ * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
+ * implements it differently.  However, the prototype is the same for all,
+ * so declare it here regardless of the CONFIG_OF_IRQ setting.
+ */
+extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
+extern struct device_node *of_irq_find_parent(struct device_node *child);
 
 #else /* !CONFIG_OF */
 static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
diff --git a/include/linux/of_net.h b/include/linux/of_net.h
index 61bf53b02779..34597c8c1a4c 100644
--- a/include/linux/of_net.h
+++ b/include/linux/of_net.h
@@ -9,10 +9,10 @@
 
 #ifdef CONFIG_OF_NET
 #include <linux/of.h>
-extern const int of_get_phy_mode(struct device_node *np);
+extern int of_get_phy_mode(struct device_node *np);
 extern const void *of_get_mac_address(struct device_node *np);
 #else
-static inline const int of_get_phy_mode(struct device_node *np)
+static inline int of_get_phy_mode(struct device_node *np)
 {
         return -ENODEV;
 }
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index bb115deb7612..fd9c408631a0 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -2,6 +2,7 @@
 #define __OF_PCI_H
 
 #include <linux/pci.h>
+#include <linux/msi.h>
 
 struct pci_dev;
 struct of_irq;
@@ -10,5 +11,18 @@ int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq);
 struct device_node;
 struct device_node *of_pci_find_child_device(struct device_node *parent,
                                              unsigned int devfn);
+int of_pci_get_devfn(struct device_node *np);
+int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
+
+#if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)
+int of_pci_msi_chip_add(struct msi_chip *chip);
+void of_pci_msi_chip_remove(struct msi_chip *chip);
+struct msi_chip *of_pci_find_msi_chip_by_node(struct device_node *of_node);
+#else
+static inline int of_pci_msi_chip_add(struct msi_chip *chip) { return -EINVAL; }
+static inline void of_pci_msi_chip_remove(struct msi_chip *chip) { }
+static inline struct msi_chip *
+of_pci_find_msi_chip_by_node(struct device_node *of_node) { return NULL; }
+#endif
 
 #endif
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 2a93b64a3869..05cb4a928252 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -13,8 +13,6 @@
 
 #include <linux/device.h>
 #include <linux/mod_devicetable.h>
-
-#ifdef CONFIG_OF_DEVICE
 #include <linux/pm.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
@@ -53,27 +51,6 @@ struct of_dev_auxdata {
         { .compatible = _compat, .phys_addr = _phys, .name = _name, \
           .platform_data = _pdata }
 
-/**
- * of_platform_driver - Legacy of-aware driver for platform devices.
- *
- * An of_platform_driver driver is attached to a basic platform_device on
- * the ibm ebus (ibmebus_bus_type).
- */
-struct of_platform_driver
-{
-        int     (*probe)(struct platform_device* dev,
-                         const struct of_device_id *match);
-        int     (*remove)(struct platform_device* dev);
-
-        int     (*suspend)(struct platform_device* dev, pm_message_t state);
-        int     (*resume)(struct platform_device* dev);
-        int     (*shutdown)(struct platform_device* dev);
-
-        struct device_driver    driver;
-};
-#define to_of_platform_driver(drv) \
-        container_of(drv,struct of_platform_driver, driver)
-
 extern const struct of_device_id of_default_bus_match_table[];
 
 /* Platform drivers register/unregister */
@@ -82,7 +59,6 @@ extern struct platform_device *of_device_alloc(struct device_node *np,
                                          struct device *parent);
 extern struct platform_device *of_find_device_by_node(struct device_node *np);
 
-#ifdef CONFIG_OF_ADDRESS /* device reg helpers depend on OF_ADDRESS */
 /* Platform devices and busses creation */
 extern struct platform_device *of_platform_device_create(struct device_node *np,
                                                    const char *bus_id,
@@ -91,17 +67,12 @@ extern struct platform_device *of_platform_device_create(struct device_node *np,
 extern int of_platform_bus_probe(struct device_node *root,
                                  const struct of_device_id *matches,
                                  struct device *parent);
+#ifdef CONFIG_OF_ADDRESS
 extern int of_platform_populate(struct device_node *root,
                                 const struct of_device_id *matches,
                                 const struct of_dev_auxdata *lookup,
                                 struct device *parent);
-#endif /* CONFIG_OF_ADDRESS */
-
-#endif /* CONFIG_OF_DEVICE */
-
-#if !defined(CONFIG_OF_ADDRESS)
-struct of_dev_auxdata;
-struct device_node;
+#else
 static inline int of_platform_populate(struct device_node *root,
                                         const struct of_device_id *matches,
                                         const struct of_dev_auxdata *lookup,
@@ -109,6 +80,6 @@ static inline int of_platform_populate(struct device_node *root,
 {
         return -ENODEV;
 }
-#endif /* !CONFIG_OF_ADDRESS */
+#endif
 
 #endif  /* _LINUX_OF_PLATFORM_H */
diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h
new file mode 100644
index 000000000000..c84128255814
--- /dev/null
+++ b/include/linux/of_reserved_mem.h
@@ -0,0 +1,14 @@
+#ifndef __OF_RESERVED_MEM_H
+#define __OF_RESERVED_MEM_H
+
+#ifdef CONFIG_OF_RESERVED_MEM
+void of_reserved_mem_device_init(struct device *dev);
+void of_reserved_mem_device_release(struct device *dev);
+void early_init_dt_scan_reserved_mem(void);
+#else
+static inline void of_reserved_mem_device_init(struct device *dev) { }
+static inline void of_reserved_mem_device_release(struct device *dev) { }
+static inline void early_init_dt_scan_reserved_mem(void) { }
+#endif
+
+#endif /* __OF_RESERVED_MEM_H */
diff --git a/include/linux/olpc-ec.h b/include/linux/olpc-ec.h
index 5bb6e760aa61..2925df3ce78a 100644
--- a/include/linux/olpc-ec.h
+++ b/include/linux/olpc-ec.h
@@ -6,6 +6,7 @@
 #define EC_WRITE_SCI_MASK               0x1b
 #define EC_WAKE_UP_WLAN                 0x24
 #define EC_WLAN_LEAVE_RESET             0x25
+#define EC_DCON_POWER_MODE              0x26
 #define EC_READ_EB_MODE                 0x2a
 #define EC_SET_SCI_INHIBIT              0x32
 #define EC_SET_SCI_INHIBIT_RELEASE      0x34
diff --git a/include/linux/omap-mailbox.h b/include/linux/omap-mailbox.h
new file mode 100644
index 000000000000..f8322d9cd235
--- /dev/null
+++ b/include/linux/omap-mailbox.h
@@ -0,0 +1,29 @@
+/*
+ * omap-mailbox: interprocessor communication module for OMAP
+ *
+ * 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 OMAP_MAILBOX_H
+#define OMAP_MAILBOX_H
+
+typedef u32 mbox_msg_t;
+struct omap_mbox;
+
+typedef int __bitwise omap_mbox_irq_t;
+#define IRQ_TX ((__force omap_mbox_irq_t) 1)
+#define IRQ_RX ((__force omap_mbox_irq_t) 2)
+
+int omap_mbox_msg_send(struct omap_mbox *, mbox_msg_t msg);
+
+struct omap_mbox *omap_mbox_get(const char *, struct notifier_block *nb);
+void omap_mbox_put(struct omap_mbox *mbox, struct notifier_block *nb);
+
+void omap_mbox_save_ctx(struct omap_mbox *mbox);
+void omap_mbox_restore_ctx(struct omap_mbox *mbox);
+void omap_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+void omap_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+
+#endif /* OMAP_MAILBOX_H */
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index a4c562453f6b..b2a0f15f11fe 100644
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
@@ -42,7 +42,6 @@
 #define IBS_FETCH_CODE                  13
 #define IBS_OP_CODE                     14
 
-struct super_block;
 struct dentry;
 struct file_operations;
 struct pt_regs;
@@ -51,7 +50,7 @@ struct pt_regs;
 struct oprofile_operations {
         /* create any necessary configuration files in the oprofile fs.
          * Optional. */
-        int (*create_files)(struct super_block * sb, struct dentry * root);
+        int (*create_files)(struct dentry * root);
         /* Do any necessary interrupt setup. Optional. */
         int (*setup)(void);
         /* Do any necessary interrupt shutdown. Optional. */
@@ -125,27 +124,26 @@ void oprofile_add_trace(unsigned long eip);
  * Create a file of the given name as a child of the given root, with
  * the specified file operations.
  */
-int oprofilefs_create_file(struct super_block * sb, struct dentry * root,
+int oprofilefs_create_file(struct dentry * root,
         char const * name, const struct file_operations * fops);
 
-int oprofilefs_create_file_perm(struct super_block * sb, struct dentry * root,
+int oprofilefs_create_file_perm(struct dentry * root,
         char const * name, const struct file_operations * fops, int perm);
  
 /** Create a file for read/write access to an unsigned long. */
-int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
+int oprofilefs_create_ulong(struct dentry * root,
         char const * name, ulong * val);
  
 /** Create a file for read-only access to an unsigned long. */
-int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
+int oprofilefs_create_ro_ulong(struct dentry * root,
         char const * name, ulong * val);
  
 /** Create a file for read-only access to an atomic_t. */
-int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
+int oprofilefs_create_ro_atomic(struct dentry * root,
         char const * name, atomic_t * val);
  
 /** create a directory */
-struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-        char const * name);
+struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
 
 /**
  * Write the given asciz string to the given user buffer @buf, updating *offset
diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h
index be655e4a2a75..2ee8cd2466b5 100644
--- a/include/linux/pageblock-flags.h
+++ b/include/linux/pageblock-flags.h
@@ -80,10 +80,4 @@ void set_pageblock_flags_group(struct page *page, unsigned long flags,
                                                         PB_migrate_skip)
 #endif /* CONFIG_COMPACTION */
 
-#define get_pageblock_flags(page) \
-                        get_pageblock_flags_group(page, 0, PB_migrate_end)
-#define set_pageblock_flags(page, flags) \
-                        set_pageblock_flags_group(page, flags,  \
-                                                  0, PB_migrate_end)
-
 #endif  /* PAGEBLOCK_FLAGS_H */
diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h
index 2aa12b8499c0..e4dbfab37729 100644
--- a/include/linux/pagevec.h
+++ b/include/linux/pagevec.h
@@ -21,7 +21,7 @@ struct pagevec {
 };
 
 void __pagevec_release(struct pagevec *pvec);
-void __pagevec_lru_add(struct pagevec *pvec, enum lru_list lru);
+void __pagevec_lru_add(struct pagevec *pvec);
 unsigned pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,
                 pgoff_t start, unsigned nr_pages);
 unsigned pagevec_lookup_tag(struct pagevec *pvec,
@@ -64,36 +64,4 @@ static inline void pagevec_release(struct pagevec *pvec)
                 __pagevec_release(pvec);
 }
 
-static inline void __pagevec_lru_add_anon(struct pagevec *pvec)
-{
-        __pagevec_lru_add(pvec, LRU_INACTIVE_ANON);
-}
-
-static inline void __pagevec_lru_add_active_anon(struct pagevec *pvec)
-{
-        __pagevec_lru_add(pvec, LRU_ACTIVE_ANON);
-}
-
-static inline void __pagevec_lru_add_file(struct pagevec *pvec)
-{
-        __pagevec_lru_add(pvec, LRU_INACTIVE_FILE);
-}
-
-static inline void __pagevec_lru_add_active_file(struct pagevec *pvec)
-{
-        __pagevec_lru_add(pvec, LRU_ACTIVE_FILE);
-}
-
-static inline void pagevec_lru_add_file(struct pagevec *pvec)
-{
-        if (pagevec_count(pvec))
-                __pagevec_lru_add_file(pvec);
-}
-
-static inline void pagevec_lru_add_anon(struct pagevec *pvec)
-{
-        if (pagevec_count(pvec))
-                __pagevec_lru_add_anon(pvec);
-}
-
 #endif /* _LINUX_PAGEVEC_H */
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 170447977278..d006f0ca60f4 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -47,24 +47,22 @@ void acpi_pci_remove_bus(struct pci_bus *bus);
 
 #ifdef  CONFIG_ACPI_PCI_SLOT
 void acpi_pci_slot_init(void);
-void acpi_pci_slot_enumerate(struct pci_bus *bus, acpi_handle handle);
+void acpi_pci_slot_enumerate(struct pci_bus *bus);
 void acpi_pci_slot_remove(struct pci_bus *bus);
 #else
 static inline void acpi_pci_slot_init(void) { }
-static inline void acpi_pci_slot_enumerate(struct pci_bus *bus,
-                                           acpi_handle handle) { }
+static inline void acpi_pci_slot_enumerate(struct pci_bus *bus) { }
 static inline void acpi_pci_slot_remove(struct pci_bus *bus) { }
 #endif
 
 #ifdef  CONFIG_HOTPLUG_PCI_ACPI
 void acpiphp_init(void);
-void acpiphp_enumerate_slots(struct pci_bus *bus, acpi_handle handle);
+void acpiphp_enumerate_slots(struct pci_bus *bus);
 void acpiphp_remove_slots(struct pci_bus *bus);
 void acpiphp_check_host_bridge(acpi_handle handle);
 #else
 static inline void acpiphp_init(void) { }
-static inline void acpiphp_enumerate_slots(struct pci_bus *bus,
-                                           acpi_handle handle) { }
+static inline void acpiphp_enumerate_slots(struct pci_bus *bus) { }
 static inline void acpiphp_remove_slots(struct pci_bus *bus) { }
 static inline void acpiphp_check_host_bridge(acpi_handle handle) { }
 #endif
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 3a24e4ff3248..da172f956ad6 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -183,6 +183,19 @@ enum pci_bus_flags {
         PCI_BUS_FLAGS_NO_MMRBC = (__force pci_bus_flags_t) 2,
 };
 
+/* These values come from the PCI Express Spec */
+enum pcie_link_width {
+        PCIE_LNK_WIDTH_RESRV    = 0x00,
+        PCIE_LNK_X1             = 0x01,
+        PCIE_LNK_X2             = 0x02,
+        PCIE_LNK_X4             = 0x04,
+        PCIE_LNK_X8             = 0x08,
+        PCIE_LNK_X12            = 0x0C,
+        PCIE_LNK_X16            = 0x10,
+        PCIE_LNK_X32            = 0x20,
+        PCIE_LNK_WIDTH_UNKNOWN  = 0xFF,
+};
+
 /* Based on the PCI Hotplug Spec, but some values are made up by us */
 enum pci_bus_speed {
         PCI_SPEED_33MHz                 = 0x00,
@@ -364,7 +377,8 @@ static inline struct pci_dev *pci_physfn(struct pci_dev *dev)
         return dev;
 }
 
-struct pci_dev *alloc_pci_dev(void);
+struct pci_dev *pci_alloc_dev(struct pci_bus *bus);
+struct pci_dev * __deprecated alloc_pci_dev(void);
 
 #define to_pci_dev(n) container_of(n, struct pci_dev, dev)
 #define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
@@ -432,6 +446,7 @@ struct pci_bus {
         struct resource busn_res;       /* bus numbers routed to this bus */
 
         struct pci_ops  *ops;           /* configuration access functions */
+        struct msi_chip *msi;           /* MSI controller */
         void            *sysdata;       /* hook for sys-specific extension */
         struct proc_dir_entry *procdir; /* directory entry in /proc/bus/pci */
 
@@ -674,7 +689,7 @@ struct pci_driver {
 /* these external functions are only available when PCI support is enabled */
 #ifdef CONFIG_PCI
 
-void pcie_bus_configure_settings(struct pci_bus *bus, u8 smpss);
+void pcie_bus_configure_settings(struct pci_bus *bus);
 
 enum pcie_bus_config_types {
         PCIE_BUS_TUNE_OFF,
@@ -913,6 +928,7 @@ bool pci_check_and_unmask_intx(struct pci_dev *dev);
 void pci_msi_off(struct pci_dev *dev);
 int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size);
 int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask);
+int pci_wait_for_pending_transaction(struct pci_dev *dev);
 int pcix_get_max_mmrbc(struct pci_dev *dev);
 int pcix_get_mmrbc(struct pci_dev *dev);
 int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc);
@@ -920,9 +936,16 @@ int pcie_get_readrq(struct pci_dev *dev);
 int pcie_set_readrq(struct pci_dev *dev, int rq);
 int pcie_get_mps(struct pci_dev *dev);
 int pcie_set_mps(struct pci_dev *dev, int mps);
+int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed,
+                          enum pcie_link_width *width);
 int __pci_reset_function(struct pci_dev *dev);
 int __pci_reset_function_locked(struct pci_dev *dev);
 int pci_reset_function(struct pci_dev *dev);
+int pci_probe_reset_slot(struct pci_slot *slot);
+int pci_reset_slot(struct pci_slot *slot);
+int pci_probe_reset_bus(struct pci_bus *bus);
+int pci_reset_bus(struct pci_bus *bus);
+void pci_reset_bridge_secondary_bus(struct pci_dev *dev);
 void pci_update_resource(struct pci_dev *dev, int resno);
 int __must_check pci_assign_resource(struct pci_dev *dev, int i);
 int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);
@@ -1002,6 +1025,7 @@ int pci_claim_resource(struct pci_dev *, int);
 void pci_assign_unassigned_resources(void);
 void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge);
 void pci_assign_unassigned_bus_resources(struct pci_bus *bus);
+void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus);
 void pdev_enable_device(struct pci_dev *);
 int pci_enable_resources(struct pci_dev *, int mask);
 void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),
@@ -1018,6 +1042,8 @@ int pci_request_selected_regions_exclusive(struct pci_dev *, int, const char *);
 void pci_release_selected_regions(struct pci_dev *, int);
 
 /* drivers/pci/bus.c */
+struct pci_bus *pci_bus_get(struct pci_bus *bus);
+void pci_bus_put(struct pci_bus *bus);
 void pci_add_resource(struct list_head *resources, struct resource *res);
 void pci_add_resource_offset(struct list_head *resources, struct resource *res,
                              resource_size_t offset);
@@ -1040,7 +1066,6 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
                                                   resource_size_t,
                                                   resource_size_t),
                         void *alignf_data);
-void pci_enable_bridges(struct pci_bus *bus);
 
 /* Proper probing supporting hot-pluggable devices */
 int __must_check __pci_register_driver(struct pci_driver *, struct module *,
@@ -1643,6 +1668,11 @@ void pcibios_set_master(struct pci_dev *dev);
 int pcibios_set_pcie_reset_state(struct pci_dev *dev,
                                  enum pcie_reset_state state);
 int pcibios_add_device(struct pci_dev *dev);
+void pcibios_release_device(struct pci_dev *dev);
+
+#ifdef CONFIG_HIBERNATE_CALLBACKS
+extern struct dev_pm_ops pcibios_pm_ops;
+#endif
 
 #ifdef CONFIG_PCI_MMCONFIG
 void __init pci_mmcfg_early_init(void);
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index 8db71dcd6337..430dd963707b 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -28,19 +28,6 @@
 #ifndef _PCI_HOTPLUG_H
 #define _PCI_HOTPLUG_H
 
-/* These values come from the PCI Express Spec */
-enum pcie_link_width {
-        PCIE_LNK_WIDTH_RESRV    = 0x00,
-        PCIE_LNK_X1             = 0x01,
-        PCIE_LNK_X2             = 0x02,
-        PCIE_LNK_X4             = 0x04,
-        PCIE_LNK_X8             = 0x08,
-        PCIE_LNK_X12            = 0x0C,
-        PCIE_LNK_X16            = 0x10,
-        PCIE_LNK_X32            = 0x20,
-        PCIE_LNK_WIDTH_UNKNOWN  = 0xFF,
-};
-
 /**
  * struct hotplug_slot_ops -the callbacks that the hotplug pci core can use
  * @owner: The module owner of this structure
@@ -63,6 +50,9 @@ enum pcie_link_width {
  * @get_adapter_status: Called to get see if an adapter is present in the slot or not.
  *      If this field is NULL, the value passed in the struct hotplug_slot_info
  *      will be used when this value is requested by a user.
+ * @reset_slot: Optional interface to allow override of a bus reset for the
+ *      slot for cases where a secondary bus reset can result in spurious
+ *      hotplug events or where a slot can be reset independent of the bus.
  *
  * The table of function pointers that is passed to the hotplug pci core by a
  * hotplug pci driver.  These functions are called by the hotplug pci core when
@@ -80,6 +70,7 @@ struct hotplug_slot_ops {
         int (*get_attention_status)     (struct hotplug_slot *slot, u8 *value);
         int (*get_latch_status)         (struct hotplug_slot *slot, u8 *value);
         int (*get_adapter_status)       (struct hotplug_slot *slot, u8 *value);
+        int (*reset_slot)               (struct hotplug_slot *slot, int probe);
 };
 
 /**
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c12916248469..97fbecdd7a40 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -518,6 +518,8 @@
 #define PCI_DEVICE_ID_AMD_11H_NB_MISC   0x1303
 #define PCI_DEVICE_ID_AMD_11H_NB_LINK   0x1304
 #define PCI_DEVICE_ID_AMD_15H_M10H_F3   0x1403
+#define PCI_DEVICE_ID_AMD_15H_M30H_NB_F3 0x141d
+#define PCI_DEVICE_ID_AMD_15H_M30H_NB_F4 0x141e
 #define PCI_DEVICE_ID_AMD_15H_NB_F0     0x1600
 #define PCI_DEVICE_ID_AMD_15H_NB_F1     0x1601
 #define PCI_DEVICE_ID_AMD_15H_NB_F2     0x1602
@@ -556,7 +558,6 @@
 #define PCI_DEVICE_ID_AMD_8131_BRIDGE   0x7450
 #define PCI_DEVICE_ID_AMD_8131_APIC     0x7451
 #define PCI_DEVICE_ID_AMD_8132_BRIDGE   0x7458
-#define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS 0x780b
 #define PCI_DEVICE_ID_AMD_CS5535_IDE    0x208F
 #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
 #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
@@ -568,8 +569,9 @@
 #define PCI_DEVICE_ID_AMD_CS5536_IDE    0x209A
 #define PCI_DEVICE_ID_AMD_LX_VIDEO  0x2081
 #define PCI_DEVICE_ID_AMD_LX_AES    0x2082
-#define PCI_DEVICE_ID_AMD_HUDSON2_IDE           0x780c
 #define PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE      0x7800
+#define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS         0x780b
+#define PCI_DEVICE_ID_AMD_HUDSON2_IDE           0x780c
 
 #define PCI_VENDOR_ID_TRIDENT           0x1023
 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
@@ -756,6 +758,7 @@
 #define PCI_DEVICE_ID_HP_CISSE          0x323a
 #define PCI_DEVICE_ID_HP_CISSF          0x323b
 #define PCI_DEVICE_ID_HP_CISSH          0x323c
+#define PCI_DEVICE_ID_HP_CISSI          0x3239
 #define PCI_DEVICE_ID_HP_ZX2_IOC        0x4031
 
 #define PCI_VENDOR_ID_PCTECH            0x1042
@@ -1311,6 +1314,8 @@
 #define PCI_DEVICE_ID_IMS_TT128         0x9128
 #define PCI_DEVICE_ID_IMS_TT3D          0x9135
 
+#define PCI_VENDOR_ID_AMCC              0x10e8
+
 #define PCI_VENDOR_ID_INTERG            0x10ea
 #define PCI_DEVICE_ID_INTERG_1682       0x1682
 #define PCI_DEVICE_ID_INTERG_2000       0x2000
@@ -2256,12 +2261,10 @@
 /*
  * ADDI-DATA GmbH communication cards <info@addi-data.com>
  */
-#define PCI_VENDOR_ID_ADDIDATA_OLD             0x10E8
 #define PCI_VENDOR_ID_ADDIDATA                 0x15B8
 #define PCI_DEVICE_ID_ADDIDATA_APCI7500        0x7000
 #define PCI_DEVICE_ID_ADDIDATA_APCI7420        0x7001
 #define PCI_DEVICE_ID_ADDIDATA_APCI7300        0x7002
-#define PCI_DEVICE_ID_ADDIDATA_APCI7800        0x818E
 #define PCI_DEVICE_ID_ADDIDATA_APCI7500_2      0x7009
 #define PCI_DEVICE_ID_ADDIDATA_APCI7420_2      0x700A
 #define PCI_DEVICE_ID_ADDIDATA_APCI7300_2      0x700B
@@ -2476,6 +2479,9 @@
 
 #define PCI_VENDOR_ID_ASMEDIA           0x1b21
 
+#define PCI_VENDOR_ID_CIRCUITCO         0x1cc8
+#define PCI_SUBSYSTEM_ID_CIRCUITCO_MINNOWBOARD  0x0001
+
 #define PCI_VENDOR_ID_TEKRAM            0x1de1
 #define PCI_DEVICE_ID_TEKRAM_DC290      0xdc29
 
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
index 27ef6b190ea6..57e890abe1f0 100644
--- a/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@ -22,9 +22,12 @@
  * Macro which verifies @ptr is a percpu pointer without evaluating
  * @ptr.  This is to be used in percpu accessors to verify that the
  * input parameter is a percpu pointer.
+ *
+ * + 0 is required in order to convert the pointer type from a
+ * potential array type to a pointer to a single item of the array.
  */
 #define __verify_pcpu_ptr(ptr)  do {                                    \
-        const void __percpu *__vpp_verify = (typeof(ptr))NULL;          \
+        const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL;    \
         (void)__vpp_verify;                                             \
 } while (0)
 
diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h
new file mode 100644
index 000000000000..95961f0bf62d
--- /dev/null
+++ b/include/linux/percpu-refcount.h
@@ -0,0 +1,174 @@
+/*
+ * Percpu refcounts:
+ * (C) 2012 Google, Inc.
+ * Author: Kent Overstreet <koverstreet@google.com>
+ *
+ * This implements a refcount with similar semantics to atomic_t - atomic_inc(),
+ * atomic_dec_and_test() - but percpu.
+ *
+ * There's one important difference between percpu refs and normal atomic_t
+ * refcounts; you have to keep track of your initial refcount, and then when you
+ * start shutting down you call percpu_ref_kill() _before_ dropping the initial
+ * refcount.
+ *
+ * The refcount will have a range of 0 to ((1U << 31) - 1), i.e. one bit less
+ * than an atomic_t - this is because of the way shutdown works, see
+ * percpu_ref_kill()/PCPU_COUNT_BIAS.
+ *
+ * Before you call percpu_ref_kill(), percpu_ref_put() does not check for the
+ * refcount hitting 0 - it can't, if it was in percpu mode. percpu_ref_kill()
+ * puts the ref back in single atomic_t mode, collecting the per cpu refs and
+ * issuing the appropriate barriers, and then marks the ref as shutting down so
+ * that percpu_ref_put() will check for the ref hitting 0.  After it returns,
+ * it's safe to drop the initial ref.
+ *
+ * USAGE:
+ *
+ * See fs/aio.c for some example usage; it's used there for struct kioctx, which
+ * is created when userspaces calls io_setup(), and destroyed when userspace
+ * calls io_destroy() or the process exits.
+ *
+ * In the aio code, kill_ioctx() is called when we wish to destroy a kioctx; it
+ * calls percpu_ref_kill(), then hlist_del_rcu() and sychronize_rcu() to remove
+ * the kioctx from the proccess's list of kioctxs - after that, there can't be
+ * any new users of the kioctx (from lookup_ioctx()) and it's then safe to drop
+ * the initial ref with percpu_ref_put().
+ *
+ * Code that does a two stage shutdown like this often needs some kind of
+ * explicit synchronization to ensure the initial refcount can only be dropped
+ * once - percpu_ref_kill() does this for you, it returns true once and false if
+ * someone else already called it. The aio code uses it this way, but it's not
+ * necessary if the code has some other mechanism to synchronize teardown.
+ * around.
+ */
+
+#ifndef _LINUX_PERCPU_REFCOUNT_H
+#define _LINUX_PERCPU_REFCOUNT_H
+
+#include <linux/atomic.h>
+#include <linux/kernel.h>
+#include <linux/percpu.h>
+#include <linux/rcupdate.h>
+
+struct percpu_ref;
+typedef void (percpu_ref_func_t)(struct percpu_ref *);
+
+struct percpu_ref {
+        atomic_t                count;
+        /*
+         * The low bit of the pointer indicates whether the ref is in percpu
+         * mode; if set, then get/put will manipulate the atomic_t (this is a
+         * hack because we need to keep the pointer around for
+         * percpu_ref_kill_rcu())
+         */
+        unsigned __percpu       *pcpu_count;
+        percpu_ref_func_t       *release;
+        percpu_ref_func_t       *confirm_kill;
+        struct rcu_head         rcu;
+};
+
+int __must_check percpu_ref_init(struct percpu_ref *ref,
+                                 percpu_ref_func_t *release);
+void percpu_ref_cancel_init(struct percpu_ref *ref);
+void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
+                                 percpu_ref_func_t *confirm_kill);
+
+/**
+ * percpu_ref_kill - drop the initial ref
+ * @ref: percpu_ref to kill
+ *
+ * Must be used to drop the initial ref on a percpu refcount; must be called
+ * precisely once before shutdown.
+ *
+ * Puts @ref in non percpu mode, then does a call_rcu() before gathering up the
+ * percpu counters and dropping the initial ref.
+ */
+static inline void percpu_ref_kill(struct percpu_ref *ref)
+{
+        return percpu_ref_kill_and_confirm(ref, NULL);
+}
+
+#define PCPU_STATUS_BITS        2
+#define PCPU_STATUS_MASK        ((1 << PCPU_STATUS_BITS) - 1)
+#define PCPU_REF_PTR            0
+#define PCPU_REF_DEAD           1
+
+#define REF_STATUS(count)       (((unsigned long) count) & PCPU_STATUS_MASK)
+
+/**
+ * percpu_ref_get - increment a percpu refcount
+ * @ref: percpu_ref to get
+ *
+ * Analagous to atomic_inc().
+  */
+static inline void percpu_ref_get(struct percpu_ref *ref)
+{
+        unsigned __percpu *pcpu_count;
+
+        rcu_read_lock_sched();
+
+        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
+
+        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
+                __this_cpu_inc(*pcpu_count);
+        else
+                atomic_inc(&ref->count);
+
+        rcu_read_unlock_sched();
+}
+
+/**
+ * percpu_ref_tryget - try to increment a percpu refcount
+ * @ref: percpu_ref to try-get
+ *
+ * Increment a percpu refcount unless it has already been killed.  Returns
+ * %true on success; %false on failure.
+ *
+ * Completion of percpu_ref_kill() in itself doesn't guarantee that tryget
+ * will fail.  For such guarantee, percpu_ref_kill_and_confirm() should be
+ * used.  After the confirm_kill callback is invoked, it's guaranteed that
+ * no new reference will be given out by percpu_ref_tryget().
+ */
+static inline bool percpu_ref_tryget(struct percpu_ref *ref)
+{
+        unsigned __percpu *pcpu_count;
+        int ret = false;
+
+        rcu_read_lock_sched();
+
+        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
+
+        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR)) {
+                __this_cpu_inc(*pcpu_count);
+                ret = true;
+        }
+
+        rcu_read_unlock_sched();
+
+        return ret;
+}
+
+/**
+ * percpu_ref_put - decrement a percpu refcount
+ * @ref: percpu_ref to put
+ *
+ * Decrement the refcount, and if 0, call the release function (which was passed
+ * to percpu_ref_init())
+ */
+static inline void percpu_ref_put(struct percpu_ref *ref)
+{
+        unsigned __percpu *pcpu_count;
+
+        rcu_read_lock_sched();
+
+        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
+
+        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
+                __this_cpu_dec(*pcpu_count);
+        else if (unlikely(atomic_dec_and_test(&ref->count)))
+                ref->release(ref);
+
+        rcu_read_unlock_sched();
+}
+
+#endif
diff --git a/include/linux/percpu_ida.h b/include/linux/percpu_ida.h
new file mode 100644
index 000000000000..0b23edbee309
--- /dev/null
+++ b/include/linux/percpu_ida.h
@@ -0,0 +1,60 @@
+#ifndef __PERCPU_IDA_H__
+#define __PERCPU_IDA_H__
+
+#include <linux/types.h>
+#include <linux/bitops.h>
+#include <linux/init.h>
+#include <linux/spinlock_types.h>
+#include <linux/wait.h>
+#include <linux/cpumask.h>
+
+struct percpu_ida_cpu;
+
+struct percpu_ida {
+        /*
+         * number of tags available to be allocated, as passed to
+         * percpu_ida_init()
+         */
+        unsigned                        nr_tags;
+
+        struct percpu_ida_cpu __percpu  *tag_cpu;
+
+        /*
+         * Bitmap of cpus that (may) have tags on their percpu freelists:
+         * steal_tags() uses this to decide when to steal tags, and which cpus
+         * to try stealing from.
+         *
+         * It's ok for a freelist to be empty when its bit is set - steal_tags()
+         * will just keep looking - but the bitmap _must_ be set whenever a
+         * percpu freelist does have tags.
+         */
+        cpumask_t                       cpus_have_tags;
+
+        struct {
+                spinlock_t              lock;
+                /*
+                 * When we go to steal tags from another cpu (see steal_tags()),
+                 * we want to pick a cpu at random. Cycling through them every
+                 * time we steal is a bit easier and more or less equivalent:
+                 */
+                unsigned                cpu_last_stolen;
+
+                /* For sleeping on allocation failure */
+                wait_queue_head_t       wait;
+
+                /*
+                 * Global freelist - it's a stack where nr_free points to the
+                 * top
+                 */
+                unsigned                nr_free;
+                unsigned                *freelist;
+        } ____cacheline_aligned_in_smp;
+};
+
+int percpu_ida_alloc(struct percpu_ida *pool, gfp_t gfp);
+void percpu_ida_free(struct percpu_ida *pool, unsigned tag);
+
+void percpu_ida_destroy(struct percpu_ida *pool);
+int percpu_ida_init(struct percpu_ida *pool, unsigned long nr_tags);
+
+#endif /* __PERCPU_IDA_H__ */
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index f463a46424e2..866e85c5eb94 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -48,6 +48,7 @@ struct perf_guest_info_callbacks {
 #include <linux/cpu.h>
 #include <linux/irq_work.h>
 #include <linux/static_key.h>
+#include <linux/jump_label_ratelimit.h>
 #include <linux/atomic.h>
 #include <linux/sysfs.h>
 #include <linux/perf_regs.h>
@@ -64,25 +65,6 @@ struct perf_raw_record {
 };
 
 /*
- * single taken branch record layout:
- *
- *      from: source instruction (may not always be a branch insn)
- *        to: branch target
- *   mispred: branch target was mispredicted
- * predicted: branch target was predicted
- *
- * support for mispred, predicted is optional. In case it
- * is not supported mispred = predicted = 0.
- */
-struct perf_branch_entry {
-        __u64   from;
-        __u64   to;
-        __u64   mispred:1,  /* target mispredicted */
-                predicted:1,/* target predicted */
-                reserved:62;
-};
-
-/*
  * branch stack layout:
  *  nr: number of taken branches stored in entries[]
  *
@@ -113,6 +95,8 @@ struct hw_perf_event_extra {
         int             idx;    /* index in shared_regs->regs[] */
 };
 
+struct event_constraint;
+
 /**
  * struct hw_perf_event - performance event hardware details:
  */
@@ -131,6 +115,8 @@ struct hw_perf_event {
 
                         struct hw_perf_event_extra extra_reg;
                         struct hw_perf_event_extra branch_reg;
+
+                        struct event_constraint *constraint;
                 };
                 struct { /* software */
                         struct hrtimer  hrtimer;
@@ -188,12 +174,13 @@ struct pmu {
 
         struct device                   *dev;
         const struct attribute_group    **attr_groups;
-        char                            *name;
+        const char                      *name;
         int                             type;
 
         int * __percpu                  pmu_disable_count;
         struct perf_cpu_context * __percpu pmu_cpu_context;
         int                             task_ctx_nr;
+        int                             hrtimer_interval_ms;
 
         /*
          * Fully disable/enable this PMU, can be used to protect from the PMI
@@ -389,8 +376,7 @@ struct perf_event {
         /* mmap bits */
         struct mutex                    mmap_mutex;
         atomic_t                        mmap_count;
-        int                             mmap_locked;
-        struct user_struct              *mmap_user;
+
         struct ring_buffer              *rb;
         struct list_head                rb_entry;
 
@@ -501,8 +487,9 @@ struct perf_cpu_context {
         struct perf_event_context       *task_ctx;
         int                             active_oncpu;
         int                             exclusive;
+        struct hrtimer                  hrtimer;
+        ktime_t                         hrtimer_interval;
         struct list_head                rotation_list;
-        int                             jiffies_interval;
         struct pmu                      *unique_pmu;
         struct perf_cgroup              *cgrp;
 };
@@ -518,7 +505,7 @@ struct perf_output_handle {
 
 #ifdef CONFIG_PERF_EVENTS
 
-extern int perf_pmu_register(struct pmu *pmu, char *name, int type);
+extern int perf_pmu_register(struct pmu *pmu, const char *name, int type);
 extern void perf_pmu_unregister(struct pmu *pmu);
 
 extern int perf_num_counters(void);
@@ -696,10 +683,17 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
 extern int sysctl_perf_event_paranoid;
 extern int sysctl_perf_event_mlock;
 extern int sysctl_perf_event_sample_rate;
+extern int sysctl_perf_cpu_time_max_percent;
+
+extern void perf_sample_event_took(u64 sample_len_ns);
 
 extern int perf_proc_update_handler(struct ctl_table *table, int write,
                 void __user *buffer, size_t *lenp,
                 loff_t *ppos);
+extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
+                void __user *buffer, size_t *lenp,
+                loff_t *ppos);
+
 
 static inline bool perf_paranoid_tracepoint_raw(void)
 {
@@ -743,6 +737,7 @@ extern unsigned int perf_output_skip(struct perf_output_handle *handle,
                                      unsigned int len);
 extern int perf_swevent_get_recursion_context(void);
 extern void perf_swevent_put_recursion_context(int rctx);
+extern u64 perf_swevent_set_period(struct perf_event *event);
 extern void perf_event_enable(struct perf_event *event);
 extern void perf_event_disable(struct perf_event *event);
 extern int __perf_event_disable(void *info);
@@ -782,6 +777,7 @@ static inline void perf_event_fork(struct task_struct *tsk)		{ }
 static inline void perf_event_init(void)                                { }
 static inline int  perf_swevent_get_recursion_context(void)             { return -1; }
 static inline void perf_swevent_put_recursion_context(int rctx)         { }
+static inline u64 perf_swevent_set_period(struct perf_event *event)     { return 0; }
 static inline void perf_event_enable(struct perf_event *event)          { }
 static inline void perf_event_disable(struct perf_event *event)         { }
 static inline int __perf_event_disable(void *info)                      { return -1; }
@@ -803,11 +799,11 @@ static inline void perf_restore_debug_store(void)			{ }
 #define perf_output_put(handle, x) perf_output_copy((handle), &(x), sizeof(x))
 
 /*
- * This has to have a higher priority than migration_notifier in sched.c.
+ * This has to have a higher priority than migration_notifier in sched/core.c.
  */
 #define perf_cpu_notifier(fn)                                           \
 do {                                                                    \
-        static struct notifier_block fn##_nb __cpuinitdata =            \
+        static struct notifier_block fn##_nb =                          \
                 { .notifier_call = fn, .priority = CPU_PRI_PERF };      \
         unsigned long cpu = smp_processor_id();                         \
         unsigned long flags;                                            \
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 9e11039dd7a3..64ab823f7b74 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -49,6 +49,7 @@
 
 #define PHY_HAS_INTERRUPT       0x00000001
 #define PHY_HAS_MAGICANEG       0x00000002
+#define PHY_IS_INTERNAL         0x00000004
 
 /* Interface Mode definitions */
 typedef enum {
@@ -57,6 +58,7 @@ typedef enum {
         PHY_INTERFACE_MODE_GMII,
         PHY_INTERFACE_MODE_SGMII,
         PHY_INTERFACE_MODE_TBI,
+        PHY_INTERFACE_MODE_REVMII,
         PHY_INTERFACE_MODE_RMII,
         PHY_INTERFACE_MODE_RGMII,
         PHY_INTERFACE_MODE_RGMII_ID,
@@ -261,6 +263,7 @@ struct phy_c45_device_ids {
  * phy_id: UID for this device found during discovery
  * c45_ids: 802.3-c45 Device Identifers if is_c45.
  * is_c45:  Set to true if this phy uses clause 45 addressing.
+ * is_internal: Set to true if this phy is internal to a MAC.
  * state: state of the PHY for management purposes
  * dev_flags: Device-specific flags used by the PHY driver.
  * addr: Bus address of PHY
@@ -298,6 +301,7 @@ struct phy_device {
 
         struct phy_c45_device_ids c45_ids;
         bool is_c45;
+        bool is_internal;
 
         enum phy_state state;
 
@@ -508,6 +512,27 @@ static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val)
         return mdiobus_write(phydev->bus, phydev->addr, regnum, val);
 }
 
+/**
+ * phy_interrupt_is_valid - Convenience function for testing a given PHY irq
+ * @phydev: the phy_device struct
+ *
+ * NOTE: must be kept in sync with addition/removal of PHY_POLL and
+ * PHY_IGNORE_INTERRUPT
+ */
+static inline bool phy_interrupt_is_valid(struct phy_device *phydev)
+{
+        return phydev->irq != PHY_POLL && phydev->irq != PHY_IGNORE_INTERRUPT;
+}
+
+/**
+ * phy_is_internal - Convenience function for testing if a PHY is internal
+ * @phydev: the phy_device struct
+ */
+static inline bool phy_is_internal(struct phy_device *phydev)
+{
+        return phydev->is_internal;
+}
+
 struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id,
                 bool is_c45, struct phy_c45_device_ids *c45_ids);
 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);
@@ -545,6 +570,8 @@ void phy_drivers_unregister(struct phy_driver *drv, int n);
 int phy_driver_register(struct phy_driver *new_driver);
 int phy_drivers_register(struct phy_driver *new_driver, int n);
 void phy_state_machine(struct work_struct *work);
+void phy_change(struct work_struct *work);
+void phy_mac_interrupt(struct phy_device *phydev, int new_link);
 void phy_start_machine(struct phy_device *phydev,
                 void (*handler)(struct net_device *));
 void phy_stop_machine(struct phy_device *phydev);
diff --git a/include/linux/pid.h b/include/linux/pid.h
index a089a3c447fc..23705a53abba 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -86,11 +86,9 @@ extern struct task_struct *get_pid_task(struct pid *pid, enum pid_type);
 extern struct pid *get_task_pid(struct task_struct *task, enum pid_type type);
 
 /*
- * attach_pid() and detach_pid() must be called with the tasklist_lock
- * write-held.
+ * these helpers must be called with the tasklist_lock write-held.
  */
-extern void attach_pid(struct task_struct *task, enum pid_type type,
-                        struct pid *pid);
+extern void attach_pid(struct task_struct *task, enum pid_type);
 extern void detach_pid(struct task_struct *task, enum pid_type);
 extern void change_pid(struct task_struct *task, enum pid_type,
                         struct pid *pid);
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 4aad3cea69ae..18eccefea06e 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -40,6 +40,25 @@ extern int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *s);
 extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev);
 extern void devm_pinctrl_put(struct pinctrl *p);
 
+#ifdef CONFIG_PM
+extern int pinctrl_pm_select_default_state(struct device *dev);
+extern int pinctrl_pm_select_sleep_state(struct device *dev);
+extern int pinctrl_pm_select_idle_state(struct device *dev);
+#else
+static inline int pinctrl_pm_select_default_state(struct device *dev)
+{
+        return 0;
+}
+static inline int pinctrl_pm_select_sleep_state(struct device *dev)
+{
+        return 0;
+}
+static inline int pinctrl_pm_select_idle_state(struct device *dev)
+{
+        return 0;
+}
+#endif
+
 #else /* !CONFIG_PINCTRL */
 
 static inline int pinctrl_request_gpio(unsigned gpio)
@@ -92,6 +111,21 @@ static inline void devm_pinctrl_put(struct pinctrl *p)
 {
 }
 
+static inline int pinctrl_pm_select_default_state(struct device *dev)
+{
+        return 0;
+}
+
+static inline int pinctrl_pm_select_sleep_state(struct device *dev)
+{
+        return 0;
+}
+
+static inline int pinctrl_pm_select_idle_state(struct device *dev)
+{
+        return 0;
+}
+
 #endif /* CONFIG_PINCTRL */
 
 static inline struct pinctrl * __must_check pinctrl_get_select(
@@ -158,47 +192,4 @@ static inline struct pinctrl * __must_check devm_pinctrl_get_select_default(
         return devm_pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT);
 }
 
-#ifdef CONFIG_PINCONF
-
-extern int pin_config_get(const char *dev_name, const char *name,
-                          unsigned long *config);
-extern int pin_config_set(const char *dev_name, const char *name,
-                          unsigned long config);
-extern int pin_config_group_get(const char *dev_name,
-                                const char *pin_group,
-                                unsigned long *config);
-extern int pin_config_group_set(const char *dev_name,
-                                const char *pin_group,
-                                unsigned long config);
-
-#else
-
-static inline int pin_config_get(const char *dev_name, const char *name,
-                                 unsigned long *config)
-{
-        return 0;
-}
-
-static inline int pin_config_set(const char *dev_name, const char *name,
-                                 unsigned long config)
-{
-        return 0;
-}
-
-static inline int pin_config_group_get(const char *dev_name,
-                                       const char *pin_group,
-                                       unsigned long *config)
-{
-        return 0;
-}
-
-static inline int pin_config_group_set(const char *dev_name,
-                                       const char *pin_group,
-                                       unsigned long config)
-{
-        return 0;
-}
-
-#endif
-
 #endif /* __LINUX_PINCTRL_CONSUMER_H */
diff --git a/include/linux/pinctrl/devinfo.h b/include/linux/pinctrl/devinfo.h
index 6e5f8a985ea7..281cb91ddcf5 100644
--- a/include/linux/pinctrl/devinfo.h
+++ b/include/linux/pinctrl/devinfo.h
@@ -28,6 +28,10 @@
 struct dev_pin_info {
         struct pinctrl *p;
         struct pinctrl_state *default_state;
+#ifdef CONFIG_PM
+        struct pinctrl_state *sleep_state;
+        struct pinctrl_state *idle_state;
+#endif
 };
 
 extern int pinctrl_bind_pins(struct device *dev);
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
index 6aa238096622..fb90ef5eb038 100644
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@ -29,12 +29,25 @@
  *      if for example some other pin is going to drive the signal connected
  *      to it for a while. Pins used for input are usually always high
  *      impedance.
+ * @PIN_CONFIG_BIAS_BUS_HOLD: the pin will be set to weakly latch so that it
+ *      weakly drives the last value on a tristate bus, also known as a "bus
+ *      holder", "bus keeper" or "repeater". This allows another device on the
+ *      bus to change the value by driving the bus high or low and switching to
+ *      tristate. The argument is ignored.
  * @PIN_CONFIG_BIAS_PULL_UP: the pin will be pulled up (usually with high
  *      impedance to VDD). If the argument is != 0 pull-up is enabled,
- *      if it is 0, pull-up is disabled.
+ *      if it is 0, pull-up is total, i.e. the pin is connected to VDD.
  * @PIN_CONFIG_BIAS_PULL_DOWN: the pin will be pulled down (usually with high
  *      impedance to GROUND). If the argument is != 0 pull-down is enabled,
- *      if it is 0, pull-down is disabled.
+ *      if it is 0, pull-down is total, i.e. the pin is connected to GROUND.
+ * @PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: the pin will be pulled up or down based
+ *      on embedded knowledge of the controller hardware, like current mux
+ *      function. The pull direction and possibly strength too will normally
+ *      be decided completely inside the hardware block and not be readable
+ *      from the kernel side.
+ *      If the argument is != 0 pull up/down is enabled, if it is 0, the
+ *      configuration is ignored. The proper way to disable it is to use
+ *      @PIN_CONFIG_BIAS_DISABLE.
  * @PIN_CONFIG_DRIVE_PUSH_PULL: the pin will be driven actively high and
  *      low, this is the most typical case and is typically achieved with two
  *      active transistors on the output. Setting this config will enable
@@ -57,14 +70,14 @@
  *      setting pins to this mode.
  * @PIN_CONFIG_INPUT_DEBOUNCE: this will configure the pin to debounce mode,
  *      which means it will wait for signals to settle when reading inputs. The
- *      argument gives the debounce time on a custom format. Setting the
+ *      argument gives the debounce time in usecs. Setting the
  *      argument to zero turns debouncing off.
  * @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.
+ *      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
@@ -78,8 +91,10 @@
 enum pin_config_param {
         PIN_CONFIG_BIAS_DISABLE,
         PIN_CONFIG_BIAS_HIGH_IMPEDANCE,
+        PIN_CONFIG_BIAS_BUS_HOLD,
         PIN_CONFIG_BIAS_PULL_UP,
         PIN_CONFIG_BIAS_PULL_DOWN,
+        PIN_CONFIG_BIAS_PULL_PIN_DEFAULT,
         PIN_CONFIG_DRIVE_PUSH_PULL,
         PIN_CONFIG_DRIVE_OPEN_DRAIN,
         PIN_CONFIG_DRIVE_OPEN_SOURCE,
@@ -122,6 +137,39 @@ static inline unsigned long pinconf_to_config_packed(enum pin_config_param param
         return PIN_CONF_PACKED(param, argument);
 }
 
+#ifdef CONFIG_OF
+
+#include <linux/device.h>
+#include <linux/pinctrl/machine.h>
+struct pinctrl_dev;
+struct pinctrl_map;
+
+int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
+                struct device_node *np, struct pinctrl_map **map,
+                unsigned *reserved_maps, unsigned *num_maps,
+                enum pinctrl_map_type type);
+int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev,
+                struct device_node *np_config, struct pinctrl_map **map,
+                unsigned *num_maps, enum pinctrl_map_type type);
+
+static inline int pinconf_generic_dt_node_to_map_group(
+                struct pinctrl_dev *pctldev, struct device_node *np_config,
+                struct pinctrl_map **map, unsigned *num_maps)
+{
+        return pinconf_generic_dt_node_to_map(pctldev, np_config, map, num_maps,
+                        PIN_MAP_TYPE_CONFIGS_GROUP);
+}
+
+static inline int pinconf_generic_dt_node_to_map_pin(
+                struct pinctrl_dev *pctldev, struct device_node *np_config,
+                struct pinctrl_map **map, unsigned *num_maps)
+{
+        return pinconf_generic_dt_node_to_map(pctldev, np_config, map, num_maps,
+                        PIN_MAP_TYPE_CONFIGS_PIN);
+}
+
+#endif
+
 #endif /* CONFIG_GENERIC_PINCONF */
 
 #endif /* __LINUX_PINCTRL_PINCONF_GENERIC_H */
diff --git a/include/linux/pinctrl/pinconf.h b/include/linux/pinctrl/pinconf.h
index 1ad4f31ef6b8..09eb80f2574a 100644
--- a/include/linux/pinctrl/pinconf.h
+++ b/include/linux/pinctrl/pinconf.h
@@ -30,7 +30,7 @@ struct seq_file;
  * @pin_config_set: configure an individual pin
  * @pin_config_group_get: get configurations for an entire pin group
  * @pin_config_group_set: configure all pins in a group
- * @pin_config_group_dbg_set: optional debugfs to modify a pin configuration
+ * @pin_config_dbg_parse_modify: optional debugfs to modify a pin configuration
  * @pin_config_dbg_show: optional debugfs display hook that will provide
  *      per-device info for a certain pin in debugfs
  * @pin_config_group_dbg_show: optional debugfs display hook that will provide
@@ -47,13 +47,15 @@ struct pinconf_ops {
                                unsigned long *config);
         int (*pin_config_set) (struct pinctrl_dev *pctldev,
                                unsigned pin,
-                               unsigned long config);
+                               unsigned long *configs,
+                               unsigned num_configs);
         int (*pin_config_group_get) (struct pinctrl_dev *pctldev,
                                      unsigned selector,
                                      unsigned long *config);
         int (*pin_config_group_set) (struct pinctrl_dev *pctldev,
                                      unsigned selector,
-                                     unsigned long config);
+                                     unsigned long *configs,
+                                     unsigned num_configs);
         int (*pin_config_dbg_parse_modify) (struct pinctrl_dev *pctldev,
                                            const char *arg,
                                            unsigned long *config);
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 2c2a9e8d8578..5979147d2bda 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -49,7 +49,8 @@ struct pinctrl_pin_desc {
  * @name: a name for the chip in this range
  * @id: an ID number for the chip in this range
  * @base: base offset of the GPIO range
- * @pin_base: base pin number of the GPIO range
+ * @pin_base: base pin number of the GPIO range if pins == NULL
+ * @pins: enumeration of pins in GPIO range or NULL
  * @npins: number of pins in the GPIO range, including the base number
  * @gc: an optional pointer to a gpio_chip
  */
@@ -59,6 +60,7 @@ struct pinctrl_gpio_range {
         unsigned int id;
         unsigned int base;
         unsigned int pin_base;
+        unsigned const *pins;
         unsigned int npins;
         struct gpio_chip *gc;
 };
diff --git a/include/linux/platform_data/ad7303.h b/include/linux/platform_data/ad7303.h
new file mode 100644
index 000000000000..de6a7a6b4bbf
--- /dev/null
+++ b/include/linux/platform_data/ad7303.h
@@ -0,0 +1,21 @@
+/*
+ * Analog Devices AD7303 DAC driver
+ *
+ * Copyright 2013 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef __IIO_ADC_AD7303_H__
+#define __IIO_ADC_AD7303_H__
+
+/**
+ * struct ad7303_platform_data - AD7303 platform data
+ * @use_external_ref: If set to true use an external voltage reference connected
+ * to the REF pin, otherwise use the internal reference derived from Vdd.
+ */
+struct ad7303_platform_data {
+        bool use_external_ref;
+};
+
+#endif
diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h
index 88272591a895..9efc04dd255a 100644
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
@@ -36,6 +36,7 @@ struct samsung_i2s {
  */
 #define QUIRK_NO_MUXPSR         (1 << 2)
 #define QUIRK_NEED_RSTCLR       (1 << 3)
+#define QUIRK_SUPPORTS_TDM      (1 << 4)
         /* Quirks of the I2S controller */
         u32 quirks;
         dma_addr_t idma_addr;
diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h
index e15745b4f3a5..b3ca1e94e0c8 100644
--- a/include/linux/platform_data/at91_adc.h
+++ b/include/linux/platform_data/at91_adc.h
@@ -14,12 +14,16 @@
                         (Interruptions registers mostly)
  * @status_register:    Offset of the Interrupt Status Register
  * @trigger_register:   Offset of the Trigger setup register
+ * @mr_prescal_mask:    Mask of the PRESCAL field in the adc MR register
+ * @mr_startup_mask:    Mask of the STARTUP field in the adc MR register
  */
 struct at91_adc_reg_desc {
         u8      channel_base;
         u32     drdy_mask;
         u8      status_register;
         u8      trigger_register;
+        u32     mr_prescal_mask;
+        u32     mr_startup_mask;
 };
 
 /**
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
index 6a293b7fff3b..cea9f70133c5 100644
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -71,6 +71,10 @@ struct atmel_nand_data {
         u8              on_flash_bbt;           /* bbt on flash */
         struct mtd_partition *parts;
         unsigned int    num_parts;
+        bool            has_dma;                /* support dma transfer */
+
+        /* default is false, only for at32ap7000 chip is true */
+        bool            need_reset_workaround;
 };
 
  /* Serial */
diff --git a/include/linux/platform_data/bd6107.h b/include/linux/platform_data/bd6107.h
new file mode 100644
index 000000000000..671d6502d241
--- /dev/null
+++ b/include/linux/platform_data/bd6107.h
@@ -0,0 +1,19 @@
+/*
+ * bd6107.h - Rohm BD6107 LEDs Driver
+ *
+ * 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 __BD6107_H__
+#define __BD6107_H__
+
+struct device;
+
+struct bd6107_platform_data {
+        struct device *fbdev;
+        int reset;                      /* Reset GPIO */
+        unsigned int def_value;
+};
+
+#endif
diff --git a/include/linux/platform_data/brcmfmac-sdio.h b/include/linux/platform_data/brcmfmac-sdio.h
index 1ade657d5fc1..e75dcbf2b230 100644
--- a/include/linux/platform_data/brcmfmac-sdio.h
+++ b/include/linux/platform_data/brcmfmac-sdio.h
@@ -90,6 +90,14 @@ void __init brcmfmac_init_pdata(void)
  * oob_irq_nr, oob_irq_flags: the OOB interrupt information. The values are
  * used for registering the irq using request_irq function.
  *
+ * broken_sg_support: flag for broken sg list support of SDIO host controller.
+ * Set this to true if the SDIO host controller has higher align requirement
+ * than 32 bytes for each scatterlist item.
+ *
+ * sd_head_align: alignment requirement for start of data buffer
+ *
+ * sd_sgentry_align: length alignment requirement for each sg entry
+ *
  * power_on: This function is called by the brcmfmac when the module gets
  * loaded. This can be particularly useful for low power devices. The platform
  * spcific routine may for example decide to power up the complete device.
@@ -116,6 +124,9 @@ struct brcmfmac_sdio_platform_data {
         bool oob_irq_supported;
         unsigned int oob_irq_nr;
         unsigned long oob_irq_flags;
+        bool broken_sg_support;
+        unsigned short sd_head_align;
+        unsigned short sd_sgentry_align;
         void (*power_on)(void);
         void (*power_off)(void);
         void (*reset)(void);
diff --git a/include/linux/platform_data/camera-mx3.h b/include/linux/platform_data/camera-mx3.h
index f226ee3777e1..a910dadc8258 100644
--- a/include/linux/platform_data/camera-mx3.h
+++ b/include/linux/platform_data/camera-mx3.h
@@ -33,6 +33,8 @@
 #define MX3_CAMERA_DATAWIDTH_MASK (MX3_CAMERA_DATAWIDTH_4 | MX3_CAMERA_DATAWIDTH_8 | \
                                    MX3_CAMERA_DATAWIDTH_10 | MX3_CAMERA_DATAWIDTH_15)
 
+struct v4l2_async_subdev;
+
 /**
  * struct mx3_camera_pdata - i.MX3x camera platform data
  * @flags:      MX3_CAMERA_* flags
@@ -43,6 +45,8 @@ struct mx3_camera_pdata {
         unsigned long flags;
         unsigned long mclk_10khz;
         struct device *dma_dev;
+        struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */
+        int *asd_sizes;                 /* 0-terminated array of asd group sizes */
 };
 
 #endif
diff --git a/include/linux/platform_data/camera-rcar.h b/include/linux/platform_data/camera-rcar.h
new file mode 100644
index 000000000000..dfc83c581593
--- /dev/null
+++ b/include/linux/platform_data/camera-rcar.h
@@ -0,0 +1,25 @@
+/*
+ * Platform data for Renesas R-Car VIN soc-camera driver
+ *
+ * Copyright (C) 2011-2013 Renesas Solutions Corp.
+ * Copyright (C) 2013 Cogent Embedded, Inc., <source@cogentembedded.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#ifndef __CAMERA_RCAR_H_
+#define __CAMERA_RCAR_H_
+
+#define RCAR_VIN_HSYNC_ACTIVE_LOW       (1 << 0)
+#define RCAR_VIN_VSYNC_ACTIVE_LOW       (1 << 1)
+#define RCAR_VIN_BT601                  (1 << 2)
+#define RCAR_VIN_BT656                  (1 << 3)
+
+struct rcar_vin_platform_data {
+        unsigned int flags;
+};
+
+#endif /* __CAMERA_RCAR_H_ */
diff --git a/include/linux/platform_data/clk-ux500.h b/include/linux/platform_data/clk-ux500.h
index 320d9c39ea0a..9d98f3aaa16c 100644
--- a/include/linux/platform_data/clk-ux500.h
+++ b/include/linux/platform_data/clk-ux500.h
@@ -12,7 +12,9 @@
 
 void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
                     u32 clkrst5_base, u32 clkrst6_base);
-void u9540_clk_init(void);
-void u8540_clk_init(void);
+void u9540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
+                    u32 clkrst5_base, u32 clkrst6_base);
+void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
+                    u32 clkrst5_base, u32 clkrst6_base);
 
 #endif /* __CLK_UX500_H */
diff --git a/include/linux/platform_data/cpsw.h b/include/linux/platform_data/cpsw.h
deleted file mode 100644
index bb3cd58d71e3..000000000000
--- a/include/linux/platform_data/cpsw.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Texas Instruments Ethernet Switch Driver
- *
- * Copyright (C) 2012 Texas Instruments
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-#ifndef __CPSW_H__
-#define __CPSW_H__
-
-#include <linux/if_ether.h>
-
-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 {
-        u32     ss_reg_ofs;     /* Subsystem control register offset */
-        u32     channels;       /* number of cpdma channels (symmetric) */
-        u32     slaves;         /* number of slave cpgmac ports */
-        struct cpsw_slave_data  *slave_data;
-        u32     active_slave; /* time stamping, ethtool and SIOCGMIIPHY slave */
-        u32     cpts_clock_mult;  /* convert input clock ticks to nanoseconds */
-        u32     cpts_clock_shift; /* convert input clock ticks to nanoseconds */
-        u32     ale_entries;    /* ale table size */
-        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/dma-atmel.h b/include/linux/platform_data/dma-atmel.h
index cab0997be3de..e95f19c65873 100644
--- a/include/linux/platform_data/dma-atmel.h
+++ b/include/linux/platform_data/dma-atmel.h
@@ -35,16 +35,20 @@ struct at_dma_slave {
 
 
 /* Platform-configurable bits in CFG */
+#define ATC_PER_MSB(h)  ((0x30U & (h)) >> 4)    /* Extract most significant bits of a handshaking identifier */
+
 #define ATC_SRC_PER(h)          (0xFU & (h))    /* Channel src rq associated with periph handshaking ifc h */
 #define ATC_DST_PER(h)          ((0xFU & (h)) <<  4)    /* Channel dst rq associated with periph handshaking ifc h */
 #define ATC_SRC_REP             (0x1 <<  8)     /* Source Replay Mod */
 #define ATC_SRC_H2SEL           (0x1 <<  9)     /* Source Handshaking Mod */
 #define         ATC_SRC_H2SEL_SW        (0x0 <<  9)
 #define         ATC_SRC_H2SEL_HW        (0x1 <<  9)
+#define ATC_SRC_PER_MSB(h)      (ATC_PER_MSB(h) << 10)  /* Channel src rq (most significant bits) */
 #define ATC_DST_REP             (0x1 << 12)     /* Destination Replay Mod */
 #define ATC_DST_H2SEL           (0x1 << 13)     /* Destination Handshaking Mod */
 #define         ATC_DST_H2SEL_SW        (0x0 << 13)
 #define         ATC_DST_H2SEL_HW        (0x1 << 13)
+#define ATC_DST_PER_MSB(h)      (ATC_PER_MSB(h) << 14)  /* Channel dst rq (most significant bits) */
 #define ATC_SOD                 (0x1 << 16)     /* Stop On Done */
 #define ATC_LOCK_IF             (0x1 << 20)     /* Interface Lock */
 #define ATC_LOCK_B              (0x1 << 21)     /* AHB Bus Lock */
diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h
index f6d30cc1cb77..beac6b8b6a7b 100644
--- a/include/linux/platform_data/dma-imx.h
+++ b/include/linux/platform_data/dma-imx.h
@@ -60,10 +60,8 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan)
 
 static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
 {
-        return strstr(dev_name(chan->device->dev), "sdma") ||
-                !strcmp(dev_name(chan->device->dev), "imx1-dma") ||
-                !strcmp(dev_name(chan->device->dev), "imx21-dma") ||
-                !strcmp(dev_name(chan->device->dev), "imx27-dma");
+        return !strcmp(chan->device->dev->driver->name, "imx-sdma") ||
+                !strcmp(chan->device->dev->driver->name, "imx-dma");
 }
 
 #endif
diff --git a/include/linux/platform_data/dma-rcar-hpbdma.h b/include/linux/platform_data/dma-rcar-hpbdma.h
new file mode 100644
index 000000000000..648b8ea61a22
--- /dev/null
+++ b/include/linux/platform_data/dma-rcar-hpbdma.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2011-2013 Renesas Electronics Corporation
+ * Copyright (C) 2013 Cogent Embedded, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ */
+
+#ifndef __DMA_RCAR_HPBDMA_H
+#define __DMA_RCAR_HPBDMA_H
+
+#include <linux/bitops.h>
+#include <linux/types.h>
+
+/* Transmit sizes and respective register values */
+enum {
+        XMIT_SZ_8BIT    = 0,
+        XMIT_SZ_16BIT   = 1,
+        XMIT_SZ_32BIT   = 2,
+        XMIT_SZ_MAX
+};
+
+/* DMA control register (DCR) bits */
+#define HPB_DMAE_DCR_DTAMD              (1u << 26)
+#define HPB_DMAE_DCR_DTAC               (1u << 25)
+#define HPB_DMAE_DCR_DTAU               (1u << 24)
+#define HPB_DMAE_DCR_DTAU1              (1u << 23)
+#define HPB_DMAE_DCR_SWMD               (1u << 22)
+#define HPB_DMAE_DCR_BTMD               (1u << 21)
+#define HPB_DMAE_DCR_PKMD               (1u << 20)
+#define HPB_DMAE_DCR_CT                 (1u << 18)
+#define HPB_DMAE_DCR_ACMD               (1u << 17)
+#define HPB_DMAE_DCR_DIP                (1u << 16)
+#define HPB_DMAE_DCR_SMDL               (1u << 13)
+#define HPB_DMAE_DCR_SPDAM              (1u << 12)
+#define HPB_DMAE_DCR_SDRMD_MASK         (3u << 10)
+#define HPB_DMAE_DCR_SDRMD_MOD          (0u << 10)
+#define HPB_DMAE_DCR_SDRMD_AUTO         (1u << 10)
+#define HPB_DMAE_DCR_SDRMD_TIMER        (2u << 10)
+#define HPB_DMAE_DCR_SPDS_MASK          (3u << 8)
+#define HPB_DMAE_DCR_SPDS_8BIT          (0u << 8)
+#define HPB_DMAE_DCR_SPDS_16BIT         (1u << 8)
+#define HPB_DMAE_DCR_SPDS_32BIT         (2u << 8)
+#define HPB_DMAE_DCR_DMDL               (1u << 5)
+#define HPB_DMAE_DCR_DPDAM              (1u << 4)
+#define HPB_DMAE_DCR_DDRMD_MASK         (3u << 2)
+#define HPB_DMAE_DCR_DDRMD_MOD          (0u << 2)
+#define HPB_DMAE_DCR_DDRMD_AUTO         (1u << 2)
+#define HPB_DMAE_DCR_DDRMD_TIMER        (2u << 2)
+#define HPB_DMAE_DCR_DPDS_MASK          (3u << 0)
+#define HPB_DMAE_DCR_DPDS_8BIT          (0u << 0)
+#define HPB_DMAE_DCR_DPDS_16BIT         (1u << 0)
+#define HPB_DMAE_DCR_DPDS_32BIT         (2u << 0)
+
+/* Asynchronous reset register (ASYNCRSTR) bits */
+#define HPB_DMAE_ASYNCRSTR_ASRST41      BIT(10)
+#define HPB_DMAE_ASYNCRSTR_ASRST40      BIT(9)
+#define HPB_DMAE_ASYNCRSTR_ASRST39      BIT(8)
+#define HPB_DMAE_ASYNCRSTR_ASRST27      BIT(7)
+#define HPB_DMAE_ASYNCRSTR_ASRST26      BIT(6)
+#define HPB_DMAE_ASYNCRSTR_ASRST25      BIT(5)
+#define HPB_DMAE_ASYNCRSTR_ASRST24      BIT(4)
+#define HPB_DMAE_ASYNCRSTR_ASRST23      BIT(3)
+#define HPB_DMAE_ASYNCRSTR_ASRST22      BIT(2)
+#define HPB_DMAE_ASYNCRSTR_ASRST21      BIT(1)
+#define HPB_DMAE_ASYNCRSTR_ASRST20      BIT(0)
+
+struct hpb_dmae_slave_config {
+        unsigned int    id;
+        dma_addr_t      addr;
+        u32             dcr;
+        u32             port;
+        u32             rstr;
+        u32             mdr;
+        u32             mdm;
+        u32             flags;
+#define HPB_DMAE_SET_ASYNC_RESET        BIT(0)
+#define HPB_DMAE_SET_ASYNC_MODE         BIT(1)
+        u32             dma_ch;
+};
+
+#define HPB_DMAE_CHANNEL(_irq, _s_id)   \
+{                                       \
+        .ch_irq         = _irq,         \
+        .s_id           = _s_id,        \
+}
+
+struct hpb_dmae_channel {
+        unsigned int    ch_irq;
+        unsigned int    s_id;
+};
+
+struct hpb_dmae_pdata {
+        const struct hpb_dmae_slave_config *slaves;
+        int num_slaves;
+        const struct hpb_dmae_channel *channels;
+        int num_channels;
+        const unsigned int ts_shift[XMIT_SZ_MAX];
+        int num_hw_channels;
+};
+
+#endif
diff --git a/include/linux/platform_data/dma-ste-dma40.h b/include/linux/platform_data/dma-ste-dma40.h
index 4b781014b0a0..1bb9b1852256 100644
--- a/include/linux/platform_data/dma-ste-dma40.h
+++ b/include/linux/platform_data/dma-ste-dma40.h
@@ -70,23 +70,8 @@ enum stedma40_flow_ctrl {
         STEDMA40_FLOW_CTRL,
 };
 
-enum stedma40_periph_data_width {
-        STEDMA40_BYTE_WIDTH = STEDMA40_ESIZE_8_BIT,
-        STEDMA40_HALFWORD_WIDTH = STEDMA40_ESIZE_16_BIT,
-        STEDMA40_WORD_WIDTH = STEDMA40_ESIZE_32_BIT,
-        STEDMA40_DOUBLEWORD_WIDTH = STEDMA40_ESIZE_64_BIT
-};
-
-enum stedma40_xfer_dir {
-        STEDMA40_MEM_TO_MEM = 1,
-        STEDMA40_MEM_TO_PERIPH,
-        STEDMA40_PERIPH_TO_MEM,
-        STEDMA40_PERIPH_TO_PERIPH
-};
-
-
 /**
- * struct stedma40_chan_cfg - dst/src channel configuration
+ * struct stedma40_half_channel_info - dst/src channel configuration
  *
  * @big_endian: true if the src/dst should be read as big endian
  * @data_width: Data width of the src/dst hardware
@@ -95,7 +80,7 @@ enum stedma40_xfer_dir {
  */
 struct stedma40_half_channel_info {
         bool big_endian;
-        enum stedma40_periph_data_width data_width;
+        enum dma_slave_buswidth data_width;
         int psize;
         enum stedma40_flow_ctrl flow_ctrl;
 };
@@ -109,8 +94,7 @@ struct stedma40_half_channel_info {
  * version 3+, i.e DB8500v2+
  * @mode: channel mode: physical, logical, or operation
  * @mode_opt: options for the chosen channel mode
- * @src_dev_type: Src device type
- * @dst_dev_type: Dst device type
+ * @dev_type: src/dst device type (driver uses dir to figure out which)
  * @src_info: Parameters for dst half channel
  * @dst_info: Parameters for dst half channel
  * @use_fixed_channel: if true, use physical channel specified by phy_channel
@@ -121,13 +105,12 @@ struct stedma40_half_channel_info {
  *
  */
 struct stedma40_chan_cfg {
-        enum stedma40_xfer_dir                   dir;
+        enum dma_transfer_direction              dir;
         bool                                     high_priority;
         bool                                     realtime;
         enum stedma40_mode                       mode;
         enum stedma40_mode_opt                   mode_opt;
-        int                                      src_dev_type;
-        int                                      dst_dev_type;
+        int                                      dev_type;
         struct stedma40_half_channel_info        src_info;
         struct stedma40_half_channel_info        dst_info;
 
@@ -138,13 +121,8 @@ struct stedma40_chan_cfg {
 /**
  * struct stedma40_platform_data - Configuration struct for the dma device.
  *
- * @dev_len: length of dev_tx and dev_rx
  * @dev_tx: mapping between destination event line and io address
  * @dev_rx: mapping between source event line and io address
- * @memcpy: list of memcpy event lines
- * @memcpy_len: length of memcpy
- * @memcpy_conf_phy: default configuration of physical channel memcpy
- * @memcpy_conf_log: default configuration of logical channel memcpy
  * @disabled_channels: A vector, ending with -1, that marks physical channels
  * that are for different reasons not available for the driver.
  * @soft_lli_chans: A vector, that marks physical channels will use LLI by SW
@@ -154,22 +132,17 @@ struct stedma40_chan_cfg {
  * @num_of_soft_lli_chans: The number of channels that needs to be configured
  * to use SoftLLI.
  * @use_esram_lcla: flag for mapping the lcla into esram region
+ * @num_of_memcpy_chans: The number of channels reserved for memcpy.
  * @num_of_phy_chans: The number of physical channels implemented in HW.
  * 0 means reading the number of channels from DMA HW but this is only valid
  * for 'multiple of 4' channels, like 8.
  */
 struct stedma40_platform_data {
-        u32                              dev_len;
-        const dma_addr_t                *dev_tx;
-        const dma_addr_t                *dev_rx;
-        int                             *memcpy;
-        u32                              memcpy_len;
-        struct stedma40_chan_cfg        *memcpy_conf_phy;
-        struct stedma40_chan_cfg        *memcpy_conf_log;
         int                              disabled_channels[STEDMA40_MAX_PHYS];
         int                             *soft_lli_chans;
         int                              num_of_soft_lli_chans;
         bool                             use_esram_lcla;
+        int                              num_of_memcpy_chans;
         int                              num_of_phy_chans;
 };
 
diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h
new file mode 100644
index 000000000000..179fb91bb5f2
--- /dev/null
+++ b/include/linux/platform_data/edma.h
@@ -0,0 +1,185 @@
+/*
+ *  TI EDMA definitions
+ *
+ *  Copyright (C) 2006-2013 Texas Instruments.
+ *
+ *  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 EDMA3 programming framework exposes two basic kinds of resource:
+ *
+ *  Channel     Triggers transfers, usually from a hardware event but
+ *              also manually or by "chaining" from DMA completions.
+ *              Each channel is coupled to a Parameter RAM (PaRAM) slot.
+ *
+ *  Slot        Each PaRAM slot holds a DMA transfer descriptor (PaRAM
+ *              "set"), source and destination addresses, a link to a
+ *              next PaRAM slot (if any), options for the transfer, and
+ *              instructions for updating those addresses.  There are
+ *              more than twice as many slots as event channels.
+ *
+ * Each PaRAM set describes a sequence of transfers, either for one large
+ * buffer or for several discontiguous smaller buffers.  An EDMA transfer
+ * is driven only from a channel, which performs the transfers specified
+ * in its PaRAM slot until there are no more transfers.  When that last
+ * transfer completes, the "link" field may be used to reload the channel's
+ * PaRAM slot with a new transfer descriptor.
+ *
+ * The EDMA Channel Controller (CC) maps requests from channels into physical
+ * Transfer Controller (TC) requests when the channel triggers (by hardware
+ * or software events, or by chaining).  The two physical DMA channels provided
+ * by the TCs are thus shared by many logical channels.
+ *
+ * DaVinci hardware also has a "QDMA" mechanism which is not currently
+ * supported through this interface.  (DSP firmware uses it though.)
+ */
+
+#ifndef EDMA_H_
+#define EDMA_H_
+
+/* PaRAM slots are laid out like this */
+struct edmacc_param {
+        unsigned int opt;
+        unsigned int src;
+        unsigned int a_b_cnt;
+        unsigned int dst;
+        unsigned int src_dst_bidx;
+        unsigned int link_bcntrld;
+        unsigned int src_dst_cidx;
+        unsigned int ccnt;
+};
+
+/* fields in edmacc_param.opt */
+#define SAM             BIT(0)
+#define DAM             BIT(1)
+#define SYNCDIM         BIT(2)
+#define STATIC          BIT(3)
+#define EDMA_FWID       (0x07 << 8)
+#define TCCMODE         BIT(11)
+#define EDMA_TCC(t)     ((t) << 12)
+#define TCINTEN         BIT(20)
+#define ITCINTEN        BIT(21)
+#define TCCHEN          BIT(22)
+#define ITCCHEN         BIT(23)
+
+/*ch_status paramater of callback function possible values*/
+#define DMA_COMPLETE 1
+#define DMA_CC_ERROR 2
+#define DMA_TC1_ERROR 3
+#define DMA_TC2_ERROR 4
+
+enum address_mode {
+        INCR = 0,
+        FIFO = 1
+};
+
+enum fifo_width {
+        W8BIT = 0,
+        W16BIT = 1,
+        W32BIT = 2,
+        W64BIT = 3,
+        W128BIT = 4,
+        W256BIT = 5
+};
+
+enum dma_event_q {
+        EVENTQ_0 = 0,
+        EVENTQ_1 = 1,
+        EVENTQ_2 = 2,
+        EVENTQ_3 = 3,
+        EVENTQ_DEFAULT = -1
+};
+
+enum sync_dimension {
+        ASYNC = 0,
+        ABSYNC = 1
+};
+
+#define EDMA_CTLR_CHAN(ctlr, chan)      (((ctlr) << 16) | (chan))
+#define EDMA_CTLR(i)                    ((i) >> 16)
+#define EDMA_CHAN_SLOT(i)               ((i) & 0xffff)
+
+#define EDMA_CHANNEL_ANY                -1      /* for edma_alloc_channel() */
+#define EDMA_SLOT_ANY                   -1      /* for edma_alloc_slot() */
+#define EDMA_CONT_PARAMS_ANY             1001
+#define EDMA_CONT_PARAMS_FIXED_EXACT     1002
+#define EDMA_CONT_PARAMS_FIXED_NOT_EXACT 1003
+
+#define EDMA_MAX_CC               2
+
+/* alloc/free DMA channels and their dedicated parameter RAM slots */
+int edma_alloc_channel(int channel,
+        void (*callback)(unsigned channel, u16 ch_status, void *data),
+        void *data, enum dma_event_q);
+void edma_free_channel(unsigned channel);
+
+/* alloc/free parameter RAM slots */
+int edma_alloc_slot(unsigned ctlr, int slot);
+void edma_free_slot(unsigned slot);
+
+/* alloc/free a set of contiguous parameter RAM slots */
+int edma_alloc_cont_slots(unsigned ctlr, unsigned int id, int slot, int count);
+int edma_free_cont_slots(unsigned slot, int count);
+
+/* calls that operate on part of a parameter RAM slot */
+void edma_set_src(unsigned slot, dma_addr_t src_port,
+                                enum address_mode mode, enum fifo_width);
+void edma_set_dest(unsigned slot, dma_addr_t dest_port,
+                                 enum address_mode mode, enum fifo_width);
+void edma_get_position(unsigned slot, dma_addr_t *src, dma_addr_t *dst);
+void edma_set_src_index(unsigned slot, s16 src_bidx, s16 src_cidx);
+void edma_set_dest_index(unsigned slot, s16 dest_bidx, s16 dest_cidx);
+void edma_set_transfer_params(unsigned slot, u16 acnt, u16 bcnt, u16 ccnt,
+                u16 bcnt_rld, enum sync_dimension sync_mode);
+void edma_link(unsigned from, unsigned to);
+void edma_unlink(unsigned from);
+
+/* calls that operate on an entire parameter RAM slot */
+void edma_write_slot(unsigned slot, const struct edmacc_param *params);
+void edma_read_slot(unsigned slot, struct edmacc_param *params);
+
+/* channel control operations */
+int edma_start(unsigned channel);
+void edma_stop(unsigned channel);
+void edma_clean_channel(unsigned channel);
+void edma_clear_event(unsigned channel);
+void edma_pause(unsigned channel);
+void edma_resume(unsigned channel);
+
+struct edma_rsv_info {
+
+        const s16       (*rsv_chans)[2];
+        const s16       (*rsv_slots)[2];
+};
+
+/* platform_data for EDMA driver */
+struct edma_soc_info {
+
+        /* how many dma resources of each type */
+        unsigned        n_channel;
+        unsigned        n_region;
+        unsigned        n_slot;
+        unsigned        n_tc;
+        unsigned        n_cc;
+        /*
+         * Default queue is expected to be a low-priority queue.
+         * This way, long transfers on the default queue started
+         * by the codec engine will not cause audio defects.
+         */
+        enum dma_event_q        default_queue;
+
+        /* Resource reservation for other cores */
+        struct edma_rsv_info    *rsv;
+
+        s8      (*queue_tc_mapping)[2];
+        s8      (*queue_priority_mapping)[2];
+        const s16       (*xbar_chans)[2];
+};
+
+int edma_trigger_channel(unsigned);
+
+#endif
diff --git a/include/linux/platform_data/efm32-spi.h b/include/linux/platform_data/efm32-spi.h
new file mode 100644
index 000000000000..31b19ca1d73a
--- /dev/null
+++ b/include/linux/platform_data/efm32-spi.h
@@ -0,0 +1,14 @@
+#ifndef __LINUX_PLATFORM_DATA_EFM32_SPI_H__
+#define __LINUX_PLATFORM_DATA_EFM32_SPI_H__
+
+#include <linux/types.h>
+
+/**
+ * struct efm32_spi_pdata
+ * @location: pinmux location for the I/O pins (to be written to the ROUTE
+ *      register)
+ */
+struct efm32_spi_pdata {
+        u8 location;
+};
+#endif /* ifndef __LINUX_PLATFORM_DATA_EFM32_SPI_H__ */
diff --git a/include/linux/platform_data/exynos_thermal.h b/include/linux/platform_data/exynos_thermal.h
deleted file mode 100644
index da7e6274b175..000000000000
--- a/include/linux/platform_data/exynos_thermal.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * exynos_thermal.h - Samsung EXYNOS TMU (Thermal Management Unit)
- *
- *  Copyright (C) 2011 Samsung Electronics
- *  Donggeun Kim <dg77.kim@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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 _LINUX_EXYNOS_THERMAL_H
-#define _LINUX_EXYNOS_THERMAL_H
-#include <linux/cpu_cooling.h>
-
-enum calibration_type {
-        TYPE_ONE_POINT_TRIMMING,
-        TYPE_TWO_POINT_TRIMMING,
-        TYPE_NONE,
-};
-
-enum soc_type {
-        SOC_ARCH_EXYNOS4210 = 1,
-        SOC_ARCH_EXYNOS,
-};
-/**
- * struct freq_clip_table
- * @freq_clip_max: maximum frequency allowed for this cooling state.
- * @temp_level: Temperature level at which the temperature clipping will
- *      happen.
- * @mask_val: cpumask of the allowed cpu's where the clipping will take place.
- *
- * This structure is required to be filled and passed to the
- * cpufreq_cooling_unregister function.
- */
-struct freq_clip_table {
-        unsigned int freq_clip_max;
-        unsigned int temp_level;
-        const struct cpumask *mask_val;
-};
-
-/**
- * struct exynos_tmu_platform_data
- * @threshold: basic temperature for generating interrupt
- *             25 <= threshold <= 125 [unit: degree Celsius]
- * @threshold_falling: differntial value for setting threshold
- *                     of temperature falling interrupt.
- * @trigger_levels: array for each interrupt levels
- *      [unit: degree Celsius]
- *      0: temperature for trigger_level0 interrupt
- *         condition for trigger_level0 interrupt:
- *              current temperature > threshold + trigger_levels[0]
- *      1: temperature for trigger_level1 interrupt
- *         condition for trigger_level1 interrupt:
- *              current temperature > threshold + trigger_levels[1]
- *      2: temperature for trigger_level2 interrupt
- *         condition for trigger_level2 interrupt:
- *              current temperature > threshold + trigger_levels[2]
- *      3: temperature for trigger_level3 interrupt
- *         condition for trigger_level3 interrupt:
- *              current temperature > threshold + trigger_levels[3]
- * @trigger_level0_en:
- *      1 = enable trigger_level0 interrupt,
- *      0 = disable trigger_level0 interrupt
- * @trigger_level1_en:
- *      1 = enable trigger_level1 interrupt,
- *      0 = disable trigger_level1 interrupt
- * @trigger_level2_en:
- *      1 = enable trigger_level2 interrupt,
- *      0 = disable trigger_level2 interrupt
- * @trigger_level3_en:
- *      1 = enable trigger_level3 interrupt,
- *      0 = disable trigger_level3 interrupt
- * @gain: gain of amplifier in the positive-TC generator block
- *      0 <= gain <= 15
- * @reference_voltage: reference voltage of amplifier
- *      in the positive-TC generator block
- *      0 <= reference_voltage <= 31
- * @noise_cancel_mode: noise cancellation mode
- *      000, 100, 101, 110 and 111 can be different modes
- * @type: determines the type of SOC
- * @efuse_value: platform defined fuse value
- * @cal_type: calibration type for temperature
- * @freq_clip_table: Table representing frequency reduction percentage.
- * @freq_tab_count: Count of the above table as frequency reduction may
- *      applicable to only some of the trigger levels.
- *
- * This structure is required for configuration of exynos_tmu driver.
- */
-struct exynos_tmu_platform_data {
-        u8 threshold;
-        u8 threshold_falling;
-        u8 trigger_levels[4];
-        bool trigger_level0_en;
-        bool trigger_level1_en;
-        bool trigger_level2_en;
-        bool trigger_level3_en;
-
-        u8 gain;
-        u8 reference_voltage;
-        u8 noise_cancel_mode;
-        u32 efuse_value;
-
-        enum calibration_type cal_type;
-        enum soc_type type;
-        struct freq_clip_table freq_tab[4];
-        unsigned int freq_tab_count;
-};
-#endif /* _LINUX_EXYNOS_THERMAL_H */
diff --git a/include/linux/clk/mvebu.h b/include/linux/platform_data/g762.h
index 8c4ae713b063..d3c51283764d 100644
--- a/include/linux/clk/mvebu.h
+++ b/include/linux/platform_data/g762.h
@@ -1,4 +1,8 @@
 /*
+ * Platform data structure for g762 fan controller driver
+ *
+ * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
+ *
  * 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
@@ -13,10 +17,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#ifndef __LINUX_PLATFORM_DATA_G762_H__
+#define __LINUX_PLATFORM_DATA_G762_H__
 
-#ifndef __CLK_MVEBU_H_
-#define __CLK_MVEBU_H_
+/*
+ * Following structure can be used to set g762 driver platform specific data
+ * during board init. Note that passing a sparse structure is possible but
+ * will result in non-specified attributes to be set to default value, hence
+ * overloading those installed during boot (e.g. by u-boot).
+ */
 
-void __init mvebu_clocks_init(void);
+struct g762_platform_data {
+        u32 fan_startv;
+        u32 fan_gear_mode;
+        u32 pwm_polarity;
+        u32 clk_freq;
+};
 
-#endif
+#endif /* __LINUX_PLATFORM_DATA_G762_H__ */
diff --git a/include/linux/platform_data/gpio-em.h b/include/linux/platform_data/gpio-em.h
index 573edfb046c4..7c5a519d2dcd 100644
--- a/include/linux/platform_data/gpio-em.h
+++ b/include/linux/platform_data/gpio-em.h
@@ -5,6 +5,7 @@ struct gpio_em_config {
         unsigned int gpio_base;
         unsigned int irq_base;
         unsigned int number_of_pins;
+        const char *pctl_name;
 };
 
 #endif /* __GPIO_EM_H__ */
diff --git a/include/linux/platform_data/gpio-rcar.h b/include/linux/platform_data/gpio-rcar.h
index b253f77a7ddf..2d8d69432813 100644
--- a/include/linux/platform_data/gpio-rcar.h
+++ b/include/linux/platform_data/gpio-rcar.h
@@ -17,10 +17,13 @@
 #define __GPIO_RCAR_H__
 
 struct gpio_rcar_config {
-        unsigned int gpio_base;
+        int gpio_base;
         unsigned int irq_base;
         unsigned int number_of_pins;
         const char *pctl_name;
+        unsigned has_both_edge_trigger:1;
 };
 
+#define RCAR_GP_PIN(bank, pin)          (((bank) * 32) + (pin))
+
 #endif /* __GPIO_RCAR_H__ */
diff --git a/include/linux/platform_data/gpio_backlight.h b/include/linux/platform_data/gpio_backlight.h
new file mode 100644
index 000000000000..5ae0d9c80d4d
--- /dev/null
+++ b/include/linux/platform_data/gpio_backlight.h
@@ -0,0 +1,21 @@
+/*
+ * gpio_backlight.h - Simple GPIO-controlled backlight
+ *
+ * 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 __GPIO_BACKLIGHT_H__
+#define __GPIO_BACKLIGHT_H__
+
+struct device;
+
+struct gpio_backlight_platform_data {
+        struct device *fbdev;
+        int gpio;
+        int def_value;
+        bool active_low;
+        const char *name;
+};
+
+#endif
diff --git a/include/linux/platform_data/leds-lp55xx.h b/include/linux/platform_data/leds-lp55xx.h
index 202e290faea8..51a2ff579d60 100644
--- a/include/linux/platform_data/leds-lp55xx.h
+++ b/include/linux/platform_data/leds-lp55xx.h
@@ -36,6 +36,13 @@ struct lp55xx_predef_pattern {
         u8 size_b;
 };
 
+enum lp8501_pwr_sel {
+        LP8501_ALL_VDD,         /* D1~9 are connected to VDD */
+        LP8501_6VDD_3VOUT,      /* D1~6 with VDD, D7~9 with VOUT */
+        LP8501_3VDD_6VOUT,      /* D1~6 with VOUT, D7~9 with VDD */
+        LP8501_ALL_VOUT,        /* D1~9 are connected to VOUT */
+};
+
 /*
  * struct lp55xx_platform_data
  * @led_config        : Configurable led class device
@@ -67,6 +74,9 @@ struct lp55xx_platform_data {
         /* Predefined pattern data */
         struct lp55xx_predef_pattern *patterns;
         unsigned int num_patterns;
+
+        /* LP8501 specific */
+        enum lp8501_pwr_sel pwr_sel;
 };
 
 #endif /* _LEDS_LP55XX_H */
diff --git a/include/linux/platform_data/leds-pca9633.h b/include/linux/platform_data/leds-pca963x.h
index c5bf29b6fa7f..e731f0036329 100644
--- a/include/linux/platform_data/leds-pca9633.h
+++ b/include/linux/platform_data/leds-pca963x.h
@@ -1,7 +1,8 @@
 /*
- * PCA9633 LED chip driver.
+ * PCA963X LED chip driver.
  *
  * Copyright 2012 bct electronic GmbH
+ * Copyright 2013 Qtechnology A/S
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,18 +19,24 @@
  * 02110-1301 USA
  */
 
-#ifndef __LINUX_PCA9633_H
-#define __LINUX_PCA9633_H
+#ifndef __LINUX_PCA963X_H
+#define __LINUX_PCA963X_H
 #include <linux/leds.h>
 
-enum pca9633_outdrv {
-        PCA9633_OPEN_DRAIN,
-        PCA9633_TOTEM_POLE, /* aka push-pull */
+enum pca963x_outdrv {
+        PCA963X_OPEN_DRAIN,
+        PCA963X_TOTEM_POLE, /* aka push-pull */
 };
 
-struct pca9633_platform_data {
+enum pca963x_blink_type {
+        PCA963X_SW_BLINK,
+        PCA963X_HW_BLINK,
+};
+
+struct pca963x_platform_data {
         struct led_platform_data leds;
-        enum pca9633_outdrv outdrv;
+        enum pca963x_outdrv outdrv;
+        enum pca963x_blink_type blink_type;
 };
 
-#endif /* __LINUX_PCA9633_H*/
+#endif /* __LINUX_PCA963X_H*/
diff --git a/include/linux/platform_data/leds-renesas-tpu.h b/include/linux/platform_data/leds-renesas-tpu.h
deleted file mode 100644
index 055387086fc1..000000000000
--- a/include/linux/platform_data/leds-renesas-tpu.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __LEDS_RENESAS_TPU_H__
-#define __LEDS_RENESAS_TPU_H__
-
-struct led_renesas_tpu_config {
-        char *name;
-        unsigned pin_gpio_fn;
-        unsigned pin_gpio;
-        unsigned int channel_offset;
-        unsigned int timer_bit;
-        unsigned int max_brightness;
-        unsigned int refresh_rate;
-};
-
-#endif /* __LEDS_RENESAS_TPU_H__ */
diff --git a/include/linux/platform_data/lv5207lp.h b/include/linux/platform_data/lv5207lp.h
new file mode 100644
index 000000000000..7dc4d9a219a6
--- /dev/null
+++ b/include/linux/platform_data/lv5207lp.h
@@ -0,0 +1,19 @@
+/*
+ * lv5207lp.h - Sanyo LV5207LP LEDs Driver
+ *
+ * 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 __LV5207LP_H__
+#define __LV5207LP_H__
+
+struct device;
+
+struct lv5207lp_platform_data {
+        struct device *fbdev;
+        unsigned int max_value;
+        unsigned int def_value;
+};
+
+#endif
diff --git a/include/linux/platform_data/mailbox-omap.h b/include/linux/platform_data/mailbox-omap.h
new file mode 100644
index 000000000000..4631dbb4255e
--- /dev/null
+++ b/include/linux/platform_data/mailbox-omap.h
@@ -0,0 +1,58 @@
+/*
+ * mailbox-omap.h
+ *
+ * Copyright (C) 2013 Texas Instruments, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _PLAT_MAILBOX_H
+#define _PLAT_MAILBOX_H
+
+/* Interrupt register configuration types */
+#define MBOX_INTR_CFG_TYPE1     (0)
+#define MBOX_INTR_CFG_TYPE2     (1)
+
+/**
+ * struct omap_mbox_dev_info - OMAP mailbox device attribute info
+ * @name:       name of the mailbox device
+ * @tx_id:      mailbox queue id used for transmitting messages
+ * @rx_id:      mailbox queue id on which messages are received
+ * @irq_id:     irq identifier number to use from the hwmod data
+ * @usr_id:     mailbox user id for identifying the interrupt into
+ *                      the MPU interrupt controller.
+ */
+struct omap_mbox_dev_info {
+        const char *name;
+        u32 tx_id;
+        u32 rx_id;
+        u32 irq_id;
+        u32 usr_id;
+};
+
+/**
+ * struct omap_mbox_pdata - OMAP mailbox platform data
+ * @intr_type:  type of interrupt configuration registers used
+                        while programming mailbox queue interrupts
+ * @num_users:  number of users (processor devices) that the mailbox
+ *                      h/w block can interrupt
+ * @num_fifos:  number of h/w fifos within the mailbox h/w block
+ * @info_cnt:   number of mailbox devices for the platform
+ * @info:       array of mailbox device attributes
+ */
+struct omap_mbox_pdata {
+        u32 intr_type;
+        u32 num_users;
+        u32 num_fifos;
+        u32 info_cnt;
+        struct omap_mbox_dev_info *info;
+};
+
+#endif /* _PLAT_MAILBOX_H */
diff --git a/include/linux/platform_data/max310x.h b/include/linux/platform_data/max310x.h
index 91648bf5fc5c..dd11dcd1a184 100644
--- a/include/linux/platform_data/max310x.h
+++ b/include/linux/platform_data/max310x.h
@@ -1,5 +1,5 @@
 /*
- *  Maxim (Dallas) MAX3107/8 serial driver
+ *  Maxim (Dallas) MAX3107/8/9, MAX14830 serial driver
  *
  *  Copyright (C) 2012 Alexander Shiyan <shc_work@mail.ru>
  *
@@ -37,14 +37,13 @@
  * };
  */
 
-#define MAX310X_MAX_UARTS       1
+#define MAX310X_MAX_UARTS       4
 
 /* MAX310X platform data structure */
 struct max310x_pdata {
         /* Flags global to driver */
-        const u8                driver_flags:2;
+        const u8                driver_flags;
 #define MAX310X_EXT_CLK         (0x00000001)    /* External clock enable */
-#define MAX310X_AUTOSLEEP       (0x00000002)    /* Enable AutoSleep mode */
         /* Flags global to UART port */
         const u8                uart_flags[MAX310X_MAX_UARTS];
 #define MAX310X_LOOPBACK        (0x00000001)    /* Loopback mode enable */
@@ -60,8 +59,6 @@ struct max310x_pdata {
         void (*init)(void);
         /* Called before finish */
         void (*exit)(void);
-        /* Suspend callback */
-        void (*suspend)(int do_suspend);
 };
 
 #endif
diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
index b4a0521ce411..d44912d81578 100644
--- a/include/linux/platform_data/mmc-esdhc-imx.h
+++ b/include/linux/platform_data/mmc-esdhc-imx.h
@@ -40,5 +40,6 @@ struct esdhc_platform_data {
         enum wp_types wp_type;
         enum cd_types cd_type;
         int max_bus_width;
+        unsigned int f_max;
 };
 #endif /* __ASM_ARCH_IMX_ESDHC_H */
diff --git a/include/linux/platform_data/mmc-pxamci.h b/include/linux/platform_data/mmc-pxamci.h
index 9eb515bb799d..1706b3597ce0 100644
--- a/include/linux/platform_data/mmc-pxamci.h
+++ b/include/linux/platform_data/mmc-pxamci.h
@@ -12,7 +12,7 @@ struct pxamci_platform_data {
         unsigned long detect_delay_ms;          /* delay in millisecond before detecting cards after interrupt */
         int (*init)(struct device *, irq_handler_t , void *);
         int (*get_ro)(struct device *);
-        void (*setpower)(struct device *, unsigned int);
+        int (*setpower)(struct device *, unsigned int);
         void (*exit)(struct device *, void *);
         int gpio_card_detect;                   /* gpio detecting card insertion */
         int gpio_card_ro;                       /* gpio detecting read only toggle */
diff --git a/include/linux/platform_data/mtd-nand-pxa3xx.h b/include/linux/platform_data/mtd-nand-pxa3xx.h
index c42f39f20195..ffb801998e5d 100644
--- a/include/linux/platform_data/mtd-nand-pxa3xx.h
+++ b/include/linux/platform_data/mtd-nand-pxa3xx.h
@@ -16,19 +16,6 @@ struct pxa3xx_nand_timing {
         unsigned int    tAR;  /* ND_ALE low to ND_nRE low delay */
 };
 
-struct pxa3xx_nand_cmdset {
-        uint16_t        read1;
-        uint16_t        read2;
-        uint16_t        program;
-        uint16_t        read_status;
-        uint16_t        read_id;
-        uint16_t        erase;
-        uint16_t        reset;
-        uint16_t        lock;
-        uint16_t        unlock;
-        uint16_t        lock_status;
-};
-
 struct pxa3xx_nand_flash {
         char            *name;
         uint32_t        chip_id;
diff --git a/include/linux/platform_data/net-cw1200.h b/include/linux/platform_data/net-cw1200.h
new file mode 100644
index 000000000000..c6fbc3ce4ab0
--- /dev/null
+++ b/include/linux/platform_data/net-cw1200.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2011
+ *
+ * Author: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#ifndef CW1200_PLAT_H_INCLUDED
+#define CW1200_PLAT_H_INCLUDED
+
+struct cw1200_platform_data_spi {
+        u8 spi_bits_per_word;           /* REQUIRED */
+        u16 ref_clk;                    /* REQUIRED (in KHz) */
+
+        /* All others are optional */
+        bool have_5ghz;
+        int reset;                     /* GPIO to RSTn signal (0 disables) */
+        int powerup;                   /* GPIO to POWERUP signal (0 disables) */
+        int (*power_ctrl)(const struct cw1200_platform_data_spi *pdata,
+                          bool enable); /* Control 3v3 / 1v8 supply */
+        int (*clk_ctrl)(const struct cw1200_platform_data_spi *pdata,
+                        bool enable); /* Control CLK32K */
+        const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
+        const char *sdd_file;  /* if NULL, will use default for detected hw type */
+};
+
+struct cw1200_platform_data_sdio {
+        u16 ref_clk;                    /* REQUIRED (in KHz) */
+
+        /* All others are optional */
+        bool have_5ghz;
+        bool no_nptb;       /* SDIO hardware does not support non-power-of-2-blocksizes */
+        int reset;          /* GPIO to RSTn signal (0 disables) */
+        int powerup;        /* GPIO to POWERUP signal (0 disables) */
+        int irq;            /* IRQ line or 0 to use SDIO IRQ */
+        int (*power_ctrl)(const struct cw1200_platform_data_sdio *pdata,
+                          bool enable); /* Control 3v3 / 1v8 supply */
+        int (*clk_ctrl)(const struct cw1200_platform_data_sdio *pdata,
+                        bool enable); /* Control CLK32K */
+        const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
+        const char *sdd_file;  /* if NULL, will use default for detected hw type */
+};
+
+
+/* An example of SPI support in your board setup file:
+
+   static struct cw1200_platform_data_spi cw1200_platform_data = {
+       .ref_clk = 38400,
+       .spi_bits_per_word = 16,
+       .reset = GPIO_RF_RESET,
+       .powerup = GPIO_RF_POWERUP,
+       .macaddr = wifi_mac_addr,
+       .sdd_file = "sdd_sagrad_1091_1098.bin",
+  };
+  static struct spi_board_info myboard_spi_devices[] __initdata = {
+       {
+               .modalias = "cw1200_wlan_spi",
+               .max_speed_hz = 52000000,
+               .bus_num = 0,
+               .irq = WIFI_IRQ,
+               .platform_data = &cw1200_platform_data,
+               .chip_select = 0,
+       },
+  };
+
+ */
+
+/* An example of SDIO support in your board setup file:
+
+  static struct cw1200_platform_data_sdio my_cw1200_platform_data = {
+        .ref_clk = 38400,
+        .have_5ghz = false,
+        .sdd_file = "sdd_myplatform.bin",
+  };
+  cw1200_sdio_set_platform_data(&my_cw1200_platform_data);
+
+ */
+
+void __init cw1200_sdio_set_platform_data(struct cw1200_platform_data_sdio *pdata);
+
+#endif /* CW1200_PLAT_H_INCLUDED */
diff --git a/include/linux/platform_data/omap-abe-twl6040.h b/include/linux/platform_data/omap-abe-twl6040.h
deleted file mode 100644
index 5d298ac10fc2..000000000000
--- a/include/linux/platform_data/omap-abe-twl6040.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * omap-abe-twl6040.h - ASoC machine driver OMAP4+ devices, header.
- *
- * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com
- * All rights reserved.
- *
- * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * 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 _OMAP_ABE_TWL6040_H_
-#define _OMAP_ABE_TWL6040_H_
-
-/* To select if only one channel is connected in a stereo port */
-#define ABE_TWL6040_LEFT        (1 << 0)
-#define ABE_TWL6040_RIGHT       (1 << 1)
-
-struct omap_abe_twl6040_data {
-        char *card_name;
-        /* Feature flags for connected audio pins */
-        u8      has_hs;
-        u8      has_hf;
-        bool    has_ep;
-        u8      has_aux;
-        u8      has_vibra;
-        bool    has_dmic;
-        bool    has_hsmic;
-        bool    has_mainmic;
-        bool    has_submic;
-        u8      has_afm;
-        /* Other features */
-        bool    jack_detection; /* board can detect jack events */
-        int     mclk_freq;      /* MCLK frequency speed for twl6040 */
-};
-
-#endif /* _OMAP_ABE_TWL6040_H_ */
diff --git a/include/linux/platform_data/omap_ocp2scp.h b/include/linux/platform_data/omap_ocp2scp.h
deleted file mode 100644
index 5c6c3939355f..000000000000
--- a/include/linux/platform_data/omap_ocp2scp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * omap_ocp2scp.h -- ocp2scp header file
- *
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Author: Kishon Vijay Abraham I <kishon@ti.com>
- *
- * 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 __DRIVERS_OMAP_OCP2SCP_H
-#define __DRIVERS_OMAP_OCP2SCP_H
-
-struct omap_ocp2scp_dev {
-        const char                      *drv_name;
-        struct resource                 *res;
-};
-
-struct omap_ocp2scp_platform_data {
-        int                             dev_cnt;
-        struct omap_ocp2scp_dev         **devices;
-};
-#endif /* __DRIVERS_OMAP_OCP2SCP_H */
diff --git a/include/linux/i2c/pca953x.h b/include/linux/platform_data/pca953x.h
index 3c98dd4f901f..3c98dd4f901f 100644
--- a/include/linux/i2c/pca953x.h
+++ b/include/linux/platform_data/pca953x.h
diff --git a/include/linux/platform_data/pinctrl-coh901.h b/include/linux/platform_data/pinctrl-coh901.h
deleted file mode 100644
index dfbc65d10484..000000000000
--- a/include/linux/platform_data/pinctrl-coh901.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2007-2012 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * GPIO block resgister definitions and inline macros for
- * U300 GPIO COH 901 335 or COH 901 571/3
- * Author: Linus Walleij <linus.walleij@stericsson.com>
- */
-
-#ifndef __MACH_U300_GPIO_U300_H
-#define __MACH_U300_GPIO_U300_H
-
-/**
- * struct u300_gpio_platform - U300 GPIO platform data
- * @ports: number of GPIO block ports
- * @gpio_base: first GPIO number for this block (use a free range)
- */
-struct u300_gpio_platform {
-        u8 ports;
-        int gpio_base;
-};
-
-#endif /* __MACH_U300_GPIO_U300_H */
diff --git a/include/linux/platform_data/pinctrl-nomadik.h b/include/linux/platform_data/pinctrl-nomadik.h
index f73b2f0c55b7..abf5bed84df3 100644
--- a/include/linux/platform_data/pinctrl-nomadik.h
+++ b/include/linux/platform_data/pinctrl-nomadik.h
@@ -226,30 +226,6 @@ enum nmk_gpio_slpm {
         NMK_GPIO_SLPM_WAKEUP_DISABLE = NMK_GPIO_SLPM_NOCHANGE,
 };
 
-/* Older deprecated pin config API that should go away soon */
-extern int nmk_config_pin(pin_cfg_t cfg, bool sleep);
-extern int nmk_config_pins(pin_cfg_t *cfgs, int num);
-extern int nmk_config_pins_sleep(pin_cfg_t *cfgs, int num);
-extern int nmk_gpio_set_slpm(int gpio, enum nmk_gpio_slpm mode);
-extern int nmk_gpio_set_pull(int gpio, enum nmk_gpio_pull pull);
-#ifdef CONFIG_PINCTRL_NOMADIK
-extern int nmk_gpio_set_mode(int gpio, int gpio_mode);
-#else
-static inline int nmk_gpio_set_mode(int gpio, int gpio_mode)
-{
-        return -ENODEV;
-}
-#endif
-extern int nmk_gpio_get_mode(int gpio);
-
-extern void nmk_gpio_wakeups_suspend(void);
-extern void nmk_gpio_wakeups_resume(void);
-
-extern void nmk_gpio_clocks_enable(void);
-extern void nmk_gpio_clocks_disable(void);
-
-extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up);
-
 /*
  * Platform data to register a block: only the initial gpio/irq number.
  */
diff --git a/include/linux/platform_data/pwm-renesas-tpu.h b/include/linux/platform_data/pwm-renesas-tpu.h
new file mode 100644
index 000000000000..a7220b10ddab
--- /dev/null
+++ b/include/linux/platform_data/pwm-renesas-tpu.h
@@ -0,0 +1,16 @@
+#ifndef __PWM_RENESAS_TPU_H__
+#define __PWM_RENESAS_TPU_H__
+
+#include <linux/pwm.h>
+
+#define TPU_CHANNEL_MAX         4
+
+struct tpu_pwm_channel_data {
+        enum pwm_polarity polarity;
+};
+
+struct tpu_pwm_platform_data {
+        struct tpu_pwm_channel_data channels[TPU_CHANNEL_MAX];
+};
+
+#endif /* __PWM_RENESAS_TPU_H__ */
diff --git a/include/linux/platform_data/rcar-du.h b/include/linux/platform_data/rcar-du.h
new file mode 100644
index 000000000000..1a2e9901a22e
--- /dev/null
+++ b/include/linux/platform_data/rcar-du.h
@@ -0,0 +1,74 @@
+/*
+ * rcar_du.h  --  R-Car Display Unit DRM driver
+ *
+ * Copyright (C) 2013 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __RCAR_DU_H__
+#define __RCAR_DU_H__
+
+#include <drm/drm_mode.h>
+
+enum rcar_du_output {
+        RCAR_DU_OUTPUT_DPAD0,
+        RCAR_DU_OUTPUT_DPAD1,
+        RCAR_DU_OUTPUT_LVDS0,
+        RCAR_DU_OUTPUT_LVDS1,
+        RCAR_DU_OUTPUT_TCON,
+        RCAR_DU_OUTPUT_MAX,
+};
+
+enum rcar_du_encoder_type {
+        RCAR_DU_ENCODER_UNUSED = 0,
+        RCAR_DU_ENCODER_NONE,
+        RCAR_DU_ENCODER_VGA,
+        RCAR_DU_ENCODER_LVDS,
+};
+
+struct rcar_du_panel_data {
+        unsigned int width_mm;          /* Panel width in mm */
+        unsigned int height_mm;         /* Panel height in mm */
+        struct drm_mode_modeinfo mode;
+};
+
+struct rcar_du_connector_lvds_data {
+        struct rcar_du_panel_data panel;
+};
+
+struct rcar_du_connector_vga_data {
+        /* TODO: Add DDC information for EDID retrieval */
+};
+
+/*
+ * struct rcar_du_encoder_data - Encoder platform data
+ * @type: the encoder type (RCAR_DU_ENCODER_*)
+ * @output: the DU output the connector is connected to (RCAR_DU_OUTPUT_*)
+ * @connector.lvds: platform data for LVDS connectors
+ * @connector.vga: platform data for VGA connectors
+ *
+ * Encoder platform data describes an on-board encoder, its associated DU SoC
+ * output, and the connector.
+ */
+struct rcar_du_encoder_data {
+        enum rcar_du_encoder_type type;
+        enum rcar_du_output output;
+
+        union {
+                struct rcar_du_connector_lvds_data lvds;
+                struct rcar_du_connector_vga_data vga;
+        } connector;
+};
+
+struct rcar_du_platform_data {
+        struct rcar_du_encoder_data *encoders;
+        unsigned int num_encoders;
+};
+
+#endif /* __RCAR_DU_H__ */
diff --git a/include/linux/platform_data/remoteproc-omap.h b/include/linux/platform_data/remoteproc-omap.h
index 3c1c6444ec4b..bfbd12b41162 100644
--- a/include/linux/platform_data/remoteproc-omap.h
+++ b/include/linux/platform_data/remoteproc-omap.h
@@ -50,7 +50,7 @@ void __init omap_rproc_reserve_cma(void);
 
 #else
 
-void __init omap_rproc_reserve_cma(void)
+static inline void __init omap_rproc_reserve_cma(void)
 {
 }
 
diff --git a/include/linux/platform_data/serial-sccnxp.h b/include/linux/platform_data/serial-sccnxp.h
index bdc510d03245..af0c8c3b89ae 100644
--- a/include/linux/platform_data/serial-sccnxp.h
+++ b/include/linux/platform_data/serial-sccnxp.h
@@ -60,7 +60,6 @@
  * };
  *
  * static struct sccnxp_pdata sc2892_info = {
- *      .frequency      = 3686400,
  *      .mctrl_cfg[0]   = MCTRL_SIG(DIR_OP, LINE_OP0),
  *      .mctrl_cfg[1]   = MCTRL_SIG(DIR_OP, LINE_OP1),
  * };
@@ -78,8 +77,6 @@
 
 /* SCCNXP platform data structure */
 struct sccnxp_pdata {
-        /* Frequency (extrenal clock or crystal) */
-        int                     frequency;
         /* Shift for A0 line */
         const u8                reg_shift;
         /* Modem control lines configuration */
diff --git a/include/linux/platform_data/si5351.h b/include/linux/platform_data/si5351.h
index 92dabcaf6499..54334393ab92 100644
--- a/include/linux/platform_data/si5351.h
+++ b/include/linux/platform_data/si5351.h
@@ -79,6 +79,23 @@ enum si5351_drive_strength {
 };
 
 /**
+ * enum si5351_disable_state - Si5351 clock output disable state
+ * @SI5351_DISABLE_DEFAULT: default, do not change eeprom config
+ * @SI5351_DISABLE_LOW: CLKx is set to a LOW state when disabled
+ * @SI5351_DISABLE_HIGH: CLKx is set to a HIGH state when disabled
+ * @SI5351_DISABLE_FLOATING: CLKx is set to a FLOATING state when
+ *                              disabled
+ * @SI5351_DISABLE_NEVER: CLKx is NEVER disabled
+ */
+enum si5351_disable_state {
+        SI5351_DISABLE_DEFAULT = 0,
+        SI5351_DISABLE_LOW,
+        SI5351_DISABLE_HIGH,
+        SI5351_DISABLE_FLOATING,
+        SI5351_DISABLE_NEVER,
+};
+
+/**
  * struct si5351_clkout_config - Si5351 clock output configuration
  * @clkout: clkout number
  * @multisynth_src: multisynth source clock
@@ -91,6 +108,7 @@ struct si5351_clkout_config {
         enum si5351_multisynth_src multisynth_src;
         enum si5351_clkout_src clkout_src;
         enum si5351_drive_strength drive;
+        enum si5351_disable_state disable_state;
         bool pll_master;
         unsigned long rate;
 };
diff --git a/include/linux/platform_data/simplefb.h b/include/linux/platform_data/simplefb.h
new file mode 100644
index 000000000000..077303cedbf4
--- /dev/null
+++ b/include/linux/platform_data/simplefb.h
@@ -0,0 +1,64 @@
+/*
+ * simplefb.h - Simple Framebuffer Device
+ *
+ * Copyright (C) 2013 David Herrmann <dh.herrmann@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __PLATFORM_DATA_SIMPLEFB_H__
+#define __PLATFORM_DATA_SIMPLEFB_H__
+
+#include <drm/drm_fourcc.h>
+#include <linux/fb.h>
+#include <linux/kernel.h>
+
+/* format array, use it to initialize a "struct simplefb_format" array */
+#define SIMPLEFB_FORMATS \
+{ \
+        { "r5g6b5", 16, {11, 5}, {5, 6}, {0, 5}, {0, 0}, DRM_FORMAT_RGB565 }, \
+        { "x1r5g5b5", 16, {10, 5}, {5, 5}, {0, 5}, {0, 0}, DRM_FORMAT_XRGB1555 }, \
+        { "a1r5g5b5", 16, {10, 5}, {5, 5}, {0, 5}, {15, 1}, DRM_FORMAT_ARGB1555 }, \
+        { "r8g8b8", 24, {16, 8}, {8, 8}, {0, 8}, {0, 0}, DRM_FORMAT_RGB888 }, \
+        { "x8r8g8b8", 32, {16, 8}, {8, 8}, {0, 8}, {0, 0}, DRM_FORMAT_XRGB8888 }, \
+        { "a8r8g8b8", 32, {16, 8}, {8, 8}, {0, 8}, {24, 8}, DRM_FORMAT_ARGB8888 }, \
+        { "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8}, DRM_FORMAT_ABGR8888 }, \
+        { "x2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {0, 0}, DRM_FORMAT_XRGB2101010 }, \
+        { "a2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {30, 2}, DRM_FORMAT_ARGB2101010 }, \
+}
+
+/*
+ * Data-Format for Simple-Framebuffers
+ * @name: unique 0-terminated name that can be used to identify the mode
+ * @red,green,blue: Offsets and sizes of the single RGB parts
+ * @transp: Offset and size of the alpha bits. length=0 means no alpha
+ * @fourcc: 32bit DRM four-CC code (see drm_fourcc.h)
+ */
+struct simplefb_format {
+        const char *name;
+        u32 bits_per_pixel;
+        struct fb_bitfield red;
+        struct fb_bitfield green;
+        struct fb_bitfield blue;
+        struct fb_bitfield transp;
+        u32 fourcc;
+};
+
+/*
+ * Simple-Framebuffer description
+ * If the arch-boot code creates simple-framebuffers without DT support, it
+ * can pass the width, height, stride and format via this platform-data object.
+ * The framebuffer location must be given as IORESOURCE_MEM resource.
+ * @format must be a format as described in "struct simplefb_format" above.
+ */
+struct simplefb_platform_data {
+        u32 width;
+        u32 height;
+        u32 stride;
+        const char *format;
+};
+
+#endif /* __PLATFORM_DATA_SIMPLEFB_H__ */
diff --git a/include/linux/platform_data/spi-davinci.h b/include/linux/platform_data/spi-davinci.h
index 7af305b37868..8dc2fa47a2aa 100644
--- a/include/linux/platform_data/spi-davinci.h
+++ b/include/linux/platform_data/spi-davinci.h
@@ -19,7 +19,7 @@
 #ifndef __ARCH_ARM_DAVINCI_SPI_H
 #define __ARCH_ARM_DAVINCI_SPI_H
 
-#include <mach/edma.h>
+#include <linux/platform_data/edma.h>
 
 #define SPI_INTERN_CS   0xFF
 
diff --git a/include/linux/platform_data/ssm2518.h b/include/linux/platform_data/ssm2518.h
new file mode 100644
index 000000000000..9a8e3ea287e3
--- /dev/null
+++ b/include/linux/platform_data/ssm2518.h
@@ -0,0 +1,22 @@
+/*
+ * SSM2518 amplifier audio driver
+ *
+ * Copyright 2013 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef __LINUX_PLATFORM_DATA_SSM2518_H__
+#define __LINUX_PLATFORM_DATA_SSM2518_H__
+
+/**
+ * struct ssm2518_platform_data - Platform data for the ssm2518 driver
+ * @enable_gpio: GPIO connected to the nSD pin. Set to -1 if the nSD pin is
+ *            hardwired.
+ */
+struct ssm2518_platform_data {
+        int enable_gpio;
+};
+
+#endif
diff --git a/include/linux/platform_data/st_sensors_pdata.h b/include/linux/platform_data/st_sensors_pdata.h
new file mode 100644
index 000000000000..753839187ba0
--- /dev/null
+++ b/include/linux/platform_data/st_sensors_pdata.h
@@ -0,0 +1,24 @@
+/*
+ * STMicroelectronics sensors platform-data driver
+ *
+ * Copyright 2013 STMicroelectronics Inc.
+ *
+ * Denis Ciocca <denis.ciocca@st.com>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef ST_SENSORS_PDATA_H
+#define ST_SENSORS_PDATA_H
+
+/**
+ * struct st_sensors_platform_data - Platform data for the ST sensors
+ * @drdy_int_pin: Redirect DRDY on pin 1 (1) or pin 2 (2).
+ *      Available only for accelerometer and pressure sensors.
+ *      Accelerometer DRDY on LSM330 available only on pin 1 (see datasheet).
+ */
+struct st_sensors_platform_data {
+        u8 drdy_int_pin;
+};
+
+#endif /* ST_SENSORS_PDATA_H */
diff --git a/include/linux/platform_data/ti_am335x_adc.h b/include/linux/platform_data/ti_am335x_adc.h
deleted file mode 100644
index e41d5834cb84..000000000000
--- a/include/linux/platform_data/ti_am335x_adc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __LINUX_TI_AM335X_ADC_H
-#define __LINUX_TI_AM335X_ADC_H
-
-/**
- * struct adc_data      ADC Input information
- * @adc_channels:       Number of analog inputs
- *                      available for ADC.
- */
-
-struct adc_data {
-        unsigned int adc_channels;
-};
-
-#endif
diff --git a/include/linux/platform_data/usb-musb-ux500.h b/include/linux/platform_data/usb-musb-ux500.h
index 4c1cc50a595a..dd9c83ac7de0 100644
--- a/include/linux/platform_data/usb-musb-ux500.h
+++ b/include/linux/platform_data/usb-musb-ux500.h
@@ -9,14 +9,11 @@
 
 #include <linux/dmaengine.h>
 
-#define UX500_MUSB_DMA_NUM_RX_CHANNELS 8
-#define UX500_MUSB_DMA_NUM_TX_CHANNELS 8
+#define UX500_MUSB_DMA_NUM_RX_TX_CHANNELS 8
 
 struct ux500_musb_board_data {
         void    **dma_rx_param_array;
         void    **dma_tx_param_array;
-        u32     num_rx_channels;
-        u32     num_tx_channels;
         bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
 };
 
diff --git a/include/linux/platform_data/usb-rcar-phy.h b/include/linux/platform_data/usb-rcar-phy.h
new file mode 100644
index 000000000000..8ec6964a32a5
--- /dev/null
+++ b/include/linux/platform_data/usb-rcar-phy.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013 Renesas Solutions Corp.
+ * Copyright (C) 2013 Cogent Embedded, Inc.
+ *
+ * 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 __USB_RCAR_PHY_H
+#define __USB_RCAR_PHY_H
+
+#include <linux/types.h>
+
+struct rcar_phy_platform_data {
+        bool ferrite_bead:1;    /* (R8A7778 only)                       */
+
+        bool port1_func:1;      /* true: port 1 used by function, false: host */
+        unsigned penc1:1;       /* Output of the PENC1 pin in function mode */
+        struct {                /* Overcurrent pin control for ports 0..2 */
+                bool select_3_3v:1; /* true: USB_OVCn pin, false: OVCn pin */
+                                /* Set to false on port 1 in function mode */
+                bool active_high:1; /* true: active  high, false: active low */
+                                /* Set to true  on port 1 in function mode */
+        } ovc_pin[3];           /* (R8A7778 only has 2 ports)           */
+};
+
+#endif /* __USB_RCAR_PHY_H */
diff --git a/include/linux/platform_data/usb3503.h b/include/linux/platform_data/usb3503.h
index 85dcc709f7e9..1d1b6ef871f6 100644
--- a/include/linux/platform_data/usb3503.h
+++ b/include/linux/platform_data/usb3503.h
@@ -3,6 +3,10 @@
 
 #define USB3503_I2C_NAME        "usb3503"
 
+#define USB3503_OFF_PORT1       (1 << 1)
+#define USB3503_OFF_PORT2       (1 << 2)
+#define USB3503_OFF_PORT3       (1 << 3)
+
 enum usb3503_mode {
         USB3503_MODE_UNKNOWN,
         USB3503_MODE_HUB,
@@ -11,6 +15,7 @@ enum usb3503_mode {
 
 struct usb3503_platform_data {
         enum usb3503_mode       initial_mode;
+        u8      port_off_mask;
         int     gpio_intn;
         int     gpio_connect;
         int     gpio_reset;
diff --git a/include/linux/platform_data/vsp1.h b/include/linux/platform_data/vsp1.h
new file mode 100644
index 000000000000..a73a456d7f11
--- /dev/null
+++ b/include/linux/platform_data/vsp1.h
@@ -0,0 +1,25 @@
+/*
+ * vsp1.h  --  R-Car VSP1 Platform Data
+ *
+ * Copyright (C) 2013 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef __PLATFORM_VSP1_H__
+#define __PLATFORM_VSP1_H__
+
+#define VSP1_HAS_LIF            (1 << 0)
+
+struct vsp1_platform_data {
+        unsigned int features;
+        unsigned int rpf_count;
+        unsigned int uds_count;
+        unsigned int wpf_count;
+};
+
+#endif /* __PLATFORM_VSP1_H__ */
diff --git a/include/linux/platform_data/tegra_usb.h b/include/linux/platform_data/zforce_ts.h
index 66c673fef408..0472ab2f6ede 100644
--- a/include/linux/platform_data/tegra_usb.h
+++ b/include/linux/platform_data/zforce_ts.h
@@ -1,5 +1,6 @@
-/*
- * Copyright (C) 2010 Google, Inc.
+/* drivers/input/touchscreen/zforce.c
+ *
+ * Copyright (C) 2012-2013 MundoReader S.L.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -9,24 +10,17 @@
  * 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 _TEGRA_USB_H_
-#define _TEGRA_USB_H_
+#ifndef _LINUX_INPUT_ZFORCE_TS_H
+#define _LINUX_INPUT_ZFORCE_TS_H
 
-enum tegra_usb_operating_modes {
-        TEGRA_USB_DEVICE,
-        TEGRA_USB_HOST,
-        TEGRA_USB_OTG,
-};
+struct zforce_ts_platdata {
+        int gpio_int;
+        int gpio_rst;
 
-struct tegra_ehci_platform_data {
-        enum tegra_usb_operating_modes operating_mode;
-        /* power down the phy on bus suspend */
-        int power_down_on_bus_suspend;
-        void *phy_config;
-        int vbus_gpio;
+        unsigned int x_max;
+        unsigned int y_max;
 };
 
-#endif /* _TEGRA_USB_H_ */
+#endif /* _LINUX_INPUT_ZFORCE_TS_H */
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 9abf1db6aea6..ce8e4ffd78c7 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -180,7 +180,16 @@ struct platform_driver {
         const struct platform_device_id *id_table;
 };
 
-extern int platform_driver_register(struct platform_driver *);
+#define to_platform_driver(drv) (container_of((drv), struct platform_driver, \
+                                 driver))
+
+/*
+ * use a macro to avoid include chaining to get THIS_MODULE
+ */
+#define platform_driver_register(drv) \
+        __platform_driver_register(drv, THIS_MODULE)
+extern int __platform_driver_register(struct platform_driver *,
+                                        struct module *);
 extern void platform_driver_unregister(struct platform_driver *);
 
 /* non-hotpluggable platform devices may use this so that probe() and
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index 7d7e09efff9b..6fa7cea25da9 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -37,7 +37,6 @@ extern void pm_runtime_enable(struct device *dev);
 extern void __pm_runtime_disable(struct device *dev, bool check_resume);
 extern void pm_runtime_allow(struct device *dev);
 extern void pm_runtime_forbid(struct device *dev);
-extern int pm_generic_runtime_idle(struct device *dev);
 extern int pm_generic_runtime_suspend(struct device *dev);
 extern int pm_generic_runtime_resume(struct device *dev);
 extern void pm_runtime_no_callbacks(struct device *dev);
@@ -143,7 +142,6 @@ 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; }
 
-static inline int pm_generic_runtime_idle(struct device *dev) { return 0; }
 static inline int pm_generic_runtime_suspend(struct device *dev) { return 0; }
 static inline int pm_generic_runtime_resume(struct device *dev) { return 0; }
 static inline void pm_runtime_no_callbacks(struct device *dev) {}
diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h
index 569781faa504..a0f70808d7f4 100644
--- a/include/linux/pm_wakeup.h
+++ b/include/linux/pm_wakeup.h
@@ -36,8 +36,8 @@
  * @last_time: Monotonic clock when the wakeup source's was touched last time.
  * @prevent_sleep_time: Total time this source has been preventing autosleep.
  * @event_count: Number of signaled wakeup events.
- * @active_count: Number of times the wakeup sorce was activated.
- * @relax_count: Number of times the wakeup sorce was deactivated.
+ * @active_count: Number of times the wakeup source was activated.
+ * @relax_count: Number of times the wakeup source was deactivated.
  * @expire_count: Number of times the wakeup source's timeout has expired.
  * @wakeup_count: Number of times the wakeup source might abort suspend.
  * @active: Status of the wakeup source.
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 7794d75ed155..907f3fd191ac 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -7,14 +7,20 @@
 #include <linux/timex.h>
 #include <linux/alarmtimer.h>
 
-union cpu_time_count {
-        cputime_t cpu;
-        unsigned long long sched;
-};
+
+static inline unsigned long long cputime_to_expires(cputime_t expires)
+{
+        return (__force unsigned long long)expires;
+}
+
+static inline cputime_t expires_to_cputime(unsigned long long expires)
+{
+        return (__force cputime_t)expires;
+}
 
 struct cpu_timer_list {
         struct list_head entry;
-        union cpu_time_count expires, incr;
+        unsigned long long expires, incr;
         struct task_struct *task;
         int firing;
 };
diff --git a/include/linux/power/bq24190_charger.h b/include/linux/power/bq24190_charger.h
new file mode 100644
index 000000000000..9f0283721cbc
--- /dev/null
+++ b/include/linux/power/bq24190_charger.h
@@ -0,0 +1,16 @@
+/*
+ * Platform data for the TI bq24190 battery charger driver.
+ *
+ * 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 _BQ24190_CHARGER_H_
+#define _BQ24190_CHARGER_H_
+
+struct bq24190_platform_data {
+        unsigned int    gpio_int;       /* GPIO pin that's connected to INT# */
+};
+
+#endif
diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
index c0f44c2b006d..d8b187c3925d 100644
--- a/include/linux/power/smartreflex.h
+++ b/include/linux/power/smartreflex.h
@@ -299,11 +299,11 @@ void omap_sr_disable_reset_volt(struct voltagedomain *voltdm);
 void omap_sr_register_pmic(struct omap_sr_pmic_data *pmic_data);
 
 /* Smartreflex driver hooks to be called from Smartreflex class driver */
-int sr_enable(struct voltagedomain *voltdm, unsigned long volt);
-void sr_disable(struct voltagedomain *voltdm);
-int sr_configure_errgen(struct voltagedomain *voltdm);
-int sr_disable_errgen(struct voltagedomain *voltdm);
-int sr_configure_minmax(struct voltagedomain *voltdm);
+int sr_enable(struct omap_sr *sr, unsigned long volt);
+void sr_disable(struct omap_sr *sr);
+int sr_configure_errgen(struct omap_sr *sr);
+int sr_disable_errgen(struct omap_sr *sr);
+int sr_configure_minmax(struct omap_sr *sr);
 
 /* API to register the smartreflex class driver with the smartreflex driver */
 int sr_register_class(struct omap_sr_class_data *class_data);
diff --git a/include/linux/power/twl4030_madc_battery.h b/include/linux/power/twl4030_madc_battery.h
new file mode 100644
index 000000000000..23110dc77726
--- /dev/null
+++ b/include/linux/power/twl4030_madc_battery.h
@@ -0,0 +1,39 @@
+/*
+ * Dumb driver for LiIon batteries using TWL4030 madc.
+ *
+ * Copyright 2013 Golden Delicious Computers
+ * Nikolaus Schaller <hns@goldelico.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.
+ *
+ *  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.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef __TWL4030_MADC_BATTERY_H
+#define __TWL4030_MADC_BATTERY_H
+
+/*
+ * Usually we can assume 100% @ 4.15V and 0% @ 3.3V but curves differ for
+ * charging and discharging!
+ */
+
+struct twl4030_madc_bat_calibration {
+        short voltage;  /* in mV - specify -1 for end of list */
+        short level;    /* in percent (0 .. 100%) */
+};
+
+struct twl4030_madc_bat_platform_data {
+        unsigned int capacity;  /* total capacity in uAh */
+        struct twl4030_madc_bat_calibration *charging;
+        int charging_size;
+        struct twl4030_madc_bat_calibration *discharging;
+        int discharging_size;
+};
+
+#endif
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 3828cefb4f65..5c2600630dc9 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -15,6 +15,7 @@
 
 #include <linux/workqueue.h>
 #include <linux/leds.h>
+#include <linux/spinlock.h>
 
 struct device;
 
@@ -162,6 +163,8 @@ union power_supply_propval {
         const char *strval;
 };
 
+struct device_node;
+
 struct power_supply {
         const char *name;
         enum power_supply_type type;
@@ -173,9 +176,7 @@ struct power_supply {
 
         char **supplied_from;
         size_t num_supplies;
-#ifdef CONFIG_OF
         struct device_node *of_node;
-#endif
 
         int (*get_property)(struct power_supply *psy,
                             enum power_supply_property psp,
@@ -194,6 +195,8 @@ struct power_supply {
         /* private */
         struct device *dev;
         struct work_struct changed_work;
+        spinlock_t changed_lock;
+        bool changed;
 #ifdef CONFIG_THERMAL
         struct thermal_zone_device *tzd;
         struct thermal_cooling_device *tcd;
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h
index 7db3eb93a079..1d2cd21242e8 100644
--- a/include/linux/pps_kernel.h
+++ b/include/linux/pps_kernel.h
@@ -80,7 +80,7 @@ struct pps_device {
  * Global variables
  */
 
-extern struct device_attribute pps_attrs[];
+extern const struct attribute_group *pps_groups[];
 
 /*
  * Internal functions.
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 87a03c746f17..f5d4723cdb3d 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -33,9 +33,25 @@ do { \
                 preempt_schedule(); \
 } while (0)
 
+#ifdef CONFIG_CONTEXT_TRACKING
+
+void preempt_schedule_context(void);
+
+#define preempt_check_resched_context() \
+do { \
+        if (unlikely(test_thread_flag(TIF_NEED_RESCHED))) \
+                preempt_schedule_context(); \
+} while (0)
+#else
+
+#define preempt_check_resched_context() preempt_check_resched()
+
+#endif /* CONFIG_CONTEXT_TRACKING */
+
 #else /* !CONFIG_PREEMPT */
 
 #define preempt_check_resched()         do { } while (0)
+#define preempt_check_resched_context() do { } while (0)
 
 #endif /* CONFIG_PREEMPT */
 
@@ -88,7 +104,7 @@ do { \
 do { \
         preempt_enable_no_resched_notrace(); \
         barrier(); \
-        preempt_check_resched(); \
+        preempt_check_resched_context(); \
 } while (0)
 
 #else /* !CONFIG_PREEMPT_COUNT */
diff --git a/include/linux/preempt_mask.h b/include/linux/preempt_mask.h
new file mode 100644
index 000000000000..931bc616219f
--- /dev/null
+++ b/include/linux/preempt_mask.h
@@ -0,0 +1,122 @@
+#ifndef LINUX_PREEMPT_MASK_H
+#define LINUX_PREEMPT_MASK_H
+
+#include <linux/preempt.h>
+#include <asm/hardirq.h>
+
+/*
+ * We put the hardirq and softirq counter into the preemption
+ * counter. The bitmask has the following meaning:
+ *
+ * - bits 0-7 are the preemption count (max preemption depth: 256)
+ * - bits 8-15 are the softirq count (max # of softirqs: 256)
+ *
+ * The hardirq count can in theory reach the same as NR_IRQS.
+ * In reality, the number of nested IRQS is limited to the stack
+ * size as well. For archs with over 1000 IRQS it is not practical
+ * to expect that they will all nest. We give a max of 10 bits for
+ * hardirq nesting. An arch may choose to give less than 10 bits.
+ * m68k expects it to be 8.
+ *
+ * - bits 16-25 are the hardirq count (max # of nested hardirqs: 1024)
+ * - bit 26 is the NMI_MASK
+ * - bit 27 is the PREEMPT_ACTIVE flag
+ *
+ * PREEMPT_MASK: 0x000000ff
+ * SOFTIRQ_MASK: 0x0000ff00
+ * HARDIRQ_MASK: 0x03ff0000
+ *     NMI_MASK: 0x04000000
+ */
+#define PREEMPT_BITS    8
+#define SOFTIRQ_BITS    8
+#define NMI_BITS        1
+
+#define MAX_HARDIRQ_BITS 10
+
+#ifndef HARDIRQ_BITS
+# define HARDIRQ_BITS   MAX_HARDIRQ_BITS
+#endif
+
+#if HARDIRQ_BITS > MAX_HARDIRQ_BITS
+#error HARDIRQ_BITS too high!
+#endif
+
+#define PREEMPT_SHIFT   0
+#define SOFTIRQ_SHIFT   (PREEMPT_SHIFT + PREEMPT_BITS)
+#define HARDIRQ_SHIFT   (SOFTIRQ_SHIFT + SOFTIRQ_BITS)
+#define NMI_SHIFT       (HARDIRQ_SHIFT + HARDIRQ_BITS)
+
+#define __IRQ_MASK(x)   ((1UL << (x))-1)
+
+#define PREEMPT_MASK    (__IRQ_MASK(PREEMPT_BITS) << PREEMPT_SHIFT)
+#define SOFTIRQ_MASK    (__IRQ_MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT)
+#define HARDIRQ_MASK    (__IRQ_MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT)
+#define NMI_MASK        (__IRQ_MASK(NMI_BITS)     << NMI_SHIFT)
+
+#define PREEMPT_OFFSET  (1UL << PREEMPT_SHIFT)
+#define SOFTIRQ_OFFSET  (1UL << SOFTIRQ_SHIFT)
+#define HARDIRQ_OFFSET  (1UL << HARDIRQ_SHIFT)
+#define NMI_OFFSET      (1UL << NMI_SHIFT)
+
+#define SOFTIRQ_DISABLE_OFFSET  (2 * SOFTIRQ_OFFSET)
+
+#ifndef PREEMPT_ACTIVE
+#define PREEMPT_ACTIVE_BITS     1
+#define PREEMPT_ACTIVE_SHIFT    (NMI_SHIFT + NMI_BITS)
+#define PREEMPT_ACTIVE  (__IRQ_MASK(PREEMPT_ACTIVE_BITS) << PREEMPT_ACTIVE_SHIFT)
+#endif
+
+#if PREEMPT_ACTIVE < (1 << (NMI_SHIFT + NMI_BITS))
+#error PREEMPT_ACTIVE is too low!
+#endif
+
+#define hardirq_count() (preempt_count() & HARDIRQ_MASK)
+#define softirq_count() (preempt_count() & SOFTIRQ_MASK)
+#define irq_count()     (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK \
+                                 | NMI_MASK))
+
+/*
+ * Are we doing bottom half or hardware interrupt processing?
+ * Are we in a softirq context? Interrupt context?
+ * in_softirq - Are we currently processing softirq or have bh disabled?
+ * in_serving_softirq - Are we currently processing softirq?
+ */
+#define in_irq()                (hardirq_count())
+#define in_softirq()            (softirq_count())
+#define in_interrupt()          (irq_count())
+#define in_serving_softirq()    (softirq_count() & SOFTIRQ_OFFSET)
+
+/*
+ * Are we in NMI context?
+ */
+#define in_nmi()        (preempt_count() & NMI_MASK)
+
+#if defined(CONFIG_PREEMPT_COUNT)
+# define PREEMPT_CHECK_OFFSET 1
+#else
+# define PREEMPT_CHECK_OFFSET 0
+#endif
+
+/*
+ * Are we running in atomic context?  WARNING: this macro cannot
+ * always detect atomic context; in particular, it cannot know about
+ * held spinlocks in non-preemptible kernels.  Thus it should not be
+ * used in the general case to determine whether sleeping is possible.
+ * Do not use in_atomic() in driver code.
+ */
+#define in_atomic()     ((preempt_count() & ~PREEMPT_ACTIVE) != 0)
+
+/*
+ * Check whether we were atomic before we did preempt_disable():
+ * (used by the scheduler, *after* releasing the kernel lock)
+ */
+#define in_atomic_preempt_off() \
+                ((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_CHECK_OFFSET)
+
+#ifdef CONFIG_PREEMPT_COUNT
+# define preemptible()  (preempt_count() == 0 && !irqs_disabled())
+#else
+# define preemptible()  0
+#endif
+
+#endif /* LINUX_PREEMPT_MASK_H */
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 22c7052e9372..e6131a782481 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -200,7 +200,7 @@ static inline void show_regs_print_info(const char *log_lvl)
 }
 #endif
 
-extern void dump_stack(void) __cold;
+extern asmlinkage void dump_stack(void) __cold;
 
 #ifndef pr_fmt
 #define pr_fmt(fmt) fmt
diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index 75d01760c911..abd437d0a8a7 100644
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -35,6 +35,10 @@ enum pstore_type_id {
         PSTORE_TYPE_MCE         = 1,
         PSTORE_TYPE_CONSOLE     = 2,
         PSTORE_TYPE_FTRACE      = 3,
+        /* PPC64 partition types */
+        PSTORE_TYPE_PPC_RTAS    = 4,
+        PSTORE_TYPE_PPC_OF      = 5,
+        PSTORE_TYPE_PPC_COMMON  = 6,
         PSTORE_TYPE_UNKNOWN     = 255
 };
 
@@ -51,15 +55,15 @@ struct pstore_info {
         int             (*close)(struct pstore_info *psi);
         ssize_t         (*read)(u64 *id, enum pstore_type_id *type,
                         int *count, struct timespec *time, char **buf,
-                        struct pstore_info *psi);
+                        bool *compressed, struct pstore_info *psi);
         int             (*write)(enum pstore_type_id type,
                         enum kmsg_dump_reason reason, u64 *id,
-                        unsigned int part, int count, size_t size,
-                        struct pstore_info *psi);
+                        unsigned int part, int count, bool compressed,
+                        size_t size, struct pstore_info *psi);
         int             (*write_buf)(enum pstore_type_id type,
                         enum kmsg_dump_reason reason, u64 *id,
-                        unsigned int part, const char *buf, size_t size,
-                        struct pstore_info *psi);
+                        unsigned int part, const char *buf, bool compressed,
+                        size_t size, struct pstore_info *psi);
         int             (*erase)(enum pstore_type_id type, u64 id,
                         int count, struct timespec time,
                         struct pstore_info *psi);
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 89573a33ab3c..07d0df6bf768 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -142,9 +142,6 @@ static inline void ptrace_init_task(struct task_struct *child, bool ptrace)
 {
         INIT_LIST_HEAD(&child->ptrace_entry);
         INIT_LIST_HEAD(&child->ptraced);
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
-        atomic_set(&child->ptrace_bp_refcnt, 1);
-#endif
         child->jobctl = 0;
         child->ptrace = 0;
         child->parent = child->real_parent;
@@ -351,11 +348,4 @@ extern int task_current_syscall(struct task_struct *target, long *callno,
                                 unsigned long args[6], unsigned int maxargs,
                                 unsigned long *sp, unsigned long *pc);
 
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
-extern int ptrace_get_breakpoints(struct task_struct *tsk);
-extern void ptrace_put_breakpoints(struct task_struct *tsk);
-#else
-static inline void ptrace_put_breakpoints(struct task_struct *tsk) { }
-#endif /* CONFIG_HAVE_HW_BREAKPOINT */
-
 #endif
diff --git a/include/linux/pvclock_gtod.h b/include/linux/pvclock_gtod.h
index 0ca75825b60d..a71d2dbd3610 100644
--- a/include/linux/pvclock_gtod.h
+++ b/include/linux/pvclock_gtod.h
@@ -3,6 +3,13 @@
 
 #include <linux/notifier.h>
 
+/*
+ * The pvclock gtod notifier is called when the system time is updated
+ * and is used to keep guest time synchronized with host time.
+ *
+ * The 'action' parameter in the notifier function is false (0), or
+ * true (non-zero) if system time was stepped.
+ */
 extern int pvclock_gtod_register_notifier(struct notifier_block *nb);
 extern int pvclock_gtod_unregister_notifier(struct notifier_block *nb);
 
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index a4df2042b79c..f0feafd184a0 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -76,6 +76,7 @@ enum pwm_polarity {
 enum {
         PWMF_REQUESTED = 1 << 0,
         PWMF_ENABLED = 1 << 1,
+        PWMF_EXPORTED = 1 << 2,
 };
 
 struct pwm_device {
@@ -86,7 +87,9 @@ struct pwm_device {
         struct pwm_chip         *chip;
         void                    *chip_data;
 
-        unsigned int            period; /* in nanoseconds */
+        unsigned int            period;         /* in nanoseconds */
+        unsigned int            duty_cycle;     /* in nanoseconds */
+        enum pwm_polarity       polarity;
 };
 
 static inline void pwm_set_period(struct pwm_device *pwm, unsigned int period)
@@ -100,6 +103,17 @@ static inline unsigned int pwm_get_period(struct pwm_device *pwm)
         return pwm ? pwm->period : 0;
 }
 
+static inline void pwm_set_duty_cycle(struct pwm_device *pwm, unsigned int duty)
+{
+        if (pwm)
+                pwm->duty_cycle = duty;
+}
+
+static inline unsigned int pwm_get_duty_cycle(struct pwm_device *pwm)
+{
+        return pwm ? pwm->duty_cycle : 0;
+}
+
 /*
  * pwm_set_polarity - configure the polarity of a PWM signal
  */
@@ -278,4 +292,17 @@ static inline void pwm_add_table(struct pwm_lookup *table, size_t num)
 }
 #endif
 
+#ifdef CONFIG_PWM_SYSFS
+void pwmchip_sysfs_export(struct pwm_chip *chip);
+void pwmchip_sysfs_unexport(struct pwm_chip *chip);
+#else
+static inline void pwmchip_sysfs_export(struct pwm_chip *chip)
+{
+}
+
+static inline void pwmchip_sysfs_unexport(struct pwm_chip *chip)
+{
+}
+#endif /* CONFIG_PWM_SYSFS */
+
 #endif /* __LINUX_PWM_H */
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h
index 467cc6307b62..49444203328a 100644
--- a/include/linux/pxa2xx_ssp.h
+++ b/include/linux/pxa2xx_ssp.h
@@ -21,6 +21,8 @@
 
 #include <linux/list.h>
 #include <linux/io.h>
+#include <linux/of.h>
+
 
 /*
  * SSP Serial Port Registers
@@ -190,6 +192,8 @@ struct ssp_device {
         int             irq;
         int             drcmr_rx;
         int             drcmr_tx;
+
+        struct device_node      *of_node;
 };
 
 /**
@@ -218,11 +222,18 @@ static inline u32 pxa_ssp_read_reg(struct ssp_device *dev, u32 reg)
 #ifdef CONFIG_ARCH_PXA
 struct ssp_device *pxa_ssp_request(int port, const char *label);
 void pxa_ssp_free(struct ssp_device *);
+struct ssp_device *pxa_ssp_request_of(const struct device_node *of_node,
+                                      const char *label);
 #else
 static inline struct ssp_device *pxa_ssp_request(int port, const char *label)
 {
         return NULL;
 }
+static inline struct ssp_device *pxa_ssp_request_of(const struct device_node *n,
+                                                    const char *name)
+{
+        return NULL;
+}
 static inline void pxa_ssp_free(struct ssp_device *ssp) {}
 #endif
 
diff --git a/include/linux/quota.h b/include/linux/quota.h
index d13371134c59..cc7494a35429 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -328,6 +328,7 @@ struct quotactl_ops {
         int (*set_dqblk)(struct super_block *, struct kqid, struct fs_disk_quota *);
         int (*get_xstate)(struct super_block *, struct fs_quota_stat *);
         int (*set_xstate)(struct super_block *, unsigned int, int);
+        int (*get_xstatev)(struct super_block *, struct fs_quota_statv *);
 };
 
 struct quota_format_type {
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 1c50093ae656..6965fe394c3b 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -41,6 +41,7 @@ void __quota_error(struct super_block *sb, const char *func,
 void inode_add_rsv_space(struct inode *inode, qsize_t number);
 void inode_claim_rsv_space(struct inode *inode, qsize_t number);
 void inode_sub_rsv_space(struct inode *inode, qsize_t number);
+void inode_reclaim_rsv_space(struct inode *inode, qsize_t number);
 
 void dquot_initialize(struct inode *inode);
 void dquot_drop(struct inode *inode);
@@ -59,6 +60,7 @@ int dquot_alloc_inode(const struct inode *inode);
 
 int dquot_claim_space_nodirty(struct inode *inode, qsize_t number);
 void dquot_free_inode(const struct inode *inode);
+void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number);
 
 int dquot_disable(struct super_block *sb, int type, unsigned int flags);
 /* Suspend quotas on remount RO */
@@ -238,6 +240,13 @@ static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
         return 0;
 }
 
+static inline int dquot_reclaim_space_nodirty(struct inode *inode,
+                                              qsize_t number)
+{
+        inode_sub_bytes(inode, number);
+        return 0;
+}
+
 static inline int dquot_disable(struct super_block *sb, int type,
                 unsigned int flags)
 {
@@ -336,6 +345,12 @@ static inline int dquot_claim_block(struct inode *inode, qsize_t nr)
         return ret;
 }
 
+static inline void dquot_reclaim_block(struct inode *inode, qsize_t nr)
+{
+        dquot_reclaim_space_nodirty(inode, nr << inode->i_blkbits);
+        mark_inode_dirty_sync(inode);
+}
+
 static inline void dquot_free_space_nodirty(struct inode *inode, qsize_t nr)
 {
         __dquot_free_space(inode, nr, 0);
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index ffc444c38b0a..403940787be1 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -231,6 +231,7 @@ unsigned long radix_tree_next_hole(struct radix_tree_root *root,
 unsigned long radix_tree_prev_hole(struct radix_tree_root *root,
                                 unsigned long index, unsigned long max_scan);
 int radix_tree_preload(gfp_t gfp_mask);
+int radix_tree_maybe_preload(gfp_t gfp_mask);
 void radix_tree_init(void);
 void *radix_tree_tag_set(struct radix_tree_root *root,
                         unsigned long index, unsigned int tag);
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 8dfaa2ce2e95..73069cb6c54a 100644
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -101,6 +101,7 @@ extern const struct raid6_calls raid6_altivec8;
 extern const struct raid6_calls raid6_avx2x1;
 extern const struct raid6_calls raid6_avx2x2;
 extern const struct raid6_calls raid6_avx2x4;
+extern const struct raid6_calls raid6_tilegx8;
 
 struct raid6_recov_calls {
         void (*data2)(int, size_t, int, int, void **);
@@ -114,6 +115,11 @@ extern const struct raid6_recov_calls raid6_recov_intx1;
 extern const struct raid6_recov_calls raid6_recov_ssse3;
 extern const struct raid6_recov_calls raid6_recov_avx2;
 
+extern const struct raid6_calls raid6_neonx1;
+extern const struct raid6_calls raid6_neonx2;
+extern const struct raid6_calls raid6_neonx4;
+extern const struct raid6_calls raid6_neonx8;
+
 /* Algorithm list */
 extern const struct raid6_calls * const raid6_algos[];
 extern const struct raid6_recov_calls *const raid6_recov_algos[];
diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index 69e37c2d1ea5..753207c8ce20 100644
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -25,7 +25,7 @@ extern int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma);
 
 extern const struct file_operations ramfs_file_operations;
 extern const struct vm_operations_struct generic_file_vm_ops;
-extern int __init init_rootfs(void);
+extern int __init init_ramfs_fs(void);
 
 int ramfs_fill_super(struct super_block *sb, void *data, int silent);
 
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 0022c1bb1e26..aa870a4ddf54 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -68,6 +68,10 @@ extern struct rb_node *rb_prev(const struct rb_node *);
 extern struct rb_node *rb_first(const struct rb_root *);
 extern struct rb_node *rb_last(const struct rb_root *);
 
+/* Postorder iteration - always visit the parent after its children */
+extern struct rb_node *rb_first_postorder(const struct rb_root *);
+extern struct rb_node *rb_next_postorder(const struct rb_node *);
+
 /* Fast replacement of a single node without remove/rebalance/add/rebalance */
 extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, 
                             struct rb_root *root);
@@ -81,4 +85,22 @@ static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
         *rb_link = node;
 }
 
+/**
+ * rbtree_postorder_for_each_entry_safe - iterate over rb_root in post order of
+ * given type safe against removal of rb_node entry
+ *
+ * @pos:        the 'type *' to use as a loop cursor.
+ * @n:          another 'type *' to use as temporary storage
+ * @root:       'rb_root *' of the rbtree.
+ * @field:      the name of the rb_node field within 'type'.
+ */
+#define rbtree_postorder_for_each_entry_safe(pos, n, root, field) \
+        for (pos = rb_entry(rb_first_postorder(root), typeof(*pos), field),\
+                n = rb_entry(rb_next_postorder(&pos->field), \
+                        typeof(*pos), field); \
+             &pos->field; \
+             pos = n, \
+                n = rb_entry(rb_next_postorder(&pos->field), \
+                        typeof(*pos), field))
+
 #endif  /* _LINUX_RBTREE_H */
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index f4b1001a4676..4106721c4e5e 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -267,8 +267,9 @@ static inline void list_splice_init_rcu(struct list_head *list,
  */
 #define list_first_or_null_rcu(ptr, type, member) \
         ({struct list_head *__ptr = (ptr); \
-          struct list_head __rcu *__next = list_next_rcu(__ptr); \
-          likely(__ptr != __next) ? container_of(__next, type, member) : NULL; \
+          struct list_head *__next = ACCESS_ONCE(__ptr->next); \
+          likely(__ptr != __next) ? \
+                list_entry_rcu(__next, type, member) : NULL; \
         })
 
 /**
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index ddcc7826d907..f1f1bc39346b 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -52,7 +52,7 @@ extern int rcutorture_runnable; /* for sysctl */
 #if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU)
 extern void rcutorture_record_test_transition(void);
 extern void rcutorture_record_progress(unsigned long vernum);
-extern void do_trace_rcu_torture_read(char *rcutorturename,
+extern void do_trace_rcu_torture_read(const char *rcutorturename,
                                       struct rcu_head *rhp,
                                       unsigned long secs,
                                       unsigned long c_old,
@@ -65,7 +65,7 @@ static inline void rcutorture_record_progress(unsigned long vernum)
 {
 }
 #ifdef CONFIG_RCU_TRACE
-extern void do_trace_rcu_torture_read(char *rcutorturename,
+extern void do_trace_rcu_torture_read(const char *rcutorturename,
                                       struct rcu_head *rhp,
                                       unsigned long secs,
                                       unsigned long c_old,
@@ -216,6 +216,7 @@ static inline int rcu_preempt_depth(void)
 #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
 
 /* Internal to kernel */
+extern void rcu_init(void);
 extern void rcu_sched_qs(int cpu);
 extern void rcu_bh_qs(int cpu);
 extern void rcu_check_callbacks(int cpu, int user);
@@ -228,19 +229,13 @@ extern void rcu_irq_exit(void);
 #ifdef CONFIG_RCU_USER_QS
 extern void rcu_user_enter(void);
 extern void rcu_user_exit(void);
-extern void rcu_user_enter_after_irq(void);
-extern void rcu_user_exit_after_irq(void);
 #else
 static inline void rcu_user_enter(void) { }
 static inline void rcu_user_exit(void) { }
-static inline void rcu_user_enter_after_irq(void) { }
-static inline void rcu_user_exit_after_irq(void) { }
 static inline void rcu_user_hooks_switch(struct task_struct *prev,
                                          struct task_struct *next) { }
 #endif /* CONFIG_RCU_USER_QS */
 
-extern void exit_rcu(void);
-
 /**
  * RCU_NONIDLE - Indicate idle-loop code that needs RCU readers
  * @a: Code that RCU needs to pay attention to.
@@ -277,7 +272,7 @@ void wait_rcu_gp(call_rcu_func_t crf);
 
 #if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU)
 #include <linux/rcutree.h>
-#elif defined(CONFIG_TINY_RCU) || defined(CONFIG_TINY_PREEMPT_RCU)
+#elif defined(CONFIG_TINY_RCU)
 #include <linux/rcutiny.h>
 #else
 #error "Unknown RCU implementation specified to kernel configuration"
@@ -1016,4 +1011,22 @@ static inline bool rcu_is_nocb_cpu(int cpu) { return false; }
 #endif /* #else #ifdef CONFIG_RCU_NOCB_CPU */
 
 
+/* Only for use by adaptive-ticks code. */
+#ifdef CONFIG_NO_HZ_FULL_SYSIDLE
+extern bool rcu_sys_is_idle(void);
+extern void rcu_sysidle_force_exit(void);
+#else /* #ifdef CONFIG_NO_HZ_FULL_SYSIDLE */
+
+static inline bool rcu_sys_is_idle(void)
+{
+        return false;
+}
+
+static inline void rcu_sysidle_force_exit(void)
+{
+}
+
+#endif /* #else #ifdef CONFIG_NO_HZ_FULL_SYSIDLE */
+
+
 #endif /* __LINUX_RCUPDATE_H */
diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h
index 4e56a9c69a35..e31005ee339e 100644
--- a/include/linux/rcutiny.h
+++ b/include/linux/rcutiny.h
@@ -27,10 +27,6 @@
 
 #include <linux/cache.h>
 
-static inline void rcu_init(void)
-{
-}
-
 static inline void rcu_barrier_bh(void)
 {
         wait_rcu_gp(call_rcu_bh);
@@ -41,8 +37,6 @@ static inline void rcu_barrier_sched(void)
         wait_rcu_gp(call_rcu_sched);
 }
 
-#ifdef CONFIG_TINY_RCU
-
 static inline void synchronize_rcu_expedited(void)
 {
         synchronize_sched();    /* Only one CPU, so pretty fast anyway!!! */
@@ -53,17 +47,6 @@ static inline void rcu_barrier(void)
         rcu_barrier_sched();  /* Only one CPU, so only one list of callbacks! */
 }
 
-#else /* #ifdef CONFIG_TINY_RCU */
-
-void synchronize_rcu_expedited(void);
-
-static inline void rcu_barrier(void)
-{
-        wait_rcu_gp(call_rcu);
-}
-
-#endif /* #else #ifdef CONFIG_TINY_RCU */
-
 static inline void synchronize_rcu_bh(void)
 {
         synchronize_sched();
@@ -85,35 +68,15 @@ static inline void kfree_call_rcu(struct rcu_head *head,
         call_rcu(head, func);
 }
 
-#ifdef CONFIG_TINY_RCU
-
-static inline void rcu_preempt_note_context_switch(void)
-{
-}
-
 static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)
 {
         *delta_jiffies = ULONG_MAX;
         return 0;
 }
 
-#else /* #ifdef CONFIG_TINY_RCU */
-
-void rcu_preempt_note_context_switch(void);
-int rcu_preempt_needs_cpu(void);
-
-static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)
-{
-        *delta_jiffies = ULONG_MAX;
-        return rcu_preempt_needs_cpu();
-}
-
-#endif /* #else #ifdef CONFIG_TINY_RCU */
-
 static inline void rcu_note_context_switch(int cpu)
 {
         rcu_sched_qs(cpu);
-        rcu_preempt_note_context_switch();
 }
 
 /*
@@ -156,6 +119,10 @@ static inline void rcu_cpu_stall_reset(void)
 {
 }
 
+static inline void exit_rcu(void)
+{
+}
+
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 extern int rcu_scheduler_active __read_mostly;
 extern void rcu_scheduler_starting(void);
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index 952b79339304..226169d1bd2b 100644
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -30,7 +30,6 @@
 #ifndef __LINUX_RCUTREE_H
 #define __LINUX_RCUTREE_H
 
-extern void rcu_init(void);
 extern void rcu_note_context_switch(int cpu);
 extern int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies);
 extern void rcu_cpu_stall_reset(void);
@@ -86,6 +85,8 @@ extern void rcu_force_quiescent_state(void);
 extern void rcu_bh_force_quiescent_state(void);
 extern void rcu_sched_force_quiescent_state(void);
 
+extern void exit_rcu(void);
+
 extern void rcu_scheduler_starting(void);
 extern int rcu_scheduler_active __read_mostly;
 
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 23b36304cd88..8e00f9f6f963 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -10,6 +10,31 @@
 #define SYS_HALT        0x0002  /* Notify of system halt */
 #define SYS_POWER_OFF   0x0003  /* Notify of system power off */
 
+enum reboot_mode {
+        REBOOT_COLD = 0,
+        REBOOT_WARM,
+        REBOOT_HARD,
+        REBOOT_SOFT,
+        REBOOT_GPIO,
+};
+extern enum reboot_mode reboot_mode;
+
+enum reboot_type {
+        BOOT_TRIPLE = 't',
+        BOOT_KBD = 'k',
+        BOOT_BIOS = 'b',
+        BOOT_ACPI = 'a',
+        BOOT_EFI = 'e',
+        BOOT_CF9 = 'p',
+        BOOT_CF9_COND = 'q',
+};
+extern enum reboot_type reboot_type;
+
+extern int reboot_default;
+extern int reboot_cpu;
+extern int reboot_force;
+
+
 extern int register_reboot_notifier(struct notifier_block *);
 extern int unregister_reboot_notifier(struct notifier_block *);
 
@@ -26,7 +51,7 @@ extern void machine_shutdown(void);
 struct pt_regs;
 extern void machine_crash_shutdown(struct pt_regs *);
 
-/* 
+/*
  * Architecture independent implemenations of sys_reboot commands.
  */
 
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 02d84e24b7c2..a10380bfbeac 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -15,6 +15,8 @@
 
 #include <linux/list.h>
 #include <linux/rbtree.h>
+#include <linux/err.h>
+#include <linux/bug.h>
 
 struct module;
 struct device;
@@ -23,6 +25,7 @@ struct irq_domain;
 struct spi_device;
 struct regmap;
 struct regmap_range_cfg;
+struct regmap_field;
 
 /* An enum of all the supported cache types */
 enum regcache_type {
@@ -394,10 +397,15 @@ bool regmap_can_raw_write(struct regmap *map);
 int regcache_sync(struct regmap *map);
 int regcache_sync_region(struct regmap *map, unsigned int min,
                          unsigned int max);
+int regcache_drop_region(struct regmap *map, unsigned int min,
+                         unsigned int max);
 void regcache_cache_only(struct regmap *map, bool enable);
 void regcache_cache_bypass(struct regmap *map, bool enable);
 void regcache_mark_dirty(struct regmap *map);
 
+bool regmap_check_range_table(struct regmap *map, unsigned int reg,
+                              const struct regmap_access_table *table);
+
 int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
                           int num_regs);
 
@@ -412,6 +420,36 @@ bool regmap_reg_in_ranges(unsigned int reg,
                           unsigned int nranges);
 
 /**
+ * Description of an register field
+ *
+ * @reg: Offset of the register within the regmap bank
+ * @lsb: lsb of the register field.
+ * @reg: msb of the register field.
+ */
+struct reg_field {
+        unsigned int reg;
+        unsigned int lsb;
+        unsigned int msb;
+};
+
+#define REG_FIELD(_reg, _lsb, _msb) {           \
+                                .reg = _reg,    \
+                                .lsb = _lsb,    \
+                                .msb = _msb,    \
+                                }
+
+struct regmap_field *regmap_field_alloc(struct regmap *regmap,
+                struct reg_field reg_field);
+void regmap_field_free(struct regmap_field *field);
+
+struct regmap_field *devm_regmap_field_alloc(struct device *dev,
+                struct regmap *regmap, struct reg_field reg_field);
+void devm_regmap_field_free(struct device *dev, struct regmap_field *field);
+
+int regmap_field_read(struct regmap_field *field, unsigned int *val);
+int regmap_field_write(struct regmap_field *field, unsigned int val);
+
+/**
  * Description of an IRQ for the generic regmap irq_chip.
  *
  * @reg_offset: Offset of the status/mask register within the bank
@@ -434,6 +472,9 @@ struct regmap_irq {
  * @ack_base:    Base ack address.  If zero then the chip is clear on read.
  * @wake_base:   Base address for wake enables.  If zero unsupported.
  * @irq_reg_stride:  Stride to use for chips where registers are not contiguous.
+ * @init_ack_masked: Ack all masked interrupts once during initalization.
+ * @mask_invert: Inverted mask register: cleared bits are masked out.
+ * @wake_invert: Inverted wake register: cleared bits are wake enabled.
  * @runtime_pm:  Hold a runtime PM lock on the device when accessing it.
  *
  * @num_regs:    Number of registers in each control bank.
@@ -449,9 +490,10 @@ struct regmap_irq_chip {
         unsigned int ack_base;
         unsigned int wake_base;
         unsigned int irq_reg_stride;
-        unsigned int mask_invert;
-        unsigned int wake_invert;
-        bool runtime_pm;
+        bool init_ack_masked:1;
+        bool mask_invert:1;
+        bool wake_invert:1;
+        bool runtime_pm:1;
 
         int num_regs;
 
@@ -562,6 +604,13 @@ static inline int regcache_sync_region(struct regmap *map, unsigned int min,
         return -EINVAL;
 }
 
+static inline int regcache_drop_region(struct regmap *map, unsigned int min,
+                                       unsigned int max)
+{
+        WARN_ONCE(1, "regmap API is disabled");
+        return -EINVAL;
+}
+
 static inline void regcache_cache_only(struct regmap *map, bool enable)
 {
         WARN_ONCE(1, "regmap API is disabled");
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 7c5ff0c55773..75307447cef9 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -336,8 +336,4 @@ static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
 }
 #endif
 
-/* AB8500 external regulator functions. */
-int ab8500_ext_regulator_init(struct platform_device *pdev);
-void ab8500_ext_regulator_exit(struct platform_device *pdev);
-
 #endif
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 145022a83085..27be915caa96 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -137,6 +137,12 @@ struct regulator *__must_check devm_regulator_get(struct device *dev,
                                              const char *id);
 struct regulator *__must_check regulator_get_exclusive(struct device *dev,
                                                        const char *id);
+struct regulator *__must_check devm_regulator_get_exclusive(struct device *dev,
+                                                        const char *id);
+struct regulator *__must_check regulator_get_optional(struct device *dev,
+                                                      const char *id);
+struct regulator *__must_check devm_regulator_get_optional(struct device *dev,
+                                                           const char *id);
 void regulator_put(struct regulator *regulator);
 void devm_regulator_put(struct regulator *regulator);
 
@@ -165,6 +171,7 @@ int regulator_count_voltages(struct regulator *regulator);
 int regulator_list_voltage(struct regulator *regulator, unsigned selector);
 int regulator_is_supported_voltage(struct regulator *regulator,
                                    int min_uV, int max_uV);
+unsigned int regulator_get_linear_step(struct regulator *regulator);
 int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV);
 int regulator_set_voltage_time(struct regulator *regulator,
                                int old_uV, int new_uV);
@@ -216,6 +223,25 @@ devm_regulator_get(struct device *dev, const char *id)
         return NULL;
 }
 
+static inline struct regulator *__must_check
+regulator_get_exclusive(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
+static inline struct regulator *__must_check
+regulator_get_optional(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
+
+static inline struct regulator *__must_check
+devm_regulator_get_optional(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
 static inline void regulator_put(struct regulator *regulator)
 {
 }
@@ -368,8 +394,11 @@ static inline int regulator_count_voltages(struct regulator *regulator)
 static inline int regulator_set_voltage_tol(struct regulator *regulator,
                                             int new_uV, int tol_uV)
 {
-        return regulator_set_voltage(regulator,
-                                     new_uV - tol_uV, new_uV + tol_uV);
+        if (regulator_set_voltage(regulator, new_uV, new_uV + tol_uV) == 0)
+                return 0;
+        else
+                return regulator_set_voltage(regulator,
+                                             new_uV - tol_uV, new_uV + tol_uV);
 }
 
 static inline int regulator_is_supported_voltage_tol(struct regulator *regulator,
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 6700cc94bdd1..9bdad43ad228 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -40,6 +40,26 @@ enum regulator_status {
 };
 
 /**
+ * struct regulator_linear_range - specify linear voltage ranges
+ *
+ * Specify a range of voltages for regulator_map_linar_range() and
+ * regulator_list_linear_range().
+ *
+ * @min_uV:  Lowest voltage in range
+ * @max_uV:  Highest voltage in range
+ * @min_sel: Lowest selector for range
+ * @max_sel: Highest selector for range
+ * @uV_step: Step size
+ */
+struct regulator_linear_range {
+        unsigned int min_uV;
+        unsigned int max_uV;
+        unsigned int min_sel;
+        unsigned int max_sel;
+        unsigned int uV_step;
+};
+
+/**
  * struct regulator_ops - regulator operations.
  *
  * @enable: Configure the regulator as enabled.
@@ -223,6 +243,9 @@ struct regulator_desc {
         unsigned int linear_min_sel;
         unsigned int ramp_delay;
 
+        const struct regulator_linear_range *linear_ranges;
+        int n_linear_ranges;
+
         const unsigned int *volt_table;
 
         unsigned int vsel_reg;
@@ -326,10 +349,14 @@ int regulator_mode_to_status(unsigned int);
 
 int regulator_list_voltage_linear(struct regulator_dev *rdev,
                                   unsigned int selector);
+int regulator_list_voltage_linear_range(struct regulator_dev *rdev,
+                                        unsigned int selector);
 int regulator_list_voltage_table(struct regulator_dev *rdev,
                                   unsigned int selector);
 int regulator_map_voltage_linear(struct regulator_dev *rdev,
                                   int min_uV, int max_uV);
+int regulator_map_voltage_linear_range(struct regulator_dev *rdev,
+                                       int min_uV, int max_uV);
 int regulator_map_voltage_iterate(struct regulator_dev *rdev,
                                   int min_uV, int max_uV);
 int regulator_map_voltage_ascend(struct regulator_dev *rdev,
diff --git a/include/linux/regulator/fan53555.h b/include/linux/regulator/fan53555.h
index 5c45c85d52ca..f13880e84d85 100644
--- a/include/linux/regulator/fan53555.h
+++ b/include/linux/regulator/fan53555.h
@@ -11,6 +11,7 @@
  */
 
 #ifndef __FAN53555_H__
+#define __FAN53555_H__
 
 /* VSEL ID */
 enum {
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 36adbc82de6a..999b20ce06cf 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -134,6 +134,7 @@ struct regulation_constraints {
         unsigned always_on:1;   /* regulator never off when system is on */
         unsigned boot_on:1;     /* bootloader/firmware enabled regulator */
         unsigned apply_uV:1;    /* apply uV constraint if min == max */
+        unsigned ramp_disable:1; /* disable ramp delay */
 };
 
 /**
diff --git a/include/linux/regulator/max8660.h b/include/linux/regulator/max8660.h
index 9936763621c7..f8a6a4844864 100644
--- a/include/linux/regulator/max8660.h
+++ b/include/linux/regulator/max8660.h
@@ -39,7 +39,7 @@ enum {
  */
 struct max8660_subdev_data {
         int                             id;
-        char                            *name;
+        const char                      *name;
         struct regulator_init_data      *platform_data;
 };
 
diff --git a/include/linux/regulator/pfuze100.h b/include/linux/regulator/pfuze100.h
new file mode 100644
index 000000000000..65d550bf3954
--- /dev/null
+++ b/include/linux/regulator/pfuze100.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; 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 __LINUX_REG_PFUZE100_H
+#define __LINUX_REG_PFUZE100_H
+
+#define PFUZE100_SW1AB          0
+#define PFUZE100_SW1C           1
+#define PFUZE100_SW2            2
+#define PFUZE100_SW3A           3
+#define PFUZE100_SW3B           4
+#define PFUZE100_SW4            5
+#define PFUZE100_SWBST          6
+#define PFUZE100_VSNVS          7
+#define PFUZE100_VREFDDR        8
+#define PFUZE100_VGEN1          9
+#define PFUZE100_VGEN2          10
+#define PFUZE100_VGEN3          11
+#define PFUZE100_VGEN4          12
+#define PFUZE100_VGEN5          13
+#define PFUZE100_VGEN6          14
+#define PFUZE100_MAX_REGULATOR  15
+
+struct regulator_init_data;
+
+struct pfuze_regulator_platform_data {
+        struct regulator_init_data *init_data[PFUZE100_MAX_REGULATOR];
+};
+
+#endif /* __LINUX_REG_PFUZE100_H */
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h
index 96a509b6be04..201a69749659 100644
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@ -54,7 +54,7 @@ struct res_counter {
         struct res_counter *parent;
 };
 
-#define RESOURCE_MAX (unsigned long long)LLONG_MAX
+#define RES_COUNTER_MAX ULLONG_MAX
 
 /**
  * Helpers to interact with userspace
diff --git a/include/linux/reservation.h b/include/linux/reservation.h
new file mode 100644
index 000000000000..813dae960ebd
--- /dev/null
+++ b/include/linux/reservation.h
@@ -0,0 +1,62 @@
+/*
+ * Header file for reservations for dma-buf and ttm
+ *
+ * Copyright(C) 2011 Linaro Limited. All rights reserved.
+ * Copyright (C) 2012-2013 Canonical Ltd
+ * Copyright (C) 2012 Texas Instruments
+ *
+ * Authors:
+ * Rob Clark <rob.clark@linaro.org>
+ * Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ * Thomas Hellstrom <thellstrom-at-vmware-dot-com>
+ *
+ * Based on bo.c which bears the following copyright notice,
+ * but is dual licensed:
+ *
+ * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef _LINUX_RESERVATION_H
+#define _LINUX_RESERVATION_H
+
+#include <linux/ww_mutex.h>
+
+extern struct ww_class reservation_ww_class;
+
+struct reservation_object {
+        struct ww_mutex lock;
+};
+
+static inline void
+reservation_object_init(struct reservation_object *obj)
+{
+        ww_mutex_init(&obj->lock, &reservation_ww_class);
+}
+
+static inline void
+reservation_object_fini(struct reservation_object *obj)
+{
+        ww_mutex_destroy(&obj->lock);
+}
+
+#endif /* _LINUX_RESERVATION_H */
diff --git a/include/linux/rio.h b/include/linux/rio.h
index 18e099342e6f..b71d5738e683 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/device.h>
 #include <linux/rio_regs.h>
+#include <linux/mod_devicetable.h>
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
 #include <linux/dmaengine.h>
 #endif
@@ -91,9 +92,24 @@ union rio_pw_msg;
 /**
  * struct rio_switch - RIO switch info
  * @node: Node in global list of switches
- * @switchid: Switch ID that is unique across a network
  * @route_table: Copy of switch routing table
  * @port_ok: Status of each port (one bit per port) - OK=1 or UNINIT=0
+ * @ops: pointer to switch-specific operations
+ * @lock: lock to serialize operations updates
+ * @nextdev: Array of per-port pointers to the next attached device
+ */
+struct rio_switch {
+        struct list_head node;
+        u8 *route_table;
+        u32 port_ok;
+        struct rio_switch_ops *ops;
+        spinlock_t lock;
+        struct rio_dev *nextdev[0];
+};
+
+/**
+ * struct rio_switch_ops - Per-switch operations
+ * @owner: The module owner of this structure
  * @add_entry: Callback for switch-specific route add function
  * @get_entry: Callback for switch-specific route get function
  * @clr_table: Callback for switch-specific clear route table function
@@ -101,14 +117,12 @@ union rio_pw_msg;
  * @get_domain: Callback for switch-specific domain get function
  * @em_init: Callback for switch-specific error management init function
  * @em_handle: Callback for switch-specific error management handler function
- * @sw_sysfs: Callback that initializes switch-specific sysfs attributes
- * @nextdev: Array of per-port pointers to the next attached device
+ *
+ * Defines the operations that are necessary to initialize/control
+ * a particular RIO switch device.
  */
-struct rio_switch {
-        struct list_head node;
-        u16 switchid;
-        u8 *route_table;
-        u32 port_ok;
+struct rio_switch_ops {
+        struct module *owner;
         int (*add_entry) (struct rio_mport *mport, u16 destid, u8 hopcount,
                           u16 table, u16 route_destid, u8 route_port);
         int (*get_entry) (struct rio_mport *mport, u16 destid, u8 hopcount,
@@ -121,8 +135,6 @@ struct rio_switch {
                            u8 *sw_domain);
         int (*em_init) (struct rio_dev *dev);
         int (*em_handle) (struct rio_dev *dev, u8 swport);
-        int (*sw_sysfs) (struct rio_dev *dev, int create);
-        struct rio_dev *nextdev[0];
 };
 
 /**
@@ -130,6 +142,7 @@ struct rio_switch {
  * @global_list: Node in list of all RIO devices
  * @net_list: Node in list of RIO devices in a network
  * @net: Network this device is a part of
+ * @do_enum: Enumeration flag
  * @did: Device ID
  * @vid: Vendor ID
  * @device_rev: Device revision
@@ -158,6 +171,7 @@ struct rio_dev {
         struct list_head global_list;   /* node in list of all RIO devices */
         struct list_head net_list;      /* node in per net list */
         struct rio_net *net;    /* RIO net this device resides in */
+        bool do_enum;
         u16 did;
         u16 vid;
         u32 device_rev;
@@ -297,10 +311,6 @@ struct rio_net {
         struct rio_id_table destid_table;  /* destID allocation table */
 };
 
-/* Definitions used by switch sysfs initialization callback */
-#define RIO_SW_SYSFS_CREATE     1       /* Create switch attributes */
-#define RIO_SW_SYSFS_REMOVE     0       /* Remove switch attributes */
-
 /* Low-level architecture-dependent routines */
 
 /**
@@ -385,35 +395,6 @@ struct rio_driver {
 
 #define to_rio_driver(drv) container_of(drv,struct rio_driver, driver)
 
-/**
- * struct rio_device_id - RIO device identifier
- * @did: RIO device ID
- * @vid: RIO vendor ID
- * @asm_did: RIO assembly device ID
- * @asm_vid: RIO assembly vendor ID
- *
- * Identifies a RIO device based on both the device/vendor IDs and
- * the assembly device/vendor IDs.
- */
-struct rio_device_id {
-        u16 did, vid;
-        u16 asm_did, asm_vid;
-};
-
-/**
- * struct rio_switch_ops - Per-switch operations
- * @vid: RIO vendor ID
- * @did: RIO device ID
- * @init_hook: Callback that performs switch device initialization
- *
- * Defines the operations that are necessary to initialize/control
- * a particular RIO switch device.
- */
-struct rio_switch_ops {
-        u16 vid, did;
-        int (*init_hook) (struct rio_dev *rdev, int do_enum);
-};
-
 union rio_pw_msg {
         struct {
                 u32 comptag;    /* Component Tag CSR */
@@ -468,14 +449,29 @@ static inline struct rio_mport *dma_to_mport(struct dma_device *ddev)
 
 /**
  * struct rio_scan - RIO enumeration and discovery operations
+ * @owner: The module owner of this structure
  * @enumerate: Callback to perform RapidIO fabric enumeration.
  * @discover: Callback to perform RapidIO fabric discovery.
  */
 struct rio_scan {
+        struct module *owner;
         int (*enumerate)(struct rio_mport *mport, u32 flags);
         int (*discover)(struct rio_mport *mport, u32 flags);
 };
 
+/**
+ * struct rio_scan_node - list node to register RapidIO enumeration and
+ * discovery methods with RapidIO core.
+ * @mport_id: ID of an mport (net) serviced by this enumerator
+ * @node: node in global list of registered enumerators
+ * @ops: RIO enumeration and discovery operations
+ */
+struct rio_scan_node {
+        int mport_id;
+        struct list_head node;
+        struct rio_scan *ops;
+};
+
 /* Architecture and hardware-specific functions */
 extern int rio_register_mport(struct rio_mport *);
 extern int rio_open_inb_mbox(struct rio_mport *, void *, int, int);
diff --git a/include/linux/rio_ids.h b/include/linux/rio_ids.h
index b66d13d1bdc0..2543bc163d54 100644
--- a/include/linux/rio_ids.h
+++ b/include/linux/rio_ids.h
@@ -13,8 +13,6 @@
 #ifndef LINUX_RIO_IDS_H
 #define LINUX_RIO_IDS_H
 
-#define RIO_ANY_ID                      0xffff
-
 #define RIO_VID_FREESCALE               0x0002
 #define RIO_DID_MPC8560                 0x0003
 
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
index 5951e3f38878..adae88f5b0ab 100644
--- a/include/linux/scatterlist.h
+++ b/include/linux/scatterlist.h
@@ -111,6 +111,9 @@ static inline struct page *sg_page(struct scatterlist *sg)
 static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
                               unsigned int buflen)
 {
+#ifdef CONFIG_DEBUG_SG
+        BUG_ON(!virt_addr_valid(buf));
+#endif
         sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
 }
 
@@ -241,6 +244,11 @@ size_t sg_copy_from_buffer(struct scatterlist *sgl, unsigned int nents,
 size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents,
                          void *buf, size_t buflen);
 
+size_t sg_pcopy_from_buffer(struct scatterlist *sgl, unsigned int nents,
+                            void *buf, size_t buflen, off_t skip);
+size_t sg_pcopy_to_buffer(struct scatterlist *sgl, unsigned int nents,
+                          void *buf, size_t buflen, off_t skip);
+
 /*
  * Maximum number of entries that will be allocated in one piece, if
  * a list larger than this is required then chaining will be utilized.
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 178a8d909f14..6682da36b293 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -107,14 +107,6 @@ extern unsigned long this_cpu_load(void);
 extern void calc_global_load(unsigned long ticks);
 extern void update_cpu_load_nohz(void);
 
-/* Notifier for when a task gets migrated to a new CPU */
-struct task_migration_notifier {
-        struct task_struct *task;
-        int from_cpu;
-        int to_cpu;
-};
-extern void register_task_migration_notifier(struct notifier_block *n);
-
 extern unsigned long get_parent_ip(unsigned long addr);
 
 extern void dump_cpu_task(int cpu);
@@ -322,8 +314,6 @@ extern unsigned long
 arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
                           unsigned long len, unsigned long pgoff,
                           unsigned long flags);
-extern void arch_unmap_area(struct mm_struct *, unsigned long);
-extern void arch_unmap_area_topdown(struct mm_struct *, unsigned long);
 #else
 static inline void arch_pick_mmap_layout(struct mm_struct *mm) {}
 #endif
@@ -924,7 +914,7 @@ struct load_weight {
 struct sched_avg {
         /*
          * These sums represent an infinite geometric series and so are bound
-         * above by 1024/(1-y).  Thus we only need a u32 to store them for for all
+         * above by 1024/(1-y).  Thus we only need a u32 to store them for all
          * choices of y < 1-2^(-32)*1024.
          */
         u32 runnable_avg_sum, runnable_avg_period;
@@ -994,12 +984,7 @@ struct sched_entity {
         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.
- * load-balance).
- */
-#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED)
+#ifdef CONFIG_SMP
         /* Per-entity load-tracking */
         struct sched_avg        avg;
 #endif
@@ -1041,6 +1026,9 @@ struct task_struct {
 #ifdef CONFIG_SMP
         struct llist_node wake_entry;
         int on_cpu;
+        struct task_struct *last_wakee;
+        unsigned long wakee_flips;
+        unsigned long wakee_flip_decay_ts;
 #endif
         int on_rq;
 
@@ -1405,9 +1393,13 @@ struct task_struct {
                 unsigned long memsw_nr_pages; /* uncharged mem+swap usage */
         } memcg_batch;
         unsigned int memcg_kmem_skip_account;
-#endif
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
-        atomic_t ptrace_bp_refcnt;
+        struct memcg_oom_info {
+                unsigned int may_oom:1;
+                unsigned int in_memcg_oom:1;
+                unsigned int oom_locked:1;
+                int wakeups;
+                struct mem_cgroup *wait_on_memcg;
+        } memcg_oom;
 #endif
 #ifdef CONFIG_UPROBES
         struct uprobe_task *utask;
@@ -1542,6 +1534,8 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)
  * Test if a process is not yet dead (at most zombie state)
  * If pid_alive fails, then pointers within the task structure
  * can be stale and must not be dereferenced.
+ *
+ * Return: 1 if the process is alive. 0 otherwise.
  */
 static inline int pid_alive(struct task_struct *p)
 {
@@ -1553,6 +1547,8 @@ static inline int pid_alive(struct task_struct *p)
  * @tsk: Task structure to be checked.
  *
  * Check if a task structure is the first user space task the kernel created.
+ *
+ * Return: 1 if the task structure is init. 0 otherwise.
  */
 static inline int is_global_init(struct task_struct *tsk)
 {
@@ -1638,6 +1634,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut,
 #define PF_MEMPOLICY    0x10000000      /* Non-default NUMA mempolicy */
 #define PF_MUTEX_TESTER 0x20000000      /* Thread belongs to the rt mutex tester */
 #define PF_FREEZER_SKIP 0x40000000      /* Freezer should not count it as freezable */
+#define PF_SUSPEND_TASK 0x80000000      /* this thread called freeze_processes and should not be frozen */
 
 /*
  * Only the _current_ task can read/write to tsk->flags, but other
@@ -1903,6 +1900,8 @@ extern struct task_struct *idle_task(int cpu);
 /**
  * is_idle_task - is the specified task an idle task?
  * @p: the task in question.
+ *
+ * Return: 1 if @p is an idle task. 0 otherwise.
  */
 static inline bool is_idle_task(const struct task_struct *p)
 {
@@ -1955,8 +1954,6 @@ extern struct task_struct *find_task_by_vpid(pid_t nr);
 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
                 struct pid_namespace *ns);
 
-extern void __set_special_pids(struct pid *pid);
-
 /* per-UID process charging. */
 extern struct user_struct * alloc_uid(kuid_t);
 static inline struct user_struct *get_uid(struct user_struct *u)
@@ -2179,15 +2176,15 @@ static inline bool thread_group_leader(struct task_struct *p)
  * all we care about is that we have a task with the appropriate
  * pid, we don't actually care if we have the right task.
  */
-static inline int has_group_leader_pid(struct task_struct *p)
+static inline bool has_group_leader_pid(struct task_struct *p)
 {
-        return p->pid == p->tgid;
+        return task_pid(p) == p->signal->leader_pid;
 }
 
 static inline
-int same_thread_group(struct task_struct *p1, struct task_struct *p2)
+bool same_thread_group(struct task_struct *p1, struct task_struct *p2)
 {
-        return p1->tgid == p2->tgid;
+        return p1->signal == p2->signal;
 }
 
 static inline struct task_struct *next_thread(const struct task_struct *p)
@@ -2444,6 +2441,15 @@ extern int __cond_resched_softirq(void);
         __cond_resched_softirq();                                       \
 })
 
+static inline void cond_resched_rcu(void)
+{
+#if defined(CONFIG_DEBUG_ATOMIC_SLEEP) || !defined(CONFIG_PREEMPT_RCU)
+        rcu_read_unlock();
+        cond_resched();
+        rcu_read_lock();
+#endif
+}
+
 /*
  * Does a critical section need to be broken due to another
  * task waiting?: (technically does not depend on CONFIG_PREEMPT,
diff --git a/include/linux/sched_clock.h b/include/linux/sched_clock.h
new file mode 100644
index 000000000000..fa7922c80a41
--- /dev/null
+++ b/include/linux/sched_clock.h
@@ -0,0 +1,21 @@
+/*
+ * sched_clock.h: support for extending counters to full 64-bit ns counter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef LINUX_SCHED_CLOCK
+#define LINUX_SCHED_CLOCK
+
+#ifdef CONFIG_GENERIC_SCHED_CLOCK
+extern void sched_clock_postinit(void);
+#else
+static inline void sched_clock_postinit(void) { }
+#endif
+
+extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate);
+
+extern unsigned long long (*sched_clock_func)(void);
+
+#endif
diff --git a/include/linux/sdb.h b/include/linux/sdb.h
new file mode 100644
index 000000000000..fbb76a46c8a5
--- /dev/null
+++ b/include/linux/sdb.h
@@ -0,0 +1,159 @@
+/*
+ * This is the official version 1.1 of sdb.h
+ */
+#ifndef __SDB_H__
+#define __SDB_H__
+#ifdef __KERNEL__
+#include <linux/types.h>
+#else
+#include <stdint.h>
+#endif
+
+/*
+ * All structures are 64 bytes long and are expected
+ * to live in an array, one for each interconnect.
+ * Most fields of the structures are shared among the
+ * various types, and most-specific fields are at the
+ * beginning (for alignment reasons, and to keep the
+ * magic number at the head of the interconnect record
+ */
+
+/* Product, 40 bytes at offset 24, 8-byte aligned
+ *
+ * device_id is vendor-assigned; version is device-specific,
+ * date is hex (e.g 0x20120501), name is UTF-8, blank-filled
+ * and not terminated with a 0 byte.
+ */
+struct sdb_product {
+        uint64_t                vendor_id;      /* 0x18..0x1f */
+        uint32_t                device_id;      /* 0x20..0x23 */
+        uint32_t                version;        /* 0x24..0x27 */
+        uint32_t                date;           /* 0x28..0x2b */
+        uint8_t                 name[19];       /* 0x2c..0x3e */
+        uint8_t                 record_type;    /* 0x3f */
+};
+
+/*
+ * Component, 56 bytes at offset 8, 8-byte aligned
+ *
+ * The address range is first to last, inclusive
+ * (for example 0x100000 - 0x10ffff)
+ */
+struct sdb_component {
+        uint64_t                addr_first;     /* 0x08..0x0f */
+        uint64_t                addr_last;      /* 0x10..0x17 */
+        struct sdb_product      product;        /* 0x18..0x3f */
+};
+
+/* Type of the SDB record */
+enum sdb_record_type {
+        sdb_type_interconnect   = 0x00,
+        sdb_type_device         = 0x01,
+        sdb_type_bridge         = 0x02,
+        sdb_type_integration    = 0x80,
+        sdb_type_repo_url       = 0x81,
+        sdb_type_synthesis      = 0x82,
+        sdb_type_empty          = 0xFF,
+};
+
+/* Type 0: interconnect (first of the array)
+ *
+ * sdb_records is the length of the table including this first
+ * record, version is 1. The bus type is enumerated later.
+ */
+#define                         SDB_MAGIC       0x5344422d /* "SDB-" */
+struct sdb_interconnect {
+        uint32_t                sdb_magic;      /* 0x00-0x03 */
+        uint16_t                sdb_records;    /* 0x04-0x05 */
+        uint8_t                 sdb_version;    /* 0x06 */
+        uint8_t                 sdb_bus_type;   /* 0x07 */
+        struct sdb_component    sdb_component;  /* 0x08-0x3f */
+};
+
+/* Type 1: device
+ *
+ * class is 0 for "custom device", other values are
+ * to be standardized; ABI version is for the driver,
+ * bus-specific bits are defined by each bus (see below)
+ */
+struct sdb_device {
+        uint16_t                abi_class;      /* 0x00-0x01 */
+        uint8_t                 abi_ver_major;  /* 0x02 */
+        uint8_t                 abi_ver_minor;  /* 0x03 */
+        uint32_t                bus_specific;   /* 0x04-0x07 */
+        struct sdb_component    sdb_component;  /* 0x08-0x3f */
+};
+
+/* Type 2: bridge
+ *
+ * child is the address of the nested SDB table
+ */
+struct sdb_bridge {
+        uint64_t                sdb_child;      /* 0x00-0x07 */
+        struct sdb_component    sdb_component;  /* 0x08-0x3f */
+};
+
+/* Type 0x80: integration
+ *
+ * all types with bit 7 set are meta-information, so
+ * software can ignore the types it doesn't know. Here we
+ * just provide product information for an aggregate device
+ */
+struct sdb_integration {
+        uint8_t                 reserved[24];   /* 0x00-0x17 */
+        struct sdb_product      product;        /* 0x08-0x3f */
+};
+
+/* Type 0x81: Top module repository url
+ *
+ * again, an informative field that software can ignore
+ */
+struct sdb_repo_url {
+        uint8_t                 repo_url[63];   /* 0x00-0x3e */
+        uint8_t                 record_type;    /* 0x3f */
+};
+
+/* Type 0x82: Synthesis tool information
+ *
+ * this informative record
+ */
+struct sdb_synthesis {
+        uint8_t                 syn_name[16];   /* 0x00-0x0f */
+        uint8_t                 commit_id[16];  /* 0x10-0x1f */
+        uint8_t                 tool_name[8];   /* 0x20-0x27 */
+        uint32_t                tool_version;   /* 0x28-0x2b */
+        uint32_t                date;           /* 0x2c-0x2f */
+        uint8_t                 user_name[15];  /* 0x30-0x3e */
+        uint8_t                 record_type;    /* 0x3f */
+};
+
+/* Type 0xff: empty
+ *
+ * this allows keeping empty slots during development,
+ * so they can be filled later with minimal efforts and
+ * no misleading description is ever shipped -- hopefully.
+ * It can also be used to pad a table to a desired length.
+ */
+struct sdb_empty {
+        uint8_t                 reserved[63];   /* 0x00-0x3e */
+        uint8_t                 record_type;    /* 0x3f */
+};
+
+/* The type of bus, for bus-specific flags */
+enum sdb_bus_type {
+        sdb_wishbone = 0x00,
+        sdb_data     = 0x01,
+};
+
+#define SDB_WB_WIDTH_MASK       0x0f
+#define SDB_WB_ACCESS8                  0x01
+#define SDB_WB_ACCESS16                 0x02
+#define SDB_WB_ACCESS32                 0x04
+#define SDB_WB_ACCESS64                 0x08
+#define SDB_WB_LITTLE_ENDIAN    0x80
+
+#define SDB_DATA_READ           0x04
+#define SDB_DATA_WRITE          0x02
+#define SDB_DATA_EXEC           0x01
+
+#endif /* __SDB_H__ */
diff --git a/include/linux/security.h b/include/linux/security.h
index 4686491852a7..9d37e2b9d3ec 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -26,6 +26,7 @@
 #include <linux/capability.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 struct linux_binprm;
 struct cred;
@@ -60,6 +61,9 @@ struct mm_struct;
 #define SECURITY_CAP_NOAUDIT 0
 #define SECURITY_CAP_AUDIT 1
 
+/* LSM Agnostic defines for sb_set_mnt_opts */
+#define SECURITY_LSM_NATIVE_LABELS      1
+
 struct ctl_table;
 struct audit_krule;
 struct user_namespace;
@@ -306,6 +310,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      Parse a string of security data filling in the opts structure
  *      @options string containing all mount options known by the LSM
  *      @opts binary data structure usable by the LSM
+ * @dentry_init_security:
+ *      Compute a context for a dentry as the inode is not yet available
+ *      since NFSv4 has no label backed by an EA anyway.
+ *      @dentry dentry to use in calculating the context.
+ *      @mode mode used to determine resource type.
+ *      @name name of the last path component used to create file
+ *      @ctx pointer to place the pointer to the resulting context in.
+ *      @ctxlen point to place the length of the resulting context.
+ *
  *
  * Security hooks for inode operations.
  *
@@ -1313,6 +1326,13 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      @pages contains the number of pages.
  *      Return 0 if permission is granted.
  *
+ * @ismaclabel:
+ *      Check if the extended attribute specified by @name
+ *      represents a MAC label. Returns 1 if name is a MAC
+ *      attribute otherwise returns 0.
+ *      @name full extended attribute name to check against
+ *      LSM as a MAC label.
+ *
  * @secid_to_secctx:
  *      Convert secid to security context.  If secdata is NULL the length of
  *      the result will be returned in seclen, but no secdata will be returned.
@@ -1392,7 +1412,8 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      @ctxlen contains the length of @ctx.
  *
  * @inode_getsecctx:
- *      Returns a string containing all relevant security context information
+ *      On success, returns 0 and fills out @ctx and @ctxlen with the security
+ *      context for the given @inode.
  *
  *      @inode we wish to get the security context of.
  *      @ctx is a pointer in which to place the allocated security context.
@@ -1439,10 +1460,16 @@ struct security_operations {
         int (*sb_pivotroot) (struct path *old_path,
                              struct path *new_path);
         int (*sb_set_mnt_opts) (struct super_block *sb,
-                                struct security_mnt_opts *opts);
+                                struct security_mnt_opts *opts,
+                                unsigned long kern_flags,
+                                unsigned long *set_kern_flags);
         int (*sb_clone_mnt_opts) (const struct super_block *oldsb,
                                    struct super_block *newsb);
         int (*sb_parse_opts_str) (char *options, struct security_mnt_opts *opts);
+        int (*dentry_init_security) (struct dentry *dentry, int mode,
+                                        struct qstr *name, void **ctx,
+                                        u32 *ctxlen);
+
 
 #ifdef CONFIG_SECURITY_PATH
         int (*path_unlink) (struct path *dir, struct dentry *dentry);
@@ -1465,7 +1492,7 @@ struct security_operations {
         int (*inode_alloc_security) (struct inode *inode);
         void (*inode_free_security) (struct inode *inode);
         int (*inode_init_security) (struct inode *inode, struct inode *dir,
-                                    const struct qstr *qstr, char **name,
+                                    const struct qstr *qstr, const char **name,
                                     void **value, size_t *len);
         int (*inode_create) (struct inode *dir,
                              struct dentry *dentry, umode_t mode);
@@ -1590,6 +1617,7 @@ struct security_operations {
 
         int (*getprocattr) (struct task_struct *p, char *name, char **value);
         int (*setprocattr) (struct task_struct *p, char *name, void *value, size_t size);
+        int (*ismaclabel) (const char *name);
         int (*secid_to_secctx) (u32 secid, char **secdata, u32 *seclen);
         int (*secctx_to_secid) (const char *secdata, u32 seclen, u32 *secid);
         void (*release_secctx) (char *secdata, u32 seclen);
@@ -1725,10 +1753,16 @@ int security_sb_mount(const char *dev_name, struct path *path,
                       const char *type, unsigned long flags, void *data);
 int security_sb_umount(struct vfsmount *mnt, int flags);
 int security_sb_pivotroot(struct path *old_path, struct path *new_path);
-int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts);
+int security_sb_set_mnt_opts(struct super_block *sb,
+                                struct security_mnt_opts *opts,
+                                unsigned long kern_flags,
+                                unsigned long *set_kern_flags);
 int security_sb_clone_mnt_opts(const struct super_block *oldsb,
                                 struct super_block *newsb);
 int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts);
+int security_dentry_init_security(struct dentry *dentry, int mode,
+                                        struct qstr *name, void **ctx,
+                                        u32 *ctxlen);
 
 int security_inode_alloc(struct inode *inode);
 void security_inode_free(struct inode *inode);
@@ -1736,7 +1770,7 @@ int security_inode_init_security(struct inode *inode, struct inode *dir,
                                  const struct qstr *qstr,
                                  initxattrs initxattrs, void *fs_data);
 int security_old_inode_init_security(struct inode *inode, struct inode *dir,
-                                     const struct qstr *qstr, char **name,
+                                     const struct qstr *qstr, const char **name,
                                      void **value, size_t *len);
 int security_inode_create(struct inode *dir, struct dentry *dentry, umode_t mode);
 int security_inode_link(struct dentry *old_dentry, struct inode *dir,
@@ -1840,6 +1874,7 @@ void security_d_instantiate(struct dentry *dentry, struct inode *inode);
 int security_getprocattr(struct task_struct *p, char *name, char **value);
 int security_setprocattr(struct task_struct *p, char *name, void *value, size_t size);
 int security_netlink_send(struct sock *sk, struct sk_buff *skb);
+int security_ismaclabel(const char *name);
 int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen);
 int security_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid);
 void security_release_secctx(char *secdata, u32 seclen);
@@ -2011,7 +2046,9 @@ static inline int security_sb_pivotroot(struct path *old_path,
 }
 
 static inline int security_sb_set_mnt_opts(struct super_block *sb,
-                                           struct security_mnt_opts *opts)
+                                           struct security_mnt_opts *opts,
+                                           unsigned long kern_flags,
+                                           unsigned long *set_kern_flags)
 {
         return 0;
 }
@@ -2035,6 +2072,16 @@ static inline int security_inode_alloc(struct inode *inode)
 static inline void security_inode_free(struct inode *inode)
 { }
 
+static inline int security_dentry_init_security(struct dentry *dentry,
+                                                 int mode,
+                                                 struct qstr *name,
+                                                 void **ctx,
+                                                 u32 *ctxlen)
+{
+        return -EOPNOTSUPP;
+}
+
+
 static inline int security_inode_init_security(struct inode *inode,
                                                 struct inode *dir,
                                                 const struct qstr *qstr,
@@ -2047,8 +2094,8 @@ static inline int security_inode_init_security(struct inode *inode,
 static inline int security_old_inode_init_security(struct inode *inode,
                                                    struct inode *dir,
                                                    const struct qstr *qstr,
-                                                   char **name, void **value,
-                                                   size_t *len)
+                                                   const char **name,
+                                                   void **value, size_t *len)
 {
         return -EOPNOTSUPP;
 }
@@ -2520,6 +2567,11 @@ static inline int security_netlink_send(struct sock *sk, struct sk_buff *skb)
         return cap_netlink_send(sk, skb);
 }
 
+static inline int security_ismaclabel(const char *name)
+{
+        return 0;
+}
+
 static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
 {
         return -EOPNOTSUPP;
diff --git a/include/linux/sem.h b/include/linux/sem.h
index 53d42650b193..976ce3a19f1b 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -12,10 +12,12 @@ struct task_struct;
 struct sem_array {
         struct kern_ipc_perm    ____cacheline_aligned_in_smp
                                 sem_perm;       /* permissions .. see ipc.h */
-        time_t                  sem_otime;      /* last semop time */
         time_t                  sem_ctime;      /* last change time */
         struct sem              *sem_base;      /* ptr to first semaphore in array */
-        struct list_head        sem_pending;    /* pending operations to be processed */
+        struct list_head        pending_alter;  /* pending operations */
+                                                /* that alter the array */
+        struct list_head        pending_const;  /* pending complex operations */
+                                                /* that do not alter semvals */
         struct list_head        list_id;        /* undo requests on this array */
         int                     sem_nsems;      /* no. of semaphores in array */
         int                     complex_count;  /* pending complex operations */
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 2da29ac178fc..4e32edc8f506 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -173,4 +173,10 @@ extern struct hlist_node *seq_hlist_start_head_rcu(struct hlist_head *head,
 extern struct hlist_node *seq_hlist_next_rcu(void *v,
                                                    struct hlist_head *head,
                                                    loff_t *ppos);
+
+/* Helpers for iterating over per-cpu hlist_head-s in seq_files */
+extern struct hlist_node *seq_hlist_start_percpu(struct hlist_head __percpu *head, int *cpu, loff_t pos);
+
+extern struct hlist_node *seq_hlist_next_percpu(void *v, struct hlist_head __percpu *head, int *cpu, loff_t *pos);
+
 #endif
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index 18299057402f..21a209336e79 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -3,15 +3,21 @@
 /*
  * Reader/writer consistent mechanism without starving writers. This type of
  * lock for data where the reader wants a consistent set of information
- * and is willing to retry if the information changes.  Readers never
- * block but they may have to retry if a writer is in
- * progress. Writers do not wait for readers. 
+ * and is willing to retry if the information changes. There are two types
+ * of readers:
+ * 1. Sequence readers which never block a writer but they may have to retry
+ *    if a writer is in progress by detecting change in sequence number.
+ *    Writers do not wait for a sequence reader.
+ * 2. Locking readers which will wait if a writer or another locking reader
+ *    is in progress. A locking reader in progress will also block a writer
+ *    from going forward. Unlike the regular rwlock, the read lock here is
+ *    exclusive so that only one locking reader can get it.
  *
- * This is not as cache friendly as brlock. Also, this will not work
+ * This is not as cache friendly as brlock. Also, this may not work well
  * for data that contains pointers, because any writer could
  * invalidate a pointer that a reader was following.
  *
- * Expected reader usage:
+ * Expected non-blocking reader usage:
  *      do {
  *          seq = read_seqbegin(&foo);
  *      ...
@@ -268,4 +274,56 @@ write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags)
         spin_unlock_irqrestore(&sl->lock, flags);
 }
 
+/*
+ * A locking reader exclusively locks out other writers and locking readers,
+ * but doesn't update the sequence number. Acts like a normal spin_lock/unlock.
+ * Don't need preempt_disable() because that is in the spin_lock already.
+ */
+static inline void read_seqlock_excl(seqlock_t *sl)
+{
+        spin_lock(&sl->lock);
+}
+
+static inline void read_sequnlock_excl(seqlock_t *sl)
+{
+        spin_unlock(&sl->lock);
+}
+
+static inline void read_seqlock_excl_bh(seqlock_t *sl)
+{
+        spin_lock_bh(&sl->lock);
+}
+
+static inline void read_sequnlock_excl_bh(seqlock_t *sl)
+{
+        spin_unlock_bh(&sl->lock);
+}
+
+static inline void read_seqlock_excl_irq(seqlock_t *sl)
+{
+        spin_lock_irq(&sl->lock);
+}
+
+static inline void read_sequnlock_excl_irq(seqlock_t *sl)
+{
+        spin_unlock_irq(&sl->lock);
+}
+
+static inline unsigned long __read_seqlock_excl_irqsave(seqlock_t *sl)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&sl->lock, flags);
+        return flags;
+}
+
+#define read_seqlock_excl_irqsave(lock, flags)                          \
+        do { flags = __read_seqlock_excl_irqsave(lock); } while (0)
+
+static inline void
+read_sequnlock_excl_irqrestore(seqlock_t *sl, unsigned long flags)
+{
+        spin_unlock_irqrestore(&sl->lock, flags);
+}
+
 #endif /* __LINUX_SEQLOCK_H */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 87d4bbc773fc..b98291ac7f14 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -31,6 +31,13 @@
 #include <linux/sysrq.h>
 #include <uapi/linux/serial_core.h>
 
+#ifdef CONFIG_SERIAL_CORE_CONSOLE
+#define uart_console(port) \
+        ((port)->cons && (port)->cons->index == (port)->line)
+#else
+#define uart_console(port)      (0)
+#endif
+
 struct uart_port;
 struct serial_struct;
 struct device;
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index eb763adf9815..d34049712a4d 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -5,7 +5,7 @@
 #include <linux/sh_dma.h>
 
 /*
- * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)
+ * Generic header for SuperH (H)SCI(F) (used by sh/sh64/h8300 and related parts)
  */
 
 #define SCIx_NOT_SUPPORTED      (-1)
@@ -16,6 +16,7 @@ enum {
         SCBRR_ALGO_3,           /* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
         SCBRR_ALGO_4,           /* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
         SCBRR_ALGO_5,           /* (((clk * 1000 / 32) / bps) - 1) */
+        SCBRR_ALGO_6,           /* HSCIF variable sample rate algorithm */
 };
 
 #define SCSCR_TIE       (1 << 7)
@@ -37,7 +38,7 @@ enum {
 
 #define SCI_DEFAULT_ERROR_MASK (SCI_PER | SCI_FER)
 
-/* SCxSR SCIF */
+/* SCxSR SCIF, HSCIF */
 #define SCIF_ER    0x0080
 #define SCIF_TEND  0x0040
 #define SCIF_TDFE  0x0020
@@ -55,6 +56,9 @@ enum {
 #define SCSPTR_SPB2IO   (1 << 1)
 #define SCSPTR_SPB2DT   (1 << 0)
 
+/* HSSRR HSCIF */
+#define HSCIF_SRE       0x8000
+
 /* Offsets into the sci_port->irqs array */
 enum {
         SCIx_ERI_IRQ,
@@ -90,6 +94,7 @@ enum {
         SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
         SCIx_SH4_SCIF_FIFODATA_REGTYPE,
         SCIx_SH7705_SCIF_REGTYPE,
+        SCIx_HSCIF_REGTYPE,
 
         SCIx_NR_REGTYPES,
 };
@@ -115,6 +120,7 @@ enum {
         SCSMR, SCBRR, SCSCR, SCxSR,
         SCFCR, SCFDR, SCxTDR, SCxRDR,
         SCLSR, SCTFDR, SCRFDR, SCSPTR,
+        HSSRR,
 
         SCIx_NR_REGS,
 };
@@ -137,7 +143,7 @@ struct plat_sci_port {
         unsigned long   mapbase;                /* resource base */
         unsigned int    irqs[SCIx_NR_IRQS];     /* ERI, RXI, TXI, BRI */
         unsigned int    gpios[SCIx_NR_FNS];     /* SCK, RXD, TXD, CTS, RTS */
-        unsigned int    type;                   /* SCI / SCIF / IRDA */
+        unsigned int    type;                   /* SCI / SCIF / IRDA / HSCIF */
         upf_t           flags;                  /* UPF_* flags */
         unsigned long   capabilities;           /* Port features/capabilities */
 
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index b64d6bec6f90..b7b43b82231e 100644
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -33,13 +33,44 @@ struct sh_dmae_slave_config {
         char            mid_rid;
 };
 
+/**
+ * struct sh_dmae_channel - DMAC channel platform data
+ * @offset:             register offset within the main IOMEM resource
+ * @dmars:              channel DMARS register offset
+ * @chclr_offset:       channel CHCLR register offset
+ * @dmars_bit:          channel DMARS field offset within the register
+ * @chclr_bit:          bit position, to be set to reset the channel
+ */
 struct sh_dmae_channel {
         unsigned int    offset;
         unsigned int    dmars;
-        unsigned int    dmars_bit;
         unsigned int    chclr_offset;
+        unsigned char   dmars_bit;
+        unsigned char   chclr_bit;
 };
 
+/**
+ * struct sh_dmae_pdata - DMAC platform data
+ * @slave:              array of slaves
+ * @slave_num:          number of slaves in the above array
+ * @channel:            array of DMA channels
+ * @channel_num:        number of channels in the above array
+ * @ts_low_shift:       shift of the low part of the TS field
+ * @ts_low_mask:        low TS field mask
+ * @ts_high_shift:      additional shift of the high part of the TS field
+ * @ts_high_mask:       high TS field mask
+ * @ts_shift:           array of Transfer Size shifts, indexed by TS value
+ * @ts_shift_num:       number of shifts in the above array
+ * @dmaor_init:         DMAOR initialisation value
+ * @chcr_offset:        CHCR address offset
+ * @chcr_ie_bit:        CHCR Interrupt Enable bit
+ * @dmaor_is_32bit:     DMAOR is a 32-bit register
+ * @needs_tend_set:     the TEND register has to be set
+ * @no_dmars:           DMAC has no DMARS registers
+ * @chclr_present:      DMAC has one or several CHCLR registers
+ * @chclr_bitwise:      channel CHCLR registers are bitwise
+ * @slave_only:         DMAC cannot be used for MEMCPY
+ */
 struct sh_dmae_pdata {
         const struct sh_dmae_slave_config *slave;
         int slave_num;
@@ -59,46 +90,24 @@ struct sh_dmae_pdata {
         unsigned int needs_tend_set:1;
         unsigned int no_dmars:1;
         unsigned int chclr_present:1;
+        unsigned int chclr_bitwise:1;
         unsigned int slave_only:1;
 };
 
-/* DMA register */
-#define SAR     0x00
-#define DAR     0x04
-#define TCR     0x08
-#define CHCR    0x0C
-#define DMAOR   0x40
-
-#define TEND    0x18 /* USB-DMAC */
-
 /* DMAOR definitions */
 #define DMAOR_AE        0x00000004
 #define DMAOR_NMIF      0x00000002
 #define DMAOR_DME       0x00000001
 
 /* Definitions for the SuperH DMAC */
-#define REQ_L   0x00000000
-#define REQ_E   0x00080000
-#define RACK_H  0x00000000
-#define RACK_L  0x00040000
-#define ACK_R   0x00000000
-#define ACK_W   0x00020000
-#define ACK_H   0x00000000
-#define ACK_L   0x00010000
 #define DM_INC  0x00004000
 #define DM_DEC  0x00008000
 #define DM_FIX  0x0000c000
 #define SM_INC  0x00001000
 #define SM_DEC  0x00002000
 #define SM_FIX  0x00003000
-#define RS_IN   0x00000200
-#define RS_OUT  0x00000300
-#define TS_BLK  0x00000040
-#define TM_BUR  0x00000020
 #define CHCR_DE 0x00000001
 #define CHCR_TE 0x00000002
 #define CHCR_IE 0x00000004
 
-bool shdma_chan_filter(struct dma_chan *chan, void *arg);
-
 #endif
diff --git a/include/linux/sh_eth.h b/include/linux/sh_eth.h
index fc305713fc6d..90b5e30c2f22 100644
--- a/include/linux/sh_eth.h
+++ b/include/linux/sh_eth.h
@@ -2,23 +2,17 @@
 #define __ASM_SH_ETH_H__
 
 #include <linux/phy.h>
+#include <linux/if_ether.h>
 
 enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};
-enum {
-        SH_ETH_REG_GIGABIT,
-        SH_ETH_REG_FAST_RCAR,
-        SH_ETH_REG_FAST_SH4,
-        SH_ETH_REG_FAST_SH3_SH2
-};
 
 struct sh_eth_plat_data {
         int phy;
         int edmac_endian;
-        int register_type;
         phy_interface_t phy_interface;
         void (*set_mdio_gate)(void *addr);
 
-        unsigned char mac_addr[6];
+        unsigned char mac_addr[ETH_ALEN];
         unsigned no_ether_link:1;
         unsigned ether_link_active_low:1;
         unsigned needs_init:1;
diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h
index a3728bf66f0e..f92c0a43c54c 100644
--- a/include/linux/shdma-base.h
+++ b/include/linux/shdma-base.h
@@ -68,6 +68,8 @@ struct shdma_chan {
         int id;                         /* Raw id of this channel */
         int irq;                        /* Channel IRQ */
         int slave_id;                   /* Client ID for slave DMA */
+        int hw_req;                     /* DMA request line for slave DMA - same
+                                         * as MID/RID, used with DT */
         enum shdma_pm_state pm_state;
 };
 
@@ -94,7 +96,7 @@ struct shdma_ops {
         dma_addr_t (*slave_addr)(struct shdma_chan *);
         int (*desc_setup)(struct shdma_chan *, struct shdma_desc *,
                           dma_addr_t, dma_addr_t, size_t *);
-        int (*set_slave)(struct shdma_chan *, int, bool);
+        int (*set_slave)(struct shdma_chan *, int, dma_addr_t, bool);
         void (*setup_xfer)(struct shdma_chan *, int);
         void (*start_xfer)(struct shdma_chan *, struct shdma_desc *);
         struct shdma_desc *(*embedded_desc)(void *, int);
@@ -114,7 +116,6 @@ struct shdma_dev {
 
 int shdma_request_irq(struct shdma_chan *, int,
                            unsigned long, const char *);
-void shdma_free_irq(struct shdma_chan *);
 bool shdma_reset(struct shdma_dev *sdev);
 void shdma_chan_probe(struct shdma_dev *sdev,
                            struct shdma_chan *schan, int id);
@@ -122,5 +123,10 @@ void shdma_chan_remove(struct shdma_chan *schan);
 int shdma_init(struct device *dev, struct shdma_dev *sdev,
                     int chan_num);
 void shdma_cleanup(struct shdma_dev *sdev);
+#if IS_ENABLED(CONFIG_SH_DMAE_BASE)
+bool shdma_chan_filter(struct dma_chan *chan, void *arg);
+#else
+#define shdma_chan_filter NULL
+#endif
 
 #endif
diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h
index ac6b8ee07825..68c097077ef0 100644
--- a/include/linux/shrinker.h
+++ b/include/linux/shrinker.h
@@ -4,39 +4,67 @@
 /*
  * This struct is used to pass information from page reclaim to the shrinkers.
  * We consolidate the values for easier extention later.
+ *
+ * The 'gfpmask' refers to the allocation we are currently trying to
+ * fulfil.
  */
 struct shrink_control {
         gfp_t gfp_mask;
 
-        /* How many slab objects shrinker() should scan and try to reclaim */
+        /*
+         * How many objects scan_objects should scan and try to reclaim.
+         * This is reset before every call, so it is safe for callees
+         * to modify.
+         */
         unsigned long nr_to_scan;
+
+        /* shrink from these nodes */
+        nodemask_t nodes_to_scan;
+        /* current node being shrunk (for NUMA aware shrinkers) */
+        int nid;
 };
 
+#define SHRINK_STOP (~0UL)
 /*
  * A callback you can register to apply pressure to ageable caches.
  *
- * 'sc' is passed shrink_control which includes a count 'nr_to_scan'
- * and a 'gfpmask'.  It should look through the least-recently-used
- * 'nr_to_scan' entries and attempt to free them up.  It should return
- * the number of objects which remain in the cache.  If it returns -1, it means
- * it cannot do any scanning at this time (eg. there is a risk of deadlock).
+ * @count_objects should return the number of freeable items in the cache. If
+ * there are no objects to free or the number of freeable items cannot be
+ * determined, it should return 0. No deadlock checks should be done during the
+ * count callback - the shrinker relies on aggregating scan counts that couldn't
+ * be executed due to potential deadlocks to be run at a later call when the
+ * deadlock condition is no longer pending.
  *
- * The 'gfpmask' refers to the allocation we are currently trying to
- * fulfil.
+ * @scan_objects will only be called if @count_objects returned a non-zero
+ * value for the number of freeable objects. The callout should scan the cache
+ * and attempt to free items from the cache. It should then return the number
+ * of objects freed during the scan, or SHRINK_STOP if progress cannot be made
+ * due to potential deadlocks. If SHRINK_STOP is returned, then no further
+ * attempts to call the @scan_objects will be made from the current reclaim
+ * context.
  *
- * Note that 'shrink' will be passed nr_to_scan == 0 when the VM is
- * querying the cache size, so a fastpath for that case is appropriate.
+ * @flags determine the shrinker abilities, like numa awareness
  */
 struct shrinker {
-        int (*shrink)(struct shrinker *, struct shrink_control *sc);
+        unsigned long (*count_objects)(struct shrinker *,
+                                       struct shrink_control *sc);
+        unsigned long (*scan_objects)(struct shrinker *,
+                                      struct shrink_control *sc);
+
         int seeks;      /* seeks to recreate an obj */
         long batch;     /* reclaim batch size, 0 = default */
+        unsigned long flags;
 
         /* These are for internal use */
         struct list_head list;
-        atomic_long_t nr_in_batch; /* objs pending delete */
+        /* objs pending delete, per node */
+        atomic_long_t *nr_deferred;
 };
 #define DEFAULT_SEEKS 2 /* A good number if you don't know better. */
-extern void register_shrinker(struct shrinker *);
+
+/* Flags */
+#define SHRINKER_NUMA_AWARE (1 << 0)
+
+extern int register_shrinker(struct shrinker *);
 extern void unregister_shrinker(struct shrinker *);
 #endif
diff --git a/include/linux/signal.h b/include/linux/signal.h
index d897484730c0..2ac423bdb676 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -434,6 +434,14 @@ void signals_init(void);
 int restore_altstack(const stack_t __user *);
 int __save_altstack(stack_t __user *, unsigned long);
 
+#define save_altstack_ex(uss, sp) do { \
+        stack_t __user *__uss = uss; \
+        struct task_struct *t = current; \
+        put_user_ex((void __user *)t->sas_ss_sp, &__uss->ss_sp); \
+        put_user_ex(sas_ss_flags(sp), &__uss->ss_flags); \
+        put_user_ex(t->sas_ss_size, &__uss->ss_size); \
+} while (0);
+
 #ifdef CONFIG_PROC_FS
 struct seq_file;
 extern void render_sigset_t(struct seq_file *, const char *, sigset_t *);
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 9c676eae3968..c2d89335f637 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -319,6 +319,8 @@ enum {
         SKB_GSO_GRE = 1 << 6,
 
         SKB_GSO_UDP_TUNNEL = 1 << 7,
+
+        SKB_GSO_MPLS = 1 << 8,
 };
 
 #if BITS_PER_LONG > 32
@@ -384,11 +386,13 @@ typedef unsigned char *sk_buff_data_t;
  *      @no_fcs:  Request NIC to treat last 4 bytes as Ethernet FCS
  *      @dma_cookie: a cookie to one of several possible DMA operations
  *              done by skb DMA functions
+  *     @napi_id: id of the NAPI struct this skb came from
  *      @secmark: security marking
  *      @mark: Generic packet mark
  *      @dropcount: total number of sk_receive_queue overflows
  *      @vlan_proto: vlan encapsulation protocol
  *      @vlan_tci: vlan tag control information
+ *      @inner_protocol: Protocol (encapsulation)
  *      @inner_transport_header: Inner transport layer header (encapsulation)
  *      @inner_network_header: Network layer header (encapsulation)
  *      @inner_mac_header: Link layer header (encapsulation)
@@ -494,11 +498,14 @@ struct sk_buff {
          * headers if needed
          */
         __u8                    encapsulation:1;
-        /* 7/9 bit hole (depending on ndisc_nodetype presence) */
+        /* 6/8 bit hole (depending on ndisc_nodetype presence) */
         kmemcheck_bitfield_end(flags2);
 
-#ifdef CONFIG_NET_DMA
-        dma_cookie_t            dma_cookie;
+#if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL
+        union {
+                unsigned int    napi_id;
+                dma_cookie_t    dma_cookie;
+        };
 #endif
 #ifdef CONFIG_NETWORK_SECMARK
         __u32                   secmark;
@@ -509,12 +516,13 @@ struct sk_buff {
                 __u32           reserved_tailroom;
         };
 
-        sk_buff_data_t          inner_transport_header;
-        sk_buff_data_t          inner_network_header;
-        sk_buff_data_t          inner_mac_header;
-        sk_buff_data_t          transport_header;
-        sk_buff_data_t          network_header;
-        sk_buff_data_t          mac_header;
+        __be16                  inner_protocol;
+        __u16                   inner_transport_header;
+        __u16                   inner_network_header;
+        __u16                   inner_mac_header;
+        __u16                   transport_header;
+        __u16                   network_header;
+        __u16                   mac_header;
         /* These elements must be at the end, see alloc_skb() for details.  */
         sk_buff_data_t          tail;
         sk_buff_data_t          end;
@@ -627,6 +635,7 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb)
 }
 
 extern void kfree_skb(struct sk_buff *skb);
+extern void kfree_skb_list(struct sk_buff *segs);
 extern void skb_tx_error(struct sk_buff *skb);
 extern void consume_skb(struct sk_buff *skb);
 extern void            __kfree_skb(struct sk_buff *skb);
@@ -1387,6 +1396,7 @@ static inline void skb_set_tail_pointer(struct sk_buff *skb, const int offset)
         skb_reset_tail_pointer(skb);
         skb->tail += offset;
 }
+
 #else /* NET_SKBUFF_DATA_USES_OFFSET */
 static inline unsigned char *skb_tail_pointer(const struct sk_buff *skb)
 {
@@ -1527,7 +1537,6 @@ static inline void skb_reset_mac_len(struct sk_buff *skb)
         skb->mac_len = skb->network_header - skb->mac_header;
 }
 
-#ifdef NET_SKBUFF_DATA_USES_OFFSET
 static inline unsigned char *skb_inner_transport_header(const struct sk_buff
                                                         *skb)
 {
@@ -1581,7 +1590,7 @@ static inline void skb_set_inner_mac_header(struct sk_buff *skb,
 }
 static inline bool skb_transport_header_was_set(const struct sk_buff *skb)
 {
-        return skb->transport_header != ~0U;
+        return skb->transport_header != (typeof(skb->transport_header))~0U;
 }
 
 static inline unsigned char *skb_transport_header(const struct sk_buff *skb)
@@ -1624,7 +1633,7 @@ static inline unsigned char *skb_mac_header(const struct sk_buff *skb)
 
 static inline int skb_mac_header_was_set(const struct sk_buff *skb)
 {
-        return skb->mac_header != ~0U;
+        return skb->mac_header != (typeof(skb->mac_header))~0U;
 }
 
 static inline void skb_reset_mac_header(struct sk_buff *skb)
@@ -1638,112 +1647,6 @@ static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)
         skb->mac_header += offset;
 }
 
-#else /* NET_SKBUFF_DATA_USES_OFFSET */
-static inline unsigned char *skb_inner_transport_header(const struct sk_buff
-                                                        *skb)
-{
-        return skb->inner_transport_header;
-}
-
-static inline void skb_reset_inner_transport_header(struct sk_buff *skb)
-{
-        skb->inner_transport_header = skb->data;
-}
-
-static inline void skb_set_inner_transport_header(struct sk_buff *skb,
-                                                   const int offset)
-{
-        skb->inner_transport_header = skb->data + offset;
-}
-
-static inline unsigned char *skb_inner_network_header(const struct sk_buff *skb)
-{
-        return skb->inner_network_header;
-}
-
-static inline void skb_reset_inner_network_header(struct sk_buff *skb)
-{
-        skb->inner_network_header = skb->data;
-}
-
-static inline void skb_set_inner_network_header(struct sk_buff *skb,
-                                                const int offset)
-{
-        skb->inner_network_header = skb->data + offset;
-}
-
-static inline unsigned char *skb_inner_mac_header(const struct sk_buff *skb)
-{
-        return skb->inner_mac_header;
-}
-
-static inline void skb_reset_inner_mac_header(struct sk_buff *skb)
-{
-        skb->inner_mac_header = skb->data;
-}
-
-static inline void skb_set_inner_mac_header(struct sk_buff *skb,
-                                                const int offset)
-{
-        skb->inner_mac_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;
-}
-
-static inline void skb_reset_transport_header(struct sk_buff *skb)
-{
-        skb->transport_header = skb->data;
-}
-
-static inline void skb_set_transport_header(struct sk_buff *skb,
-                                            const int offset)
-{
-        skb->transport_header = skb->data + offset;
-}
-
-static inline unsigned char *skb_network_header(const struct sk_buff *skb)
-{
-        return skb->network_header;
-}
-
-static inline void skb_reset_network_header(struct sk_buff *skb)
-{
-        skb->network_header = skb->data;
-}
-
-static inline void skb_set_network_header(struct sk_buff *skb, const int offset)
-{
-        skb->network_header = skb->data + offset;
-}
-
-static inline unsigned char *skb_mac_header(const struct sk_buff *skb)
-{
-        return skb->mac_header;
-}
-
-static inline int skb_mac_header_was_set(const struct sk_buff *skb)
-{
-        return skb->mac_header != NULL;
-}
-
-static inline void skb_reset_mac_header(struct sk_buff *skb)
-{
-        skb->mac_header = skb->data;
-}
-
-static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)
-{
-        skb->mac_header = skb->data + offset;
-}
-#endif /* NET_SKBUFF_DATA_USES_OFFSET */
-
 static inline void skb_probe_transport_header(struct sk_buff *skb,
                                               const int offset_hint)
 {
@@ -1902,10 +1805,13 @@ static inline void pskb_trim_unique(struct sk_buff *skb, unsigned int len)
  */
 static inline void skb_orphan(struct sk_buff *skb)
 {
-        if (skb->destructor)
+        if (skb->destructor) {
                 skb->destructor(skb);
-        skb->destructor = NULL;
-        skb->sk         = NULL;
+                skb->destructor = NULL;
+                skb->sk         = NULL;
+        } else {
+                BUG_ON(skb->sk);
+        }
 }
 
 /**
@@ -1999,8 +1905,8 @@ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
         return __netdev_alloc_skb_ip_align(dev, length, GFP_ATOMIC);
 }
 
-/*
- *      __skb_alloc_page - allocate pages for ps-rx on a skb and preserve pfmemalloc data
+/**
+ *      __skb_alloc_pages - allocate pages for ps-rx on a skb and preserve pfmemalloc data
  *      @gfp_mask: alloc_pages_node mask. Set __GFP_NOMEMALLOC if not for network packet RX
  *      @skb: skb to set pfmemalloc on if __GFP_MEMALLOC is used
  *      @order: size of the allocation
@@ -2453,6 +2359,10 @@ extern int	       skb_copy_datagram_from_iovec(struct sk_buff *skb,
                                                     const struct iovec *from,
                                                     int from_offset,
                                                     int len);
+extern int             zerocopy_sg_from_iovec(struct sk_buff *skb,
+                                              const struct iovec *frm,
+                                              int offset,
+                                              size_t count);
 extern int             skb_copy_datagram_const_iovec(const struct sk_buff *from,
                                                      int offset,
                                                      const struct iovec *to,
@@ -2482,6 +2392,7 @@ extern void	       skb_split(struct sk_buff *skb,
                                  struct sk_buff *skb1, const u32 len);
 extern int             skb_shift(struct sk_buff *tgt, struct sk_buff *skb,
                                  int shiftlen);
+extern void            skb_scrub_packet(struct sk_buff *skb, bool xnet);
 
 extern struct sk_buff *skb_segment(struct sk_buff *skb,
                                    netdev_features_t features);
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 0c621752caa6..74f105847d13 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -4,6 +4,8 @@
  * (C) SGI 2006, Christoph Lameter
  *      Cleaned up and restructured to ease the addition of alternative
  *      implementations of SLAB allocators.
+ * (C) Linux Foundation 2008-2013
+ *      Unified interface for all slab allocators
  */
 
 #ifndef _LINUX_SLAB_H
@@ -94,6 +96,7 @@
 #define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
                                 (unsigned long)ZERO_SIZE_PTR)
 
+#include <linux/kmemleak.h>
 
 struct mem_cgroup;
 /*
@@ -169,11 +172,7 @@ struct kmem_cache {
         struct list_head list;  /* List of all slab caches on the system */
 };
 
-#define KMALLOC_MAX_SIZE (1UL << 30)
-
-#include <linux/slob_def.h>
-
-#else /* CONFIG_SLOB */
+#endif /* CONFIG_SLOB */
 
 /*
  * Kmalloc array related definitions
@@ -195,7 +194,9 @@ struct kmem_cache {
 #ifndef KMALLOC_SHIFT_LOW
 #define KMALLOC_SHIFT_LOW       5
 #endif
-#else
+#endif
+
+#ifdef CONFIG_SLUB
 /*
  * SLUB allocates up to order 2 pages directly and otherwise
  * passes the request to the page allocator.
@@ -207,6 +208,19 @@ struct kmem_cache {
 #endif
 #endif
 
+#ifdef CONFIG_SLOB
+/*
+ * SLOB passes all page size and larger requests to the page allocator.
+ * No kmalloc array is necessary since objects of different sizes can
+ * be allocated from the same page.
+ */
+#define KMALLOC_SHIFT_MAX       30
+#define KMALLOC_SHIFT_HIGH      PAGE_SHIFT
+#ifndef KMALLOC_SHIFT_LOW
+#define KMALLOC_SHIFT_LOW       3
+#endif
+#endif
+
 /* Maximum allocatable size */
 #define KMALLOC_MAX_SIZE        (1UL << KMALLOC_SHIFT_MAX)
 /* Maximum size for which we actually use a slab cache */
@@ -221,6 +235,7 @@ struct kmem_cache {
 #define KMALLOC_MIN_SIZE (1 << KMALLOC_SHIFT_LOW)
 #endif
 
+#ifndef CONFIG_SLOB
 extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
 #ifdef CONFIG_ZONE_DMA
 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
@@ -275,14 +290,121 @@ static __always_inline int kmalloc_index(size_t size)
         /* Will never be reached. Needed because the compiler may complain */
         return -1;
 }
+#endif /* !CONFIG_SLOB */
+
+void *__kmalloc(size_t size, gfp_t flags);
+void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
+
+#ifdef CONFIG_NUMA
+void *__kmalloc_node(size_t size, gfp_t flags, int node);
+void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
+#else
+static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
+{
+        return __kmalloc(size, flags);
+}
+
+static __always_inline void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t flags, int node)
+{
+        return kmem_cache_alloc(s, flags);
+}
+#endif
+
+#ifdef CONFIG_TRACING
+extern void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t);
+
+#ifdef CONFIG_NUMA
+extern void *kmem_cache_alloc_node_trace(struct kmem_cache *s,
+                                           gfp_t gfpflags,
+                                           int node, size_t size);
+#else
+static __always_inline void *
+kmem_cache_alloc_node_trace(struct kmem_cache *s,
+                              gfp_t gfpflags,
+                              int node, size_t size)
+{
+        return kmem_cache_alloc_trace(s, gfpflags, size);
+}
+#endif /* CONFIG_NUMA */
+
+#else /* CONFIG_TRACING */
+static __always_inline void *kmem_cache_alloc_trace(struct kmem_cache *s,
+                gfp_t flags, size_t size)
+{
+        return kmem_cache_alloc(s, flags);
+}
+
+static __always_inline void *
+kmem_cache_alloc_node_trace(struct kmem_cache *s,
+                              gfp_t gfpflags,
+                              int node, size_t size)
+{
+        return kmem_cache_alloc_node(s, gfpflags, node);
+}
+#endif /* CONFIG_TRACING */
 
 #ifdef CONFIG_SLAB
 #include <linux/slab_def.h>
-#elif defined(CONFIG_SLUB)
+#endif
+
+#ifdef CONFIG_SLUB
 #include <linux/slub_def.h>
+#endif
+
+static __always_inline void *
+kmalloc_order(size_t size, gfp_t flags, unsigned int order)
+{
+        void *ret;
+
+        flags |= (__GFP_COMP | __GFP_KMEMCG);
+        ret = (void *) __get_free_pages(flags, order);
+        kmemleak_alloc(ret, size, 1, flags);
+        return ret;
+}
+
+#ifdef CONFIG_TRACING
+extern void *kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order);
 #else
-#error "Unknown slab allocator"
+static __always_inline void *
+kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
+{
+        return kmalloc_order(size, flags, order);
+}
+#endif
+
+static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
+{
+        unsigned int order = get_order(size);
+        return kmalloc_order_trace(size, flags, order);
+}
+
+/**
+ * kmalloc - allocate memory
+ * @size: how many bytes of memory are required.
+ * @flags: the type of memory to allocate (see kcalloc).
+ *
+ * kmalloc is the normal method of allocating memory
+ * for objects smaller than page size in the kernel.
+ */
+static __always_inline void *kmalloc(size_t size, gfp_t flags)
+{
+        if (__builtin_constant_p(size)) {
+                if (size > KMALLOC_MAX_CACHE_SIZE)
+                        return kmalloc_large(size, flags);
+#ifndef CONFIG_SLOB
+                if (!(flags & GFP_DMA)) {
+                        int index = kmalloc_index(size);
+
+                        if (!index)
+                                return ZERO_SIZE_PTR;
+
+                        return kmem_cache_alloc_trace(kmalloc_caches[index],
+                                        flags, size);
+                }
 #endif
+        }
+        return __kmalloc(size, flags);
+}
 
 /*
  * Determine size used for the nth kmalloc cache.
@@ -291,6 +413,7 @@ static __always_inline int kmalloc_index(size_t size)
  */
 static __always_inline int kmalloc_size(int n)
 {
+#ifndef CONFIG_SLOB
         if (n > 2)
                 return 1 << n;
 
@@ -299,10 +422,26 @@ static __always_inline int kmalloc_size(int n)
 
         if (n == 2 && KMALLOC_MIN_SIZE <= 64)
                 return 192;
-
+#endif
         return 0;
 }
-#endif /* !CONFIG_SLOB */
+
+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+{
+#ifndef CONFIG_SLOB
+        if (__builtin_constant_p(size) &&
+                size <= KMALLOC_MAX_CACHE_SIZE && !(flags & GFP_DMA)) {
+                int i = kmalloc_index(size);
+
+                if (!i)
+                        return ZERO_SIZE_PTR;
+
+                return kmem_cache_alloc_node_trace(kmalloc_caches[i],
+                                                flags, node, size);
+        }
+#endif
+        return __kmalloc_node(size, flags, node);
+}
 
 /*
  * Setting ARCH_SLAB_MINALIGN in arch headers allows a different alignment.
@@ -356,9 +495,8 @@ int cache_show(struct kmem_cache *s, struct seq_file *m);
 void print_slabinfo_header(struct seq_file *m);
 
 /**
- * kmalloc_array - allocate memory for an array.
- * @n: number of elements.
- * @size: element size.
+ * kmalloc - allocate memory
+ * @size: how many bytes of memory are required.
  * @flags: the type of memory to allocate.
  *
  * The @flags argument may be one of:
@@ -405,6 +543,17 @@ void print_slabinfo_header(struct seq_file *m);
  * There are other flags available as well, but these are not intended
  * for general use, and so are not documented here. For a full list of
  * potential flags, always refer to linux/gfp.h.
+ *
+ * kmalloc is the normal method of allocating memory
+ * in the kernel.
+ */
+static __always_inline void *kmalloc(size_t size, gfp_t flags);
+
+/**
+ * kmalloc_array - allocate memory for an array.
+ * @n: number of elements.
+ * @size: element size.
+ * @flags: the type of memory to allocate (see kmalloc).
  */
 static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
 {
@@ -424,36 +573,6 @@ static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
         return kmalloc_array(n, size, flags | __GFP_ZERO);
 }
 
-#if !defined(CONFIG_NUMA) && !defined(CONFIG_SLOB)
-/**
- * kmalloc_node - allocate memory from a specific node
- * @size: how many bytes of memory are required.
- * @flags: the type of memory to allocate (see kcalloc).
- * @node: node to allocate from.
- *
- * kmalloc() for non-local nodes, used to allocate from a specific node
- * if available. Equivalent to kmalloc() in the non-NUMA single-node
- * case.
- */
-static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
-{
-        return kmalloc(size, flags);
-}
-
-static inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
-{
-        return __kmalloc(size, flags);
-}
-
-void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
-
-static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
-                                        gfp_t flags, int node)
-{
-        return kmem_cache_alloc(cachep, flags);
-}
-#endif /* !CONFIG_NUMA && !CONFIG_SLOB */
-
 /*
  * kmalloc_track_caller is a special version of kmalloc that records the
  * calling function of the routine calling it for slab leak tracking instead
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index cd401580bdd3..e9346b4f1ef4 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -3,20 +3,6 @@
 
 /*
  * Definitions unique to the original Linux SLAB allocator.
- *
- * What we provide here is a way to optimize the frequent kmalloc
- * calls in the kernel by selecting the appropriate general cache
- * if kmalloc was called with a size that can be established at
- * compile time.
- */
-
-#include <linux/init.h>
-#include <linux/compiler.h>
-
-/*
- * struct kmem_cache
- *
- * manages a cache.
  */
 
 struct kmem_cache {
@@ -102,96 +88,4 @@ struct kmem_cache {
          */
 };
 
-void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
-void *__kmalloc(size_t size, gfp_t flags);
-
-#ifdef CONFIG_TRACING
-extern void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t);
-#else
-static __always_inline void *
-kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
-{
-        return kmem_cache_alloc(cachep, flags);
-}
-#endif
-
-static __always_inline void *kmalloc(size_t size, gfp_t flags)
-{
-        struct kmem_cache *cachep;
-        void *ret;
-
-        if (__builtin_constant_p(size)) {
-                int i;
-
-                if (!size)
-                        return ZERO_SIZE_PTR;
-
-                if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
-                        return NULL;
-
-                i = kmalloc_index(size);
-
-#ifdef CONFIG_ZONE_DMA
-                if (flags & GFP_DMA)
-                        cachep = kmalloc_dma_caches[i];
-                else
-#endif
-                        cachep = kmalloc_caches[i];
-
-                ret = kmem_cache_alloc_trace(cachep, flags, size);
-
-                return ret;
-        }
-        return __kmalloc(size, flags);
-}
-
-#ifdef CONFIG_NUMA
-extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
-extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
-
-#ifdef CONFIG_TRACING
-extern void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
-                                         gfp_t flags,
-                                         int nodeid,
-                                         size_t size);
-#else
-static __always_inline void *
-kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
-                            gfp_t flags,
-                            int nodeid,
-                            size_t size)
-{
-        return kmem_cache_alloc_node(cachep, flags, nodeid);
-}
-#endif
-
-static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
-{
-        struct kmem_cache *cachep;
-
-        if (__builtin_constant_p(size)) {
-                int i;
-
-                if (!size)
-                        return ZERO_SIZE_PTR;
-
-                if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
-                        return NULL;
-
-                i = kmalloc_index(size);
-
-#ifdef CONFIG_ZONE_DMA
-                if (flags & GFP_DMA)
-                        cachep = kmalloc_dma_caches[i];
-                else
-#endif
-                        cachep = kmalloc_caches[i];
-
-                return kmem_cache_alloc_node_trace(cachep, flags, node, size);
-        }
-        return __kmalloc_node(size, flags, node);
-}
-
-#endif  /* CONFIG_NUMA */
-
 #endif  /* _LINUX_SLAB_DEF_H */
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
deleted file mode 100644
index f28e14a12e3f..000000000000
--- a/include/linux/slob_def.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __LINUX_SLOB_DEF_H
-#define __LINUX_SLOB_DEF_H
-
-#include <linux/numa.h>
-
-void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
-
-static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
-                                              gfp_t flags)
-{
-        return kmem_cache_alloc_node(cachep, flags, NUMA_NO_NODE);
-}
-
-void *__kmalloc_node(size_t size, gfp_t flags, int node);
-
-static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
-{
-        return __kmalloc_node(size, flags, node);
-}
-
-/**
- * kmalloc - allocate memory
- * @size: how many bytes of memory are required.
- * @flags: the type of memory to allocate (see kcalloc).
- *
- * kmalloc is the normal method of allocating memory
- * in the kernel.
- */
-static __always_inline void *kmalloc(size_t size, gfp_t flags)
-{
-        return __kmalloc_node(size, flags, NUMA_NO_NODE);
-}
-
-static __always_inline void *__kmalloc(size_t size, gfp_t flags)
-{
-        return kmalloc(size, flags);
-}
-
-#endif /* __LINUX_SLOB_DEF_H */
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 027276fa8713..cc0b67eada42 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -6,14 +6,8 @@
  *
  * (C) 2007 SGI, Christoph Lameter
  */
-#include <linux/types.h>
-#include <linux/gfp.h>
-#include <linux/bug.h>
-#include <linux/workqueue.h>
 #include <linux/kobject.h>
 
-#include <linux/kmemleak.h>
-
 enum stat_item {
         ALLOC_FASTPATH,         /* Allocation from cpu slab */
         ALLOC_SLOWPATH,         /* Allocation by getting a new cpu slab */
@@ -104,108 +98,4 @@ struct kmem_cache {
         struct kmem_cache_node *node[MAX_NUMNODES];
 };
 
-void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
-void *__kmalloc(size_t size, gfp_t flags);
-
-static __always_inline void *
-kmalloc_order(size_t size, gfp_t flags, unsigned int order)
-{
-        void *ret;
-
-        flags |= (__GFP_COMP | __GFP_KMEMCG);
-        ret = (void *) __get_free_pages(flags, order);
-        kmemleak_alloc(ret, size, 1, flags);
-        return ret;
-}
-
-/**
- * Calling this on allocated memory will check that the memory
- * is expected to be in use, and print warnings if not.
- */
-#ifdef CONFIG_SLUB_DEBUG
-extern bool verify_mem_not_deleted(const void *x);
-#else
-static inline bool verify_mem_not_deleted(const void *x)
-{
-        return true;
-}
-#endif
-
-#ifdef CONFIG_TRACING
-extern void *
-kmem_cache_alloc_trace(struct kmem_cache *s, gfp_t gfpflags, size_t size);
-extern void *kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order);
-#else
-static __always_inline void *
-kmem_cache_alloc_trace(struct kmem_cache *s, gfp_t gfpflags, size_t size)
-{
-        return kmem_cache_alloc(s, gfpflags);
-}
-
-static __always_inline void *
-kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
-{
-        return kmalloc_order(size, flags, order);
-}
-#endif
-
-static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
-{
-        unsigned int order = get_order(size);
-        return kmalloc_order_trace(size, flags, order);
-}
-
-static __always_inline void *kmalloc(size_t size, gfp_t flags)
-{
-        if (__builtin_constant_p(size)) {
-                if (size > KMALLOC_MAX_CACHE_SIZE)
-                        return kmalloc_large(size, flags);
-
-                if (!(flags & GFP_DMA)) {
-                        int index = kmalloc_index(size);
-
-                        if (!index)
-                                return ZERO_SIZE_PTR;
-
-                        return kmem_cache_alloc_trace(kmalloc_caches[index],
-                                        flags, size);
-                }
-        }
-        return __kmalloc(size, flags);
-}
-
-#ifdef CONFIG_NUMA
-void *__kmalloc_node(size_t size, gfp_t flags, int node);
-void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
-
-#ifdef CONFIG_TRACING
-extern void *kmem_cache_alloc_node_trace(struct kmem_cache *s,
-                                           gfp_t gfpflags,
-                                           int node, size_t size);
-#else
-static __always_inline void *
-kmem_cache_alloc_node_trace(struct kmem_cache *s,
-                              gfp_t gfpflags,
-                              int node, size_t size)
-{
-        return kmem_cache_alloc_node(s, gfpflags, node);
-}
-#endif
-
-static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
-{
-        if (__builtin_constant_p(size) &&
-                size <= KMALLOC_MAX_CACHE_SIZE && !(flags & GFP_DMA)) {
-                int index = kmalloc_index(size);
-
-                if (!index)
-                        return ZERO_SIZE_PTR;
-
-                return kmem_cache_alloc_node_trace(kmalloc_caches[index],
-                               flags, node, size);
-        }
-        return __kmalloc_node(size, flags, node);
-}
-#endif
-
 #endif /* _LINUX_SLUB_DEF_H */
diff --git a/include/linux/smp.h b/include/linux/smp.h
index e6564c1dc552..731f5237d5f4 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -28,6 +28,27 @@ extern unsigned int total_cpus;
 int smp_call_function_single(int cpuid, smp_call_func_t func, void *info,
                              int wait);
 
+/*
+ * Call a function on all processors
+ */
+int on_each_cpu(smp_call_func_t func, void *info, int wait);
+
+/*
+ * Call a function on processors specified by mask, which might include
+ * the local one.
+ */
+void on_each_cpu_mask(const struct cpumask *mask, smp_call_func_t func,
+                void *info, bool wait);
+
+/*
+ * Call a function on each processor for which the supplied function
+ * cond_func returns a positive value. This may include the local
+ * processor.
+ */
+void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),
+                smp_call_func_t func, void *info, bool wait,
+                gfp_t gfp_flags);
+
 #ifdef CONFIG_SMP
 
 #include <linux/preempt.h>
@@ -95,27 +116,6 @@ static inline void call_function_init(void) { }
 #endif
 
 /*
- * Call a function on all processors
- */
-int on_each_cpu(smp_call_func_t func, void *info, int wait);
-
-/*
- * Call a function on processors specified by mask, which might include
- * the local one.
- */
-void on_each_cpu_mask(const struct cpumask *mask, smp_call_func_t func,
-                void *info, bool wait);
-
-/*
- * Call a function on each processor for which the supplied function
- * cond_func returns a positive value. This may include the local
- * processor.
- */
-void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),
-                smp_call_func_t func, void *info, bool wait,
-                gfp_t gfp_flags);
-
-/*
  * Mark the boot cpu "online" so that it can call console drivers in
  * printk() and can access its per-cpu storage.
  */
@@ -139,42 +139,6 @@ static inline int up_smp_call_function(smp_call_func_t func, void *info)
 }
 #define smp_call_function(func, info, wait) \
                         (up_smp_call_function(func, info))
-#define on_each_cpu(func,info,wait)             \
-        ({                                      \
-                local_irq_disable();            \
-                func(info);                     \
-                local_irq_enable();             \
-                0;                              \
-        })
-/*
- * Note we still need to test the mask even for UP
- * because we actually can get an empty mask from
- * code that on SMP might call us without the local
- * CPU in the mask.
- */
-#define on_each_cpu_mask(mask, func, info, wait) \
-        do {                                            \
-                if (cpumask_test_cpu(0, (mask))) {      \
-                        local_irq_disable();            \
-                        (func)(info);                   \
-                        local_irq_enable();             \
-                }                                       \
-        } while (0)
-/*
- * Preemption is disabled here to make sure the cond_func is called under the
- * same condtions in UP and SMP.
- */
-#define on_each_cpu_cond(cond_func, func, info, wait, gfp_flags)\
-        do {                                                    \
-                void *__info = (info);                          \
-                preempt_disable();                              \
-                if ((cond_func)(0, __info)) {                   \
-                        local_irq_disable();                    \
-                        (func)(__info);                         \
-                        local_irq_enable();                     \
-                }                                               \
-                preempt_enable();                               \
-        } while (0)
 
 static inline void smp_send_reschedule(int cpu) { }
 #define smp_prepare_boot_cpu()                  do {} while (0)
@@ -191,6 +155,12 @@ smp_call_function_any(const struct cpumask *mask, smp_call_func_t func,
 
 static inline void kick_all_cpus_sync(void) {  }
 
+static inline void __smp_call_function_single(int cpuid,
+                struct call_single_data *data, int wait)
+{
+        on_each_cpu(data->func, data->info, wait);
+}
+
 #endif /* !SMP */
 
 /*
diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h
index 4dde70e74822..eec3efd19beb 100644
--- a/include/linux/smsc911x.h
+++ b/include/linux/smsc911x.h
@@ -22,6 +22,7 @@
 #define __LINUX_SMSC911X_H__
 
 #include <linux/phy.h>
+#include <linux/if_ether.h>
 
 /* platform_device configuration data, should be assigned to
  * the platform_device's dev.platform_data */
@@ -31,7 +32,7 @@ struct smsc911x_platform_config {
         unsigned int flags;
         unsigned int shift;
         phy_interface_t phy_interface;
-        unsigned char mac[6];
+        unsigned char mac[ETH_ALEN];
 };
 
 /* Constants for platform_device irq polarity configuration */
diff --git a/include/linux/socket.h b/include/linux/socket.h
index b10ce4b341ea..445ef7519dc2 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -167,6 +167,7 @@ struct ucred {
 #define AF_PPPOX        24      /* PPPoX sockets                */
 #define AF_WANPIPE      25      /* Wanpipe API Sockets */
 #define AF_LLC          26      /* Linux LLC                    */
+#define AF_IB           27      /* Native InfiniBand address    */
 #define AF_CAN          29      /* Controller Area Network      */
 #define AF_TIPC         30      /* TIPC sockets                 */
 #define AF_BLUETOOTH    31      /* Bluetooth sockets            */
@@ -211,6 +212,7 @@ struct ucred {
 #define PF_PPPOX        AF_PPPOX
 #define PF_WANPIPE      AF_WANPIPE
 #define PF_LLC          AF_LLC
+#define PF_IB           AF_IB
 #define PF_CAN          AF_CAN
 #define PF_TIPC         AF_TIPC
 #define PF_BLUETOOTH    AF_BLUETOOTH
@@ -311,6 +313,8 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata,
                                           struct iovec *iov, 
                                           int offset, 
                                           unsigned int len, __wsum *csump);
+extern unsigned long iov_pages(const struct iovec *iov, int offset,
+                               unsigned long nr_segs);
 
 extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *address, int mode);
 extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata,
diff --git a/include/linux/spi/mmc_spi.h b/include/linux/spi/mmc_spi.h
index 32be8dbdf191..274bc0fa00af 100644
--- a/include/linux/spi/mmc_spi.h
+++ b/include/linux/spi/mmc_spi.h
@@ -7,6 +7,11 @@
 struct device;
 struct mmc_host;
 
+#define MMC_SPI_USE_CD_GPIO                     (1 << 0)
+#define MMC_SPI_USE_RO_GPIO                     (1 << 1)
+#define MMC_SPI_CD_GPIO_ACTIVE_LOW              (1 << 2)
+#define MMC_SPI_RO_GPIO_ACTIVE_LOW              (1 << 3)
+
 /* Put this in platform_data of a device being used to manage an MMC/SD
  * card slot.  (Modeled after PXA mmc glue; see that for usage examples.)
  *
@@ -21,17 +26,19 @@ struct mmc_spi_platform_data {
                 void *);
         void (*exit)(struct device *, void *);
 
-        /* sense switch on sd cards */
-        int (*get_ro)(struct device *);
-
         /*
-         * If board does not use CD interrupts, driver can optimize polling
-         * using this function.
+         * Card Detect and Read Only GPIOs. To enable debouncing on the card
+         * detect GPIO, set the cd_debounce to the debounce time in
+         * microseconds.
          */
-        int (*get_cd)(struct device *);
+        unsigned int flags;
+        unsigned int cd_gpio;
+        unsigned int cd_debounce;
+        unsigned int ro_gpio;
 
         /* Capabilities to pass into mmc core (e.g. MMC_CAP_NEEDS_POLL). */
         unsigned long caps;
+        unsigned long caps2;
 
         /* how long to debounce card detect, in msecs */
         u16 detect_delay;
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 6ff26c8db7b9..887116dbce2c 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -74,7 +74,7 @@ struct spi_device {
         struct spi_master       *master;
         u32                     max_speed_hz;
         u8                      chip_select;
-        u8                      mode;
+        u16                     mode;
 #define SPI_CPHA        0x01                    /* clock phase */
 #define SPI_CPOL        0x02                    /* clock polarity */
 #define SPI_MODE_0      (0|0)                   /* (original MicroWire) */
@@ -87,6 +87,10 @@ struct spi_device {
 #define SPI_LOOP        0x20                    /* loopback mode */
 #define SPI_NO_CS       0x40                    /* 1 dev/bus, no chipselect */
 #define SPI_READY       0x80                    /* slave pulls low to pause */
+#define SPI_TX_DUAL     0x100                   /* transmit with 2 wires */
+#define SPI_TX_QUAD     0x200                   /* transmit with 4 wires */
+#define SPI_RX_DUAL     0x400                   /* receive with 2 wires */
+#define SPI_RX_QUAD     0x800                   /* receive with 4 wires */
         u8                      bits_per_word;
         int                     irq;
         void                    *controller_state;
@@ -233,6 +237,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
  *      suported. If set, the SPI core will reject any transfer with an
  *      unsupported bits_per_word. If not set, this value is simply ignored,
  *      and it's up to the individual driver to perform any validation.
+ * @min_speed_hz: Lowest supported transfer speed
+ * @max_speed_hz: Highest supported transfer speed
  * @flags: other constraints relevant to this driver
  * @bus_lock_spinlock: spinlock for SPI bus locking
  * @bus_lock_mutex: mutex for SPI bus locking
@@ -254,6 +260,9 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
  * @busy: message pump is busy
  * @running: message pump is running
  * @rt: whether this queue is set to run as a realtime task
+ * @auto_runtime_pm: the core should ensure a runtime PM reference is held
+ *                   while the hardware is prepared, using the parent
+ *                   device for the spidev
  * @prepare_transfer_hardware: a message will soon arrive from the queue
  *      so the subsystem requests the driver to prepare the transfer hardware
  *      by issuing this call
@@ -308,6 +317,13 @@ struct spi_master {
 
         /* bitmask of supported bits_per_word for transfers */
         u32                     bits_per_word_mask;
+#define SPI_BPW_MASK(bits) BIT((bits) - 1)
+#define SPI_BIT_MASK(bits) (((bits) == 32) ? ~0U : (BIT(bits) - 1))
+#define SPI_BPW_RANGE_MASK(min, max) (SPI_BIT_MASK(max) - SPI_BIT_MASK(min - 1))
+
+        /* limits on transfer speed */
+        u32                     min_speed_hz;
+        u32                     max_speed_hz;
 
         /* other constraints relevant to this driver */
         u16                     flags;
@@ -371,11 +387,13 @@ struct spi_master {
         bool                            busy;
         bool                            running;
         bool                            rt;
+        bool                            auto_runtime_pm;
 
         int (*prepare_transfer_hardware)(struct spi_master *master);
         int (*transfer_one_message)(struct spi_master *master,
                                     struct spi_message *mesg);
         int (*unprepare_transfer_hardware)(struct spi_master *master);
+
         /* gpio chip select */
         int                     *cs_gpios;
 };
@@ -445,6 +463,10 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum);
  * @rx_buf: data to be read (dma-safe memory), or NULL
  * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped
  * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped
+ * @tx_nbits: number of bits used for writting. If 0 the default
+ *      (SPI_NBITS_SINGLE) is used.
+ * @rx_nbits: number of bits used for reading. If 0 the default
+ *      (SPI_NBITS_SINGLE) is used.
  * @len: size of rx and tx buffers (in bytes)
  * @speed_hz: Select a speed other than the device default for this
  *      transfer. If 0 the default (from @spi_device) is used.
@@ -499,6 +521,11 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum);
  * by the results of previous messages and where the whole transaction
  * ends when the chipselect goes intactive.
  *
+ * When SPI can transfer in 1x,2x or 4x. It can get this tranfer information
+ * from device through @tx_nbits and @rx_nbits. In Bi-direction, these
+ * two should both be set. User can set transfer mode with SPI_NBITS_SINGLE(1x)
+ * SPI_NBITS_DUAL(2x) and SPI_NBITS_QUAD(4x) to support these three transfer.
+ *
  * The code that submits an spi_message (and its spi_transfers)
  * to the lower layers is responsible for managing its memory.
  * Zero-initialize every field you don't set up explicitly, to
@@ -519,6 +546,11 @@ struct spi_transfer {
         dma_addr_t      rx_dma;
 
         unsigned        cs_change:1;
+        u8              tx_nbits;
+        u8              rx_nbits;
+#define SPI_NBITS_SINGLE        0x01 /* 1bit transfer */
+#define SPI_NBITS_DUAL          0x02 /* 2bits transfer */
+#define SPI_NBITS_QUAD          0x04 /* 4bits transfer */
         u8              bits_per_word;
         u16             delay_usecs;
         u32             speed_hz;
@@ -575,6 +607,7 @@ struct spi_message {
         /* completion is reported through a callback */
         void                    (*complete)(void *context);
         void                    *context;
+        unsigned                frame_length;
         unsigned                actual_length;
         int                     status;
 
@@ -866,7 +899,7 @@ struct spi_board_info {
         /* mode becomes spi_device.mode, and is essential for chips
          * where the default of SPI_CS_HIGH = 0 is wrong.
          */
-        u8              mode;
+        u16             mode;
 
         /* ... may need additional spi_device chip config data here.
          * avoid stuff protocol drivers can set; but include stuff
diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h
index f987a2bee16a..daebaba886aa 100644
--- a/include/linux/spi/spi_bitbang.h
+++ b/include/linux/spi/spi_bitbang.h
@@ -4,11 +4,7 @@
 #include <linux/workqueue.h>
 
 struct spi_bitbang {
-        struct workqueue_struct *workqueue;
-        struct work_struct      work;
-
         spinlock_t              lock;
-        struct list_head        queue;
         u8                      busy;
         u8                      use_dma;
         u8                      flags;          /* extra spi->mode support */
@@ -41,7 +37,6 @@ struct spi_bitbang {
  */
 extern int spi_bitbang_setup(struct spi_device *spi);
 extern void spi_bitbang_cleanup(struct spi_device *spi);
-extern int spi_bitbang_transfer(struct spi_device *spi, struct spi_message *m);
 extern int spi_bitbang_setup_transfer(struct spi_device *spi,
                                       struct spi_transfer *t);
 
diff --git a/include/linux/spi/xilinx_spi.h b/include/linux/spi/xilinx_spi.h
index 6f17278810b0..333ecdfee0d9 100644
--- a/include/linux/spi/xilinx_spi.h
+++ b/include/linux/spi/xilinx_spi.h
@@ -11,7 +11,6 @@
  */
 struct xspi_platform_data {
         u16 num_chipselect;
-        bool little_endian;
         u8 bits_per_word;
         struct spi_board_info *devices;
         u8 num_devices;
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 7d537ced949a..75f34949d9ab 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -117,9 +117,17 @@ do {								\
 #endif /*arch_spin_is_contended*/
 #endif
 
-/* The lock does not imply full memory barrier. */
-#ifndef ARCH_HAS_SMP_MB_AFTER_LOCK
-static inline void smp_mb__after_lock(void) { smp_mb(); }
+/*
+ * Despite its name it doesn't necessarily has to be a full barrier.
+ * It should only guarantee that a STORE before the critical section
+ * can not be reordered with a LOAD inside this section.
+ * spin_lock() is the one-way barrier, this LOAD can not escape out
+ * of the region. So the default implementation simply ensures that
+ * a STORE can not move into the critical section, smp_wmb() should
+ * serialize it with another STORE done by spin_lock().
+ */
+#ifndef smp_mb__before_spinlock
+#define smp_mb__before_spinlock()       smp_wmb()
 #endif
 
 /**
diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h
index 51df117abe46..bdb9993f0fda 100644
--- a/include/linux/spinlock_api_smp.h
+++ b/include/linux/spinlock_api_smp.h
@@ -144,7 +144,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
         LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
 }
 
-#endif /* CONFIG_PREEMPT */
+#endif /* !CONFIG_GENERIC_LOCKBREAK || CONFIG_DEBUG_LOCK_ALLOC */
 
 static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
diff --git a/include/linux/spinlock_up.h b/include/linux/spinlock_up.h
index e2369c167dbd..8b3ac0d718eb 100644
--- a/include/linux/spinlock_up.h
+++ b/include/linux/spinlock_up.h
@@ -67,7 +67,7 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)
 
 #else /* DEBUG_SPINLOCK */
 #define arch_spin_is_locked(lock)       ((void)(lock), 0)
-/* for sched.c and kernel_lock.c: */
+/* for sched/core.c and kernel_lock.c: */
 # define arch_spin_lock(lock)           do { barrier(); (void)(lock); } while (0)
 # define arch_spin_lock_flags(lock, flags)      do { barrier(); (void)(lock); } while (0)
 # define arch_spin_unlock(lock) do { barrier(); (void)(lock); } while (0)
diff --git a/include/linux/splice.h b/include/linux/splice.h
index 09a545a7dfa3..74575cbf2d6f 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -35,6 +35,7 @@ struct splice_desc {
                 void *data;             /* cookie */
         } u;
         loff_t pos;                     /* file position */
+        loff_t *opos;                   /* sendfile: output position */
         size_t num_spliced;             /* number of bytes already spliced */
         bool need_wakeup;               /* need to wake up writer */
 };
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index 04f4121a23ae..c114614ed172 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -237,47 +237,4 @@ static inline void srcu_read_unlock(struct srcu_struct *sp, int idx)
         __srcu_read_unlock(sp, idx);
 }
 
-/**
- * srcu_read_lock_raw - register a new reader for an SRCU-protected structure.
- * @sp: srcu_struct in which to register the new reader.
- *
- * Enter an SRCU read-side critical section.  Similar to srcu_read_lock(),
- * but avoids the RCU-lockdep checking.  This means that it is legal to
- * use srcu_read_lock_raw() in one context, for example, in an exception
- * handler, and then have the matching srcu_read_unlock_raw() in another
- * context, for example in the task that took the exception.
- *
- * However, the entire SRCU read-side critical section must reside within a
- * single task.  For example, beware of using srcu_read_lock_raw() in
- * a device interrupt handler and srcu_read_unlock() in the interrupted
- * task:  This will not work if interrupts are threaded.
- */
-static inline int srcu_read_lock_raw(struct srcu_struct *sp)
-{
-        unsigned long flags;
-        int ret;
-
-        local_irq_save(flags);
-        ret =  __srcu_read_lock(sp);
-        local_irq_restore(flags);
-        return ret;
-}
-
-/**
- * srcu_read_unlock_raw - unregister reader from an SRCU-protected structure.
- * @sp: srcu_struct in which to unregister the old reader.
- * @idx: return value from corresponding srcu_read_lock_raw().
- *
- * Exit an SRCU read-side critical section without lockdep-RCU checking.
- * See srcu_read_lock_raw() for more details.
- */
-static inline void srcu_read_unlock_raw(struct srcu_struct *sp, int idx)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        __srcu_read_unlock(sp, idx);
-        local_irq_restore(flags);
-}
-
 #endif
diff --git a/include/linux/ssb/ssb_driver_mips.h b/include/linux/ssb/ssb_driver_mips.h
index afe79d40a99e..6535e4718fde 100644
--- a/include/linux/ssb/ssb_driver_mips.h
+++ b/include/linux/ssb/ssb_driver_mips.h
@@ -20,6 +20,18 @@ struct ssb_pflash {
         u32 window_size;
 };
 
+#ifdef CONFIG_SSB_SFLASH
+struct ssb_sflash {
+        bool present;
+        u32 window;
+        u32 blocksize;
+        u16 numblocks;
+        u32 size;
+
+        void *priv;
+};
+#endif
+
 struct ssb_mipscore {
         struct ssb_device *dev;
 
@@ -27,6 +39,9 @@ struct ssb_mipscore {
         struct ssb_serial_port serial_ports[4];
 
         struct ssb_pflash pflash;
+#ifdef CONFIG_SSB_SFLASH
+        struct ssb_sflash sflash;
+#endif
 };
 
 extern void ssb_mipscore_init(struct ssb_mipscore *mcore);
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index 3a7256955b10..f9f931c89e3e 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -172,6 +172,7 @@
 #define SSB_SPROMSIZE_WORDS_R4          220
 #define SSB_SPROMSIZE_BYTES_R123        (SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
 #define SSB_SPROMSIZE_BYTES_R4          (SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
+#define SSB_SPROMSIZE_WORDS_R10         230
 #define SSB_SPROM_BASE1                 0x1000
 #define SSB_SPROM_BASE31                0x0800
 #define SSB_SPROM_REVISION              0x007E
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index c1b3ed3fb787..bb5deb0feb6b 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -80,6 +80,10 @@ struct stmmac_mdio_bus_data {
         unsigned int phy_mask;
         int *irqs;
         int probed_phy_irq;
+#ifdef CONFIG_OF
+        int reset_gpio, active_low;
+        u32 delays[3];
+#endif
 };
 
 struct stmmac_dma_cfg {
@@ -104,6 +108,7 @@ struct plat_stmmacenet_data {
         int bugged_jumbo;
         int pmt;
         int force_sf_dma_mode;
+        int force_thresh_dma_mode;
         int riwt_off;
         void (*fix_mac_speed)(void *priv, unsigned int speed);
         void (*bus_setup)(void __iomem *ioaddr);
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index 0dd00f4f6810..790be1472792 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -24,12 +24,21 @@
 
 struct rpcsec_gss_info;
 
+/* auth_cred ac_flags bits */
+enum {
+        RPC_CRED_NO_CRKEY_TIMEOUT = 0, /* underlying cred has no key timeout */
+        RPC_CRED_KEY_EXPIRE_SOON = 1, /* underlying cred key will expire soon */
+        RPC_CRED_NOTIFY_TIMEOUT = 2,   /* nofity generic cred when underlying
+                                        key will expire soon */
+};
+
 /* Work around the lack of a VFS credential */
 struct auth_cred {
         kuid_t  uid;
         kgid_t  gid;
         struct group_info *group_info;
         const char *principal;
+        unsigned long ac_flags;
         unsigned char machine_cred : 1;
 };
 
@@ -87,6 +96,11 @@ struct rpc_auth {
         /* per-flavor data */
 };
 
+struct rpc_auth_create_args {
+        rpc_authflavor_t pseudoflavor;
+        const char *target_name;
+};
+
 /* Flags for rpcauth_lookupcred() */
 #define RPCAUTH_LOOKUP_NEW              0x01    /* Accept an uninitialised cred */
 
@@ -97,17 +111,17 @@ struct rpc_authops {
         struct module           *owner;
         rpc_authflavor_t        au_flavor;      /* flavor (RPC_AUTH_*) */
         char *                  au_name;
-        struct rpc_auth *       (*create)(struct rpc_clnt *, rpc_authflavor_t);
+        struct rpc_auth *       (*create)(struct rpc_auth_create_args *, struct rpc_clnt *);
         void                    (*destroy)(struct rpc_auth *);
 
         struct rpc_cred *       (*lookup_cred)(struct rpc_auth *, struct auth_cred *, int);
         struct rpc_cred *       (*crcreate)(struct rpc_auth*, struct auth_cred *, int);
-        int                     (*pipes_create)(struct rpc_auth *);
-        void                    (*pipes_destroy)(struct rpc_auth *);
         int                     (*list_pseudoflavors)(rpc_authflavor_t *, int);
         rpc_authflavor_t        (*info2flavor)(struct rpcsec_gss_info *);
         int                     (*flavor2info)(rpc_authflavor_t,
                                                 struct rpcsec_gss_info *);
+        int                     (*key_timeout)(struct rpc_auth *,
+                                                struct rpc_cred *);
 };
 
 struct rpc_credops {
@@ -124,6 +138,8 @@ struct rpc_credops {
                                                 void *, __be32 *, void *);
         int                     (*crunwrap_resp)(struct rpc_task *, kxdrdproc_t,
                                                 void *, __be32 *, void *);
+        int                     (*crkey_timeout)(struct rpc_cred *);
+        bool                    (*crkey_to_expire)(struct rpc_cred *);
 };
 
 extern const struct rpc_authops authunix_ops;
@@ -140,7 +156,8 @@ struct rpc_cred *	rpc_lookup_cred(void);
 struct rpc_cred *       rpc_lookup_machine_cred(const char *service_name);
 int                     rpcauth_register(const struct rpc_authops *);
 int                     rpcauth_unregister(const struct rpc_authops *);
-struct rpc_auth *       rpcauth_create(rpc_authflavor_t, struct rpc_clnt *);
+struct rpc_auth *       rpcauth_create(struct rpc_auth_create_args *,
+                                struct rpc_clnt *);
 void                    rpcauth_release(struct rpc_auth *);
 rpc_authflavor_t        rpcauth_get_pseudoflavor(rpc_authflavor_t,
                                 struct rpcsec_gss_info *);
@@ -162,6 +179,9 @@ int			rpcauth_uptodatecred(struct rpc_task *);
 int                     rpcauth_init_credcache(struct rpc_auth *);
 void                    rpcauth_destroy_credcache(struct rpc_auth *);
 void                    rpcauth_clear_credcache(struct rpc_cred_cache *);
+int                     rpcauth_key_timeout_notify(struct rpc_auth *,
+                                                struct rpc_cred *);
+bool                    rpcauth_cred_key_to_expire(struct rpc_cred *);
 
 static inline
 struct rpc_cred *       get_rpccred(struct rpc_cred *cred)
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 303399b1ba59..437ddb6c4aef 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -57,6 +57,7 @@ struct cache_head {
 #define CACHE_VALID     0       /* Entry contains valid data */
 #define CACHE_NEGATIVE  1       /* Negative entry - there is no match for the key */
 #define CACHE_PENDING   2       /* An upcall has been sent but no reply received yet*/
+#define CACHE_CLEANED   3       /* Entry has been cleaned from cache */
 
 #define CACHE_NEW_EXPIRY 120    /* keep new things pending confirmation for 120 seconds */
 
@@ -148,6 +149,24 @@ struct cache_deferred_req {
                                            int too_many);
 };
 
+/*
+ * timestamps kept in the cache are expressed in seconds
+ * since boot.  This is the best for measuring differences in
+ * real time.
+ */
+static inline time_t seconds_since_boot(void)
+{
+        struct timespec boot;
+        getboottime(&boot);
+        return get_seconds() - boot.tv_sec;
+}
+
+static inline time_t convert_to_wallclock(time_t sinceboot)
+{
+        struct timespec boot;
+        getboottime(&boot);
+        return boot.tv_sec + sinceboot;
+}
 
 extern const struct file_operations cache_file_operations_pipefs;
 extern const struct file_operations content_file_operations_pipefs;
@@ -181,15 +200,10 @@ static inline void cache_put(struct cache_head *h, struct cache_detail *cd)
         kref_put(&h->ref, cd->cache_put);
 }
 
-static inline int cache_valid(struct cache_head *h)
+static inline int cache_is_expired(struct cache_detail *detail, struct cache_head *h)
 {
-        /* If an item has been unhashed pending removal when
-         * the refcount drops to 0, the expiry_time will be
-         * set to 0.  We don't want to consider such items
-         * valid in this context even though CACHE_VALID is
-         * set.
-         */
-        return (h->expiry_time != 0 && test_bit(CACHE_VALID, &h->flags));
+        return  (h->expiry_time < seconds_since_boot()) ||
+                (detail->flush_time > h->last_refresh);
 }
 
 extern int cache_check(struct cache_detail *detail,
@@ -250,31 +264,30 @@ static inline int get_uint(char **bpp, unsigned int *anint)
         return 0;
 }
 
-/*
- * timestamps kept in the cache are expressed in seconds
- * since boot.  This is the best for measuring differences in
- * real time.
- */
-static inline time_t seconds_since_boot(void)
+static inline int get_time(char **bpp, time_t *time)
 {
-        struct timespec boot;
-        getboottime(&boot);
-        return get_seconds() - boot.tv_sec;
-}
+        char buf[50];
+        long long ll;
+        int len = qword_get(bpp, buf, sizeof(buf));
 
-static inline time_t convert_to_wallclock(time_t sinceboot)
-{
-        struct timespec boot;
-        getboottime(&boot);
-        return boot.tv_sec + sinceboot;
+        if (len < 0)
+                return -EINVAL;
+        if (len == 0)
+                return -ENOENT;
+
+        if (kstrtoll(buf, 0, &ll))
+                return -EINVAL;
+
+        *time = (time_t)ll;
+        return 0;
 }
 
 static inline time_t get_expiry(char **bpp)
 {
-        int rv;
+        time_t rv;
         struct timespec boot;
 
-        if (get_int(bpp, &rv))
+        if (get_time(bpp, &rv))
                 return 0;
         if (rv < 0)
                 return 0;
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index bfe11be81f6f..6740801aa71a 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -21,6 +21,7 @@
 #include <linux/sunrpc/stats.h>
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/timer.h>
+#include <linux/sunrpc/rpc_pipe_fs.h>
 #include <asm/signal.h>
 #include <linux/path.h>
 #include <net/ipv6.h>
@@ -32,6 +33,7 @@ struct rpc_inode;
  */
 struct rpc_clnt {
         atomic_t                cl_count;       /* Number of references */
+        unsigned int            cl_clid;        /* client id */
         struct list_head        cl_clients;     /* Global list of clients */
         struct list_head        cl_tasks;       /* List of tasks */
         spinlock_t              cl_lock;        /* spinlock */
@@ -41,7 +43,6 @@ struct rpc_clnt {
                                 cl_vers,        /* RPC version number */
                                 cl_maxproc;     /* max procedure number */
 
-        const char *            cl_protname;    /* protocol name */
         struct rpc_auth *       cl_auth;        /* authenticator */
         struct rpc_stat *       cl_stats;       /* per-program statistics */
         struct rpc_iostats *    cl_metrics;     /* per-client statistics */
@@ -56,12 +57,11 @@ struct rpc_clnt {
 
         int                     cl_nodelen;     /* nodename length */
         char                    cl_nodename[UNX_MAXNODENAME];
-        struct dentry *         cl_dentry;
+        struct rpc_pipe_dir_head cl_pipedir_objects;
         struct rpc_clnt *       cl_parent;      /* Points to parent of clones */
         struct rpc_rtt          cl_rtt_default;
         struct rpc_timeout      cl_timeout_default;
         const struct rpc_program *cl_program;
-        char                    *cl_principal;  /* target to authenticate to */
 };
 
 /*
diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h
index 161463e59624..1f911ccb2a75 100644
--- a/include/linux/sunrpc/gss_api.h
+++ b/include/linux/sunrpc/gss_api.h
@@ -151,6 +151,8 @@ struct gss_api_mech *gss_mech_get_by_pseudoflavor(u32);
 /* Fill in an array with a list of supported pseudoflavors */
 int gss_mech_list_pseudoflavors(rpc_authflavor_t *, int);
 
+struct gss_api_mech * gss_mech_get(struct gss_api_mech *);
+
 /* For every successful gss_mech_get or gss_mech_get_by_* call there must be a
  * corresponding call to gss_mech_put. */
 void gss_mech_put(struct gss_api_mech *);
diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index a7b422b33eda..a353e0300b54 100644
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -5,6 +5,26 @@
 
 #include <linux/workqueue.h>
 
+struct rpc_pipe_dir_head {
+        struct list_head pdh_entries;
+        struct dentry *pdh_dentry;
+};
+
+struct rpc_pipe_dir_object_ops;
+struct rpc_pipe_dir_object {
+        struct list_head pdo_head;
+        const struct rpc_pipe_dir_object_ops *pdo_ops;
+
+        void *pdo_data;
+};
+
+struct rpc_pipe_dir_object_ops {
+        int (*create)(struct dentry *dir,
+                        struct rpc_pipe_dir_object *pdo);
+        void (*destroy)(struct dentry *dir,
+                        struct rpc_pipe_dir_object *pdo);
+};
+
 struct rpc_pipe_msg {
         struct list_head list;
         void *data;
@@ -73,12 +93,29 @@ extern ssize_t rpc_pipe_generic_upcall(struct file *, struct rpc_pipe_msg *,
 extern int rpc_queue_upcall(struct rpc_pipe *, struct rpc_pipe_msg *);
 
 struct rpc_clnt;
-extern struct dentry *rpc_create_client_dir(struct dentry *, struct qstr *, struct rpc_clnt *);
-extern int rpc_remove_client_dir(struct dentry *);
+extern struct dentry *rpc_create_client_dir(struct dentry *, const char *, struct rpc_clnt *);
+extern int rpc_remove_client_dir(struct rpc_clnt *);
+
+extern void rpc_init_pipe_dir_head(struct rpc_pipe_dir_head *pdh);
+extern void rpc_init_pipe_dir_object(struct rpc_pipe_dir_object *pdo,
+                const struct rpc_pipe_dir_object_ops *pdo_ops,
+                void *pdo_data);
+extern int rpc_add_pipe_dir_object(struct net *net,
+                struct rpc_pipe_dir_head *pdh,
+                struct rpc_pipe_dir_object *pdo);
+extern void rpc_remove_pipe_dir_object(struct net *net,
+                struct rpc_pipe_dir_head *pdh,
+                struct rpc_pipe_dir_object *pdo);
+extern struct rpc_pipe_dir_object *rpc_find_or_alloc_pipe_dir_object(
+                struct net *net,
+                struct rpc_pipe_dir_head *pdh,
+                int (*match)(struct rpc_pipe_dir_object *, void *),
+                struct rpc_pipe_dir_object *(*alloc)(void *),
+                void *data);
 
 struct cache_detail;
 extern struct dentry *rpc_create_cache_dir(struct dentry *,
-                                           struct qstr *,
+                                           const char *,
                                            umode_t umode,
                                            struct cache_detail *);
 extern void rpc_remove_cache_dir(struct dentry *);
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 84ca436b76c2..096ee58be11a 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -79,7 +79,7 @@ struct rpc_task {
         unsigned short          tk_flags;       /* misc flags */
         unsigned short          tk_timeouts;    /* maj timeouts */
 
-#ifdef RPC_DEBUG
+#if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
         unsigned short          tk_pid;         /* debugging aid */
 #endif
         unsigned char           tk_priority : 2,/* Task priority */
@@ -88,15 +88,6 @@ struct rpc_task {
                                 tk_rebind_retry : 2;
 };
 
-/* support walking a list of tasks on a wait queue */
-#define task_for_each(task, pos, head) \
-        list_for_each(pos, head) \
-                if ((task=list_entry(pos, struct rpc_task, u.tk_wait.list)),1)
-
-#define task_for_first(task, head) \
-        if (!list_empty(head) &&  \
-            ((task=list_entry((head)->next, struct rpc_task, u.tk_wait.list)),1))
-
 typedef void                    (*rpc_action)(struct rpc_task *);
 
 struct rpc_call_ops {
@@ -130,6 +121,7 @@ struct rpc_task_setup {
 #define RPC_TASK_SOFTCONN       0x0400          /* Fail if can't connect */
 #define RPC_TASK_SENT           0x0800          /* message was sent */
 #define RPC_TASK_TIMEOUT        0x1000          /* fail with ETIMEDOUT on timeout */
+#define RPC_TASK_NOCONNECT      0x2000          /* return ENOTCONN if not connected */
 
 #define RPC_IS_ASYNC(t)         ((t)->tk_flags & RPC_TASK_ASYNC)
 #define RPC_IS_SWAPPER(t)       ((t)->tk_flags & RPC_TASK_SWAPPER)
@@ -238,7 +230,6 @@ struct rpc_task *rpc_wake_up_first(struct rpc_wait_queue *,
                                         bool (*)(struct rpc_task *, void *),
                                         void *);
 void            rpc_wake_up_status(struct rpc_wait_queue *, int);
-int             rpc_queue_empty(struct rpc_wait_queue *);
 void            rpc_delay(struct rpc_task *, unsigned long);
 void *          rpc_malloc(struct rpc_task *, size_t);
 void            rpc_free(void *);
@@ -259,16 +250,6 @@ static inline int rpc_wait_for_completion_task(struct rpc_task *task)
         return __rpc_wait_for_completion_task(task, NULL);
 }
 
-static inline void rpc_task_set_priority(struct rpc_task *task, unsigned char prio)
-{
-        task->tk_priority = prio - RPC_PRIORITY_LOW;
-}
-
-static inline int rpc_task_has_priority(struct rpc_task *task, unsigned char prio)
-{
-        return (task->tk_priority + RPC_PRIORITY_LOW == prio);
-}
-
 #if defined(RPC_DEBUG) || defined (RPC_TRACEPOINTS)
 static inline const char * rpc_qname(const struct rpc_wait_queue *q)
 {
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 1f0216b9a6c9..6eecfc2e4f98 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -243,7 +243,6 @@ struct svc_rqst {
         struct xdr_buf          rq_res;
         struct page *           rq_pages[RPCSVC_MAXPAGES];
         struct page *           *rq_respages;   /* points into rq_pages */
-        int                     rq_resused;     /* number of pages used for result */
         struct page *           *rq_next_page; /* next reply page to use */
 
         struct kvec             rq_vec[RPCSVC_MAXPAGES]; /* generally useful.. */
diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
index ff374ab30839..8d71d6577459 100644
--- a/include/linux/sunrpc/svcauth.h
+++ b/include/linux/sunrpc/svcauth.h
@@ -14,6 +14,7 @@
 #include <linux/string.h>
 #include <linux/sunrpc/msg_prot.h>
 #include <linux/sunrpc/cache.h>
+#include <linux/sunrpc/gss_api.h>
 #include <linux/hash.h>
 #include <linux/cred.h>
 
@@ -23,13 +24,23 @@ struct svc_cred {
         struct group_info       *cr_group_info;
         u32                     cr_flavor; /* pseudoflavor */
         char                    *cr_principal; /* for gss */
+        struct gss_api_mech     *cr_gss_mech;
 };
 
+static inline void init_svc_cred(struct svc_cred *cred)
+{
+        cred->cr_group_info = NULL;
+        cred->cr_principal = NULL;
+        cred->cr_gss_mech = NULL;
+}
+
 static inline void free_svc_cred(struct svc_cred *cred)
 {
         if (cred->cr_group_info)
                 put_group_info(cred->cr_group_info);
         kfree(cred->cr_principal);
+        gss_mech_put(cred->cr_gss_mech);
+        init_svc_cred(cred);
 }
 
 struct svc_rqst;                /* forward decl */
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index d4e3f16d5e89..f73cabf59012 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -363,6 +363,7 @@ extern bool pm_wakeup_pending(void);
 extern bool pm_get_wakeup_count(unsigned int *count, bool block);
 extern bool pm_save_wakeup_count(unsigned int count);
 extern void pm_wakep_autosleep_enabled(bool set);
+extern void pm_print_active_wakeup_sources(void);
 
 static inline void lock_system_sleep(void)
 {
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 1701ce4be746..46ba0c6c219f 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -10,6 +10,7 @@
 #include <linux/node.h>
 #include <linux/fs.h>
 #include <linux/atomic.h>
+#include <linux/page-flags.h>
 #include <asm/page.h>
 
 struct notifier_block;
@@ -19,10 +20,13 @@ struct bio;
 #define SWAP_FLAG_PREFER        0x8000  /* set if swap priority specified */
 #define SWAP_FLAG_PRIO_MASK     0x7fff
 #define SWAP_FLAG_PRIO_SHIFT    0
-#define SWAP_FLAG_DISCARD       0x10000 /* discard swap cluster after use */
+#define SWAP_FLAG_DISCARD       0x10000 /* enable discard for swap */
+#define SWAP_FLAG_DISCARD_ONCE  0x20000 /* discard swap area at swapon-time */
+#define SWAP_FLAG_DISCARD_PAGES 0x40000 /* discard page-clusters after use */
 
 #define SWAP_FLAGS_VALID        (SWAP_FLAG_PRIO_MASK | SWAP_FLAG_PREFER | \
-                                 SWAP_FLAG_DISCARD)
+                                 SWAP_FLAG_DISCARD | SWAP_FLAG_DISCARD_ONCE | \
+                                 SWAP_FLAG_DISCARD_PAGES)
 
 static inline int current_is_kswapd(void)
 {
@@ -146,14 +150,16 @@ struct swap_extent {
 enum {
         SWP_USED        = (1 << 0),     /* is slot in swap_info[] used? */
         SWP_WRITEOK     = (1 << 1),     /* ok to write to this swap?    */
-        SWP_DISCARDABLE = (1 << 2),     /* swapon+blkdev support discard */
+        SWP_DISCARDABLE = (1 << 2),     /* blkdev support discard */
         SWP_DISCARDING  = (1 << 3),     /* now discarding a free cluster */
         SWP_SOLIDSTATE  = (1 << 4),     /* blkdev seeks are cheap */
         SWP_CONTINUED   = (1 << 5),     /* swap_map has count continuation */
         SWP_BLKDEV      = (1 << 6),     /* its a block device */
         SWP_FILE        = (1 << 7),     /* set after swap_activate success */
+        SWP_AREA_DISCARD = (1 << 8),    /* single-time swap area discards */
+        SWP_PAGE_DISCARD = (1 << 9),    /* freed swap page-cluster discards */
                                         /* add others here before... */
-        SWP_SCANNING    = (1 << 8),     /* refcount in scan_swap_map */
+        SWP_SCANNING    = (1 << 10),    /* refcount in scan_swap_map */
 };
 
 #define SWAP_CLUSTER_MAX 32UL
@@ -176,6 +182,33 @@ enum {
 #define SWAP_MAP_SHMEM  0xbf    /* Owned by shmem/tmpfs, in first swap_map */
 
 /*
+ * We use this to track usage of a cluster. A cluster is a block of swap disk
+ * space with SWAPFILE_CLUSTER pages long and naturally aligns in disk. All
+ * free clusters are organized into a list. We fetch an entry from the list to
+ * get a free cluster.
+ *
+ * The data field stores next cluster if the cluster is free or cluster usage
+ * counter otherwise. The flags field determines if a cluster is free. This is
+ * protected by swap_info_struct.lock.
+ */
+struct swap_cluster_info {
+        unsigned int data:24;
+        unsigned int flags:8;
+};
+#define CLUSTER_FLAG_FREE 1 /* This cluster is free */
+#define CLUSTER_FLAG_NEXT_NULL 2 /* This cluster has no next cluster */
+
+/*
+ * We assign a cluster to each CPU, so each CPU can allocate swap entry from
+ * its own cluster and swapout sequentially. The purpose is to optimize swapout
+ * throughput.
+ */
+struct percpu_cluster {
+        struct swap_cluster_info index; /* Current cluster index */
+        unsigned int next; /* Likely next allocation offset */
+};
+
+/*
  * The in-memory structure used to track swap areas.
  */
 struct swap_info_struct {
@@ -185,14 +218,16 @@ struct swap_info_struct {
         signed char     next;           /* next type on the swap list */
         unsigned int    max;            /* extent of the swap_map */
         unsigned char *swap_map;        /* vmalloc'ed array of usage counts */
+        struct swap_cluster_info *cluster_info; /* cluster info. Only for SSD */
+        struct swap_cluster_info free_cluster_head; /* free cluster list head */
+        struct swap_cluster_info free_cluster_tail; /* free cluster list tail */
         unsigned int lowest_bit;        /* index of first free in swap_map */
         unsigned int highest_bit;       /* index of last free in swap_map */
         unsigned int pages;             /* total of usable pages of swap */
         unsigned int inuse_pages;       /* number of those currently in use */
         unsigned int cluster_next;      /* likely index for next allocation */
         unsigned int cluster_nr;        /* countdown to next cluster search */
-        unsigned int lowest_alloc;      /* while preparing discard cluster */
-        unsigned int highest_alloc;     /* while preparing discard cluster */
+        struct percpu_cluster __percpu *percpu_cluster; /* per cpu's swap location */
         struct swap_extent *curr_swap_extent;
         struct swap_extent first_swap_extent;
         struct block_device *bdev;      /* swap device or bdev of swap file */
@@ -206,14 +241,18 @@ struct swap_info_struct {
                                          * protect map scan related fields like
                                          * swap_map, lowest_bit, highest_bit,
                                          * inuse_pages, cluster_next,
-                                         * cluster_nr, lowest_alloc and
-                                         * highest_alloc. other fields are only
-                                         * changed at swapon/swapoff, so are
-                                         * protected by swap_lock. changing
-                                         * flags need hold this lock and
-                                         * swap_lock. If both locks need hold,
-                                         * hold swap_lock first.
+                                         * cluster_nr, lowest_alloc,
+                                         * highest_alloc, free/discard cluster
+                                         * list. other fields are only changed
+                                         * at swapon/swapoff, so are protected
+                                         * by swap_lock. changing flags need
+                                         * hold this lock and swap_lock. If
+                                         * both locks need hold, hold swap_lock
+                                         * first.
                                          */
+        struct work_struct discard_work; /* discard worker */
+        struct swap_cluster_info discard_cluster_head; /* list head of discard clusters */
+        struct swap_cluster_info discard_cluster_tail; /* list tail of discard clusters */
 };
 
 struct swap_list_t {
@@ -233,15 +272,15 @@ extern unsigned long nr_free_pagecache_pages(void);
 
 
 /* linux/mm/swap.c */
-extern void __lru_cache_add(struct page *, enum lru_list lru);
-extern void lru_cache_add_lru(struct page *, enum lru_list lru);
+extern void __lru_cache_add(struct page *);
+extern void lru_cache_add(struct page *);
 extern void lru_add_page_tail(struct page *page, struct page *page_tail,
                          struct lruvec *lruvec, struct list_head *head);
 extern void activate_page(struct page *);
 extern void mark_page_accessed(struct page *);
 extern void lru_add_drain(void);
 extern void lru_add_drain_cpu(int cpu);
-extern int lru_add_drain_all(void);
+extern void lru_add_drain_all(void);
 extern void rotate_reclaimable_page(struct page *page);
 extern void deactivate_page(struct page *page);
 extern void swap_setup(void);
@@ -254,12 +293,14 @@ extern void add_page_to_unevictable_list(struct page *page);
  */
 static inline void lru_cache_add_anon(struct page *page)
 {
-        __lru_cache_add(page, LRU_INACTIVE_ANON);
+        ClearPageActive(page);
+        __lru_cache_add(page);
 }
 
 static inline void lru_cache_add_file(struct page *page)
 {
-        __lru_cache_add(page, LRU_INACTIVE_FILE);
+        ClearPageActive(page);
+        __lru_cache_add(page);
 }
 
 /* linux/mm/vmscan.c */
@@ -406,6 +447,7 @@ mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout)
 
 #else /* CONFIG_SWAP */
 
+#define swap_address_space(entry)               (NULL)
 #define get_nr_swap_pages()                     0L
 #define total_swap_pages                        0L
 #define total_swapcache_pages()                 0UL
diff --git a/include/linux/swapops.h b/include/linux/swapops.h
index 47ead515c811..8d4fa82bfb91 100644
--- a/include/linux/swapops.h
+++ b/include/linux/swapops.h
@@ -67,6 +67,8 @@ static inline swp_entry_t pte_to_swp_entry(pte_t pte)
         swp_entry_t arch_entry;
 
         BUG_ON(pte_file(pte));
+        if (pte_swp_soft_dirty(pte))
+                pte = pte_swp_clear_soft_dirty(pte);
         arch_entry = __pte_to_swp_entry(pte);
         return swp_entry(__swp_type(arch_entry), __swp_offset(arch_entry));
 }
@@ -137,6 +139,7 @@ static inline void make_migration_entry_read(swp_entry_t *entry)
 
 extern void migration_entry_wait(struct mm_struct *mm, pmd_t *pmd,
                                         unsigned long address);
+extern void migration_entry_wait_huge(struct mm_struct *mm, pte_t *pte);
 #else
 
 #define make_migration_entry(page, write) swp_entry(0, 0)
@@ -148,6 +151,8 @@ static inline int is_migration_entry(swp_entry_t swp)
 static inline void make_migration_entry_read(swp_entry_t *entryp) { }
 static inline void migration_entry_wait(struct mm_struct *mm, pmd_t *pmd,
                                          unsigned long address) { }
+static inline void migration_entry_wait_huge(struct mm_struct *mm,
+                                        pte_t *pte) { }
 static inline int is_write_migration_entry(swp_entry_t entry)
 {
         return 0;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 4147d700a293..7fac04e7ff6e 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -186,6 +186,7 @@ extern struct trace_event_functions exit_syscall_print_funcs;
 #define __SYSCALL_DEFINEx(x, name, ...)                                 \
         asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));      \
         static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));  \
+        asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));      \
         asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))       \
         {                                                               \
                 long ret = SYSC##name(__MAP(x,__SC_CAST,__VA_ARGS__));  \
@@ -802,9 +803,14 @@ asmlinkage long sys_vfork(void);
 asmlinkage long sys_clone(unsigned long, unsigned long, int __user *, int,
                int __user *);
 #else
+#ifdef CONFIG_CLONE_BACKWARDS3
+asmlinkage long sys_clone(unsigned long, unsigned long, int, int __user *,
+                          int __user *, int);
+#else
 asmlinkage long sys_clone(unsigned long, unsigned long, int __user *,
                int __user *, int);
 #endif
+#endif
 
 asmlinkage long sys_execve(const char __user *filename,
                 const char __user *const __user *argv,
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index e2cee22f578a..11baec7c9b26 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -17,10 +17,12 @@
 #include <linux/list.h>
 #include <linux/lockdep.h>
 #include <linux/kobject_ns.h>
+#include <linux/stat.h>
 #include <linux/atomic.h>
 
 struct kobject;
 struct module;
+struct bin_attribute;
 enum kobj_ns_type;
 
 struct attribute {
@@ -49,9 +51,9 @@ do {							\
         static struct lock_class_key __key;             \
                                                         \
         (attr)->key = &__key;                           \
-} while(0)
+} while (0)
 #else
-#define sysfs_attr_init(attr) do {} while(0)
+#define sysfs_attr_init(attr) do {} while (0)
 #endif
 
 struct attribute_group {
@@ -59,26 +61,33 @@ struct attribute_group {
         umode_t                 (*is_visible)(struct kobject *,
                                               struct attribute *, int);
         struct attribute        **attrs;
+        struct bin_attribute    **bin_attrs;
 };
 
-
-
 /**
  * Use these macros to make defining attributes easier. See include/linux/device.h
  * for examples..
  */
 
-#define __ATTR(_name,_mode,_show,_store) { \
-        .attr = {.name = __stringify(_name), .mode = _mode },   \
-        .show   = _show,                                        \
-        .store  = _store,                                       \
+#define __ATTR(_name, _mode, _show, _store) {                           \
+        .attr = {.name = __stringify(_name), .mode = _mode },           \
+        .show   = _show,                                                \
+        .store  = _store,                                               \
+}
+
+#define __ATTR_RO(_name) {                                              \
+        .attr   = { .name = __stringify(_name), .mode = S_IRUGO },      \
+        .show   = _name##_show,                                         \
 }
 
-#define __ATTR_RO(_name) { \
-        .attr   = { .name = __stringify(_name), .mode = 0444 }, \
-        .show   = _name##_show,                                 \
+#define __ATTR_WO(_name) {                                              \
+        .attr   = { .name = __stringify(_name), .mode = S_IWUSR },      \
+        .store  = _name##_store,                                        \
 }
 
+#define __ATTR_RW(_name) __ATTR(_name, (S_IWUSR | S_IRUGO),             \
+                         _name##_show, _name##_store)
+
 #define __ATTR_NULL { .attr = { .name = NULL } }
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
@@ -92,7 +101,17 @@ struct attribute_group {
 #define __ATTR_IGNORE_LOCKDEP   __ATTR
 #endif
 
-#define attr_name(_attr) (_attr).attr.name
+#define __ATTRIBUTE_GROUPS(_name)                               \
+static const struct attribute_group *_name##_groups[] = {       \
+        &_name##_group,                                         \
+        NULL,                                                   \
+}
+
+#define ATTRIBUTE_GROUPS(_name)                                 \
+static const struct attribute_group _name##_group = {           \
+        .attrs = _name##_attrs,                                 \
+};                                                              \
+__ATTRIBUTE_GROUPS(_name)
 
 struct file;
 struct vm_area_struct;
@@ -103,7 +122,7 @@ struct bin_attribute {
         void                    *private;
         ssize_t (*read)(struct file *, struct kobject *, struct bin_attribute *,
                         char *, loff_t, size_t);
-        ssize_t (*write)(struct file *,struct kobject *, struct bin_attribute *,
+        ssize_t (*write)(struct file *, struct kobject *, struct bin_attribute *,
                          char *, loff_t, size_t);
         int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
                     struct vm_area_struct *vma);
@@ -121,9 +140,39 @@ struct bin_attribute {
  */
 #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
 
+/* macros to create static binary attributes easier */
+#define __BIN_ATTR(_name, _mode, _read, _write, _size) {                \
+        .attr = { .name = __stringify(_name), .mode = _mode },          \
+        .read   = _read,                                                \
+        .write  = _write,                                               \
+        .size   = _size,                                                \
+}
+
+#define __BIN_ATTR_RO(_name, _size) {                                   \
+        .attr   = { .name = __stringify(_name), .mode = S_IRUGO },      \
+        .read   = _name##_read,                                         \
+        .size   = _size,                                                \
+}
+
+#define __BIN_ATTR_RW(_name, _size) __BIN_ATTR(_name,                   \
+                                   (S_IWUSR | S_IRUGO), _name##_read,   \
+                                   _name##_write, _size)
+
+#define __BIN_ATTR_NULL __ATTR_NULL
+
+#define BIN_ATTR(_name, _mode, _read, _write, _size)                    \
+struct bin_attribute bin_attr_##_name = __BIN_ATTR(_name, _mode, _read, \
+                                        _write, _size)
+
+#define BIN_ATTR_RO(_name, _size)                                       \
+struct bin_attribute bin_attr_##_name = __BIN_ATTR_RO(_name, _size)
+
+#define BIN_ATTR_RW(_name, _size)                                       \
+struct bin_attribute bin_attr_##_name = __BIN_ATTR_RW(_name, _size)
+
 struct sysfs_ops {
-        ssize_t (*show)(struct kobject *, struct attribute *,char *);
-        ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t);
+        ssize_t (*show)(struct kobject *, struct attribute *, char *);
+        ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t);
         const void *(*namespace)(struct kobject *, const struct attribute *);
 };
 
@@ -169,10 +218,14 @@ void sysfs_delete_link(struct kobject *dir, struct kobject *targ,
 
 int __must_check sysfs_create_group(struct kobject *kobj,
                                     const struct attribute_group *grp);
+int __must_check sysfs_create_groups(struct kobject *kobj,
+                                     const struct attribute_group **groups);
 int sysfs_update_group(struct kobject *kobj,
                        const struct attribute_group *grp);
 void sysfs_remove_group(struct kobject *kobj,
                         const struct attribute_group *grp);
+void sysfs_remove_groups(struct kobject *kobj,
+                         const struct attribute_group **groups);
 int sysfs_add_file_to_group(struct kobject *kobj,
                         const struct attribute *attr, const char *group);
 void sysfs_remove_file_from_group(struct kobject *kobj,
@@ -297,6 +350,12 @@ static inline int sysfs_create_group(struct kobject *kobj,
         return 0;
 }
 
+static inline int sysfs_create_groups(struct kobject *kobj,
+                                      const struct attribute_group **groups)
+{
+        return 0;
+}
+
 static inline int sysfs_update_group(struct kobject *kobj,
                                 const struct attribute_group *grp)
 {
@@ -308,6 +367,11 @@ static inline void sysfs_remove_group(struct kobject *kobj,
 {
 }
 
+static inline void sysfs_remove_groups(struct kobject *kobj,
+                                       const struct attribute_group **groups)
+{
+}
+
 static inline int sysfs_add_file_to_group(struct kobject *kobj,
                 const struct attribute *attr, const char *group)
 {
diff --git a/include/linux/syslog.h b/include/linux/syslog.h
index 38911391a139..98a3153c0f96 100644
--- a/include/linux/syslog.h
+++ b/include/linux/syslog.h
@@ -44,8 +44,8 @@
 /* Return size of the log buffer */
 #define SYSLOG_ACTION_SIZE_BUFFER   10
 
-#define SYSLOG_FROM_CALL 0
-#define SYSLOG_FROM_FILE 1
+#define SYSLOG_FROM_READER           0
+#define SYSLOG_FROM_PROC             1
 
 int do_syslog(int type, char __user *buf, int count, bool from_file);
 
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 5adbc33d1ab3..d68633452d9b 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -107,7 +107,6 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
  * only four options will fit in a standard TCP header */
 #define TCP_NUM_SACKS 4
 
-struct tcp_cookie_values;
 struct tcp_request_sock_ops;
 
 struct tcp_request_sock {
@@ -238,6 +237,7 @@ struct tcp_sock {
 
         u32     rcv_wnd;        /* Current receiver window              */
         u32     write_seq;      /* Tail(+1) of data held in tcp send buffer */
+        u32     notsent_lowat;  /* TCP_NOTSENT_LOWAT */
         u32     pushed_seq;     /* Last pushed seq, required to talk to windows */
         u32     lost_out;       /* Lost packets                 */
         u32     sacked_out;     /* SACK'd packets                       */
@@ -246,7 +246,6 @@ struct tcp_sock {
 
         /* from STCP, retrans queue hinting */
         struct sk_buff* lost_skb_hint;
-        struct sk_buff *scoreboard_skb_hint;
         struct sk_buff *retransmit_skb_hint;
 
         struct sk_buff_head     out_of_order_queue; /* Out of order segments go here */
diff --git a/include/linux/tegra-cpuidle.h b/include/linux/tegra-cpuidle.h
new file mode 100644
index 000000000000..9c6286bbf662
--- /dev/null
+++ b/include/linux/tegra-cpuidle.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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_TEGRA_CPUIDLE_H__
+#define __LINUX_TEGRA_CPUIDLE_H__
+
+#ifdef CONFIG_CPU_IDLE
+void tegra_cpuidle_pcie_irqs_in_use(void);
+#else
+static inline void tegra_cpuidle_pcie_irqs_in_use(void)
+{
+}
+#endif
+
+#endif
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index a386a1cbb6e1..b268d3cf7ae3 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -207,6 +207,16 @@ struct thermal_bind_params {
          * See Documentation/thermal/sysfs-api.txt for more information.
          */
         int trip_mask;
+
+        /*
+         * This is an array of cooling state limits. Must have exactly
+         * 2 * thermal_zone.number_of_trip_points. It is an array consisting
+         * of tuples <lower-state upper-state> of state limits. Each trip
+         * will be associated with one state limit tuple when binding.
+         * A NULL pointer means <THERMAL_NO_LIMITS THERMAL_NO_LIMITS>
+         * on all trips.
+         */
+        unsigned long *binding_limits;
         int (*match) (struct thermal_zone_device *tz,
                         struct thermal_cooling_device *cdev);
 };
@@ -214,6 +224,14 @@ struct thermal_bind_params {
 /* Structure to define Thermal Zone parameters */
 struct thermal_zone_params {
         char governor_name[THERMAL_NAME_LENGTH];
+
+        /*
+         * a boolean to indicate if the thermal to hwmon sysfs interface
+         * is required. when no_hwmon == false, a hwmon sysfs interface
+         * will be created. when no_hwmon == true, nothing will be done
+         */
+        bool no_hwmon;
+
         int num_tbps;   /* Number of tbp entries */
         struct thermal_bind_params *tbp;
 };
diff --git a/include/linux/tick.h b/include/linux/tick.h
index 9180f4b85e6d..5128d33bbb39 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -10,6 +10,8 @@
 #include <linux/irqflags.h>
 #include <linux/percpu.h>
 #include <linux/hrtimer.h>
+#include <linux/context_tracking_state.h>
+#include <linux/cpumask.h>
 
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
 
@@ -158,26 +160,51 @@ static inline u64 get_cpu_iowait_time_us(int cpu, u64 *unused) { return -1; }
 # endif /* !CONFIG_NO_HZ_COMMON */
 
 #ifdef CONFIG_NO_HZ_FULL
+extern bool tick_nohz_full_running;
+extern cpumask_var_t tick_nohz_full_mask;
+
+static inline bool tick_nohz_full_enabled(void)
+{
+        if (!static_key_false(&context_tracking_enabled))
+                return false;
+
+        return tick_nohz_full_running;
+}
+
+static inline bool tick_nohz_full_cpu(int cpu)
+{
+        if (!tick_nohz_full_enabled())
+                return false;
+
+        return cpumask_test_cpu(cpu, tick_nohz_full_mask);
+}
+
 extern void tick_nohz_init(void);
-extern int tick_nohz_full_cpu(int cpu);
-extern void tick_nohz_full_check(void);
+extern void __tick_nohz_full_check(void);
 extern void tick_nohz_full_kick(void);
 extern void tick_nohz_full_kick_all(void);
-extern void tick_nohz_task_switch(struct task_struct *tsk);
+extern void __tick_nohz_task_switch(struct task_struct *tsk);
 #else
 static inline void tick_nohz_init(void) { }
-static inline int tick_nohz_full_cpu(int cpu) { return 0; }
-static inline void tick_nohz_full_check(void) { }
+static inline bool tick_nohz_full_enabled(void) { return false; }
+static inline bool tick_nohz_full_cpu(int cpu) { return false; }
+static inline void __tick_nohz_full_check(void) { }
 static inline void tick_nohz_full_kick(void) { }
 static inline void tick_nohz_full_kick_all(void) { }
-static inline void tick_nohz_task_switch(struct task_struct *tsk) { }
+static inline void __tick_nohz_task_switch(struct task_struct *tsk) { }
 #endif
 
+static inline void tick_nohz_full_check(void)
+{
+        if (tick_nohz_full_enabled())
+                __tick_nohz_full_check();
+}
+
+static inline void tick_nohz_task_switch(struct task_struct *tsk)
+{
+        if (tick_nohz_full_enabled())
+                __tick_nohz_task_switch(tsk);
+}
 
-# ifdef CONFIG_CPU_IDLE_GOV_MENU
-extern void menu_hrtimer_cancel(void);
-# else
-static inline void menu_hrtimer_cancel(void) {}
-# endif /* CONFIG_CPU_IDLE_GOV_MENU */
 
 #endif
diff --git a/include/linux/time-armada-370-xp.h b/include/linux/time-armada-370-xp.h
deleted file mode 100644
index dfdfdc03115b..000000000000
--- a/include/linux/time-armada-370-xp.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Marvell Armada 370/XP SoC timer handling.
- *
- * Copyright (C) 2012 Marvell
- *
- * Lior Amsalem <alior@marvell.com>
- * Gregory CLEMENT <gregory.clement@free-electrons.com>
- * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- *
- */
-#ifndef __TIME_ARMADA_370_XPPRCMU_H
-#define __TIME_ARMADA_370_XPPRCMU_H
-
-#include <linux/init.h>
-
-void __init armada_370_xp_timer_init(void);
-
-#endif
diff --git a/include/linux/timex.h b/include/linux/timex.h
index b3726e61368e..dd3edd7dfc94 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -141,6 +141,7 @@ extern int do_adjtimex(struct timex *);
 extern void hardpps(const struct timespec *, const struct timespec *);
 
 int read_current_timer(unsigned long *timer_val);
+void ntp_notify_cmos_timer(void);
 
 /* The clock frequency of the i8253/i8254 PIT */
 #define PIT_TICK_RATE 1193182ul
diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index fcb627ff8d3e..9a9051bb1a03 100644
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -22,6 +22,8 @@
 #ifndef __LINUX_TPM_H__
 #define __LINUX_TPM_H__
 
+#define TPM_DIGEST_SIZE 20      /* Max TPM v1.2 PCR size */
+
 /*
  * Chip num is this value or a valid tpm idx
  */
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 2f322c38bd4d..ebeab360d851 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -145,8 +145,8 @@ static inline void tracepoint_synchronize_unregister(void)
                                 TP_PROTO(data_proto),                   \
                                 TP_ARGS(data_args),                     \
                                 TP_CONDITION(cond),                     \
-                                rcu_idle_exit(),                        \
-                                rcu_idle_enter());                      \
+                                rcu_irq_enter(),                        \
+                                rcu_irq_exit());                        \
         }
 #else
 #define __DECLARE_TRACE_RCU(name, proto, args, cond, data_proto, data_args)
@@ -378,6 +378,8 @@ static inline void tracepoint_synchronize_unregister(void)
 #define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print)
 #define DEFINE_EVENT(template, name, proto, args)               \
         DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
+#define DEFINE_EVENT_FN(template, name, proto, args, reg, unreg)\
+        DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
 #define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
         DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
 #define DEFINE_EVENT_CONDITION(template, name, proto,           \
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 8780bd2a272a..64f864651d86 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -10,6 +10,8 @@
 #include <linux/mutex.h>
 #include <linux/tty_flags.h>
 #include <uapi/linux/tty.h>
+#include <linux/rwsem.h>
+#include <linux/llist.h>
 
 
 
@@ -29,9 +31,10 @@
 #define __DISABLED_CHAR '\0'
 
 struct tty_buffer {
-        struct tty_buffer *next;
-        char *char_buf_ptr;
-        unsigned char *flag_buf_ptr;
+        union {
+                struct tty_buffer *next;
+                struct llist_node free;
+        };
         int used;
         int size;
         int commit;
@@ -40,25 +43,25 @@ struct tty_buffer {
         unsigned long data[0];
 };
 
-/*
- * We default to dicing tty buffer allocations to this many characters
- * in order to avoid multiple page allocations. We know the size of
- * tty_buffer itself but it must also be taken into account that the
- * the buffer is 256 byte aligned. See tty_buffer_find for the allocation
- * logic this must match
- */
-
-#define TTY_BUFFER_PAGE (((PAGE_SIZE - sizeof(struct tty_buffer)) / 2) & ~0xFF)
+static inline unsigned char *char_buf_ptr(struct tty_buffer *b, int ofs)
+{
+        return ((unsigned char *)b->data) + ofs;
+}
 
+static inline char *flag_buf_ptr(struct tty_buffer *b, int ofs)
+{
+        return (char *)char_buf_ptr(b, ofs) + b->size;
+}
 
 struct tty_bufhead {
-        struct work_struct work;
-        spinlock_t lock;
         struct tty_buffer *head;        /* Queue head */
+        struct work_struct work;
+        struct mutex       lock;
+        atomic_t           priority;
+        struct tty_buffer sentinel;
+        struct llist_head free;         /* Free queue head */
+        atomic_t           memory_used; /* In-use buffers excluding free list */
         struct tty_buffer *tail;        /* Active buffer */
-        struct tty_buffer *free;        /* Free queue head */
-        int memory_used;                /* Buffer space used excluding
-                                                                free queue */
 };
 /*
  * When a break, frame error, or parity error happens, these codes are
@@ -199,9 +202,6 @@ struct tty_port {
         wait_queue_head_t       close_wait;     /* Close waiters */
         wait_queue_head_t       delta_msr_wait; /* Modem status change */
         unsigned long           flags;          /* TTY flags ASY_*/
-        unsigned long           iflags;         /* TTYP_ internal flags */
-#define TTYP_FLUSHING                   1  /* Flushing to ldisc in progress */
-#define TTYP_FLUSHPENDING               2  /* Queued buffer flush pending */
         unsigned char           console:1,      /* port is a console */
                                 low_latency:1;  /* direct buffer flush */
         struct mutex            mutex;          /* Locking */
@@ -238,14 +238,16 @@ struct tty_struct {
         int index;
 
         /* Protects ldisc changes: Lock tty not pty */
-        struct mutex ldisc_mutex;
+        struct ld_semaphore ldisc_sem;
         struct tty_ldisc *ldisc;
 
         struct mutex atomic_write_lock;
         struct mutex legacy_mutex;
-        struct mutex termios_mutex;
+        struct mutex throttle_mutex;
+        struct rw_semaphore termios_rwsem;
+        struct mutex winsize_mutex;
         spinlock_t ctrl_lock;
-        /* Termios values are protected by the termios mutex */
+        /* Termios values are protected by the termios rwsem */
         struct ktermios termios, termios_locked;
         struct termiox *termiox;        /* May be NULL for unsupported */
         char name[64];
@@ -253,7 +255,7 @@ struct tty_struct {
         struct pid *session;
         unsigned long flags;
         int count;
-        struct winsize winsize;         /* termios mutex */
+        struct winsize winsize;         /* winsize_mutex */
         unsigned char stopped:1, hw_stopped:1, flow_stopped:1, packet:1;
         unsigned char ctrl_status;      /* ctrl_lock */
         unsigned int receive_room;      /* Bytes free for queue */
@@ -272,7 +274,6 @@ struct tty_struct {
 #define N_TTY_BUF_SIZE 4096
 
         unsigned char closing:1;
-        unsigned short minimum_to_wake;
         unsigned char *write_buf;
         int write_cnt;
         /* If the tty has a pending do_SAK, queue it here - akpm */
@@ -304,13 +305,8 @@ struct tty_file_private {
 #define TTY_EXCLUSIVE           3       /* Exclusive open mode */
 #define TTY_DEBUG               4       /* Debugging */
 #define TTY_DO_WRITE_WAKEUP     5       /* Call write_wakeup after queuing new */
-#define TTY_PUSH                6       /* n_tty private */
 #define TTY_CLOSING             7       /* ->close() in progress */
-#define TTY_LDISC               9       /* Line discipline attached */
-#define TTY_LDISC_CHANGING      10      /* Line discipline changing */
 #define TTY_LDISC_OPEN          11      /* Line discipline is open */
-#define TTY_HW_COOK_OUT         14      /* Hardware can do output cooking */
-#define TTY_HW_COOK_IN          15      /* Hardware can do input cooking */
 #define TTY_PTY_LOCK            16      /* pty private */
 #define TTY_NO_WRITE_SPLIT      17      /* Preserve write boundaries to driver */
 #define TTY_HUPPED              18      /* Post driver->hangup() */
@@ -562,6 +558,19 @@ extern void tty_ldisc_init(struct tty_struct *tty);
 extern void tty_ldisc_deinit(struct tty_struct *tty);
 extern void tty_ldisc_begin(void);
 
+static inline int tty_ldisc_receive_buf(struct tty_ldisc *ld, unsigned char *p,
+                                        char *f, int count)
+{
+        if (ld->ops->receive_buf2)
+                count = ld->ops->receive_buf2(ld->tty, p, f, count);
+        else {
+                count = min_t(int, count, ld->tty->receive_room);
+                if (count)
+                        ld->ops->receive_buf(ld->tty, p, f, count);
+        }
+        return count;
+}
+
 
 /* n_tty.c */
 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h
index e0f252633b47..21ddd7d9ea1f 100644
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_TTY_FLIP_H
 #define _LINUX_TTY_FLIP_H
 
+extern int tty_buffer_space_avail(struct tty_port *port);
 extern int tty_buffer_request_room(struct tty_port *port, size_t size);
 extern int tty_insert_flip_string_flags(struct tty_port *port,
                 const unsigned char *chars, const char *flags, size_t size);
@@ -18,8 +19,8 @@ static inline int tty_insert_flip_char(struct tty_port *port,
 {
         struct tty_buffer *tb = port->buf.tail;
         if (tb && tb->used < tb->size) {
-                tb->flag_buf_ptr[tb->used] = flag;
-                tb->char_buf_ptr[tb->used++] = ch;
+                *flag_buf_ptr(tb, tb->used) = flag;
+                *char_buf_ptr(tb, tb->used++) = ch;
                 return 1;
         }
         return tty_insert_flip_string_flags(port, &ch, &flag, 1);
@@ -31,4 +32,7 @@ static inline int tty_insert_flip_string(struct tty_port *port,
         return tty_insert_flip_string_fixed_flag(port, chars, TTY_NORMAL, size);
 }
 
+extern void tty_buffer_lock_exclusive(struct tty_port *port);
+extern void tty_buffer_unlock_exclusive(struct tty_port *port);
+
 #endif /* _LINUX_TTY_FLIP_H */
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 58390c73df8b..f15c898ff462 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -100,16 +100,78 @@
  *      seek to perform this action quickly but should wait until
  *      any pending driver I/O is completed.
  *
+ * void (*fasync)(struct tty_struct *, int on)
+ *
+ *      Notify line discipline when signal-driven I/O is enabled or
+ *      disabled.
+ *
  * void (*dcd_change)(struct tty_struct *tty, unsigned int status)
  *
  *      Tells the discipline that the DCD pin has changed its status.
  *      Used exclusively by the N_PPS (Pulse-Per-Second) line discipline.
+ *
+ * int  (*receive_buf2)(struct tty_struct *, const unsigned char *cp,
+ *                      char *fp, int count);
+ *
+ *      This function is called by the low-level tty driver to send
+ *      characters received by the hardware to the line discpline for
+ *      processing.  <cp> is a pointer to the buffer of input
+ *      character received by the device.  <fp> is a pointer to a
+ *      pointer of flag bytes which indicate whether a character was
+ *      received with a parity error, etc.
+ *      If assigned, prefer this function for automatic flow control.
  */
 
 #include <linux/fs.h>
 #include <linux/wait.h>
 #include <linux/wait.h>
 
+
+/*
+ * the semaphore definition
+ */
+struct ld_semaphore {
+        long                    count;
+        raw_spinlock_t          wait_lock;
+        unsigned int            wait_readers;
+        struct list_head        read_wait;
+        struct list_head        write_wait;
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+        struct lockdep_map      dep_map;
+#endif
+};
+
+extern void __init_ldsem(struct ld_semaphore *sem, const char *name,
+                         struct lock_class_key *key);
+
+#define init_ldsem(sem)                                         \
+do {                                                            \
+        static struct lock_class_key __key;                     \
+                                                                \
+        __init_ldsem((sem), #sem, &__key);                      \
+} while (0)
+
+
+extern int ldsem_down_read(struct ld_semaphore *sem, long timeout);
+extern int ldsem_down_read_trylock(struct ld_semaphore *sem);
+extern int ldsem_down_write(struct ld_semaphore *sem, long timeout);
+extern int ldsem_down_write_trylock(struct ld_semaphore *sem);
+extern void ldsem_up_read(struct ld_semaphore *sem);
+extern void ldsem_up_write(struct ld_semaphore *sem);
+
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+extern int ldsem_down_read_nested(struct ld_semaphore *sem, int subclass,
+                                  long timeout);
+extern int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,
+                                   long timeout);
+#else
+# define ldsem_down_read_nested(sem, subclass, timeout)         \
+                ldsem_down_read(sem, timeout)
+# define ldsem_down_write_nested(sem, subclass, timeout)        \
+                ldsem_down_write(sem, timeout)
+#endif
+
+
 struct tty_ldisc_ops {
         int     magic;
         char    *name;
@@ -143,6 +205,9 @@ struct tty_ldisc_ops {
                                char *fp, int count);
         void    (*write_wakeup)(struct tty_struct *);
         void    (*dcd_change)(struct tty_struct *, unsigned int);
+        void    (*fasync)(struct tty_struct *tty, int on);
+        int     (*receive_buf2)(struct tty_struct *, const unsigned char *cp,
+                                char *fp, int count);
 
         struct  module *owner;
 
@@ -151,8 +216,7 @@ struct tty_ldisc_ops {
 
 struct tty_ldisc {
         struct tty_ldisc_ops *ops;
-        atomic_t users;
-        wait_queue_head_t wq_idle;
+        struct tty_struct *tty;
 };
 
 #define TTY_LDISC_MAGIC 0x5403
diff --git a/include/linux/usb.h b/include/linux/usb.h
index a0bee5a28d1a..001629cd1a97 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -337,6 +337,7 @@ struct usb_bus {
                                          * the ep queue on a short transfer
                                          * with the URB_SHORT_NOT_OK flag set.
                                          */
+        unsigned no_sg_constraint:1;    /* no sg constraint */
         unsigned sg_tablesize;          /* 0 or largest number of sg list entries */
 
         int devnum_next;                /* Next open device number in
@@ -367,17 +368,6 @@ struct usb_bus {
 
 /* ----------------------------------------------------------------------- */
 
-/* This is arbitrary.
- * From USB 2.0 spec Table 11-13, offset 7, a hub can
- * have up to 255 ports. The most yet reported is 10.
- *
- * Current Wireless USB host hardware (Intel i1480 for example) allows
- * up to 22 devices to connect. Upcoming hardware might raise that
- * limit. Because the arrays need to add a bit for hub status data, we
- * do 31, so plus one evens out to four bytes.
- */
-#define USB_MAXCHILDREN         (31)
-
 struct usb_tt;
 
 enum usb_device_removable {
@@ -394,6 +384,22 @@ enum usb_port_connect_type {
 };
 
 /*
+ * USB 2.0 Link Power Management (LPM) parameters.
+ */
+struct usb2_lpm_parameters {
+        /* Best effort service latency indicate how long the host will drive
+         * resume on an exit from L1.
+         */
+        unsigned int besl;
+
+        /* Timeout value in microseconds for the L1 inactivity (LPM) timer.
+         * When the timer counts to zero, the parent hub will initiate a LPM
+         * transition to L1.
+         */
+        int timeout;
+};
+
+/*
  * USB 3.0 Link Power Management (LPM) parameters.
  *
  * PEL and SEL are USB 3.0 Link PM latencies for device-initiated LPM exit.
@@ -468,6 +474,7 @@ struct usb3_lpm_parameters {
  * @wusb: device is Wireless USB
  * @lpm_capable: device supports LPM
  * @usb2_hw_lpm_capable: device can perform USB2 hardware LPM
+ * @usb2_hw_lpm_besl_capable: device can perform USB2 hardware BESL LPM
  * @usb2_hw_lpm_enabled: USB2 hardware LPM enabled
  * @usb3_lpm_enabled: USB3 hardware LPM enabled
  * @string_langid: language ID for strings
@@ -487,6 +494,7 @@ struct usb3_lpm_parameters {
  *      specific data for the device.
  * @slot_id: Slot ID assigned by xHCI
  * @removable: Device can be physically removed from this port
+ * @l1_params: best effor service latency for USB2 L1 LPM state, and L1 timeout.
  * @u1_params: exit latencies for USB3 U1 LPM state, and hub-initiated timeout.
  * @u2_params: exit latencies for USB3 U2 LPM state, and hub-initiated timeout.
  * @lpm_disable_count: Ref count used by usb_disable_lpm() and usb_enable_lpm()
@@ -538,6 +546,7 @@ struct usb_device {
         unsigned wusb:1;
         unsigned lpm_capable:1;
         unsigned usb2_hw_lpm_capable:1;
+        unsigned usb2_hw_lpm_besl_capable:1;
         unsigned usb2_hw_lpm_enabled:1;
         unsigned usb3_lpm_enabled:1;
         int string_langid;
@@ -566,6 +575,7 @@ struct usb_device {
         struct wusb_dev *wusb_dev;
         int slot_id;
         enum usb_device_removable removable;
+        struct usb2_lpm_parameters l1_params;
         struct usb3_lpm_parameters u1_params;
         struct usb3_lpm_parameters u2_params;
         unsigned lpm_disable_count;
@@ -675,6 +685,11 @@ static inline bool usb_device_supports_ltm(struct usb_device *udev)
         return udev->bos->ss_cap->bmAttributes & USB_LTM_SUPPORT;
 }
 
+static inline bool usb_device_no_sg_constraint(struct usb_device *udev)
+{
+        return udev && udev->bus && udev->bus->no_sg_constraint;
+}
+
 
 /*-------------------------------------------------------------------------*/
 
@@ -699,7 +714,10 @@ extern int usb_driver_claim_interface(struct usb_driver *driver,
  * usb_interface_claimed - returns true iff an interface is claimed
  * @iface: the interface being checked
  *
- * Returns true (nonzero) iff the interface is claimed, else false (zero).
+ * Return: %true (nonzero) iff the interface is claimed, else %false
+ * (zero).
+ *
+ * Note:
  * Callers must own the driver model's usb bus readlock.  So driver
  * probe() entries don't need extra locking, but other call contexts
  * may need to explicitly claim that lock.
@@ -717,6 +735,7 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface,
 extern int usb_match_one_id(struct usb_interface *interface,
                             const struct usb_device_id *id);
 
+extern int usb_for_each_dev(void *data, int (*fn)(struct usb_device *, void *));
 extern struct usb_interface *usb_find_interface(struct usb_driver *drv,
                 int minor);
 extern struct usb_interface *usb_ifnum_to_if(const struct usb_device *dev,
@@ -735,8 +754,9 @@ extern struct usb_host_interface *usb_find_alt_setting(
  * @buf: where to put the string
  * @size: how big is "buf"?
  *
- * Returns length of the string (> 0) or negative if size was too small.
+ * Return: Length of the string (> 0) or negative if size was too small.
  *
+ * Note:
  * This identifier is intended to be "stable", reflecting physical paths in
  * hardware such as physical bus addresses for host controllers or ports on
  * USB hubs.  That makes it stay the same until systems are physically
@@ -1237,7 +1257,9 @@ typedef void (*usb_complete_t)(struct urb *);
  *      the device driver is saying that it provided this DMA address,
  *      which the host controller driver should use in preference to the
  *      transfer_buffer.
- * @sg: scatter gather buffer list
+ * @sg: scatter gather buffer list, the buffer size of each element in
+ *      the list (except the last) must be divisible by the endpoint's
+ *      max packet size if no_sg_constraint isn't set in 'struct usb_bus'
  * @num_mapped_sgs: (internal) number of mapped sg entries
  * @num_sgs: number of entries in the sg list
  * @transfer_buffer_length: How big is transfer_buffer.  The transfer may
@@ -1524,10 +1546,16 @@ static inline void usb_fill_int_urb(struct urb *urb,
         urb->transfer_buffer_length = buffer_length;
         urb->complete = complete_fn;
         urb->context = context;
-        if (dev->speed == USB_SPEED_HIGH || dev->speed == USB_SPEED_SUPER)
+
+        if (dev->speed == USB_SPEED_HIGH || dev->speed == USB_SPEED_SUPER) {
+                /* make sure interval is within allowed range */
+                interval = clamp(interval, 1, 16);
+
                 urb->interval = 1 << (interval - 1);
-        else
+        } else {
                 urb->interval = interval;
+        }
+
         urb->start_frame = -1;
 }
 
@@ -1560,7 +1588,7 @@ extern int usb_anchor_empty(struct usb_anchor *anchor);
  * usb_urb_dir_in - check if an URB describes an IN transfer
  * @urb: URB to be checked
  *
- * Returns 1 if @urb describes an IN transfer (device-to-host),
+ * Return: 1 if @urb describes an IN transfer (device-to-host),
  * otherwise 0.
  */
 static inline int usb_urb_dir_in(struct urb *urb)
@@ -1572,7 +1600,7 @@ static inline int usb_urb_dir_in(struct urb *urb)
  * usb_urb_dir_out - check if an URB describes an OUT transfer
  * @urb: URB to be checked
  *
- * Returns 1 if @urb describes an OUT transfer (host-to-device),
+ * Return: 1 if @urb describes an OUT transfer (host-to-device),
  * otherwise 0.
  */
 static inline int usb_urb_dir_out(struct urb *urb)
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 544825dde823..7d399671a566 100644
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -7,32 +7,38 @@
 
 #include <linux/usb/otg.h>
 
-struct ci13xxx;
-struct ci13xxx_platform_data {
+struct ci_hdrc;
+struct ci_hdrc_platform_data {
         const char      *name;
         /* offset of the capability registers */
         uintptr_t        capoffset;
         unsigned         power_budget;
         struct usb_phy  *phy;
+        enum usb_phy_interface phy_mode;
         unsigned long    flags;
-#define CI13XXX_REGS_SHARED             BIT(0)
-#define CI13XXX_REQUIRE_TRANSCEIVER     BIT(1)
-#define CI13XXX_PULLUP_ON_VBUS          BIT(2)
-#define CI13XXX_DISABLE_STREAMING       BIT(3)
-
-#define CI13XXX_CONTROLLER_RESET_EVENT          0
-#define CI13XXX_CONTROLLER_STOPPED_EVENT        1
-        void    (*notify_event) (struct ci13xxx *ci, unsigned event);
+#define CI_HDRC_REGS_SHARED             BIT(0)
+#define CI_HDRC_REQUIRE_TRANSCEIVER     BIT(1)
+#define CI_HDRC_DISABLE_STREAMING       BIT(3)
+        /*
+         * Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1,
+         * but otg is not supported (no register otgsc).
+         */
+#define CI_HDRC_DUAL_ROLE_NOT_OTG       BIT(4)
+        enum usb_dr_mode        dr_mode;
+#define CI_HDRC_CONTROLLER_RESET_EVENT          0
+#define CI_HDRC_CONTROLLER_STOPPED_EVENT        1
+        void    (*notify_event) (struct ci_hdrc *ci, unsigned event);
+        struct regulator        *reg_vbus;
 };
 
 /* Default offset of capability registers */
 #define DEF_CAPOFFSET           0x100
 
-/* Add ci13xxx device */
-struct platform_device *ci13xxx_add_device(struct device *dev,
+/* Add ci hdrc device */
+struct platform_device *ci_hdrc_add_device(struct device *dev,
                         struct resource *res, int nres,
-                        struct ci13xxx_platform_data *platdata);
-/* Remove ci13xxx device */
-void ci13xxx_remove_device(struct platform_device *pdev);
+                        struct ci_hdrc_platform_data *platdata);
+/* Remove ci hdrc device */
+void ci_hdrc_remove_device(struct platform_device *pdev);
 
 #endif
diff --git a/include/linux/usb/dwc3-omap.h b/include/linux/usb/dwc3-omap.h
deleted file mode 100644
index 5615f4d82724..000000000000
--- a/include/linux/usb/dwc3-omap.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2013 by Texas Instruments
- *
- * The Inventra Controller Driver for Linux 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 __DWC3_OMAP_H__
-#define __DWC3_OMAP_H__
-
-enum omap_dwc3_vbus_id_status {
-        OMAP_DWC3_UNKNOWN = 0,
-        OMAP_DWC3_ID_GROUND,
-        OMAP_DWC3_ID_FLOAT,
-        OMAP_DWC3_VBUS_VALID,
-        OMAP_DWC3_VBUS_OFF,
-};
-
-#if (defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_DWC3_MODULE))
-extern int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status);
-#else
-static inline int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
-{
-        return -ENODEV;
-}
-#endif
-
-#endif  /* __DWC3_OMAP_H__ */
diff --git a/include/linux/usb/ehci_pdriver.h b/include/linux/usb/ehci_pdriver.h
index 99238b096f7e..7eb4dcd0d386 100644
--- a/include/linux/usb/ehci_pdriver.h
+++ b/include/linux/usb/ehci_pdriver.h
@@ -19,6 +19,9 @@
 #ifndef __USB_CORE_EHCI_PDRIVER_H
 #define __USB_CORE_EHCI_PDRIVER_H
 
+struct platform_device;
+struct usb_hcd;
+
 /**
  * struct usb_ehci_pdata - platform_data for generic ehci driver
  *
@@ -50,6 +53,7 @@ struct usb_ehci_pdata {
         /* Turn on only VBUS suspend power and hotplug detection,
          * turn off everything else */
         void (*power_suspend)(struct platform_device *pdev);
+        int (*pre_setup)(struct usb_hcd *hcd);
 };
 
 #endif /* __USB_CORE_EHCI_PDRIVER_H */
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index f1b0dca60f12..942ef5e053bf 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -22,6 +22,7 @@
 #include <linux/slab.h>
 #include <linux/scatterlist.h>
 #include <linux/types.h>
+#include <linux/workqueue.h>
 #include <linux/usb/ch9.h>
 
 struct usb_ep;
@@ -475,6 +476,7 @@ struct usb_gadget_ops {
 
 /**
  * struct usb_gadget - represents a usb slave device
+ * @work: (internal use) Workqueue to be used for sysfs_notify()
  * @ops: Function pointers used to access hardware-specific operations.
  * @ep0: Endpoint zero, used when reading or writing responses to
  *      driver setup() requests
@@ -520,6 +522,7 @@ struct usb_gadget_ops {
  * device is acting as a B-Peripheral (so is_a_peripheral is false).
  */
 struct usb_gadget {
+        struct work_struct              work;
         /* readonly to gadget driver */
         const struct usb_gadget_ops     *ops;
         struct usb_ep                   *ep0;
@@ -538,6 +541,7 @@ struct usb_gadget {
         unsigned                        out_epnum;
         unsigned                        in_epnum;
 };
+#define work_to_gadget(w)       (container_of((w), struct usb_gadget, work))
 
 static inline void set_gadget_data(struct usb_gadget *gadget, void *data)
         { dev_set_drvdata(&gadget->dev, data); }
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index f5f5c7dfda90..75efc45eaa2f 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -22,6 +22,7 @@
 #ifdef __KERNEL__
 
 #include <linux/rwsem.h>
+#include <linux/interrupt.h>
 
 #define MAX_TOPO_LEVEL          6
 
@@ -67,6 +68,13 @@
 
 /*-------------------------------------------------------------------------*/
 
+struct giveback_urb_bh {
+        bool running;
+        spinlock_t lock;
+        struct list_head  head;
+        struct tasklet_struct bh;
+};
+
 struct usb_hcd {
 
         /*
@@ -139,6 +147,9 @@ struct usb_hcd {
         resource_size_t         rsrc_len;       /* memory/io resource length */
         unsigned                power_budget;   /* in mA, 0 = no limit */
 
+        struct giveback_urb_bh  high_prio_bh;
+        struct giveback_urb_bh  low_prio_bh;
+
         /* bandwidth_mutex should be taken before adding or removing
          * any new bus bandwidth constraints:
          *   1. Before adding a configuration for a new device.
@@ -218,8 +229,10 @@ struct hc_driver {
 #define HCD_SHARED      0x0004          /* Two (or more) usb_hcds share HW */
 #define HCD_USB11       0x0010          /* USB 1.1 */
 #define HCD_USB2        0x0020          /* USB 2.0 */
+#define HCD_USB25       0x0030          /* Wireless USB 1.0 (USB 2.5)*/
 #define HCD_USB3        0x0040          /* USB 3.0 */
 #define HCD_MASK        0x0070
+#define HCD_BH          0x0100          /* URB complete in BH context */
 
         /* called to init HCD and root hub */
         int     (*reset) (struct usb_hcd *hcd);
@@ -360,6 +373,11 @@ struct hc_driver {
         int     (*find_raw_port_number)(struct usb_hcd *, int);
 };
 
+static inline int hcd_giveback_urb_in_bh(struct usb_hcd *hcd)
+{
+        return hcd->driver->flags & HCD_BH;
+}
+
 extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb);
 extern int usb_hcd_check_unlink_urb(struct usb_hcd *hcd, struct urb *urb,
                 int status);
@@ -410,7 +428,7 @@ extern int usb_hcd_pci_probe(struct pci_dev *dev,
 extern void usb_hcd_pci_remove(struct pci_dev *dev);
 extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
 extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
 #endif
 #endif /* CONFIG_PCI */
diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
new file mode 100644
index 000000000000..8c38aa26b3bb
--- /dev/null
+++ b/include/linux/usb/of.h
@@ -0,0 +1,40 @@
+/*
+ * OF helpers for usb devices.
+ *
+ * This file is released under the GPLv2
+ */
+
+#ifndef __LINUX_USB_OF_H
+#define __LINUX_USB_OF_H
+
+#include <linux/usb/ch9.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/phy.h>
+
+#if IS_ENABLED(CONFIG_OF)
+enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np);
+enum usb_device_speed of_usb_get_maximum_speed(struct device_node *np);
+#else
+static inline enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np)
+{
+        return USB_DR_MODE_UNKNOWN;
+}
+
+static inline enum usb_device_speed
+of_usb_get_maximum_speed(struct device_node *np)
+{
+        return USB_SPEED_UNKNOWN;
+}
+#endif
+
+#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_SUPPORT)
+enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np);
+#else
+static inline enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np)
+{
+        return USBPHY_INTERFACE_MODE_UNKNOWN;
+}
+
+#endif
+
+#endif /* __LINUX_USB_OF_H */
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index 291e01ba32e5..154332b7c8c0 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -92,4 +92,11 @@ otg_start_srp(struct usb_otg *otg)
 /* for OTG controller drivers (and maybe other stuff) */
 extern int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num);
 
+enum usb_dr_mode {
+        USB_DR_MODE_UNKNOWN,
+        USB_DR_MODE_HOST,
+        USB_DR_MODE_PERIPHERAL,
+        USB_DR_MODE_OTG,
+};
+
 #endif /* __LINUX_USB_OTG_H */
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index 6b5978f57633..6c0b1c513db7 100644
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -12,6 +12,15 @@
 #include <linux/notifier.h>
 #include <linux/usb.h>
 
+enum usb_phy_interface {
+        USBPHY_INTERFACE_MODE_UNKNOWN,
+        USBPHY_INTERFACE_MODE_UTMI,
+        USBPHY_INTERFACE_MODE_UTMIW,
+        USBPHY_INTERFACE_MODE_ULPI,
+        USBPHY_INTERFACE_MODE_SERIAL,
+        USBPHY_INTERFACE_MODE_HSIC,
+};
+
 enum usb_phy_events {
         USB_EVENT_NONE,         /* no events or cable disconnected */
         USB_EVENT_VBUS,         /* vbus valid event */
@@ -133,7 +142,7 @@ extern void usb_remove_phy(struct usb_phy *);
 /* helpers for direct access thru low-level io interface */
 static inline int usb_phy_io_read(struct usb_phy *x, u32 reg)
 {
-        if (x->io_ops && x->io_ops->read)
+        if (x && x->io_ops && x->io_ops->read)
                 return x->io_ops->read(x, reg);
 
         return -EINVAL;
@@ -141,7 +150,7 @@ static inline int usb_phy_io_read(struct usb_phy *x, u32 reg)
 
 static inline int usb_phy_io_write(struct usb_phy *x, u32 val, u32 reg)
 {
-        if (x->io_ops && x->io_ops->write)
+        if (x && x->io_ops && x->io_ops->write)
                 return x->io_ops->write(x, val, reg);
 
         return -EINVAL;
@@ -150,7 +159,7 @@ static inline int usb_phy_io_write(struct usb_phy *x, u32 val, u32 reg)
 static inline int
 usb_phy_init(struct usb_phy *x)
 {
-        if (x->init)
+        if (x && x->init)
                 return x->init(x);
 
         return 0;
@@ -159,14 +168,14 @@ usb_phy_init(struct usb_phy *x)
 static inline void
 usb_phy_shutdown(struct usb_phy *x)
 {
-        if (x->shutdown)
+        if (x && x->shutdown)
                 x->shutdown(x);
 }
 
 static inline int
 usb_phy_vbus_on(struct usb_phy *x)
 {
-        if (!x->set_vbus)
+        if (!x || !x->set_vbus)
                 return 0;
 
         return x->set_vbus(x, true);
@@ -175,7 +184,7 @@ usb_phy_vbus_on(struct usb_phy *x)
 static inline int
 usb_phy_vbus_off(struct usb_phy *x)
 {
-        if (!x->set_vbus)
+        if (!x || !x->set_vbus)
                 return 0;
 
         return x->set_vbus(x, false);
@@ -249,7 +258,7 @@ usb_phy_set_power(struct usb_phy *x, unsigned mA)
 static inline int
 usb_phy_set_suspend(struct usb_phy *x, int suspend)
 {
-        if (x->set_suspend != NULL)
+        if (x && x->set_suspend != NULL)
                 return x->set_suspend(x, suspend);
         else
                 return 0;
@@ -258,7 +267,7 @@ usb_phy_set_suspend(struct usb_phy *x, int suspend)
 static inline int
 usb_phy_notify_connect(struct usb_phy *x, enum usb_device_speed speed)
 {
-        if (x->notify_connect)
+        if (x && x->notify_connect)
                 return x->notify_connect(x, speed);
         else
                 return 0;
@@ -267,7 +276,7 @@ usb_phy_notify_connect(struct usb_phy *x, enum usb_device_speed speed)
 static inline int
 usb_phy_notify_disconnect(struct usb_phy *x, enum usb_device_speed speed)
 {
-        if (x->notify_disconnect)
+        if (x && x->notify_disconnect)
                 return x->notify_disconnect(x, speed);
         else
                 return 0;
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 302ddf55d2da..d528b8045150 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -19,10 +19,6 @@
 #include <linux/sysrq.h>
 #include <linux/kfifo.h>
 
-#define SERIAL_TTY_MAJOR        188     /* Nice legal number now */
-#define SERIAL_TTY_MINORS       254     /* loads of devices :) */
-#define SERIAL_TTY_NO_MINOR     255     /* No minor was assigned */
-
 /* The maximum number of ports one device can grab at once */
 #define MAX_NUM_PORTS           8
 
@@ -37,7 +33,8 @@
  * @serial: pointer back to the struct usb_serial owner of this port.
  * @port: pointer to the corresponding tty_port for this port.
  * @lock: spinlock to grab when updating portions of this structure.
- * @number: the number of the port (the minor number).
+ * @minor: the minor number of the port
+ * @port_number: the struct usb_serial port number of this port (starts at 0)
  * @interrupt_in_buffer: pointer to the interrupt in buffer for this port.
  * @interrupt_in_urb: pointer to the interrupt in struct urb for this port.
  * @interrupt_in_endpointAddress: endpoint address for the interrupt in pipe
@@ -80,7 +77,8 @@ struct usb_serial_port {
         struct usb_serial       *serial;
         struct tty_port         port;
         spinlock_t              lock;
-        unsigned char           number;
+        u32                     minor;
+        u8                      port_number;
 
         unsigned char           *interrupt_in_buffer;
         struct urb              *interrupt_in_urb;
@@ -140,7 +138,6 @@ static inline void usb_set_serial_port_data(struct usb_serial_port *port,
  * @dev: pointer to the struct usb_device for this device
  * @type: pointer to the struct usb_serial_driver for this device
  * @interface: pointer to the struct usb_interface for this device
- * @minor: the starting minor number for this device
  * @num_ports: the number of ports this device has
  * @num_interrupt_in: number of interrupt in endpoints we have
  * @num_interrupt_out: number of interrupt out endpoints we have
@@ -159,7 +156,7 @@ struct usb_serial {
         unsigned char                   disconnected:1;
         unsigned char                   suspending:1;
         unsigned char                   attached:1;
-        unsigned char                   minor;
+        unsigned char                   minors_reserved:1;
         unsigned char                   num_ports;
         unsigned char                   num_port_pointers;
         char                            num_interrupt_in;
@@ -319,7 +316,7 @@ static inline void usb_serial_console_disconnect(struct usb_serial *serial) {}
 #endif
 
 /* Functions needed by other parts of the usbserial core */
-extern struct usb_serial *usb_serial_get_by_index(unsigned int minor);
+extern struct usb_serial_port *usb_serial_port_get_by_minor(unsigned int minor);
 extern void usb_serial_put(struct usb_serial *serial);
 extern int usb_serial_generic_open(struct tty_struct *tty,
         struct usb_serial_port *port);
diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
index 1b7519a8c0bf..1de16c324ec8 100644
--- a/include/linux/usb/tegra_usb_phy.h
+++ b/include/linux/usb/tegra_usb_phy.h
@@ -18,19 +18,36 @@
 #include <linux/clk.h>
 #include <linux/usb/otg.h>
 
+/*
+ * utmi_pll_config_in_car_module: true if the UTMI PLL configuration registers
+ *     should be set up by clk-tegra, false if by the PHY code
+ * has_hostpc: true if the USB controller has the HOSTPC extension, which
+ *     changes the location of the PHCD and PTS fields
+ * requires_usbmode_setup: true if the USBMODE register needs to be set to
+ *      enter host mode
+ * requires_extra_tuning_parameters: true if xcvr_hsslew, hssquelch_level
+ *      and hsdiscon_level should be set for adequate signal quality
+ */
+
+struct tegra_phy_soc_config {
+        bool utmi_pll_config_in_car_module;
+        bool has_hostpc;
+        bool requires_usbmode_setup;
+        bool requires_extra_tuning_parameters;
+};
+
 struct tegra_utmip_config {
         u8 hssync_start_delay;
         u8 elastic_limit;
         u8 idle_wait_delay;
         u8 term_range_adj;
+        bool xcvr_setup_use_fuses;
         u8 xcvr_setup;
         u8 xcvr_lsfslew;
         u8 xcvr_lsrslew;
-};
-
-struct tegra_ulpi_config {
-        int reset_gpio;
-        const char *clk;
+        u8 xcvr_hsslew;
+        u8 hssquelch_level;
+        u8 hsdiscon_level;
 };
 
 enum tegra_usb_phy_port_speed {
@@ -39,11 +56,6 @@ enum tegra_usb_phy_port_speed {
         TEGRA_USB_PHY_PORT_SPEED_HIGH,
 };
 
-enum tegra_usb_phy_mode {
-        TEGRA_USB_PHY_MODE_DEVICE,
-        TEGRA_USB_PHY_MODE_HOST,
-};
-
 struct tegra_xtal_freq;
 
 struct tegra_usb_phy {
@@ -54,22 +66,17 @@ struct tegra_usb_phy {
         struct clk *clk;
         struct clk *pll_u;
         struct clk *pad_clk;
-        enum tegra_usb_phy_mode mode;
+        struct regulator *vbus;
+        enum usb_dr_mode mode;
         void *config;
+        const struct tegra_phy_soc_config *soc_config;
         struct usb_phy *ulpi;
         struct usb_phy u_phy;
-        struct device *dev;
         bool is_legacy_phy;
         bool is_ulpi_phy;
-        void (*set_pts)(struct usb_phy *x, u8 pts_val);
-        void (*set_phcd)(struct usb_phy *x, bool enable);
+        int reset_gpio;
 };
 
-struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
-        void __iomem *regs, void *config, enum tegra_usb_phy_mode phy_mode,
-        void (*set_pts)(struct usb_phy *x, u8 pts_val),
-        void (*set_phcd)(struct usb_phy *x, bool enable));
-
 void tegra_usb_phy_preresume(struct usb_phy *phy);
 
 void tegra_usb_phy_postresume(struct usb_phy *phy);
diff --git a/include/linux/usb/nop-usb-xceiv.h b/include/linux/usb/usb_phy_gen_xceiv.h
index 148d35171aac..f9a7e7bc925b 100644
--- a/include/linux/usb/nop-usb-xceiv.h
+++ b/include/linux/usb/usb_phy_gen_xceiv.h
@@ -3,7 +3,7 @@
 
 #include <linux/usb/otg.h>
 
-struct nop_usb_xceiv_platform_data {
+struct usb_phy_gen_xceiv_platform_data {
         enum usb_phy_type type;
         unsigned long clk_rate;
 
@@ -12,7 +12,7 @@ struct nop_usb_xceiv_platform_data {
         unsigned int needs_reset:1;
 };
 
-#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
 /* sometimes transceivers are accessed only through e.g. ULPI */
 extern void usb_nop_xceiv_register(void);
 extern void usb_nop_xceiv_unregister(void);
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index f18d64129f99..e303eef94dd5 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -34,12 +34,15 @@ struct usbnet {
         struct mutex            phy_mutex;
         unsigned char           suspend_count;
         unsigned char           pkt_cnt, pkt_err;
+        unsigned short          rx_qlen, tx_qlen;
+        unsigned                can_dma_sg:1;
 
         /* i/o info: pipes etc */
         unsigned                in, out;
         struct usb_host_endpoint *status;
         unsigned                maxpacket;
         struct timer_list       delay;
+        const char              *padding_pkt;
 
         /* protocol/interface state */
         struct net_device       *net;
@@ -253,4 +256,6 @@ extern void usbnet_link_change(struct usbnet *, bool, bool);
 extern int usbnet_status_start(struct usbnet *dev, gfp_t mem_flags);
 extern void usbnet_status_stop(struct usbnet *dev);
 
+extern void usbnet_update_max_qlen(struct usbnet *dev);
+
 #endif /* __LINUX_USB_USBNET_H */
diff --git a/include/linux/usb/wusb-wa.h b/include/linux/usb/wusb-wa.h
index f9dec37f617b..4ff744e2b678 100644
--- a/include/linux/usb/wusb-wa.h
+++ b/include/linux/usb/wusb-wa.h
@@ -66,6 +66,7 @@ enum {
         WA_ENABLE = 0x01,
         WA_RESET = 0x02,
         RPIPE_PAUSE = 0x1,
+        RPIPE_STALL = 0x2,
 };
 
 /* Responses from Get Status request ([WUSB] section 8.3.1.6) */
@@ -92,11 +93,20 @@ struct usb_rpipe_descriptor {
         __le16  wRPipeIndex;
         __le16  wRequests;
         __le16  wBlocks;                /* rw if 0 */
-        __le16  wMaxPacketSize;         /* rw? */
-        u8      bHSHubAddress;          /* reserved: 0 */
-        u8      bHSHubPort;             /* ??? FIXME ??? */
+        __le16  wMaxPacketSize;         /* rw */
+        union {
+                u8      dwa_bHSHubAddress;              /* rw: DWA. */
+                u8      hwa_bMaxBurst;                  /* rw: HWA. */
+        };
+        union {
+                u8      dwa_bHSHubPort;         /*  rw: DWA. */
+                u8      hwa_bDeviceInfoIndex;   /*  rw: HWA. */
+        };
         u8      bSpeed;                 /* rw: xfer rate 'enum uwb_phy_rate' */
-        u8      bDeviceAddress;         /* rw: Target device address */
+        union {
+                u8 dwa_bDeviceAddress;  /* rw: DWA Target device address. */
+                u8 hwa_reserved;                /* rw: HWA. */
+        };
         u8      bEndpointAddress;       /* rw: Target EP address */
         u8      bDataSequence;          /* ro: Current Data sequence */
         __le32  dwCurrentWindow;        /* ro */
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index b6b215f13b45..4db29859464f 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -23,11 +23,10 @@ struct user_namespace {
         struct uid_gid_map      projid_map;
         atomic_t                count;
         struct user_namespace   *parent;
+        int                     level;
         kuid_t                  owner;
         kgid_t                  group;
         unsigned int            proc_inum;
-        bool                    may_mount_sysfs;
-        bool                    may_mount_proc;
 };
 
 extern struct user_namespace init_user_ns;
@@ -84,6 +83,4 @@ static inline void put_user_ns(struct user_namespace *ns)
 
 #endif
 
-void update_mnt_policy(struct user_namespace *userns);
-
 #endif /* _LINUX_USER_H */
diff --git a/include/linux/uwb/spec.h b/include/linux/uwb/spec.h
index b52e44f1bd33..0df24bfcdb38 100644
--- a/include/linux/uwb/spec.h
+++ b/include/linux/uwb/spec.h
@@ -32,6 +32,7 @@
 
 #include <linux/types.h>
 #include <linux/bitmap.h>
+#include <linux/if_ether.h>
 
 #define i1480_FW 0x00000303
 /* #define i1480_FW 0x00000302 */
@@ -130,7 +131,7 @@ enum { UWB_DRP_BACKOFF_WIN_MAX = 16 };
  * it is also used to define headers sent down and up the wire/radio).
  */
 struct uwb_mac_addr {
-        u8 data[6];
+        u8 data[ETH_ALEN];
 } __attribute__((packed));
 
 
@@ -568,7 +569,7 @@ struct uwb_rc_evt_confirm {
 /* Device Address Management event. [WHCI] section 3.1.3.2. */
 struct uwb_rc_evt_dev_addr_mgmt {
         struct uwb_rceb rceb;
-        u8 baAddr[6];
+        u8 baAddr[ETH_ALEN];
         u8 bResultCode;
 } __attribute__((packed));
 
diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h
index ea7168a68081..617c01b8f74a 100644
--- a/include/linux/vexpress.h
+++ b/include/linux/vexpress.h
@@ -15,6 +15,7 @@
 #define _LINUX_VEXPRESS_H
 
 #include <linux/device.h>
+#include <linux/reboot.h>
 
 #define VEXPRESS_SITE_MB                0
 #define VEXPRESS_SITE_DB1               1
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index ac8d488e4372..24579a0312a0 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -90,4 +90,11 @@ extern void vfio_unregister_iommu_driver(
         TYPE tmp;                                               \
         offsetof(TYPE, MEMBER) + sizeof(tmp.MEMBER); })         \
 
+/*
+ * External user API
+ */
+extern struct vfio_group *vfio_group_get_external_user(struct file *filep);
+extern void vfio_group_put_external_user(struct vfio_group *group);
+extern int vfio_external_user_iommu_id(struct vfio_group *group);
+
 #endif /* VFIO_H */
diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
index ddb419cf4530..502073a53dd3 100644
--- a/include/linux/vga_switcheroo.h
+++ b/include/linux/vga_switcheroo.h
@@ -45,7 +45,8 @@ struct vga_switcheroo_client_ops {
 #if defined(CONFIG_VGA_SWITCHEROO)
 void vga_switcheroo_unregister_client(struct pci_dev *dev);
 int vga_switcheroo_register_client(struct pci_dev *dev,
-                                   const struct vga_switcheroo_client_ops *ops);
+                                   const struct vga_switcheroo_client_ops *ops,
+                                   bool driver_power_control);
 int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
                                          const struct vga_switcheroo_client_ops *ops,
                                          int id, bool active);
@@ -60,11 +61,15 @@ int vga_switcheroo_process_delayed_switch(void);
 
 int vga_switcheroo_get_client_state(struct pci_dev *dev);
 
+void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
+
+int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
 #else
 
 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
 static inline int vga_switcheroo_register_client(struct pci_dev *dev,
-                const struct vga_switcheroo_client_ops *ops) { return 0; }
+                const struct vga_switcheroo_client_ops *ops, bool driver_power_control) { return 0; }
 static inline void vga_switcheroo_client_fb_set(struct pci_dev *dev, struct fb_info *info) {}
 static inline int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler) { return 0; }
 static inline int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
@@ -74,6 +79,10 @@ static inline void vga_switcheroo_unregister_handler(void) {}
 static inline int vga_switcheroo_process_delayed_switch(void) { return 0; }
 static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return VGA_SWITCHEROO_ON; }
 
+static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
+
+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
 
 #endif
 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index 2c02f3a8d2ba..80cf8173a65b 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -65,8 +65,15 @@ struct pci_dev;
  *     out of the arbitration process (and can be safe to take
  *     interrupts at any time.
  */
+#if defined(CONFIG_VGA_ARB)
 extern void vga_set_legacy_decoding(struct pci_dev *pdev,
                                     unsigned int decodes);
+#else
+static inline void vga_set_legacy_decoding(struct pci_dev *pdev,
+                                           unsigned int decodes)
+{
+}
+#endif
 
 /**
  *     vga_get         - acquire & locks VGA resources
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 9ff8645b7e0b..36d36cc89329 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -34,13 +34,6 @@ struct virtqueue {
         void *priv;
 };
 
-int virtqueue_add_buf(struct virtqueue *vq,
-                      struct scatterlist sg[],
-                      unsigned int out_num,
-                      unsigned int in_num,
-                      void *data,
-                      gfp_t gfp);
-
 int virtqueue_add_outbuf(struct virtqueue *vq,
                          struct scatterlist sg[], unsigned int num,
                          void *data,
@@ -70,6 +63,10 @@ void virtqueue_disable_cb(struct virtqueue *vq);
 
 bool virtqueue_enable_cb(struct virtqueue *vq);
 
+unsigned virtqueue_enable_cb_prepare(struct virtqueue *vq);
+
+bool virtqueue_poll(struct virtqueue *vq, unsigned);
+
 bool virtqueue_enable_cb_delayed(struct virtqueue *vq);
 
 void *virtqueue_detach_unused_buf(struct virtqueue *vq);
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index ca3ad41c2c82..b300787af8e0 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_VIRTIO_RING_H
 #define _LINUX_VIRTIO_RING_H
 
+#include <asm/barrier.h>
 #include <linux/irqreturn.h>
 #include <uapi/linux/virtio_ring.h>
 
diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index bd6cf61142be..1855f0a22add 100644
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
@@ -70,6 +70,12 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
                 THP_ZERO_PAGE_ALLOC,
                 THP_ZERO_PAGE_ALLOC_FAILED,
 #endif
+#ifdef CONFIG_SMP
+                NR_TLB_REMOTE_FLUSH,    /* cpu tried to flush others' tlbs */
+                NR_TLB_REMOTE_FLUSH_RECEIVED,/* cpu received ipi for flush */
+#endif
+                NR_TLB_LOCAL_FLUSH_ALL,
+                NR_TLB_LOCAL_FLUSH_ONE,
                 NR_VM_EVENT_ITEMS
 };
 
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 7d5773a99f20..4b8a89189a29 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -10,12 +10,12 @@
 struct vm_area_struct;          /* vma defining user mapping in mm_types.h */
 
 /* bits in flags of vmalloc's vm_struct below */
-#define VM_IOREMAP      0x00000001      /* ioremap() and friends */
-#define VM_ALLOC        0x00000002      /* vmalloc() */
-#define VM_MAP          0x00000004      /* vmap()ed pages */
-#define VM_USERMAP      0x00000008      /* suitable for remap_vmalloc_range */
-#define VM_VPAGES       0x00000010      /* buffer for pages was vmalloc'ed */
-#define VM_UNLIST       0x00000020      /* vm_struct is not listed in vmlist */
+#define VM_IOREMAP              0x00000001      /* ioremap() and friends */
+#define VM_ALLOC                0x00000002      /* vmalloc() */
+#define VM_MAP                  0x00000004      /* vmap()ed pages */
+#define VM_USERMAP              0x00000008      /* suitable for remap_vmalloc_range */
+#define VM_VPAGES               0x00000010      /* buffer for pages was vmalloc'ed */
+#define VM_UNINITIALIZED        0x00000020      /* vm_struct is not fully initialized */
 /* bits [20..32] reserved for arch specific ioremap internals */
 
 /*
@@ -82,6 +82,10 @@ extern void *vmap(struct page **pages, unsigned int count,
                         unsigned long flags, pgprot_t prot);
 extern void vunmap(const void *addr);
 
+extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
+                                       unsigned long uaddr, void *kaddr,
+                                       unsigned long size);
+
 extern int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
                                                         unsigned long pgoff);
 void vmalloc_sync_all(void);
diff --git a/include/linux/vmpressure.h b/include/linux/vmpressure.h
index 76be077340ea..3f3788d49362 100644
--- a/include/linux/vmpressure.h
+++ b/include/linux/vmpressure.h
@@ -12,7 +12,7 @@ struct vmpressure {
         unsigned long scanned;
         unsigned long reclaimed;
         /* The lock is used to keep the scanned/reclaimed above in sync. */
-        struct mutex sr_lock;
+        struct spinlock sr_lock;
 
         /* The list of vmpressure_event structs. */
         struct list_head events;
@@ -30,13 +30,16 @@ extern void vmpressure(gfp_t gfp, struct mem_cgroup *memcg,
 extern void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio);
 
 extern void vmpressure_init(struct vmpressure *vmpr);
+extern void vmpressure_cleanup(struct vmpressure *vmpr);
 extern struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg);
 extern struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr);
 extern struct vmpressure *css_to_vmpressure(struct cgroup_subsys_state *css);
-extern int vmpressure_register_event(struct cgroup *cg, struct cftype *cft,
+extern int vmpressure_register_event(struct cgroup_subsys_state *css,
+                                     struct cftype *cft,
                                      struct eventfd_ctx *eventfd,
                                      const char *args);
-extern void vmpressure_unregister_event(struct cgroup *cg, struct cftype *cft,
+extern void vmpressure_unregister_event(struct cgroup_subsys_state *css,
+                                        struct cftype *cft,
                                         struct eventfd_ctx *eventfd);
 #else
 static inline void vmpressure(gfp_t gfp, struct mem_cgroup *memcg,
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index c586679b6fef..e4b948080d20 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -143,7 +143,6 @@ static inline unsigned long zone_page_state_snapshot(struct zone *zone,
 }
 
 extern unsigned long global_reclaimable_pages(void);
-extern unsigned long zone_reclaimable_pages(struct zone *zone);
 
 #ifdef CONFIG_NUMA
 /*
@@ -198,7 +197,7 @@ extern void __inc_zone_state(struct zone *, enum zone_stat_item);
 extern void dec_zone_state(struct zone *, enum zone_stat_item);
 extern void __dec_zone_state(struct zone *, enum zone_stat_item);
 
-void refresh_cpu_vm_stats(int);
+void cpu_vm_stats_fold(int cpu);
 void refresh_zone_stat_thresholds(void);
 
 void drain_zonestat(struct zone *zone, struct per_cpu_pageset *);
@@ -255,6 +254,7 @@ static inline void __dec_zone_page_state(struct page *page,
 
 static inline void refresh_cpu_vm_stats(int cpu) { }
 static inline void refresh_zone_stat_thresholds(void) { }
+static inline void cpu_vm_stats_fold(int cpu) { }
 
 static inline void drain_zonestat(struct zone *zone,
                         struct per_cpu_pageset *pset) { }
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 0d33fca48774..8d7634247fb4 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -133,8 +133,6 @@ void change_console(struct vc_data *new_vc);
 void reset_vc(struct vc_data *vc);
 extern int do_unbind_con_driver(const struct consw *csw, int first, int last,
                              int deflt);
-extern int unbind_con_driver(const struct consw *csw, int first, int last,
-                             int deflt);
 int vty_init(const struct file_operations *console_fops);
 
 static inline bool vt_force_oops_output(struct vc_data *vc)
diff --git a/include/linux/vtime.h b/include/linux/vtime.h
index 71a5782d8c59..f5b72b364bda 100644
--- a/include/linux/vtime.h
+++ b/include/linux/vtime.h
@@ -1,18 +1,68 @@
 #ifndef _LINUX_KERNEL_VTIME_H
 #define _LINUX_KERNEL_VTIME_H
 
+#include <linux/context_tracking_state.h>
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
+#include <asm/vtime.h>
+#endif
+
+
 struct task_struct;
 
+/*
+ * vtime_accounting_enabled() definitions/declarations
+ */
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
+static inline bool vtime_accounting_enabled(void) { return true; }
+#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
+
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
+static inline bool vtime_accounting_enabled(void)
+{
+        if (static_key_false(&context_tracking_enabled)) {
+                if (context_tracking_active())
+                        return true;
+        }
+
+        return false;
+}
+#endif /* CONFIG_VIRT_CPU_ACCOUNTING_GEN */
+
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+static inline bool vtime_accounting_enabled(void) { return false; }
+#endif /* !CONFIG_VIRT_CPU_ACCOUNTING */
+
+
+/*
+ * Common vtime APIs
+ */
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
+
+#ifdef __ARCH_HAS_VTIME_TASK_SWITCH
 extern void vtime_task_switch(struct task_struct *prev);
+#else
+extern void vtime_common_task_switch(struct task_struct *prev);
+static inline void vtime_task_switch(struct task_struct *prev)
+{
+        if (vtime_accounting_enabled())
+                vtime_common_task_switch(prev);
+}
+#endif /* __ARCH_HAS_VTIME_TASK_SWITCH */
+
 extern void vtime_account_system(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_irq_enter(struct task_struct *tsk);
 
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
-static inline bool vtime_accounting_enabled(void) { return true; }
-#endif
+#ifdef __ARCH_HAS_VTIME_ACCOUNT
+extern void vtime_account_irq_enter(struct task_struct *tsk);
+#else
+extern void vtime_common_account_irq_enter(struct task_struct *tsk);
+static inline void vtime_account_irq_enter(struct task_struct *tsk)
+{
+        if (vtime_accounting_enabled())
+                vtime_common_account_irq_enter(tsk);
+}
+#endif /* __ARCH_HAS_VTIME_ACCOUNT */
 
 #else /* !CONFIG_VIRT_CPU_ACCOUNTING */
 
@@ -20,22 +70,28 @@ 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_user(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
+#endif /* !CONFIG_VIRT_CPU_ACCOUNTING */
 
 #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_gen_account_irq_exit(struct task_struct *tsk);
+
+static inline void vtime_account_irq_exit(struct task_struct *tsk)
+{
+        if (vtime_accounting_enabled())
+                vtime_gen_account_irq_exit(tsk);
+}
+
 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
+extern void vtime_init_idle(struct task_struct *tsk, int cpu);
+#else /* !CONFIG_VIRT_CPU_ACCOUNTING_GEN  */
 static inline void vtime_account_irq_exit(struct task_struct *tsk)
 {
         /* On hard|softirq exit we always account to hard|softirq cputime */
@@ -45,7 +101,7 @@ 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) { }
+static inline void vtime_init_idle(struct task_struct *tsk, int cpu) { }
 #endif
 
 #ifdef CONFIG_IRQ_TIME_ACCOUNTING
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 1133695eb067..a67fc1635592 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -23,6 +23,7 @@ struct __wait_queue {
 struct wait_bit_key {
         void *flags;
         int bit_nr;
+#define WAIT_ATOMIC_T_BIT_NR -1
 };
 
 struct wait_bit_queue {
@@ -60,6 +61,9 @@ struct task_struct;
 #define __WAIT_BIT_KEY_INITIALIZER(word, bit)                           \
         { .flags = word, .bit_nr = bit, }
 
+#define __WAIT_ATOMIC_T_KEY_INITIALIZER(p)                              \
+        { .flags = p, .bit_nr = WAIT_ATOMIC_T_BIT_NR, }
+
 extern void __init_waitqueue_head(wait_queue_head_t *q, const char *name, struct lock_class_key *);
 
 #define init_waitqueue_head(q)                          \
@@ -146,8 +150,10 @@ void __wake_up_bit(wait_queue_head_t *, void *, int);
 int __wait_on_bit(wait_queue_head_t *, struct wait_bit_queue *, int (*)(void *), unsigned);
 int __wait_on_bit_lock(wait_queue_head_t *, struct wait_bit_queue *, int (*)(void *), unsigned);
 void wake_up_bit(void *, int);
+void wake_up_atomic_t(atomic_t *);
 int out_of_line_wait_on_bit(void *, int, int (*)(void *), unsigned);
 int out_of_line_wait_on_bit_lock(void *, int, int (*)(void *), unsigned);
+int out_of_line_wait_on_atomic_t(atomic_t *, int (*)(atomic_t *), unsigned);
 wait_queue_head_t *bit_waitqueue(void *, int);
 
 #define wake_up(x)                      __wake_up(x, TASK_NORMAL, 1, NULL)
@@ -805,6 +811,63 @@ do {									\
         __ret;                                                          \
 })
 
+#define __wait_event_interruptible_lock_irq_timeout(wq, condition,      \
+                                                    lock, ret)          \
+do {                                                                    \
+        DEFINE_WAIT(__wait);                                            \
+                                                                        \
+        for (;;) {                                                      \
+                prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE);      \
+                if (condition)                                          \
+                        break;                                          \
+                if (signal_pending(current)) {                          \
+                        ret = -ERESTARTSYS;                             \
+                        break;                                          \
+                }                                                       \
+                spin_unlock_irq(&lock);                                 \
+                ret = schedule_timeout(ret);                            \
+                spin_lock_irq(&lock);                                   \
+                if (!ret)                                               \
+                        break;                                          \
+        }                                                               \
+        finish_wait(&wq, &__wait);                                      \
+} while (0)
+
+/**
+ * wait_event_interruptible_lock_irq_timeout - sleep until a condition gets true or a timeout elapses.
+ *              The condition is checked under the lock. This is expected
+ *              to be called with the lock taken.
+ * @wq: the waitqueue to wait on
+ * @condition: a C expression for the event to wait for
+ * @lock: a locked spinlock_t, which will be released before schedule()
+ *        and reacquired afterwards.
+ * @timeout: timeout, in jiffies
+ *
+ * The process is put to sleep (TASK_INTERRUPTIBLE) until the
+ * @condition evaluates to true or signal is received. The @condition is
+ * checked each time the waitqueue @wq is woken up.
+ *
+ * wake_up() has to be called after changing any variable that could
+ * change the result of the wait condition.
+ *
+ * This is supposed to be called while holding the lock. The lock is
+ * dropped before going to sleep and is reacquired afterwards.
+ *
+ * The function returns 0 if the @timeout elapsed, -ERESTARTSYS if it
+ * was interrupted by a signal, and the remaining jiffies otherwise
+ * if the condition evaluated to true before the timeout elapsed.
+ */
+#define wait_event_interruptible_lock_irq_timeout(wq, condition, lock,  \
+                                                  timeout)              \
+({                                                                      \
+        int __ret = timeout;                                            \
+                                                                        \
+        if (!(condition))                                               \
+                __wait_event_interruptible_lock_irq_timeout(            \
+                                        wq, condition, lock, __ret);    \
+        __ret;                                                          \
+})
+
 
 /*
  * These are the old interfaces to sleep waiting for an event.
@@ -902,5 +965,23 @@ static inline int wait_on_bit_lock(void *word, int bit,
                 return 0;
         return out_of_line_wait_on_bit_lock(word, bit, action, mode);
 }
+
+/**
+ * wait_on_atomic_t - Wait for an atomic_t to become 0
+ * @val: The atomic value being waited on, a kernel virtual address
+ * @action: the function used to sleep, which may take special actions
+ * @mode: the task state to sleep in
+ *
+ * Wait for an atomic_t to become 0.  We abuse the bit-wait waitqueue table for
+ * the purpose of getting a waitqueue, but we set the key to a bit number
+ * outside of the target 'word'.
+ */
+static inline
+int wait_on_atomic_t(atomic_t *val, int (*action)(atomic_t *), unsigned mode)
+{
+        if (atomic_read(val) == 0)
+                return 0;
+        return out_of_line_wait_on_atomic_t(val, action, mode);
+}
         
 #endif
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 623488fdc1f5..594521ba0d43 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -295,7 +295,12 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }
  * Documentation/workqueue.txt.
  */
 enum {
-        WQ_NON_REENTRANT        = 1 << 0, /* guarantee non-reentrance */
+        /*
+         * All wqs are now non-reentrant making the following flag
+         * meaningless.  Will be removed.
+         */
+        WQ_NON_REENTRANT        = 1 << 0, /* DEPRECATED */
+
         WQ_UNBOUND              = 1 << 1, /* not bound to any cpu */
         WQ_FREEZABLE            = 1 << 2, /* freeze during suspend */
         WQ_MEM_RECLAIM          = 1 << 3, /* may be used for memory reclaim */
@@ -303,6 +308,33 @@ enum {
         WQ_CPU_INTENSIVE        = 1 << 5, /* cpu instensive workqueue */
         WQ_SYSFS                = 1 << 6, /* visible in sysfs, see wq_sysfs_register() */
 
+        /*
+         * Per-cpu workqueues are generally preferred because they tend to
+         * show better performance thanks to cache locality.  Per-cpu
+         * workqueues exclude the scheduler from choosing the CPU to
+         * execute the worker threads, which has an unfortunate side effect
+         * of increasing power consumption.
+         *
+         * The scheduler considers a CPU idle if it doesn't have any task
+         * to execute and tries to keep idle cores idle to conserve power;
+         * however, for example, a per-cpu work item scheduled from an
+         * interrupt handler on an idle CPU will force the scheduler to
+         * excute the work item on that CPU breaking the idleness, which in
+         * turn may lead to more scheduling choices which are sub-optimal
+         * in terms of power consumption.
+         *
+         * Workqueues marked with WQ_POWER_EFFICIENT are per-cpu by default
+         * but become unbound if workqueue.power_efficient kernel param is
+         * specified.  Per-cpu workqueues which are identified to
+         * contribute significantly to power-consumption are identified and
+         * marked with this flag and enabling the power_efficient mode
+         * leads to noticeable power saving at the cost of small
+         * performance disadvantage.
+         *
+         * http://thread.gmane.org/gmane.linux.kernel/1480396
+         */
+        WQ_POWER_EFFICIENT      = 1 << 7,
+
         __WQ_DRAINING           = 1 << 16, /* internal: workqueue is draining */
         __WQ_ORDERED            = 1 << 17, /* internal: workqueue is ordered */
 
@@ -333,11 +365,19 @@ enum {
  *
  * system_freezable_wq is equivalent to system_wq except that it's
  * freezable.
+ *
+ * *_power_efficient_wq are inclined towards saving power and converted
+ * into WQ_UNBOUND variants if 'wq_power_efficient' is enabled; otherwise,
+ * they are same as their non-power-efficient counterparts - e.g.
+ * system_power_efficient_wq is identical to system_wq if
+ * 'wq_power_efficient' is disabled.  See WQ_POWER_EFFICIENT for more info.
  */
 extern struct workqueue_struct *system_wq;
 extern struct workqueue_struct *system_long_wq;
 extern struct workqueue_struct *system_unbound_wq;
 extern struct workqueue_struct *system_freezable_wq;
+extern struct workqueue_struct *system_power_efficient_wq;
+extern struct workqueue_struct *system_freezable_power_efficient_wq;
 
 static inline struct workqueue_struct * __deprecated __system_nrt_wq(void)
 {
@@ -410,11 +450,12 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,
         alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args)
 
 #define create_workqueue(name)                                          \
-        alloc_workqueue((name), WQ_MEM_RECLAIM, 1)
+        alloc_workqueue("%s", WQ_MEM_RECLAIM, 1, (name))
 #define create_freezable_workqueue(name)                                \
-        alloc_workqueue((name), WQ_FREEZABLE | WQ_UNBOUND | WQ_MEM_RECLAIM, 1)
+        alloc_workqueue("%s", WQ_FREEZABLE | WQ_UNBOUND | WQ_MEM_RECLAIM, \
+                        1, (name))
 #define create_singlethread_workqueue(name)                             \
-        alloc_workqueue((name), WQ_UNBOUND | WQ_MEM_RECLAIM, 1)
+        alloc_workqueue("%s", WQ_UNBOUND | WQ_MEM_RECLAIM, 1, (name))
 
 extern void destroy_workqueue(struct workqueue_struct *wq);
 
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 579a5007c696..021b8a319b9e 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -47,11 +47,16 @@ enum wb_reason {
         WB_REASON_LAPTOP_TIMER,
         WB_REASON_FREE_MORE_MEM,
         WB_REASON_FS_FREE_SPACE,
+        /*
+         * There is no bdi forker thread any more and works are done
+         * by emergency worker, however, this is TPs userland visible
+         * and we'll be exposing exactly the same information,
+         * so it has a mismatch name.
+         */
         WB_REASON_FORKER_THREAD,
 
         WB_REASON_MAX,
 };
-extern const char *wb_reason_name[];
 
 /*
  * A control structure which tells the writeback code what to do.  These are
@@ -78,6 +83,7 @@ struct writeback_control {
         unsigned tagged_writepages:1;   /* tag-and-write to avoid livelock */
         unsigned for_reclaim:1;         /* Invoked from the page allocator */
         unsigned range_cyclic:1;        /* range_start is cyclic */
+        unsigned for_sync:1;            /* sync(2) WB_SYNC_ALL writeback */
 };
 
 /*
@@ -92,9 +98,6 @@ int try_to_writeback_inodes_sb(struct super_block *, enum wb_reason reason);
 int try_to_writeback_inodes_sb_nr(struct super_block *, unsigned long nr,
                                   enum wb_reason reason);
 void sync_inodes_sb(struct super_block *);
-long writeback_inodes_wb(struct bdi_writeback *wb, long nr_pages,
-                                enum wb_reason reason);
-long wb_do_writeback(struct bdi_writeback *wb, int force_wait);
 void wakeup_flusher_threads(long nr_pages, enum wb_reason reason);
 void inode_wait_for_writeback(struct inode *inode);
 
diff --git a/include/linux/ww_mutex.h b/include/linux/ww_mutex.h
new file mode 100644
index 000000000000..760399a470bd
--- /dev/null
+++ b/include/linux/ww_mutex.h
@@ -0,0 +1,378 @@
+/*
+ * Wound/Wait Mutexes: blocking mutual exclusion locks with deadlock avoidance
+ *
+ * Original mutex implementation started by Ingo Molnar:
+ *
+ *  Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
+ *
+ * Wound/wait implementation:
+ *  Copyright (C) 2013 Canonical Ltd.
+ *
+ * This file contains the main data structure and API definitions.
+ */
+
+#ifndef __LINUX_WW_MUTEX_H
+#define __LINUX_WW_MUTEX_H
+
+#include <linux/mutex.h>
+
+struct ww_class {
+        atomic_long_t stamp;
+        struct lock_class_key acquire_key;
+        struct lock_class_key mutex_key;
+        const char *acquire_name;
+        const char *mutex_name;
+};
+
+struct ww_acquire_ctx {
+        struct task_struct *task;
+        unsigned long stamp;
+        unsigned acquired;
+#ifdef CONFIG_DEBUG_MUTEXES
+        unsigned done_acquire;
+        struct ww_class *ww_class;
+        struct ww_mutex *contending_lock;
+#endif
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+        struct lockdep_map dep_map;
+#endif
+#ifdef CONFIG_DEBUG_WW_MUTEX_SLOWPATH
+        unsigned deadlock_inject_interval;
+        unsigned deadlock_inject_countdown;
+#endif
+};
+
+struct ww_mutex {
+        struct mutex base;
+        struct ww_acquire_ctx *ctx;
+#ifdef CONFIG_DEBUG_MUTEXES
+        struct ww_class *ww_class;
+#endif
+};
+
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+# define __WW_CLASS_MUTEX_INITIALIZER(lockname, ww_class) \
+                , .ww_class = &ww_class
+#else
+# define __WW_CLASS_MUTEX_INITIALIZER(lockname, ww_class)
+#endif
+
+#define __WW_CLASS_INITIALIZER(ww_class) \
+                { .stamp = ATOMIC_LONG_INIT(0) \
+                , .acquire_name = #ww_class "_acquire" \
+                , .mutex_name = #ww_class "_mutex" }
+
+#define __WW_MUTEX_INITIALIZER(lockname, class) \
+                { .base = { \__MUTEX_INITIALIZER(lockname) } \
+                __WW_CLASS_MUTEX_INITIALIZER(lockname, class) }
+
+#define DEFINE_WW_CLASS(classname) \
+        struct ww_class classname = __WW_CLASS_INITIALIZER(classname)
+
+#define DEFINE_WW_MUTEX(mutexname, ww_class) \
+        struct ww_mutex mutexname = __WW_MUTEX_INITIALIZER(mutexname, ww_class)
+
+/**
+ * ww_mutex_init - initialize the w/w mutex
+ * @lock: the mutex to be initialized
+ * @ww_class: the w/w class the mutex should belong to
+ *
+ * Initialize the w/w mutex to unlocked state and associate it with the given
+ * class.
+ *
+ * It is not allowed to initialize an already locked mutex.
+ */
+static inline void ww_mutex_init(struct ww_mutex *lock,
+                                 struct ww_class *ww_class)
+{
+        __mutex_init(&lock->base, ww_class->mutex_name, &ww_class->mutex_key);
+        lock->ctx = NULL;
+#ifdef CONFIG_DEBUG_MUTEXES
+        lock->ww_class = ww_class;
+#endif
+}
+
+/**
+ * ww_acquire_init - initialize a w/w acquire context
+ * @ctx: w/w acquire context to initialize
+ * @ww_class: w/w class of the context
+ *
+ * Initializes an context to acquire multiple mutexes of the given w/w class.
+ *
+ * Context-based w/w mutex acquiring can be done in any order whatsoever within
+ * a given lock class. Deadlocks will be detected and handled with the
+ * wait/wound logic.
+ *
+ * Mixing of context-based w/w mutex acquiring and single w/w mutex locking can
+ * result in undetected deadlocks and is so forbidden. Mixing different contexts
+ * for the same w/w class when acquiring mutexes can also result in undetected
+ * deadlocks, and is hence also forbidden. Both types of abuse will be caught by
+ * enabling CONFIG_PROVE_LOCKING.
+ *
+ * Nesting of acquire contexts for _different_ w/w classes is possible, subject
+ * to the usual locking rules between different lock classes.
+ *
+ * An acquire context must be released with ww_acquire_fini by the same task
+ * before the memory is freed. It is recommended to allocate the context itself
+ * on the stack.
+ */
+static inline void ww_acquire_init(struct ww_acquire_ctx *ctx,
+                                   struct ww_class *ww_class)
+{
+        ctx->task = current;
+        ctx->stamp = atomic_long_inc_return(&ww_class->stamp);
+        ctx->acquired = 0;
+#ifdef CONFIG_DEBUG_MUTEXES
+        ctx->ww_class = ww_class;
+        ctx->done_acquire = 0;
+        ctx->contending_lock = NULL;
+#endif
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+        debug_check_no_locks_freed((void *)ctx, sizeof(*ctx));
+        lockdep_init_map(&ctx->dep_map, ww_class->acquire_name,
+                         &ww_class->acquire_key, 0);
+        mutex_acquire(&ctx->dep_map, 0, 0, _RET_IP_);
+#endif
+#ifdef CONFIG_DEBUG_WW_MUTEX_SLOWPATH
+        ctx->deadlock_inject_interval = 1;
+        ctx->deadlock_inject_countdown = ctx->stamp & 0xf;
+#endif
+}
+
+/**
+ * ww_acquire_done - marks the end of the acquire phase
+ * @ctx: the acquire context
+ *
+ * Marks the end of the acquire phase, any further w/w mutex lock calls using
+ * this context are forbidden.
+ *
+ * Calling this function is optional, it is just useful to document w/w mutex
+ * code and clearly designated the acquire phase from actually using the locked
+ * data structures.
+ */
+static inline void ww_acquire_done(struct ww_acquire_ctx *ctx)
+{
+#ifdef CONFIG_DEBUG_MUTEXES
+        lockdep_assert_held(ctx);
+
+        DEBUG_LOCKS_WARN_ON(ctx->done_acquire);
+        ctx->done_acquire = 1;
+#endif
+}
+
+/**
+ * ww_acquire_fini - releases a w/w acquire context
+ * @ctx: the acquire context to free
+ *
+ * Releases a w/w acquire context. This must be called _after_ all acquired w/w
+ * mutexes have been released with ww_mutex_unlock.
+ */
+static inline void ww_acquire_fini(struct ww_acquire_ctx *ctx)
+{
+#ifdef CONFIG_DEBUG_MUTEXES
+        mutex_release(&ctx->dep_map, 0, _THIS_IP_);
+
+        DEBUG_LOCKS_WARN_ON(ctx->acquired);
+        if (!config_enabled(CONFIG_PROVE_LOCKING))
+                /*
+                 * lockdep will normally handle this,
+                 * but fail without anyway
+                 */
+                ctx->done_acquire = 1;
+
+        if (!config_enabled(CONFIG_DEBUG_LOCK_ALLOC))
+                /* ensure ww_acquire_fini will still fail if called twice */
+                ctx->acquired = ~0U;
+#endif
+}
+
+extern int __must_check __ww_mutex_lock(struct ww_mutex *lock,
+                                        struct ww_acquire_ctx *ctx);
+extern int __must_check __ww_mutex_lock_interruptible(struct ww_mutex *lock,
+                                                      struct ww_acquire_ctx *ctx);
+
+/**
+ * ww_mutex_lock - acquire the w/w mutex
+ * @lock: the mutex to be acquired
+ * @ctx: w/w acquire context, or NULL to acquire only a single lock.
+ *
+ * Lock the w/w mutex exclusively for this task.
+ *
+ * Deadlocks within a given w/w class of locks are detected and handled with the
+ * wait/wound algorithm. If the lock isn't immediately avaiable this function
+ * will either sleep until it is (wait case). Or it selects the current context
+ * for backing off by returning -EDEADLK (wound case). Trying to acquire the
+ * same lock with the same context twice is also detected and signalled by
+ * returning -EALREADY. Returns 0 if the mutex was successfully acquired.
+ *
+ * In the wound case the caller must release all currently held w/w mutexes for
+ * the given context and then wait for this contending lock to be available by
+ * calling ww_mutex_lock_slow. Alternatively callers can opt to not acquire this
+ * lock and proceed with trying to acquire further w/w mutexes (e.g. when
+ * scanning through lru lists trying to free resources).
+ *
+ * The mutex must later on be released by the same task that
+ * acquired it. The task may not exit without first unlocking the mutex. Also,
+ * kernel memory where the mutex resides must not be freed with the mutex still
+ * locked. The mutex must first be initialized (or statically defined) before it
+ * can be locked. memset()-ing the mutex to 0 is not allowed. The mutex must be
+ * of the same w/w lock class as was used to initialize the acquire context.
+ *
+ * A mutex acquired with this function must be released with ww_mutex_unlock.
+ */
+static inline int ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
+{
+        if (ctx)
+                return __ww_mutex_lock(lock, ctx);
+
+        mutex_lock(&lock->base);
+        return 0;
+}
+
+/**
+ * ww_mutex_lock_interruptible - acquire the w/w mutex, interruptible
+ * @lock: the mutex to be acquired
+ * @ctx: w/w acquire context
+ *
+ * Lock the w/w mutex exclusively for this task.
+ *
+ * Deadlocks within a given w/w class of locks are detected and handled with the
+ * wait/wound algorithm. If the lock isn't immediately avaiable this function
+ * will either sleep until it is (wait case). Or it selects the current context
+ * for backing off by returning -EDEADLK (wound case). Trying to acquire the
+ * same lock with the same context twice is also detected and signalled by
+ * returning -EALREADY. Returns 0 if the mutex was successfully acquired. If a
+ * signal arrives while waiting for the lock then this function returns -EINTR.
+ *
+ * In the wound case the caller must release all currently held w/w mutexes for
+ * the given context and then wait for this contending lock to be available by
+ * calling ww_mutex_lock_slow_interruptible. Alternatively callers can opt to
+ * not acquire this lock and proceed with trying to acquire further w/w mutexes
+ * (e.g. when scanning through lru lists trying to free resources).
+ *
+ * The mutex must later on be released by the same task that
+ * acquired it. The task may not exit without first unlocking the mutex. Also,
+ * kernel memory where the mutex resides must not be freed with the mutex still
+ * locked. The mutex must first be initialized (or statically defined) before it
+ * can be locked. memset()-ing the mutex to 0 is not allowed. The mutex must be
+ * of the same w/w lock class as was used to initialize the acquire context.
+ *
+ * A mutex acquired with this function must be released with ww_mutex_unlock.
+ */
+static inline int __must_check ww_mutex_lock_interruptible(struct ww_mutex *lock,
+                                                           struct ww_acquire_ctx *ctx)
+{
+        if (ctx)
+                return __ww_mutex_lock_interruptible(lock, ctx);
+        else
+                return mutex_lock_interruptible(&lock->base);
+}
+
+/**
+ * ww_mutex_lock_slow - slowpath acquiring of the w/w mutex
+ * @lock: the mutex to be acquired
+ * @ctx: w/w acquire context
+ *
+ * Acquires a w/w mutex with the given context after a wound case. This function
+ * will sleep until the lock becomes available.
+ *
+ * The caller must have released all w/w mutexes already acquired with the
+ * context and then call this function on the contended lock.
+ *
+ * Afterwards the caller may continue to (re)acquire the other w/w mutexes it
+ * needs with ww_mutex_lock. Note that the -EALREADY return code from
+ * ww_mutex_lock can be used to avoid locking this contended mutex twice.
+ *
+ * It is forbidden to call this function with any other w/w mutexes associated
+ * with the context held. It is forbidden to call this on anything else than the
+ * contending mutex.
+ *
+ * Note that the slowpath lock acquiring can also be done by calling
+ * ww_mutex_lock directly. This function here is simply to help w/w mutex
+ * locking code readability by clearly denoting the slowpath.
+ */
+static inline void
+ww_mutex_lock_slow(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
+{
+        int ret;
+#ifdef CONFIG_DEBUG_MUTEXES
+        DEBUG_LOCKS_WARN_ON(!ctx->contending_lock);
+#endif
+        ret = ww_mutex_lock(lock, ctx);
+        (void)ret;
+}
+
+/**
+ * ww_mutex_lock_slow_interruptible - slowpath acquiring of the w/w mutex, interruptible
+ * @lock: the mutex to be acquired
+ * @ctx: w/w acquire context
+ *
+ * Acquires a w/w mutex with the given context after a wound case. This function
+ * will sleep until the lock becomes available and returns 0 when the lock has
+ * been acquired. If a signal arrives while waiting for the lock then this
+ * function returns -EINTR.
+ *
+ * The caller must have released all w/w mutexes already acquired with the
+ * context and then call this function on the contended lock.
+ *
+ * Afterwards the caller may continue to (re)acquire the other w/w mutexes it
+ * needs with ww_mutex_lock. Note that the -EALREADY return code from
+ * ww_mutex_lock can be used to avoid locking this contended mutex twice.
+ *
+ * It is forbidden to call this function with any other w/w mutexes associated
+ * with the given context held. It is forbidden to call this on anything else
+ * than the contending mutex.
+ *
+ * Note that the slowpath lock acquiring can also be done by calling
+ * ww_mutex_lock_interruptible directly. This function here is simply to help
+ * w/w mutex locking code readability by clearly denoting the slowpath.
+ */
+static inline int __must_check
+ww_mutex_lock_slow_interruptible(struct ww_mutex *lock,
+                                 struct ww_acquire_ctx *ctx)
+{
+#ifdef CONFIG_DEBUG_MUTEXES
+        DEBUG_LOCKS_WARN_ON(!ctx->contending_lock);
+#endif
+        return ww_mutex_lock_interruptible(lock, ctx);
+}
+
+extern void ww_mutex_unlock(struct ww_mutex *lock);
+
+/**
+ * ww_mutex_trylock - tries to acquire the w/w mutex without acquire context
+ * @lock: mutex to lock
+ *
+ * Trylocks a mutex without acquire context, so no deadlock detection is
+ * possible. Returns 1 if the mutex has been acquired successfully, 0 otherwise.
+ */
+static inline int __must_check ww_mutex_trylock(struct ww_mutex *lock)
+{
+        return mutex_trylock(&lock->base);
+}
+
+/***
+ * ww_mutex_destroy - mark a w/w mutex unusable
+ * @lock: the mutex to be destroyed
+ *
+ * This function marks the mutex uninitialized, and any subsequent
+ * use of the mutex is forbidden. The mutex must not be locked when
+ * this function is called.
+ */
+static inline void ww_mutex_destroy(struct ww_mutex *lock)
+{
+        mutex_destroy(&lock->base);
+}
+
+/**
+ * ww_mutex_is_locked - is the w/w mutex locked
+ * @lock: the mutex to be queried
+ *
+ * Returns 1 if the mutex is locked, 0 if unlocked.
+ */
+static inline bool ww_mutex_is_locked(struct ww_mutex *lock)
+{
+        return mutex_is_locked(&lock->base);
+}
+
+#endif
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index fdbafc6841cf..91b0a68d38dc 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -31,7 +31,7 @@ struct xattr_handler {
 };
 
 struct xattr {
-        char *name;
+        const char *name;
         void *value;
         size_t value_len;
 };
diff --git a/include/linux/zbud.h b/include/linux/zbud.h
new file mode 100644
index 000000000000..2571a5cfa5fc
--- /dev/null
+++ b/include/linux/zbud.h
@@ -0,0 +1,22 @@
+#ifndef _ZBUD_H_
+#define _ZBUD_H_
+
+#include <linux/types.h>
+
+struct zbud_pool;
+
+struct zbud_ops {
+        int (*evict)(struct zbud_pool *pool, unsigned long handle);
+};
+
+struct zbud_pool *zbud_create_pool(gfp_t gfp, struct zbud_ops *ops);
+void zbud_destroy_pool(struct zbud_pool *pool);
+int zbud_alloc(struct zbud_pool *pool, int size, gfp_t gfp,
+        unsigned long *handle);
+void zbud_free(struct zbud_pool *pool, unsigned long handle);
+int zbud_reclaim_page(struct zbud_pool *pool, unsigned int retries);
+void *zbud_map(struct zbud_pool *pool, unsigned long handle);
+void zbud_unmap(struct zbud_pool *pool, unsigned long handle);
+u64 zbud_get_pool_size(struct zbud_pool *pool);
+
+#endif /* _ZBUD_H_ */