129 files changed, 2142 insertions, 1027 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index f46cfd73a553..bcbdd7484e58 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -485,14 +485,6 @@ static inline bool acpi_driver_match_device(struct device *dev,
 #endif  /* !CONFIG_ACPI */
-#ifdef CONFIG_ACPI_NUMA
-void __init early_parse_srat(void);
-#else
-static inline void early_parse_srat(void)
-{
-}
-#endif
 #ifdef CONFIG_ACPI
 void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state,
                               u32 pm1a_ctrl,  u32 pm1b_ctrl));
diff --git a/include/linux/acpi_gpio.h b/include/linux/acpi_gpio.h
index 91615a389b65..b76ebd08ff8e 100644
--- a/include/linux/acpi_gpio.h
+++ b/include/linux/acpi_gpio.h
@@ -2,10 +2,12 @@
 #define _LINUX_ACPI_GPIO_H_
 #include <linux/errno.h>
+#include <linux/gpio.h>
 #ifdef CONFIG_GPIO_ACPI
 int acpi_get_gpio(char *path, int pin);
+void acpi_gpiochip_request_interrupts(struct gpio_chip *chip);
 #else /* CONFIG_GPIO_ACPI */
@@ -14,6 +16,8 @@ static inline int acpi_get_gpio(char *path, int pin)
        return -ENODEV;
 }
+static inline void acpi_gpiochip_request_interrupts(struct gpio_chip *chip) { }
 #endif /* CONFIG_GPIO_ACPI */
 #endif /* _LINUX_ACPI_GPIO_H_ */
diff --git a/include/linux/amba/pl080.h b/include/linux/amba/pl080.h
new file mode 100644
index 000000000000..3e7b62fbefbd
--- /dev/null
+++ b/include/linux/amba/pl080.h
@@ -0,0 +1,146 @@
+/* include/linux/amba/pl080.h
+ *
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * ARM PrimeCell PL080 DMA controller
+ *
+ * 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.
+*/
+/* Note, there are some Samsung updates to this controller block which
+ * make it not entierly compatible with the PL080 specification from
+ * ARM. When in doubt, check the Samsung documentation first.
+ *
+ * The Samsung defines are PL080S, and add an extra control register,
+ * the ability to move more than 2^11 counts of data and some extra
+ * OneNAND features.
+*/
+#ifndef ASM_PL080_H
+#define ASM_PL080_H
+#define PL080_INT_STATUS                        (0x00)
+#define PL080_TC_STATUS                         (0x04)
+#define PL080_TC_CLEAR                          (0x08)
+#define PL080_ERR_STATUS                        (0x0C)
+#define PL080_ERR_CLEAR                         (0x10)
+#define PL080_RAW_TC_STATUS                     (0x14)
+#define PL080_RAW_ERR_STATUS                    (0x18)
+#define PL080_EN_CHAN                           (0x1c)
+#define PL080_SOFT_BREQ                         (0x20)
+#define PL080_SOFT_SREQ                         (0x24)
+#define PL080_SOFT_LBREQ                        (0x28)
+#define PL080_SOFT_LSREQ                        (0x2C)
+#define PL080_CONFIG                            (0x30)
+#define PL080_CONFIG_M2_BE                      (1 << 2)
+#define PL080_CONFIG_M1_BE                      (1 << 1)
+#define PL080_CONFIG_ENABLE                     (1 << 0)
+#define PL080_SYNC                              (0x34)
+/* Per channel configuration registers */
+#define PL080_Cx_STRIDE                         (0x20)
+#define PL080_Cx_BASE(x)                        ((0x100 + (x * 0x20)))
+#define PL080_Cx_SRC_ADDR(x)                    ((0x100 + (x * 0x20)))
+#define PL080_Cx_DST_ADDR(x)                    ((0x104 + (x * 0x20)))
+#define PL080_Cx_LLI(x)                         ((0x108 + (x * 0x20)))
+#define PL080_Cx_CONTROL(x)                     ((0x10C + (x * 0x20)))
+#define PL080_Cx_CONFIG(x)                      ((0x110 + (x * 0x20)))
+#define PL080S_Cx_CONTROL2(x)                   ((0x110 + (x * 0x20)))
+#define PL080S_Cx_CONFIG(x)                     ((0x114 + (x * 0x20)))
+#define PL080_CH_SRC_ADDR                       (0x00)
+#define PL080_CH_DST_ADDR                       (0x04)
+#define PL080_CH_LLI                            (0x08)
+#define PL080_CH_CONTROL                        (0x0C)
+#define PL080_CH_CONFIG                         (0x10)
+#define PL080S_CH_CONTROL2                      (0x10)
+#define PL080S_CH_CONFIG                        (0x14)
+#define PL080_LLI_ADDR_MASK                     (0x3fffffff << 2)
+#define PL080_LLI_ADDR_SHIFT                    (2)
+#define PL080_LLI_LM_AHB2                       (1 << 0)
+#define PL080_CONTROL_TC_IRQ_EN                 (1 << 31)
+#define PL080_CONTROL_PROT_MASK                 (0x7 << 28)
+#define PL080_CONTROL_PROT_SHIFT                (28)
+#define PL080_CONTROL_PROT_CACHE                (1 << 30)
+#define PL080_CONTROL_PROT_BUFF                 (1 << 29)
+#define PL080_CONTROL_PROT_SYS                  (1 << 28)
+#define PL080_CONTROL_DST_INCR                  (1 << 27)
+#define PL080_CONTROL_SRC_INCR                  (1 << 26)
+#define PL080_CONTROL_DST_AHB2                  (1 << 25)
+#define PL080_CONTROL_SRC_AHB2                  (1 << 24)
+#define PL080_CONTROL_DWIDTH_MASK               (0x7 << 21)
+#define PL080_CONTROL_DWIDTH_SHIFT              (21)
+#define PL080_CONTROL_SWIDTH_MASK               (0x7 << 18)
+#define PL080_CONTROL_SWIDTH_SHIFT              (18)
+#define PL080_CONTROL_DB_SIZE_MASK              (0x7 << 15)
+#define PL080_CONTROL_DB_SIZE_SHIFT             (15)
+#define PL080_CONTROL_SB_SIZE_MASK              (0x7 << 12)
+#define PL080_CONTROL_SB_SIZE_SHIFT             (12)
+#define PL080_CONTROL_TRANSFER_SIZE_MASK        (0xfff << 0)
+#define PL080_CONTROL_TRANSFER_SIZE_SHIFT       (0)
+#define PL080_BSIZE_1                           (0x0)
+#define PL080_BSIZE_4                           (0x1)
+#define PL080_BSIZE_8                           (0x2)
+#define PL080_BSIZE_16                          (0x3)
+#define PL080_BSIZE_32                          (0x4)
+#define PL080_BSIZE_64                          (0x5)
+#define PL080_BSIZE_128                         (0x6)
+#define PL080_BSIZE_256                         (0x7)
+#define PL080_WIDTH_8BIT                        (0x0)
+#define PL080_WIDTH_16BIT                       (0x1)
+#define PL080_WIDTH_32BIT                       (0x2)
+#define PL080N_CONFIG_ITPROT                    (1 << 20)
+#define PL080N_CONFIG_SECPROT                   (1 << 19)
+#define PL080_CONFIG_HALT                       (1 << 18)
+#define PL080_CONFIG_ACTIVE                     (1 << 17)  /* RO */
+#define PL080_CONFIG_LOCK                       (1 << 16)
+#define PL080_CONFIG_TC_IRQ_MASK                (1 << 15)
+#define PL080_CONFIG_ERR_IRQ_MASK               (1 << 14)
+#define PL080_CONFIG_FLOW_CONTROL_MASK          (0x7 << 11)
+#define PL080_CONFIG_FLOW_CONTROL_SHIFT         (11)
+#define PL080_CONFIG_DST_SEL_MASK               (0xf << 6)
+#define PL080_CONFIG_DST_SEL_SHIFT              (6)
+#define PL080_CONFIG_SRC_SEL_MASK               (0xf << 1)
+#define PL080_CONFIG_SRC_SEL_SHIFT              (1)
+#define PL080_CONFIG_ENABLE                     (1 << 0)
+#define PL080_FLOW_MEM2MEM                      (0x0)
+#define PL080_FLOW_MEM2PER                      (0x1)
+#define PL080_FLOW_PER2MEM                      (0x2)
+#define PL080_FLOW_SRC2DST                      (0x3)
+#define PL080_FLOW_SRC2DST_DST                  (0x4)
+#define PL080_FLOW_MEM2PER_PER                  (0x5)
+#define PL080_FLOW_PER2MEM_PER                  (0x6)
+#define PL080_FLOW_SRC2DST_SRC                  (0x7)
+/* DMA linked list chain structure */
+struct pl080_lli {
+        u32     src_addr;
+        u32     dst_addr;
+        u32     next_lli;
+        u32     control0;
+};
+struct pl080s_lli {
+        u32     src_addr;
+        u32     dst_addr;
+        u32     next_lli;
+        u32     control0;
+        u32     control1;
+};
+#endif /* ASM_PL080_H */
diff --git a/include/linux/bcm47xx_wdt.h b/include/linux/bcm47xx_wdt.h
index e5dfc256485b..b708786d4cbf 100644
--- a/include/linux/bcm47xx_wdt.h
+++ b/include/linux/bcm47xx_wdt.h
@@ -1,7 +1,10 @@
 #ifndef LINUX_BCM47XX_WDT_H_
 #define LINUX_BCM47XX_WDT_H_
+#include <linux/notifier.h>
+#include <linux/timer.h>
 #include <linux/types.h>
+#include <linux/watchdog.h>
 struct bcm47xx_wdt {
@@ -10,6 +13,12 @@ struct bcm47xx_wdt {
        u32 max_timer_ms;
        void *driver_data;
+        struct watchdog_device wdd;
+        struct notifier_block notifier;
+        struct timer_list soft_timer;
+        atomic_t soft_ticks;
 };
 static inline void *bcm47xx_wdt_get_drvdata(struct bcm47xx_wdt *wdt)
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 1d002b58b60b..8390c474f69a 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -528,6 +528,7 @@ struct bcma_sflash {
        u32 size;
        struct mtd_info *mtd;
+        void *priv;
 };
 #endif
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 0530b9860359..c3a09149f793 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -111,7 +111,6 @@ extern int suid_dumpable;
 extern int setup_arg_pages(struct linux_binprm * bprm,
                           unsigned long stack_top,
                           int executable_stack);
-extern int bprm_mm_init(struct linux_binprm *bprm);
 extern int bprm_change_interp(char *interp, struct linux_binprm *bprm);
 extern int copy_strings_kernel(int argc, const char *const *argv,
                               struct linux_binprm *bprm);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index f94bc83011ed..78feda9bbae2 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -19,6 +19,7 @@
 #include <linux/gfp.h>
 #include <linux/bsg.h>
 #include <linux/smp.h>
+#include <linux/rcupdate.h>
 #include <asm/scatterlist.h>
@@ -437,6 +438,7 @@ struct request_queue {
        /* Throttle data */
        struct throtl_data *td;
 #endif
+        struct rcu_head         rcu_head;
 };
 #define QUEUE_FLAG_QUEUED       1       /* uses generic tag queueing */
@@ -974,7 +976,6 @@ struct blk_plug {
        unsigned long magic; /* detect uninitialized use-cases */
        struct list_head list; /* requests */
        struct list_head cb_list; /* md requires an unplug callback */
-        unsigned int should_sort; /* list to be sorted before flushing? */
 };
 #define BLK_MAX_REQUEST_COUNT 16
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 7c2e030e72f1..0ea61e07a91c 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -12,6 +12,7 @@
 struct blk_trace {
        int trace_state;
+        bool rq_based;
        struct rchan *rchan;
        unsigned long __percpu *sequence;
        unsigned char __percpu *msg_data;
diff --git a/include/linux/btrfs.h b/include/linux/btrfs.h
new file mode 100644
index 000000000000..22d799147db2
--- /dev/null
+++ b/include/linux/btrfs.h
@@ -0,0 +1,6 @@
+#ifndef _LINUX_BTRFS_H
+#define _LINUX_BTRFS_H
+#include <uapi/linux/btrfs.h>
+#endif /* _LINUX_BTRFS_H */
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 458f497738a4..5afc4f94d110 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -126,7 +126,6 @@ BUFFER_FNS(Write_EIO, write_io_error)
 BUFFER_FNS(Unwritten, unwritten)
 #define bh_offset(bh)           ((unsigned long)(bh)->b_data & ~PAGE_MASK)
-#define touch_buffer(bh)        mark_page_accessed(bh->b_page)
 /* If we *know* page->private refers to buffer_heads */
 #define page_buffers(page)                                      \
@@ -142,6 +141,7 @@ BUFFER_FNS(Unwritten, unwritten)
 void mark_buffer_dirty(struct buffer_head *bh);
 void init_buffer(struct buffer_head *, bh_end_io_t *, void *);
+void touch_buffer(struct buffer_head *bh);
 void set_bh_page(struct buffer_head *bh,
                struct page *page, unsigned long offset);
 int try_to_free_buffers(struct page *);
diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h
index dad579b0c0e6..76554cecaab2 100644
--- a/include/linux/ceph/ceph_features.h
+++ b/include/linux/ceph/ceph_features.h
@@ -12,16 +12,46 @@
 #define CEPH_FEATURE_MONNAMES       (1<<5)
 #define CEPH_FEATURE_RECONNECT_SEQ  (1<<6)
 #define CEPH_FEATURE_DIRLAYOUTHASH  (1<<7)
-/* bits 8-17 defined by user-space; not supported yet here */
+#define CEPH_FEATURE_OBJECTLOCATOR  (1<<8)
+#define CEPH_FEATURE_PGID64         (1<<9)
+#define CEPH_FEATURE_INCSUBOSDMAP   (1<<10)
+#define CEPH_FEATURE_PGPOOL3        (1<<11)
+#define CEPH_FEATURE_OSDREPLYMUX    (1<<12)
+#define CEPH_FEATURE_OSDENC         (1<<13)
+#define CEPH_FEATURE_OMAP           (1<<14)
+#define CEPH_FEATURE_MONENC         (1<<15)
+#define CEPH_FEATURE_QUERY_T        (1<<16)
+#define CEPH_FEATURE_INDEP_PG_MAP   (1<<17)
 #define CEPH_FEATURE_CRUSH_TUNABLES (1<<18)
+#define CEPH_FEATURE_CHUNKY_SCRUB   (1<<19)
+#define CEPH_FEATURE_MON_NULLROUTE  (1<<20)
+#define CEPH_FEATURE_MON_GV         (1<<21)
+#define CEPH_FEATURE_BACKFILL_RESERVATION (1<<22)
+#define CEPH_FEATURE_MSG_AUTH       (1<<23)
+#define CEPH_FEATURE_RECOVERY_RESERVATION (1<<24)
+#define CEPH_FEATURE_CRUSH_TUNABLES2 (1<<25)
+#define CEPH_FEATURE_CREATEPOOLID   (1<<26)
+#define CEPH_FEATURE_REPLY_CREATE_INODE   (1<<27)
+#define CEPH_FEATURE_OSD_HBMSGS     (1<<28)
+#define CEPH_FEATURE_MDSENC         (1<<29)
+#define CEPH_FEATURE_OSDHASHPSPOOL  (1<<30)
 /*
 * Features supported.
 */
 #define CEPH_FEATURES_SUPPORTED_DEFAULT  \
-        (CEPH_FEATURE_NOSRCADDR |        \
+        (CEPH_FEATURE_NOSRCADDR |               \
-         CEPH_FEATURE_CRUSH_TUNABLES)
+         CEPH_FEATURE_PGID64 |                  \
+         CEPH_FEATURE_PGPOOL3 |                 \
+         CEPH_FEATURE_OSDENC |                  \
+         CEPH_FEATURE_CRUSH_TUNABLES |          \
+         CEPH_FEATURE_CRUSH_TUNABLES2 |         \
+         CEPH_FEATURE_REPLY_CREATE_INODE |      \
+         CEPH_FEATURE_OSDHASHPSPOOL)
 #define CEPH_FEATURES_REQUIRED_DEFAULT   \
-        (CEPH_FEATURE_NOSRCADDR)
+        (CEPH_FEATURE_NOSRCADDR |        \
+         CEPH_FEATURE_PGID64 |           \
+         CEPH_FEATURE_PGPOOL3 |          \
+         CEPH_FEATURE_OSDENC)
 #endif
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index cf6f4d998a76..2ad7b860f062 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -21,16 +21,14 @@
 * internal cluster protocols separately from the public,
 * client-facing protocol.
 */
-#define CEPH_OSD_PROTOCOL     8 /* cluster internal */
-#define CEPH_MDS_PROTOCOL    12 /* cluster internal */
-#define CEPH_MON_PROTOCOL     5 /* cluster internal */
 #define CEPH_OSDC_PROTOCOL   24 /* server/client */
 #define CEPH_MDSC_PROTOCOL   32 /* server/client */
 #define CEPH_MONC_PROTOCOL   15 /* server/client */
-#define CEPH_INO_ROOT  1
+#define CEPH_INO_ROOT   1
-#define CEPH_INO_CEPH  2        /* hidden .ceph dir */
+#define CEPH_INO_CEPH   2       /* hidden .ceph dir */
+#define CEPH_INO_DOTDOT 3       /* used by ceph fuse for parent (..) */
 /* arbitrary limit on max # of monitors (cluster of 3 is typical) */
 #define CEPH_MAX_MON   31
@@ -51,7 +49,7 @@ struct ceph_file_layout {
        __le32 fl_object_stripe_unit;  /* UNUSED.  for per-object parity, if any */
        /* object -> pg layout */
-        __le32 fl_unused;       /* unused; used to be preferred primary (-1) */
+        __le32 fl_unused;       /* unused; used to be preferred primary for pg (-1 for none) */
        __le32 fl_pg_pool;      /* namespace, crush ruleset, rep level */
 } __attribute__ ((packed));
@@ -101,6 +99,8 @@ struct ceph_dir_layout {
 #define CEPH_MSG_MON_SUBSCRIBE_ACK      16
 #define CEPH_MSG_AUTH                   17
 #define CEPH_MSG_AUTH_REPLY             18
+#define CEPH_MSG_MON_GET_VERSION        19
+#define CEPH_MSG_MON_GET_VERSION_REPLY  20
 /* client <-> mds */
 #define CEPH_MSG_MDS_MAP                21
@@ -221,6 +221,11 @@ struct ceph_mon_subscribe_ack {
 } __attribute__ ((packed));
 /*
+ * mdsmap flags
+ */
+#define CEPH_MDSMAP_DOWN    (1<<0)  /* cluster deliberately down */
+/*
 * mds states
 *   > 0 -> in
 *  <= 0 -> out
@@ -233,6 +238,7 @@ struct ceph_mon_subscribe_ack {
 #define CEPH_MDS_STATE_CREATING    -6  /* up, creating MDS instance. */
 #define CEPH_MDS_STATE_STARTING    -7  /* up, starting previously stopped mds */
 #define CEPH_MDS_STATE_STANDBY_REPLAY -8 /* up, tailing active node's journal */
+#define CEPH_MDS_STATE_REPLAYONCE   -9 /* up, replaying an active node's journal */
 #define CEPH_MDS_STATE_REPLAY       8  /* up, replaying journal. */
 #define CEPH_MDS_STATE_RESOLVE      9  /* up, disambiguating distributed
@@ -264,6 +270,7 @@ extern const char *ceph_mds_state_name(int s);
 #define CEPH_LOCK_IXATTR      2048
 #define CEPH_LOCK_IFLOCK      4096  /* advisory file locks */
 #define CEPH_LOCK_INO         8192  /* immutable inode bits; not a lock */
+#define CEPH_LOCK_IPOLICY     16384 /* policy lock on dirs. MDS internal */
 /* client_session ops */
 enum {
@@ -338,6 +345,12 @@ extern const char *ceph_mds_op_name(int op);
 #define CEPH_SETATTR_SIZE  32
 #define CEPH_SETATTR_CTIME 64
+/*
+ * Ceph setxattr request flags.
+ */
+#define CEPH_XATTR_CREATE  1
+#define CEPH_XATTR_REPLACE 2
 union ceph_mds_request_args {
        struct {
                __le32 mask;                 /* CEPH_CAP_* */
@@ -522,14 +535,17 @@ int ceph_flags_to_mode(int flags);
 #define CEPH_CAP_GWREXTEND  64  /* (file) client can extend EOF */
 #define CEPH_CAP_GLAZYIO   128  /* (file) client can perform lazy io */
+#define CEPH_CAP_SIMPLE_BITS  2
+#define CEPH_CAP_FILE_BITS    8
 /* per-lock shift */
 #define CEPH_CAP_SAUTH      2
 #define CEPH_CAP_SLINK      4
 #define CEPH_CAP_SXATTR     6
 #define CEPH_CAP_SFILE      8
-#define CEPH_CAP_SFLOCK    20 
+#define CEPH_CAP_SFLOCK    20
-#define CEPH_CAP_BITS       22
+#define CEPH_CAP_BITS      22
 /* composed values */
 #define CEPH_CAP_AUTH_SHARED  (CEPH_CAP_GSHARED  << CEPH_CAP_SAUTH)
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 63d092822bad..360d9d08ca9e 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -52,10 +52,10 @@ static inline int ceph_has_room(void **p, void *end, size_t n)
        return end >= *p && n <= end - *p;
 }
-#define ceph_decode_need(p, end, n, bad)                \
+#define ceph_decode_need(p, end, n, bad)                        \
-        do {                                            \
+        do {                                                    \
-                if (!likely(ceph_has_room(p, end, n)))  \
+                if (!likely(ceph_has_room(p, end, n)))          \
-                        goto bad;                       \
+                        goto bad;                               \
        } while (0)
 #define ceph_decode_64_safe(p, end, v, bad)                     \
@@ -99,8 +99,8 @@ static inline int ceph_has_room(void **p, void *end, size_t n)
 *
 * There are two possible failures:
 *   - converting the string would require accessing memory at or
- *     beyond the "end" pointer provided (-E
+ *     beyond the "end" pointer provided (-ERANGE)
- *   - memory could not be allocated for the result
+ *   - memory could not be allocated for the result (-ENOMEM)
 */
 static inline char *ceph_extract_encoded_string(void **p, void *end,
                                                size_t *lenp, gfp_t gfp)
@@ -217,10 +217,10 @@ static inline void ceph_encode_string(void **p, void *end,
        *p += len;
 }
-#define ceph_encode_need(p, end, n, bad)                \
+#define ceph_encode_need(p, end, n, bad)                        \
-        do {                                            \
+        do {                                                    \
-                if (!likely(ceph_has_room(p, end, n)))  \
+                if (!likely(ceph_has_room(p, end, n)))          \
-                        goto bad;                       \
+                        goto bad;                               \
        } while (0)
 #define ceph_encode_64_safe(p, end, v, bad)                     \
@@ -231,12 +231,17 @@ static inline void ceph_encode_string(void **p, void *end,
 #define ceph_encode_32_safe(p, end, v, bad)                     \
        do {                                                    \
                ceph_encode_need(p, end, sizeof(u32), bad);     \
-                ceph_encode_32(p, v);                   \
+                ceph_encode_32(p, v);                           \
        } while (0)
 #define ceph_encode_16_safe(p, end, v, bad)                     \
        do {                                                    \
                ceph_encode_need(p, end, sizeof(u16), bad);     \
-                ceph_encode_16(p, v);                   \
+                ceph_encode_16(p, v);                           \
+        } while (0)
+#define ceph_encode_8_safe(p, end, v, bad)                      \
+        do {                                                    \
+                ceph_encode_need(p, end, sizeof(u8), bad);      \
+                ceph_encode_8(p, v);                            \
        } while (0)
 #define ceph_encode_copy_safe(p, end, pv, n, bad)               \
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 084d3c622b12..29818fc3fa49 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -193,6 +193,8 @@ static inline int calc_pages_for(u64 off, u64 len)
 }
 /* ceph_common.c */
+extern bool libceph_compatible(void *data);
 extern const char *ceph_msg_type_name(int type);
 extern int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid);
 extern struct kmem_cache *ceph_inode_cachep;
@@ -220,7 +222,7 @@ extern int ceph_open_session(struct ceph_client *client);
 /* pagevec.c */
 extern void ceph_release_page_vector(struct page **pages, int num_pages);
-extern struct page **ceph_get_direct_page_vector(const char __user *data,
+extern struct page **ceph_get_direct_page_vector(const void __user *data,
                                                 int num_pages,
                                                 bool write_page);
 extern void ceph_put_page_vector(struct page **pages, int num_pages,
@@ -228,15 +230,15 @@ extern void ceph_put_page_vector(struct page **pages, int num_pages,
 extern void ceph_release_page_vector(struct page **pages, int num_pages);
 extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);
 extern int ceph_copy_user_to_page_vector(struct page **pages,
-                                         const char __user *data,
+                                         const void __user *data,
                                         loff_t off, size_t len);
-extern int ceph_copy_to_page_vector(struct page **pages,
+extern void ceph_copy_to_page_vector(struct page **pages,
-                                    const char *data,
+                                    const void *data,
                                    loff_t off, size_t len);
-extern int ceph_copy_from_page_vector(struct page **pages,
+extern void ceph_copy_from_page_vector(struct page **pages,
-                                    char *data,
+                                    void *data,
                                    loff_t off, size_t len);
-extern int ceph_copy_page_vector_to_user(struct page **pages, char __user *data,
+extern int ceph_copy_page_vector_to_user(struct page **pages, void __user *data,
                                    loff_t off, size_t len);
 extern void ceph_zero_page_vector_range(int off, int len, struct page **pages);
diff --git a/include/linux/ceph/mdsmap.h b/include/linux/ceph/mdsmap.h
index cb15b5d867c7..87ed09f54800 100644
--- a/include/linux/ceph/mdsmap.h
+++ b/include/linux/ceph/mdsmap.h
@@ -29,8 +29,8 @@ struct ceph_mdsmap {
        /* which object pools file data can be stored in */
        int m_num_data_pg_pools;
-        u32 *m_data_pg_pools;
+        u64 *m_data_pg_pools;
-        u32 m_cas_pg_pool;
+        u64 m_cas_pg_pool;
 };
 static inline struct ceph_entity_addr *
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 14ba5ee738a9..60903e0f665c 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -83,9 +83,11 @@ struct ceph_msg {
        struct list_head list_head;
        struct kref kref;
+#ifdef CONFIG_BLOCK
        struct bio  *bio;               /* instead of pages/pagelist */
        struct bio  *bio_iter;          /* bio iterator */
        int bio_seg;                    /* current bio segment */
+#endif /* CONFIG_BLOCK */
        struct ceph_pagelist *trail;    /* the trailing part of the data */
        bool front_is_vmalloc;
        bool more_to_follow;
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index d9b880e977e6..1dd5d466b6f9 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -10,6 +10,7 @@
 #include <linux/ceph/osdmap.h>
 #include <linux/ceph/messenger.h>
 #include <linux/ceph/auth.h>
+#include <linux/ceph/pagelist.h>
 /* 
 * Maximum object name size 
@@ -22,7 +23,6 @@ struct ceph_snap_context;
 struct ceph_osd_request;
 struct ceph_osd_client;
 struct ceph_authorizer;
-struct ceph_pagelist;
 /*
 * completion callback for async writepages
@@ -47,6 +47,9 @@ struct ceph_osd {
        struct list_head o_keepalive_item;
 };
+#define CEPH_OSD_MAX_OP 10
 /* an in-flight request */
 struct ceph_osd_request {
        u64             r_tid;              /* unique for this client */
@@ -63,9 +66,23 @@ struct ceph_osd_request {
        struct ceph_connection *r_con_filling_msg;
        struct ceph_msg  *r_request, *r_reply;
-        int               r_result;
        int               r_flags;     /* any additional flags for the osd */
        u32               r_sent;      /* >0 if r_request is sending/sent */
+        int               r_num_ops;
+        /* encoded message content */
+        struct ceph_osd_op *r_request_ops;
+        /* these are updated on each send */
+        __le32           *r_request_osdmap_epoch;
+        __le32           *r_request_flags;
+        __le64           *r_request_pool;
+        void             *r_request_pgid;
+        __le32           *r_request_attempts;
+        struct ceph_eversion *r_request_reassert_version;
+        int               r_result;
+        int               r_reply_op_len[CEPH_OSD_MAX_OP];
+        s32               r_reply_op_result[CEPH_OSD_MAX_OP];
        int               r_got_reply;
        int               r_linger;
@@ -82,6 +99,7 @@ struct ceph_osd_request {
        char              r_oid[MAX_OBJ_NAME_SIZE];          /* object name */
        int               r_oid_len;
+        u64               r_snapid;
        unsigned long     r_stamp;            /* send OR check time */
        struct ceph_file_layout r_file_layout;
@@ -95,7 +113,7 @@ struct ceph_osd_request {
        struct bio       *r_bio;              /* instead of pages */
 #endif
-        struct ceph_pagelist *r_trail;        /* trailing part of the data */
+        struct ceph_pagelist r_trail;         /* trailing part of the data */
 };
 struct ceph_osd_event {
@@ -107,7 +125,6 @@ struct ceph_osd_event {
        struct rb_node node;
        struct list_head osd_node;
        struct kref kref;
-        struct completion completion;
 };
 struct ceph_osd_event_work {
@@ -157,7 +174,7 @@ struct ceph_osd_client {
 struct ceph_osd_req_op {
        u16 op;           /* CEPH_OSD_OP_* */
-        u32 flags;        /* CEPH_OSD_FLAG_* */
+        u32 payload_len;
        union {
                struct {
                        u64 offset, length;
@@ -166,23 +183,24 @@ struct ceph_osd_req_op {
                } extent;
                struct {
                        const char *name;
-                        u32 name_len;
                        const char  *val;
+                        u32 name_len;
                        u32 value_len;
                        __u8 cmp_op;       /* CEPH_OSD_CMPXATTR_OP_* */
                        __u8 cmp_mode;     /* CEPH_OSD_CMPXATTR_MODE_* */
                } xattr;
                struct {
                        const char *class_name;
-                        __u8 class_len;
                        const char *method_name;
-                        __u8 method_len;
-                        __u8 argc;
                        const char *indata;
                        u32 indata_len;
+                        __u8 class_len;
+                        __u8 method_len;
+                        __u8 argc;
                } cls;
                struct {
-                        u64 cookie, count;
+                        u64 cookie;
+                        u64 count;
                } pgls;
                struct {
                        u64 snapid;
@@ -190,12 +208,11 @@ struct ceph_osd_req_op {
                struct {
                        u64 cookie;
                        u64 ver;
-                        __u8 flag;
                        u32 prot_ver;
                        u32 timeout;
+                        __u8 flag;
                } watch;
        };
-        u32 payload_len;
 };
 extern int ceph_osdc_init(struct ceph_osd_client *osdc,
@@ -207,29 +224,19 @@ extern void ceph_osdc_handle_reply(struct ceph_osd_client *osdc,
 extern void ceph_osdc_handle_map(struct ceph_osd_client *osdc,
                                 struct ceph_msg *msg);
-extern int ceph_calc_raw_layout(struct ceph_osd_client *osdc,
-                        struct ceph_file_layout *layout,
-                        u64 snapid,
-                        u64 off, u64 *plen, u64 *bno,
-                        struct ceph_osd_request *req,
-                        struct ceph_osd_req_op *op);
 extern struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
-                                               int flags,
                                               struct ceph_snap_context *snapc,
-                                               struct ceph_osd_req_op *ops,
+                                               unsigned int num_op,
                                               bool use_mempool,
-                                               gfp_t gfp_flags,
+                                               gfp_t gfp_flags);
-                                               struct page **pages,
-                                               struct bio *bio);
 extern void ceph_osdc_build_request(struct ceph_osd_request *req,
-                                    u64 off, u64 *plen,
+                                    u64 off, u64 len,
+                                    unsigned int num_op,
                                    struct ceph_osd_req_op *src_ops,
                                    struct ceph_snap_context *snapc,
-                                    struct timespec *mtime,
+                                    u64 snap_id,
-                                    const char *oid,
+                                    struct timespec *mtime);
-                                    int oid_len);
 extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *,
                                      struct ceph_file_layout *layout,
@@ -239,8 +246,7 @@ extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *,
                                      int do_sync, u32 truncate_seq,
                                      u64 truncate_size,
                                      struct timespec *mtime,
-                                      bool use_mempool, int num_reply,
+                                      bool use_mempool, int page_align);
-                                      int page_align);
 extern void ceph_osdc_set_request_linger(struct ceph_osd_client *osdc,
                                         struct ceph_osd_request *req);
@@ -279,17 +285,13 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc,
                                u64 off, u64 len,
                                u32 truncate_seq, u64 truncate_size,
                                struct timespec *mtime,
-                                struct page **pages, int nr_pages,
+                                struct page **pages, int nr_pages);
-                                int flags, int do_sync, bool nofail);
 /* watch/notify events */
 extern int ceph_osdc_create_event(struct ceph_osd_client *osdc,
                                  void (*event_cb)(u64, u64, u8, void *),
-                                  int one_shot, void *data,
+                                  void *data, struct ceph_osd_event **pevent);
-                                  struct ceph_osd_event **pevent);
 extern void ceph_osdc_cancel_event(struct ceph_osd_event *event);
-extern int ceph_osdc_wait_event(struct ceph_osd_event *event,
-                                unsigned long timeout);
 extern void ceph_osdc_put_event(struct ceph_osd_event *event);
 #endif
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index 10a417f9f76f..c819190d1642 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -18,14 +18,31 @@
 * The map can be updated either via an incremental map (diff) describing
 * the change between two successive epochs, or as a fully encoded map.
 */
+struct ceph_pg {
+        uint64_t pool;
+        uint32_t seed;
+};
+#define CEPH_POOL_FLAG_HASHPSPOOL  1
 struct ceph_pg_pool_info {
        struct rb_node node;
-        int id;
+        s64 id;
-        struct ceph_pg_pool v;
+        u8 type;
-        int pg_num_mask, pgp_num_mask, lpg_num_mask, lpgp_num_mask;
+        u8 size;
+        u8 crush_ruleset;
+        u8 object_hash;
+        u32 pg_num, pgp_num;
+        int pg_num_mask, pgp_num_mask;
+        u64 flags;
        char *name;
 };
+struct ceph_object_locator {
+        uint64_t pool;
+        char *key;
+};
 struct ceph_pg_mapping {
        struct rb_node node;
        struct ceph_pg pgid;
@@ -110,15 +127,16 @@ extern void ceph_osdmap_destroy(struct ceph_osdmap *map);
 /* calculate mapping of a file extent to an object */
 extern int ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
-                                         u64 off, u64 *plen,
+                                         u64 off, u64 len,
                                         u64 *bno, u64 *oxoff, u64 *oxlen);
 /* calculate mapping of object to a placement group */
-extern int ceph_calc_object_layout(struct ceph_object_layout *ol,
+extern int ceph_calc_object_layout(struct ceph_pg *pg,
                                   const char *oid,
                                   struct ceph_file_layout *fl,
                                   struct ceph_osdmap *osdmap);
-extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
+extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap,
+                               struct ceph_pg pgid,
                               int *acting);
 extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap,
                                struct ceph_pg pgid);
diff --git a/include/linux/ceph/rados.h b/include/linux/ceph/rados.h
index 2c04afeead1c..68c96a508ac2 100644
--- a/include/linux/ceph/rados.h
+++ b/include/linux/ceph/rados.h
@@ -9,14 +9,6 @@
 #include <linux/ceph/msgr.h>
 /*
- * osdmap encoding versions
- */
-#define CEPH_OSDMAP_INC_VERSION     5
-#define CEPH_OSDMAP_INC_VERSION_EXT 6
-#define CEPH_OSDMAP_VERSION         5
-#define CEPH_OSDMAP_VERSION_EXT     6
-/*
 * fs id
 */
 struct ceph_fsid {
@@ -64,7 +56,7 @@ struct ceph_timespec {
 * placement group.
 * we encode this into one __le64.
 */
-struct ceph_pg {
+struct ceph_pg_v1 {
        __le16 preferred; /* preferred primary osd */
        __le16 ps;        /* placement seed */
        __le32 pool;      /* object pool */
@@ -91,21 +83,6 @@ struct ceph_pg {
 #define CEPH_PG_TYPE_REP     1
 #define CEPH_PG_TYPE_RAID4   2
-#define CEPH_PG_POOL_VERSION 2
-struct ceph_pg_pool {
-        __u8 type;                /* CEPH_PG_TYPE_* */
-        __u8 size;                /* number of osds in each pg */
-        __u8 crush_ruleset;       /* crush placement rule */
-        __u8 object_hash;         /* hash mapping object name to ps */
-        __le32 pg_num, pgp_num;   /* number of pg's */
-        __le32 lpg_num, lpgp_num; /* number of localized pg's */
-        __le32 last_change;       /* most recent epoch changed */
-        __le64 snap_seq;          /* seq for per-pool snapshot */
-        __le32 snap_epoch;        /* epoch of last snap */
-        __le32 num_snaps;
-        __le32 num_removed_snap_intervals; /* if non-empty, NO per-pool snaps */
-        __le64 auid;               /* who owns the pg */
-} __attribute__ ((packed));
 /*
 * stable_mod func is used to control number of placement groups.
@@ -128,7 +105,7 @@ static inline int ceph_stable_mod(int x, int b, int bmask)
 * object layout - how a given object should be stored.
 */
 struct ceph_object_layout {
-        struct ceph_pg ol_pgid;   /* raw pg, with _full_ ps precision. */
+        struct ceph_pg_v1 ol_pgid;   /* raw pg, with _full_ ps precision. */
        __le32 ol_stripe_unit;    /* for per-object parity, if any */
 } __attribute__ ((packed));
@@ -145,8 +122,12 @@ struct ceph_eversion {
 */
 /* status bits */
-#define CEPH_OSD_EXISTS 1
+#define CEPH_OSD_EXISTS  (1<<0)
-#define CEPH_OSD_UP     2
+#define CEPH_OSD_UP      (1<<1)
+#define CEPH_OSD_AUTOOUT (1<<2)  /* osd was automatically marked out */
+#define CEPH_OSD_NEW     (1<<3)  /* osd is new, never marked in */
+extern const char *ceph_osd_state_name(int s);
 /* osd weights.  fixed point value: 0x10000 == 1.0 ("in"), 0 == "out" */
 #define CEPH_OSD_IN  0x10000
@@ -161,9 +142,25 @@ struct ceph_eversion {
 #define CEPH_OSDMAP_PAUSERD  (1<<2)  /* pause all reads */
 #define CEPH_OSDMAP_PAUSEWR  (1<<3)  /* pause all writes */
 #define CEPH_OSDMAP_PAUSEREC (1<<4)  /* pause recovery */
+#define CEPH_OSDMAP_NOUP     (1<<5)  /* block osd boot */
+#define CEPH_OSDMAP_NODOWN   (1<<6)  /* block osd mark-down/failure */
+#define CEPH_OSDMAP_NOOUT    (1<<7)  /* block osd auto mark-out */
+#define CEPH_OSDMAP_NOIN     (1<<8)  /* block osd auto mark-in */
+#define CEPH_OSDMAP_NOBACKFILL (1<<9) /* block osd backfill */
+#define CEPH_OSDMAP_NORECOVER (1<<10) /* block osd recovery and backfill */
+/*
+ * The error code to return when an OSD can't handle a write
+ * because it is too large.
+ */
+#define OSD_WRITETOOBIG EMSGSIZE
 /*
 * osd ops
+ *
+ * WARNING: do not use these op codes directly.  Use the helpers
+ * defined below instead.  In certain cases, op code behavior was
+ * redefined, resulting in special-cases in the helpers.
 */
 #define CEPH_OSD_OP_MODE       0xf000
 #define CEPH_OSD_OP_MODE_RD    0x1000
@@ -177,6 +174,7 @@ struct ceph_eversion {
 #define CEPH_OSD_OP_TYPE_ATTR  0x0300
 #define CEPH_OSD_OP_TYPE_EXEC  0x0400
 #define CEPH_OSD_OP_TYPE_PG    0x0500
+#define CEPH_OSD_OP_TYPE_MULTI 0x0600 /* multiobject */
 enum {
        /** data **/
@@ -217,6 +215,23 @@ enum {
        CEPH_OSD_OP_WATCH   = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 15,
+        /* omap */
+        CEPH_OSD_OP_OMAPGETKEYS   = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 17,
+        CEPH_OSD_OP_OMAPGETVALS   = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 18,
+        CEPH_OSD_OP_OMAPGETHEADER = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 19,
+        CEPH_OSD_OP_OMAPGETVALSBYKEYS  =
+          CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 20,
+        CEPH_OSD_OP_OMAPSETVALS   = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 21,
+        CEPH_OSD_OP_OMAPSETHEADER = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 22,
+        CEPH_OSD_OP_OMAPCLEAR     = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 23,
+        CEPH_OSD_OP_OMAPRMKEYS    = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 24,
+        CEPH_OSD_OP_OMAP_CMP      = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 25,
+        /** multi **/
+        CEPH_OSD_OP_CLONERANGE = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_MULTI | 1,
+        CEPH_OSD_OP_ASSERT_SRC_VERSION = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_MULTI | 2,
+        CEPH_OSD_OP_SRC_CMPXATTR = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_MULTI | 3,
        /** attrs **/
        /* read */
        CEPH_OSD_OP_GETXATTR  = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_ATTR | 1,
@@ -238,6 +253,7 @@ enum {
        CEPH_OSD_OP_SCRUB_RESERVE   = CEPH_OSD_OP_MODE_SUB | 6,
        CEPH_OSD_OP_SCRUB_UNRESERVE = CEPH_OSD_OP_MODE_SUB | 7,
        CEPH_OSD_OP_SCRUB_STOP      = CEPH_OSD_OP_MODE_SUB | 8,
+        CEPH_OSD_OP_SCRUB_MAP     = CEPH_OSD_OP_MODE_SUB | 9,
        /** lock **/
        CEPH_OSD_OP_WRLOCK    = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_LOCK | 1,
@@ -248,10 +264,12 @@ enum {
        CEPH_OSD_OP_DNLOCK    = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_LOCK | 6,
        /** exec **/
+        /* note: the RD bit here is wrong; see special-case below in helper */
        CEPH_OSD_OP_CALL    = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_EXEC | 1,
        /** pg **/
        CEPH_OSD_OP_PGLS      = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_PG | 1,
+        CEPH_OSD_OP_PGLS_FILTER = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_PG | 2,
 };
 static inline int ceph_osd_op_type_lock(int op)
@@ -274,6 +292,10 @@ static inline int ceph_osd_op_type_pg(int op)
 {
        return (op & CEPH_OSD_OP_TYPE) == CEPH_OSD_OP_TYPE_PG;
 }
+static inline int ceph_osd_op_type_multi(int op)
+{
+        return (op & CEPH_OSD_OP_TYPE) == CEPH_OSD_OP_TYPE_MULTI;
+}
 static inline int ceph_osd_op_mode_subop(int op)
 {
@@ -281,11 +303,12 @@ static inline int ceph_osd_op_mode_subop(int op)
 }
 static inline int ceph_osd_op_mode_read(int op)
 {
-        return (op & CEPH_OSD_OP_MODE) == CEPH_OSD_OP_MODE_RD;
+        return (op & CEPH_OSD_OP_MODE_RD) &&
+                op != CEPH_OSD_OP_CALL;
 }
 static inline int ceph_osd_op_mode_modify(int op)
 {
-        return (op & CEPH_OSD_OP_MODE) == CEPH_OSD_OP_MODE_WR;
+        return op & CEPH_OSD_OP_MODE_WR;
 }
 /*
@@ -294,34 +317,38 @@ static inline int ceph_osd_op_mode_modify(int op)
 */
 #define CEPH_OSD_TMAP_HDR 'h'
 #define CEPH_OSD_TMAP_SET 's'
+#define CEPH_OSD_TMAP_CREATE 'c' /* create key */
 #define CEPH_OSD_TMAP_RM  'r'
+#define CEPH_OSD_TMAP_RMSLOPPY 'R'
 extern const char *ceph_osd_op_name(int op);
 /*
 * osd op flags
 *
 * An op may be READ, WRITE, or READ|WRITE.
 */
 enum {
-        CEPH_OSD_FLAG_ACK = 1,          /* want (or is) "ack" ack */
+        CEPH_OSD_FLAG_ACK =            0x0001,  /* want (or is) "ack" ack */
-        CEPH_OSD_FLAG_ONNVRAM = 2,      /* want (or is) "onnvram" ack */
+        CEPH_OSD_FLAG_ONNVRAM =        0x0002,  /* want (or is) "onnvram" ack */
-        CEPH_OSD_FLAG_ONDISK = 4,       /* want (or is) "ondisk" ack */
+        CEPH_OSD_FLAG_ONDISK =         0x0004,  /* want (or is) "ondisk" ack */
-        CEPH_OSD_FLAG_RETRY = 8,        /* resend attempt */
+        CEPH_OSD_FLAG_RETRY =          0x0008,  /* resend attempt */
-        CEPH_OSD_FLAG_READ = 16,        /* op may read */
+        CEPH_OSD_FLAG_READ =           0x0010,  /* op may read */
-        CEPH_OSD_FLAG_WRITE = 32,       /* op may write */
+        CEPH_OSD_FLAG_WRITE =          0x0020,  /* op may write */
-        CEPH_OSD_FLAG_ORDERSNAP = 64,   /* EOLDSNAP if snapc is out of order */
+        CEPH_OSD_FLAG_ORDERSNAP =      0x0040,  /* EOLDSNAP if snapc is out of order */
-        CEPH_OSD_FLAG_PEERSTAT = 128,   /* msg includes osd_peer_stat */
+        CEPH_OSD_FLAG_PEERSTAT_OLD =   0x0080,  /* DEPRECATED msg includes osd_peer_stat */
-        CEPH_OSD_FLAG_BALANCE_READS = 256,
+        CEPH_OSD_FLAG_BALANCE_READS =  0x0100,
-        CEPH_OSD_FLAG_PARALLELEXEC = 512, /* execute op in parallel */
+        CEPH_OSD_FLAG_PARALLELEXEC =   0x0200,  /* execute op in parallel */
-        CEPH_OSD_FLAG_PGOP = 1024,      /* pg op, no object */
+        CEPH_OSD_FLAG_PGOP =           0x0400,  /* pg op, no object */
-        CEPH_OSD_FLAG_EXEC = 2048,      /* op may exec */
+        CEPH_OSD_FLAG_EXEC =           0x0800,  /* op may exec */
-        CEPH_OSD_FLAG_EXEC_PUBLIC = 4096, /* op may exec (public) */
+        CEPH_OSD_FLAG_EXEC_PUBLIC =    0x1000,  /* DEPRECATED op may exec (public) */
+        CEPH_OSD_FLAG_LOCALIZE_READS = 0x2000,  /* read from nearby replica, if any */
+        CEPH_OSD_FLAG_RWORDERED =      0x4000,  /* order wrt concurrent reads */
 };
 enum {
        CEPH_OSD_OP_FLAG_EXCL = 1,      /* EXCL object create */
+        CEPH_OSD_OP_FLAG_FAILOK = 2,    /* continue despite failure */
 };
 #define EOLDSNAPC    ERESTART  /* ORDERSNAP flag set; writer has old snapc*/
@@ -381,48 +408,13 @@ struct ceph_osd_op {
                        __le64 ver;
                        __u8 flag;      /* 0 = unwatch, 1 = watch */
                } __attribute__ ((packed)) watch;
-};
+                struct {
+                        __le64 offset, length;
+                        __le64 src_offset;
+                } __attribute__ ((packed)) clonerange;
+        };
        __le32 payload_len;
 } __attribute__ ((packed));
-/*
- * osd request message header.  each request may include multiple
- * ceph_osd_op object operations.
- */
-struct ceph_osd_request_head {
-        __le32 client_inc;                 /* client incarnation */
-        struct ceph_object_layout layout;  /* pgid */
-        __le32 osdmap_epoch;               /* client's osdmap epoch */
-        __le32 flags;
-        struct ceph_timespec mtime;        /* for mutations only */
-        struct ceph_eversion reassert_version; /* if we are replaying op */
-        __le32 object_len;     /* length of object name */
-        __le64 snapid;         /* snapid to read */
-        __le64 snap_seq;       /* writer's snap context */
-        __le32 num_snaps;
-        __le16 num_ops;
-        struct ceph_osd_op ops[];  /* followed by ops[], obj, ticket, snaps */
-} __attribute__ ((packed));
-struct ceph_osd_reply_head {
-        __le32 client_inc;                /* client incarnation */
-        __le32 flags;
-        struct ceph_object_layout layout;
-        __le32 osdmap_epoch;
-        struct ceph_eversion reassert_version; /* for replaying uncommitted */
-        __le32 result;                    /* result code */
-        __le32 object_len;                /* length of object name */
-        __le32 num_ops;
-        struct ceph_osd_op ops[0];  /* ops[], object */
-} __attribute__ ((packed));
 #endif
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 8031d6eef102..5b8721efa948 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -34,7 +34,7 @@ int venus_lookup(struct super_block *sb, struct CodaFid *fid,
                 const char *name, int length, int *type, 
                 struct CodaFid *resfid);
 int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
-                vuid_t uid);
+                kuid_t uid);
 int venus_open(struct super_block *sb, struct CodaFid *fid, int flags,
               struct file **f);
 int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid, 
diff --git a/include/linux/compat.h b/include/linux/compat.h
index de095b0462a7..76a87fb57ac2 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -359,6 +359,7 @@ asmlinkage ssize_t compat_sys_preadv(unsigned long fd,
 asmlinkage ssize_t compat_sys_pwritev(unsigned long fd,
                const struct compat_iovec __user *vec,
                unsigned long vlen, u32 pos_low, u32 pos_high);
+asmlinkage long comat_sys_lseek(unsigned int, compat_off_t, unsigned int);
 asmlinkage long compat_sys_execve(const char __user *filename, const compat_uptr_t __user *argv,
                     const compat_uptr_t __user *envp);
@@ -535,6 +536,8 @@ asmlinkage long compat_sys_openat(int dfd, const char __user *filename,
 asmlinkage long compat_sys_open_by_handle_at(int mountdirfd,
                                             struct file_handle __user *handle,
                                             int flags);
+asmlinkage long compat_sys_truncate(const char __user *, compat_off_t);
+asmlinkage long compat_sys_ftruncate(unsigned int, compat_ulong_t);
 asmlinkage long compat_sys_pselect6(int n, compat_ulong_t __user *inp,
                                    compat_ulong_t __user *outp,
                                    compat_ulong_t __user *exp,
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 51494e6b5548..33f0280fd533 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -77,10 +77,13 @@ static inline void init_completion(struct completion *x)
 }
 extern void wait_for_completion(struct completion *);
+extern void wait_for_completion_io(struct completion *);
 extern int wait_for_completion_interruptible(struct completion *x);
 extern int wait_for_completion_killable(struct completion *x);
 extern unsigned long wait_for_completion_timeout(struct completion *x,
                                                   unsigned long timeout);
+extern unsigned long wait_for_completion_io_timeout(struct completion *x,
+                                                    unsigned long timeout);
 extern long wait_for_completion_interruptible_timeout(
        struct completion *x, unsigned long timeout);
 extern long wait_for_completion_killable_timeout(
diff --git a/include/linux/console.h b/include/linux/console.h
index 3b709da1786e..29680a8cda99 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -77,7 +77,9 @@ 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
 int con_debug_enter(struct vc_data *vc);
diff --git a/include/linux/crush/crush.h b/include/linux/crush/crush.h
index 25baa287cff7..6a1101f24cfb 100644
--- a/include/linux/crush/crush.h
+++ b/include/linux/crush/crush.h
@@ -162,6 +162,8 @@ struct crush_map {
        __u32 choose_local_fallback_tries;
        /* choose attempts before giving up */ 
        __u32 choose_total_tries;
+        /* attempt chooseleaf inner descent once; on failure retry outer descent */
+        __u32 chooseleaf_descend_once;
 };
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index c1754b59ddd3..1a6bb81f0fe5 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -145,6 +145,7 @@ 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 *,
@@ -192,6 +193,8 @@ struct dentry_operations {
 #define DCACHE_GENOCIDE         0x0200
 #define DCACHE_SHRINK_LIST      0x0400
+#define DCACHE_OP_WEAK_REVALIDATE       0x0800
 #define DCACHE_NFSFS_RENAMED    0x1000
     /* this dentry has been "silly renamed" and has to be deleted on the last
      * dput() */
@@ -293,9 +296,9 @@ extern void d_move(struct dentry *, struct dentry *);
 extern struct dentry *d_ancestor(struct dentry *, struct dentry *);
 /* appendix may either be NULL or be used for transname suffixes */
-extern struct dentry *d_lookup(struct dentry *, struct qstr *);
+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(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);
@@ -333,7 +336,6 @@ extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
 extern char *__d_path(const struct path *, const struct path *, char *, int);
 extern char *d_absolute_path(const struct path *, char *, int);
 extern char *d_path(const struct path *, char *, int);
-extern char *d_path_with_unreachable(const struct path *, char *, int);
 extern char *dentry_path_raw(struct dentry *, char *, int);
 extern char *dentry_path(struct dentry *, char *, int);
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 3bd46f766751..a975de1ff59f 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/device-mapper.h b/include/linux/device-mapper.h
index bf6afa2fc432..1e483fa7afb4 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -68,8 +68,8 @@ typedef void (*dm_postsuspend_fn) (struct dm_target *ti);
 typedef int (*dm_preresume_fn) (struct dm_target *ti);
 typedef void (*dm_resume_fn) (struct dm_target *ti);
-typedef int (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
+typedef void (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
-                             unsigned status_flags, char *result, unsigned maxlen);
+                              unsigned status_flags, char *result, unsigned maxlen);
 typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv);
@@ -175,6 +175,14 @@ struct target_type {
 #define DM_TARGET_IMMUTABLE             0x00000004
 #define dm_target_is_immutable(type)    ((type)->features & DM_TARGET_IMMUTABLE)
+/*
+ * Some targets need to be sent the same WRITE bio severals times so
+ * that they can send copies of it to different devices.  This function
+ * examines any supplied bio and returns the number of copies of it the
+ * target requires.
+ */
+typedef unsigned (*dm_num_write_bios_fn) (struct dm_target *ti, struct bio *bio);
 struct dm_target {
        struct dm_table *table;
        struct target_type *type;
@@ -187,26 +195,26 @@ struct dm_target {
        uint32_t max_io_len;
        /*
-         * A number of zero-length barrier requests that will be submitted
+         * A number of zero-length barrier bios that will be submitted
         * to the target for the purpose of flushing cache.
         *
-         * The request number can be accessed with dm_bio_get_target_request_nr.
+         * The bio number can be accessed with dm_bio_get_target_bio_nr.
-         * It is a responsibility of the target driver to remap these requests
+         * It is a responsibility of the target driver to remap these bios
         * to the real underlying devices.
         */
-        unsigned num_flush_requests;
+        unsigned num_flush_bios;
        /*
-         * The number of discard requests that will be submitted to the target.
+         * The number of discard bios that will be submitted to the target.
-         * The request number can be accessed with dm_bio_get_target_request_nr.
+         * The bio number can be accessed with dm_bio_get_target_bio_nr.
         */
-        unsigned num_discard_requests;
+        unsigned num_discard_bios;
        /*
-         * The number of WRITE SAME requests that will be submitted to the target.
+         * The number of WRITE SAME bios that will be submitted to the target.
-         * The request number can be accessed with dm_bio_get_target_request_nr.
+         * The bio number can be accessed with dm_bio_get_target_bio_nr.
         */
-        unsigned num_write_same_requests;
+        unsigned num_write_same_bios;
        /*
         * The minimum number of extra bytes allocated in each bio for the
@@ -214,6 +222,13 @@ struct dm_target {
         */
        unsigned per_bio_data_size;
+        /*
+         * If defined, this function is called to find out how many
+         * duplicate bios should be sent to the target when writing
+         * data.
+         */
+        dm_num_write_bios_fn num_write_bios;
        /* target specific data */
        void *private;
@@ -233,10 +248,10 @@ struct dm_target {
        bool discards_supported:1;
        /*
-         * Set if the target required discard request to be split
+         * Set if the target required discard bios to be split
         * on max_io_len boundary.
         */
-        bool split_discard_requests:1;
+        bool split_discard_bios:1;
        /*
         * Set if this target does not return zeroes on discarded blocks.
@@ -261,7 +276,7 @@ struct dm_target_io {
        struct dm_io *io;
        struct dm_target *ti;
        union map_info info;
-        unsigned target_request_nr;
+        unsigned target_bio_nr;
        struct bio clone;
 };
@@ -275,9 +290,9 @@ static inline struct bio *dm_bio_from_per_bio_data(void *data, size_t data_size)
        return (struct bio *)((char *)data + data_size + offsetof(struct dm_target_io, clone));
 }
-static inline unsigned dm_bio_get_target_request_nr(const struct bio *bio)
+static inline unsigned dm_bio_get_target_bio_nr(const struct bio *bio)
 {
-        return container_of(bio, struct dm_target_io, clone)->target_request_nr;
+        return container_of(bio, struct dm_target_io, clone)->target_bio_nr;
 }
 int dm_register_target(struct target_type *t);
diff --git a/include/linux/dm-kcopyd.h b/include/linux/dm-kcopyd.h
index 47d9d376e4e7..f486d636b82e 100644
--- a/include/linux/dm-kcopyd.h
+++ b/include/linux/dm-kcopyd.h
@@ -21,11 +21,34 @@
 #define DM_KCOPYD_IGNORE_ERROR 1
+struct dm_kcopyd_throttle {
+        unsigned throttle;
+        unsigned num_io_jobs;
+        unsigned io_period;
+        unsigned total_period;
+        unsigned last_jiffies;
+};
+/*
+ * kcopyd clients that want to support throttling must pass an initialised
+ * dm_kcopyd_throttle struct into dm_kcopyd_client_create().
+ * Two or more clients may share the same instance of this struct between
+ * them if they wish to be throttled as a group.
+ *
+ * This macro also creates a corresponding module parameter to configure
+ * the amount of throttling.
+ */
+#define DECLARE_DM_KCOPYD_THROTTLE_WITH_MODULE_PARM(name, description)  \
+static struct dm_kcopyd_throttle dm_kcopyd_throttle = { 100, 0, 0, 0, 0 }; \
+module_param_named(name, dm_kcopyd_throttle.throttle, uint, 0644); \
+MODULE_PARM_DESC(name, description)
 /*
 * To use kcopyd you must first create a dm_kcopyd_client object.
+ * throttle can be NULL if you don't want any throttling.
 */
 struct dm_kcopyd_client;
-struct dm_kcopyd_client *dm_kcopyd_client_create(void);
+struct dm_kcopyd_client *dm_kcopyd_client_create(struct dm_kcopyd_throttle *throttle);
 void dm_kcopyd_client_destroy(struct dm_kcopyd_client *kc);
 /*
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 3d754a394e92..9978b614a1aa 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -119,8 +119,10 @@ struct dma_buf {
        struct file *file;
        struct list_head attachments;
        const struct dma_buf_ops *ops;
-        /* mutex to serialize list manipulation and attach/detach */
+        /* mutex to serialize list manipulation, attach/detach and vmap/unmap */
        struct mutex lock;
+        unsigned vmapping_counter;
+        void *vmap_ptr;
        void *priv;
 };
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index d3201e438d16..91ac8da25020 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -608,7 +608,10 @@ static inline int dmaengine_device_control(struct dma_chan *chan,
                                           enum dma_ctrl_cmd cmd,
                                           unsigned long arg)
 {
-        return chan->device->device_control(chan, cmd, arg);
+        if (chan->device->device_control)
+                return chan->device->device_control(chan, cmd, arg);
+        return -ENOSYS;
 }
 static inline int dmaengine_slave_config(struct dma_chan *chan,
@@ -618,6 +621,11 @@ static inline int dmaengine_slave_config(struct dma_chan *chan,
                        (unsigned long)config);
 }
+static inline bool is_slave_direction(enum dma_transfer_direction direction)
+{
+        return (direction == DMA_MEM_TO_DEV) || (direction == DMA_DEV_TO_MEM);
+}
 static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
        struct dma_chan *chan, dma_addr_t buf, size_t len,
        enum dma_transfer_direction dir, unsigned long flags)
@@ -660,6 +668,13 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic(
                                                period_len, dir, flags, NULL);
 }
+static inline struct dma_async_tx_descriptor *dmaengine_prep_interleaved_dma(
+                struct dma_chan *chan, struct dma_interleaved_template *xt,
+                unsigned long flags)
+{
+        return chan->device->device_prep_interleaved_dma(chan, xt, flags);
+}
 static inline int dmaengine_terminate_all(struct dma_chan *chan)
 {
        return dmaengine_device_control(chan, DMA_TERMINATE_ALL, 0);
@@ -849,20 +864,6 @@ static inline bool async_tx_test_ack(struct dma_async_tx_descriptor *tx)
        return (tx->flags & DMA_CTRL_ACK) == DMA_CTRL_ACK;
 }
-#define first_dma_cap(mask) __first_dma_cap(&(mask))
-static inline int __first_dma_cap(const dma_cap_mask_t *srcp)
-{
-        return min_t(int, DMA_TX_TYPE_END,
-                find_first_bit(srcp->bits, DMA_TX_TYPE_END));
-}
-#define next_dma_cap(n, mask) __next_dma_cap((n), &(mask))
-static inline int __next_dma_cap(int n, const dma_cap_mask_t *srcp)
-{
-        return min_t(int, DMA_TX_TYPE_END,
-                find_next_bit(srcp->bits, DMA_TX_TYPE_END, n+1));
-}
 #define dma_cap_set(tx, mask) __dma_cap_set((tx), &(mask))
 static inline void
 __dma_cap_set(enum dma_transaction_type tx_type, dma_cap_mask_t *dstp)
@@ -891,9 +892,7 @@ __dma_has_cap(enum dma_transaction_type tx_type, dma_cap_mask_t *srcp)
 }
 #define for_each_dma_cap_mask(cap, mask) \
-        for ((cap) = first_dma_cap(mask);       \
+        for_each_set_bit(cap, mask.bits, DMA_TX_TYPE_END)
-                (cap) < DMA_TX_TYPE_END;        \
-                (cap) = next_dma_cap((cap), (mask)))
 /**
 * dma_async_issue_pending - flush pending transactions to HW
@@ -907,8 +906,6 @@ static inline void dma_async_issue_pending(struct dma_chan *chan)
        chan->device->device_issue_pending(chan);
 }
-#define dma_async_memcpy_issue_pending(chan) dma_async_issue_pending(chan)
 /**
 * dma_async_is_tx_complete - poll for transaction completion
 * @chan: DMA channel
@@ -934,16 +931,13 @@ static inline enum dma_status dma_async_is_tx_complete(struct dma_chan *chan,
        return status;
 }
-#define dma_async_memcpy_complete(chan, cookie, last, used)\
-        dma_async_is_tx_complete(chan, cookie, last, used)
 /**
 * dma_async_is_complete - test a cookie against chan state
 * @cookie: transaction identifier to test status of
 * @last_complete: last know completed transaction
 * @last_used: last cookie value handed out
 *
- * dma_async_is_complete() is used in dma_async_memcpy_complete()
+ * dma_async_is_complete() is used in dma_async_is_tx_complete()
 * the test logic is separated for lightweight testing of multiple cookies
 */
 static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie,
@@ -974,6 +968,7 @@ 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(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param);
+struct dma_chan *dma_request_slave_channel(struct device *dev, char *name);
 void dma_release_channel(struct dma_chan *chan);
 #else
 static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
@@ -988,6 +983,11 @@ static inline struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask,
 {
        return NULL;
 }
+static inline struct dma_chan *dma_request_slave_channel(struct device *dev,
+                                                         char *name)
+{
+        return NULL;
+}
 static inline void dma_release_channel(struct dma_chan *chan)
 {
 }
@@ -1001,6 +1001,22 @@ 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 *net_dma_find_channel(void);
 #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
+#define dma_request_slave_channel_compat(mask, x, y, dev, name) \
+        __dma_request_slave_channel_compat(&(mask), x, y, dev, name)
+static inline struct dma_chan
+*__dma_request_slave_channel_compat(dma_cap_mask_t *mask, dma_filter_fn fn,
+                                  void *fn_param, struct device *dev,
+                                  char *name)
+{
+        struct dma_chan *chan;
+        chan = dma_request_slave_channel(dev, name);
+        if (chan)
+                return chan;
+        return __dma_request_channel(mask, fn, fn_param);
+}
 /* --- Helper iov-locking functions --- */
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index e1c8c9e919ac..481ab2345d6b 100644
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -15,14 +15,37 @@
 #include <linux/dmaengine.h>
 /**
+ * struct dw_dma_slave - Controller-specific information about a slave
+ *
+ * @dma_dev: required DMA master device. Depricated.
+ * @bus_id: name of this device channel, not just a device name since
+ *          devices may have more than one channel e.g. "foo_tx"
+ * @cfg_hi: Platform-specific initializer for the CFG_HI register
+ * @cfg_lo: Platform-specific initializer for the CFG_LO register
+ * @src_master: src master for transfers on allocated channel.
+ * @dst_master: dest master for transfers on allocated channel.
+ */
+struct dw_dma_slave {
+        struct device           *dma_dev;
+        u32                     cfg_hi;
+        u32                     cfg_lo;
+        u8                      src_master;
+        u8                      dst_master;
+};
+/**
 * struct dw_dma_platform_data - Controller configuration parameters
 * @nr_channels: Number of channels supported by hardware (max 8)
 * @is_private: The device channels should be marked as private and not for
 *      by the general purpose DMA channel allocator.
+ * @chan_allocation_order: Allocate channels starting from 0 or 7
+ * @chan_priority: Set channel priority increasing from 0 to 7 or 7 to 0.
 * @block_size: Maximum block size supported by the controller
 * @nr_masters: Number of AHB masters supported by the controller
 * @data_width: Maximum data width supported by hardware per AHB master
 *              (0 - 8bits, 1 - 16bits, ..., 5 - 256bits)
+ * @sd: slave specific data. Used for configuring channels
+ * @sd_count: count of slave data structures passed.
 */
 struct dw_dma_platform_data {
        unsigned int    nr_channels;
@@ -50,23 +73,6 @@ enum dw_dma_msize {
        DW_DMA_MSIZE_256,
 };
-/**
- * struct dw_dma_slave - Controller-specific information about a slave
- *
- * @dma_dev: required DMA master device
- * @cfg_hi: Platform-specific initializer for the CFG_HI register
- * @cfg_lo: Platform-specific initializer for the CFG_LO register
- * @src_master: src master for transfers on allocated channel.
- * @dst_master: dest master for transfers on allocated channel.
- */
-struct dw_dma_slave {
-        struct device           *dma_dev;
-        u32                     cfg_hi;
-        u32                     cfg_lo;
-        u8                      src_master;
-        u8                      dst_master;
-};
 /* Platform-configurable bits in CFG_HI */
 #define DWC_CFGH_FCMODE         (1 << 0)
 #define DWC_CFGH_FIFO_MODE      (1 << 1)
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 1b8c02b36f76..4fd4999ccb5b 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -14,7 +14,6 @@
 #include <linux/atomic.h>
 #include <linux/device.h>
-#include <linux/kobject.h>
 #include <linux/completion.h>
 #include <linux/workqueue.h>
 #include <linux/debugfs.h>
@@ -48,8 +47,17 @@ static inline void opstate_init(void)
        return;
 }
+/* Max length of a DIMM label*/
 #define EDAC_MC_LABEL_LEN       31
-#define MC_PROC_NAME_MAX_LEN    7
+/* Maximum size of the location string */
+#define LOCATION_SIZE 80
+/* Defines the maximum number of labels that can be reported */
+#define EDAC_MAX_LABELS         8
+/* String used to join two or more labels */
+#define OTHER_LABEL " or "
 /**
 * enum dev_type - describe the type of memory DRAM chips used at the stick
@@ -101,8 +109,24 @@ enum hw_event_mc_err_type {
        HW_EVENT_ERR_CORRECTED,
        HW_EVENT_ERR_UNCORRECTED,
        HW_EVENT_ERR_FATAL,
+        HW_EVENT_ERR_INFO,
 };
+static inline char *mc_event_error_type(const unsigned int err_type)
+{
+        switch (err_type) {
+        case HW_EVENT_ERR_CORRECTED:
+                return "Corrected";
+        case HW_EVENT_ERR_UNCORRECTED:
+                return "Uncorrected";
+        case HW_EVENT_ERR_FATAL:
+                return "Fatal";
+        default:
+        case HW_EVENT_ERR_INFO:
+                return "Info";
+        }
+}
 /**
 * enum mem_type - memory types. For a more detailed reference, please see
 *                      http://en.wikipedia.org/wiki/DRAM
@@ -376,6 +400,9 @@ enum scrub_type {
 * @EDAC_MC_LAYER_CHANNEL:      memory layer is named "channel"
 * @EDAC_MC_LAYER_SLOT:         memory layer is named "slot"
 * @EDAC_MC_LAYER_CHIP_SELECT:  memory layer is named "chip select"
+ * @EDAC_MC_LAYER_ALL_MEM:      memory layout is unknown. All memory is mapped
+ *                              as a single memory area. This is used when
+ *                              retrieving errors from a firmware driven driver.
 *
 * This enum is used by the drivers to tell edac_mc_sysfs what name should
 * be used when describing a memory stick location.
@@ -385,6 +412,7 @@ enum edac_mc_layer_type {
        EDAC_MC_LAYER_CHANNEL,
        EDAC_MC_LAYER_SLOT,
        EDAC_MC_LAYER_CHIP_SELECT,
+        EDAC_MC_LAYER_ALL_MEM,
 };
 /**
@@ -551,6 +579,46 @@ struct errcount_attribute_data {
        int layer0, layer1, layer2;
 };
+/**
+ * edac_raw_error_desc - Raw error report structure
+ * @grain:                      minimum granularity for an error report, in bytes
+ * @error_count:                number of errors of the same type
+ * @top_layer:                  top layer of the error (layer[0])
+ * @mid_layer:                  middle layer of the error (layer[1])
+ * @low_layer:                  low layer of the error (layer[2])
+ * @page_frame_number:          page where the error happened
+ * @offset_in_page:             page offset
+ * @syndrome:                   syndrome of the error (or 0 if unknown or if
+ *                              the syndrome is not applicable)
+ * @msg:                        error message
+ * @location:                   location of the error
+ * @label:                      label of the affected DIMM(s)
+ * @other_detail:               other driver-specific detail about the error
+ * @enable_per_layer_report:    if false, the error affects all layers
+ *                              (typically, a memory controller error)
+ */
+struct edac_raw_error_desc {
+        /*
+         * NOTE: everything before grain won't be cleaned by
+         * edac_raw_error_desc_clean()
+         */
+        char location[LOCATION_SIZE];
+        char label[(EDAC_MC_LABEL_LEN + 1 + sizeof(OTHER_LABEL)) * EDAC_MAX_LABELS];
+        long grain;
+        /* the vars below and grain will be cleaned on every new error report */
+        u16 error_count;
+        int top_layer;
+        int mid_layer;
+        int low_layer;
+        unsigned long page_frame_number;
+        unsigned long offset_in_page;
+        unsigned long syndrome;
+        const char *msg;
+        const char *other_detail;
+        bool enable_per_layer_report;
+};
 /* MEMORY controller information structure
 */
 struct mem_ctl_info {
@@ -630,7 +698,6 @@ struct mem_ctl_info {
        const char *mod_ver;
        const char *ctl_name;
        const char *dev_name;
-        char proc_name[MC_PROC_NAME_MAX_LEN + 1];
        void *pvt_info;
        unsigned long start_time;       /* mci load start time (in jiffies) */
@@ -659,6 +726,12 @@ struct mem_ctl_info {
        /* work struct for this MC */
        struct delayed_work work;
+        /*
+         * Used to report an error - by being at the global struct
+         * makes the memory allocated by the EDAC core
+         */
+        struct edac_raw_error_desc error_desc;
        /* the internal state of this controller instance */
        int op_state;
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 186620631750..acd0312d46fb 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -2,6 +2,7 @@
 #define _LINUX_ELEVATOR_H
 #include <linux/percpu.h>
+#include <linux/hashtable.h>
 #ifdef CONFIG_BLOCK
@@ -96,6 +97,8 @@ struct elevator_type
        struct list_head list;
 };
+#define ELV_HASH_BITS 6
 /*
 * each queue has an elevator_queue associated with it
 */
@@ -105,8 +108,8 @@ struct elevator_queue
        void *elevator_data;
        struct kobject kobj;
        struct mutex sysfs_lock;
-        struct hlist_head *hash;
        unsigned int registered:1;
+        DECLARE_HASHTABLE(hash, ELV_HASH_BITS);
 };
 /*
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 8c9048e33463..40a3c0e01b2b 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -10,6 +10,10 @@
     Override in asm/elf.h as needed.  */
 # define elf_read_implies_exec(ex, have_pt_gnu_stack)   0
 #endif
+#ifndef SET_PERSONALITY
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
+#endif
 #if ELF_CLASS == ELFCLASS32
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index 3c3ef19a625a..cf5d2af61b81 100644
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -13,7 +13,7 @@
 #include <linux/wait.h>
 /*
- * CAREFUL: Check include/asm-generic/fcntl.h when defining
+ * CAREFUL: Check include/uapi/asm-generic/fcntl.h when defining
 * new flags, since they might collide with O_* ones. We want
 * to re-use O_* flags that couldn't possibly have a meaning
 * from eventfd, in order to leave a free define-space for
diff --git a/include/linux/fb.h b/include/linux/fb.h
index c7a95714b1fe..58b98606ac26 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -19,6 +19,8 @@ struct vm_area_struct;
 struct fb_info;
 struct device;
 struct file;
+struct videomode;
+struct device_node;
 /* Definitions below are used in the parsed monitor specs */
 #define FB_DPMS_ACTIVE_OFF      1
@@ -714,6 +716,12 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb);
 extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
 extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
+extern int of_get_fb_videomode(struct device_node *np,
+                               struct fb_videomode *fb,
+                               int index);
+extern int fb_videomode_from_videomode(const struct videomode *vm,
+                                       struct fb_videomode *fbmode);
 /* drivers/video/modedb.c */
 #define VESA_MODEDB_SIZE 34
 extern void fb_var_to_videomode(struct fb_videomode *mode,
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index e70df40d84f6..043a5cf8b5ba 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>
@@ -48,6 +49,8 @@ extern void thaw_kernel_threads(void);
 static inline bool try_to_freeze(void)
 {
+        if (!(current->flags & PF_NOFREEZE))
+                debug_check_no_locks_held();
        might_sleep();
        if (likely(!freezing(current)))
                return false;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7d2e893ec3d1..74a907b8b950 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -769,7 +769,7 @@ struct file {
        } f_u;
        struct path             f_path;
 #define f_dentry        f_path.dentry
-#define f_vfsmnt        f_path.mnt
+        struct inode            *f_inode;       /* cached value */
        const struct file_operations    *f_op;
        /*
@@ -1807,7 +1807,6 @@ struct file_system_type {
 #define FS_HAS_SUBTYPE          4
 #define FS_USERNS_MOUNT         8       /* Can be mounted by userns root */
 #define FS_USERNS_DEV_MOUNT     16 /* A userns mount does not imply MNT_NODEV */
-#define FS_REVAL_DOT            16384   /* Check the paths ".", ".." for staleness */
 #define FS_RENAME_DOES_D_MOVE   32768   /* FS will handle d_move() during rename() internally. */
        struct dentry *(*mount) (struct file_system_type *, int,
                       const char *, void *);
@@ -2217,6 +2216,11 @@ static inline bool execute_ok(struct inode *inode)
        return (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode);
 }
+static inline struct inode *file_inode(struct file *f)
+{
+        return f->f_inode;
+}
 /*
 * get_write_access() gets write permission for a file.
 * put_write_access() releases this write permission.
@@ -2239,7 +2243,7 @@ static inline int get_write_access(struct inode *inode)
 }
 static inline int deny_write_access(struct file *file)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
        return atomic_dec_unless_positive(&inode->i_writecount) ? 0 : -ETXTBSY;
 }
 static inline void put_write_access(struct inode * inode)
@@ -2249,7 +2253,7 @@ static inline void put_write_access(struct inode * inode)
 static inline void allow_write_access(struct file *file)
 {
        if (file)
-                atomic_inc(&file->f_path.dentry->d_inode->i_writecount);
+                atomic_inc(&file_inode(file)->i_writecount);
 }
 #ifdef CONFIG_IMA
 static inline void i_readcount_dec(struct inode *inode)
@@ -2274,6 +2278,7 @@ static inline void i_readcount_inc(struct inode *inode)
 extern int do_pipe_flags(int *, int);
 extern int kernel_read(struct file *, loff_t, char *, unsigned long);
+extern ssize_t kernel_write(struct file *, const char *, size_t, loff_t);
 extern struct file * open_exec(const char *);
 
 /* fs/dcache.c -- generic fs support functions */
@@ -2463,7 +2468,7 @@ extern int page_symlink(struct inode *inode, const char *symname, int len);
 extern const struct inode_operations page_symlink_inode_operations;
 extern int generic_readlink(struct dentry *, char __user *, int);
 extern void generic_fillattr(struct inode *, struct kstat *);
-extern int vfs_getattr(struct vfsmount *, struct dentry *, 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);
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index d0ae3a84bcfb..729eded4b24f 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -17,8 +17,8 @@ struct fs_struct {
 extern struct kmem_cache *fs_cachep;
 extern void exit_fs(struct task_struct *);
-extern void set_fs_root(struct fs_struct *, struct path *);
+extern void set_fs_root(struct fs_struct *, const struct path *);
-extern void set_fs_pwd(struct fs_struct *, struct path *);
+extern void set_fs_pwd(struct fs_struct *, const struct path *);
 extern struct fs_struct *copy_fs_struct(struct fs_struct *);
 extern void free_fs_struct(struct fs_struct *);
 extern int unshare_fs_struct(void);
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 0fbfb4646d1b..a78680a92dba 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -244,7 +244,7 @@ static inline void fsnotify_open(struct file *file)
 static inline void fsnotify_close(struct file *file)
 {
        struct path *path = &file->f_path;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
        fmode_t mode = file->f_mode;
        __u32 mask = (mode & FMODE_WRITE) ? FS_CLOSE_WRITE : FS_CLOSE_NOWRITE;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 79b8bba19363..9f3c275e053e 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -231,6 +231,12 @@ static inline void part_pack_uuid(const u8 *uuid_str, u8 *to)
        }
 }
+static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to)
+{
+        part_pack_uuid(uuid_str, to);
+        return 0;
+}
 static inline int disk_max_parts(struct gendisk *disk)
 {
        if (disk->flags & GENHD_FL_EXT_DEVT)
@@ -718,6 +724,10 @@ static inline dev_t blk_lookup_devt(const char *name, int partno)
        return devt;
 }
+static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to)
+{
+        return -EINVAL;
+}
 #endif /* CONFIG_BLOCK */
 #endif /* _LINUX_GENHD_H */
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index bfe665621536..f6c7ae3e223b 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -94,24 +94,12 @@ static inline int gpio_request(unsigned gpio, const char *label)
        return -ENOSYS;
 }
-static inline int devm_gpio_request(struct device *dev, unsigned gpio,
-                                    const char *label)
-{
-        return -ENOSYS;
-}
 static inline int gpio_request_one(unsigned gpio,
                                        unsigned long flags, const char *label)
 {
        return -ENOSYS;
 }
-static inline int devm_gpio_request_one(struct device *dev, unsigned gpio,
-                                        unsigned long flags, const char *label)
-{
-        return -ENOSYS;
-}
 static inline int gpio_request_array(const struct gpio *array, size_t num)
 {
        return -ENOSYS;
@@ -125,14 +113,6 @@ static inline void gpio_free(unsigned gpio)
        WARN_ON(1);
 }
-static inline void devm_gpio_free(struct device *dev, unsigned gpio)
-{
-        might_sleep();
-        /* GPIO can never have been requested */
-        WARN_ON(1);
-}
 static inline void gpio_free_array(const struct gpio *array, size_t num)
 {
        might_sleep();
@@ -248,4 +228,12 @@ gpiochip_remove_pin_ranges(struct gpio_chip *chip)
 #endif /* ! CONFIG_GENERIC_GPIO */
+struct device;
+/* bindings for managed devices that want to request gpios */
+int devm_gpio_request(struct device *dev, unsigned gpio, const char *label);
+int devm_gpio_request_one(struct device *dev, unsigned gpio,
+                          unsigned long flags, const char *label);
+void devm_gpio_free(struct device *dev, unsigned int gpio);
 #endif /* __LINUX_GPIO_H */
diff --git a/include/linux/hashtable.h b/include/linux/hashtable.h
index 227c62424f3c..a9df51f5d54c 100644
--- a/include/linux/hashtable.h
+++ b/include/linux/hashtable.h
@@ -115,51 +115,50 @@ static inline void hash_del_rcu(struct hlist_node *node)
 * hash_for_each - iterate over a hashtable
 * @name: hashtable to iterate
 * @bkt: integer to use as bucket loop cursor
- * @node: the &struct list_head to use as a loop cursor for each entry
 * @obj: the type * to use as a loop cursor for each entry
 * @member: the name of the hlist_node within the struct
 */
-#define hash_for_each(name, bkt, node, obj, member)                             \
+#define hash_for_each(name, bkt, obj, member)                           \
-        for ((bkt) = 0, node = NULL; node == NULL && (bkt) < HASH_SIZE(name); (bkt)++)\
+        for ((bkt) = 0, obj = NULL; obj == NULL && (bkt) < HASH_SIZE(name);\
-                hlist_for_each_entry(obj, node, &name[bkt], member)
+                        (bkt)++)\
+                hlist_for_each_entry(obj, &name[bkt], member)
 /**
 * hash_for_each_rcu - iterate over a rcu enabled hashtable
 * @name: hashtable to iterate
 * @bkt: integer to use as bucket loop cursor
- * @node: the &struct list_head to use as a loop cursor for each entry
 * @obj: the type * to use as a loop cursor for each entry
 * @member: the name of the hlist_node within the struct
 */
-#define hash_for_each_rcu(name, bkt, node, obj, member)                         \
+#define hash_for_each_rcu(name, bkt, obj, member)                       \
-        for ((bkt) = 0, node = NULL; node == NULL && (bkt) < HASH_SIZE(name); (bkt)++)\
+        for ((bkt) = 0, obj = NULL; obj == NULL && (bkt) < HASH_SIZE(name);\
-                hlist_for_each_entry_rcu(obj, node, &name[bkt], member)
+                        (bkt)++)\
+                hlist_for_each_entry_rcu(obj, &name[bkt], member)
 /**
 * hash_for_each_safe - iterate over a hashtable safe against removal of
 * hash entry
 * @name: hashtable to iterate
 * @bkt: integer to use as bucket loop cursor
- * @node: the &struct list_head to use as a loop cursor for each entry
 * @tmp: a &struct used for temporary storage
 * @obj: the type * to use as a loop cursor for each entry
 * @member: the name of the hlist_node within the struct
 */
-#define hash_for_each_safe(name, bkt, node, tmp, obj, member)                   \
+#define hash_for_each_safe(name, bkt, tmp, obj, member)                 \
-        for ((bkt) = 0, node = NULL; node == NULL && (bkt) < HASH_SIZE(name); (bkt)++)\
+        for ((bkt) = 0, obj = NULL; obj == NULL && (bkt) < HASH_SIZE(name);\
-                hlist_for_each_entry_safe(obj, node, tmp, &name[bkt], member)
+                        (bkt)++)\
+                hlist_for_each_entry_safe(obj, tmp, &name[bkt], member)
 /**
 * hash_for_each_possible - iterate over all possible objects hashing to the
 * same bucket
 * @name: hashtable to iterate
 * @obj: the type * to use as a loop cursor for each entry
- * @node: the &struct list_head to use as a loop cursor for each entry
 * @member: the name of the hlist_node within the struct
 * @key: the key of the objects to iterate over
 */
-#define hash_for_each_possible(name, obj, node, member, key)                    \
+#define hash_for_each_possible(name, obj, member, key)                  \
-        hlist_for_each_entry(obj, node, &name[hash_min(key, HASH_BITS(name))], member)
+        hlist_for_each_entry(obj, &name[hash_min(key, HASH_BITS(name))], member)
 /**
 * hash_for_each_possible_rcu - iterate over all possible objects hashing to the
@@ -167,25 +166,24 @@ static inline void hash_del_rcu(struct hlist_node *node)
 * in a rcu enabled hashtable
 * @name: hashtable to iterate
 * @obj: the type * to use as a loop cursor for each entry
- * @node: the &struct list_head to use as a loop cursor for each entry
 * @member: the name of the hlist_node within the struct
 * @key: the key of the objects to iterate over
 */
-#define hash_for_each_possible_rcu(name, obj, node, member, key)                \
+#define hash_for_each_possible_rcu(name, obj, member, key)              \
-        hlist_for_each_entry_rcu(obj, node, &name[hash_min(key, HASH_BITS(name))], member)
+        hlist_for_each_entry_rcu(obj, &name[hash_min(key, HASH_BITS(name))],\
+                member)
 /**
 * hash_for_each_possible_safe - iterate over all possible objects hashing to the
 * same bucket safe against removals
 * @name: hashtable to iterate
 * @obj: the type * to use as a loop cursor for each entry
- * @node: the &struct list_head to use as a loop cursor for each entry
 * @tmp: a &struct used for temporary storage
 * @member: the name of the hlist_node within the struct
 * @key: the key of the objects to iterate over
 */
-#define hash_for_each_possible_safe(name, obj, node, tmp, member, key)          \
+#define hash_for_each_possible_safe(name, obj, tmp, member, key)        \
-        hlist_for_each_entry_safe(obj, node, tmp,                               \
+        hlist_for_each_entry_safe(obj, tmp,\
                &name[hash_min(key, HASH_BITS(name))], member)
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
new file mode 100644
index 000000000000..3b589440ecfe
--- /dev/null
+++ b/include/linux/hdmi.h
@@ -0,0 +1,231 @@
+/*
+ * Copyright (C) 2012 Avionic Design GmbH
+ *
+ * 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_HDMI_H_
+#define __LINUX_HDMI_H_
+#include <linux/types.h>
+enum hdmi_infoframe_type {
+        HDMI_INFOFRAME_TYPE_VENDOR = 0x81,
+        HDMI_INFOFRAME_TYPE_AVI = 0x82,
+        HDMI_INFOFRAME_TYPE_SPD = 0x83,
+        HDMI_INFOFRAME_TYPE_AUDIO = 0x84,
+};
+#define HDMI_INFOFRAME_HEADER_SIZE  4
+#define HDMI_AVI_INFOFRAME_SIZE    13
+#define HDMI_SPD_INFOFRAME_SIZE    25
+#define HDMI_AUDIO_INFOFRAME_SIZE  10
+enum hdmi_colorspace {
+        HDMI_COLORSPACE_RGB,
+        HDMI_COLORSPACE_YUV422,
+        HDMI_COLORSPACE_YUV444,
+};
+enum hdmi_scan_mode {
+        HDMI_SCAN_MODE_NONE,
+        HDMI_SCAN_MODE_OVERSCAN,
+        HDMI_SCAN_MODE_UNDERSCAN,
+};
+enum hdmi_colorimetry {
+        HDMI_COLORIMETRY_NONE,
+        HDMI_COLORIMETRY_ITU_601,
+        HDMI_COLORIMETRY_ITU_709,
+        HDMI_COLORIMETRY_EXTENDED,
+};
+enum hdmi_picture_aspect {
+        HDMI_PICTURE_ASPECT_NONE,
+        HDMI_PICTURE_ASPECT_4_3,
+        HDMI_PICTURE_ASPECT_16_9,
+};
+enum hdmi_active_aspect {
+        HDMI_ACTIVE_ASPECT_16_9_TOP = 2,
+        HDMI_ACTIVE_ASPECT_14_9_TOP = 3,
+        HDMI_ACTIVE_ASPECT_16_9_CENTER = 4,
+        HDMI_ACTIVE_ASPECT_PICTURE = 8,
+        HDMI_ACTIVE_ASPECT_4_3 = 9,
+        HDMI_ACTIVE_ASPECT_16_9 = 10,
+        HDMI_ACTIVE_ASPECT_14_9 = 11,
+        HDMI_ACTIVE_ASPECT_4_3_SP_14_9 = 13,
+        HDMI_ACTIVE_ASPECT_16_9_SP_14_9 = 14,
+        HDMI_ACTIVE_ASPECT_16_9_SP_4_3 = 15,
+};
+enum hdmi_extended_colorimetry {
+        HDMI_EXTENDED_COLORIMETRY_XV_YCC_601,
+        HDMI_EXTENDED_COLORIMETRY_XV_YCC_709,
+        HDMI_EXTENDED_COLORIMETRY_S_YCC_601,
+        HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601,
+        HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB,
+};
+enum hdmi_quantization_range {
+        HDMI_QUANTIZATION_RANGE_DEFAULT,
+        HDMI_QUANTIZATION_RANGE_LIMITED,
+        HDMI_QUANTIZATION_RANGE_FULL,
+};
+/* non-uniform picture scaling */
+enum hdmi_nups {
+        HDMI_NUPS_UNKNOWN,
+        HDMI_NUPS_HORIZONTAL,
+        HDMI_NUPS_VERTICAL,
+        HDMI_NUPS_BOTH,
+};
+enum hdmi_ycc_quantization_range {
+        HDMI_YCC_QUANTIZATION_RANGE_LIMITED,
+        HDMI_YCC_QUANTIZATION_RANGE_FULL,
+};
+enum hdmi_content_type {
+        HDMI_CONTENT_TYPE_NONE,
+        HDMI_CONTENT_TYPE_PHOTO,
+        HDMI_CONTENT_TYPE_CINEMA,
+        HDMI_CONTENT_TYPE_GAME,
+};
+struct hdmi_avi_infoframe {
+        enum hdmi_infoframe_type type;
+        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;
+        enum hdmi_active_aspect active_aspect;
+        bool itc;
+        enum hdmi_extended_colorimetry extended_colorimetry;
+        enum hdmi_quantization_range quantization_range;
+        enum hdmi_nups nups;
+        unsigned char video_code;
+        enum hdmi_ycc_quantization_range ycc_quantization_range;
+        enum hdmi_content_type content_type;
+        unsigned char pixel_repeat;
+        unsigned short top_bar;
+        unsigned short bottom_bar;
+        unsigned short left_bar;
+        unsigned short right_bar;
+};
+int hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame);
+ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer,
+                                size_t size);
+enum hdmi_spd_sdi {
+        HDMI_SPD_SDI_UNKNOWN,
+        HDMI_SPD_SDI_DSTB,
+        HDMI_SPD_SDI_DVDP,
+        HDMI_SPD_SDI_DVHS,
+        HDMI_SPD_SDI_HDDVR,
+        HDMI_SPD_SDI_DVC,
+        HDMI_SPD_SDI_DSC,
+        HDMI_SPD_SDI_VCD,
+        HDMI_SPD_SDI_GAME,
+        HDMI_SPD_SDI_PC,
+        HDMI_SPD_SDI_BD,
+        HDMI_SPD_SDI_SACD,
+        HDMI_SPD_SDI_HDDVD,
+        HDMI_SPD_SDI_PMP,
+};
+struct hdmi_spd_infoframe {
+        enum hdmi_infoframe_type type;
+        unsigned char version;
+        unsigned char length;
+        char vendor[8];
+        char product[16];
+        enum hdmi_spd_sdi sdi;
+};
+int hdmi_spd_infoframe_init(struct hdmi_spd_infoframe *frame,
+                            const char *vendor, const char *product);
+ssize_t hdmi_spd_infoframe_pack(struct hdmi_spd_infoframe *frame, void *buffer,
+                                size_t size);
+enum hdmi_audio_coding_type {
+        HDMI_AUDIO_CODING_TYPE_STREAM,
+        HDMI_AUDIO_CODING_TYPE_PCM,
+        HDMI_AUDIO_CODING_TYPE_AC3,
+        HDMI_AUDIO_CODING_TYPE_MPEG1,
+        HDMI_AUDIO_CODING_TYPE_MP3,
+        HDMI_AUDIO_CODING_TYPE_MPEG2,
+        HDMI_AUDIO_CODING_TYPE_AAC_LC,
+        HDMI_AUDIO_CODING_TYPE_DTS,
+        HDMI_AUDIO_CODING_TYPE_ATRAC,
+        HDMI_AUDIO_CODING_TYPE_DSD,
+        HDMI_AUDIO_CODING_TYPE_EAC3,
+        HDMI_AUDIO_CODING_TYPE_DTS_HD,
+        HDMI_AUDIO_CODING_TYPE_MLP,
+        HDMI_AUDIO_CODING_TYPE_DST,
+        HDMI_AUDIO_CODING_TYPE_WMA_PRO,
+};
+enum hdmi_audio_sample_size {
+        HDMI_AUDIO_SAMPLE_SIZE_STREAM,
+        HDMI_AUDIO_SAMPLE_SIZE_16,
+        HDMI_AUDIO_SAMPLE_SIZE_20,
+        HDMI_AUDIO_SAMPLE_SIZE_24,
+};
+enum hdmi_audio_sample_frequency {
+        HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM,
+        HDMI_AUDIO_SAMPLE_FREQUENCY_32000,
+        HDMI_AUDIO_SAMPLE_FREQUENCY_44100,
+        HDMI_AUDIO_SAMPLE_FREQUENCY_48000,
+        HDMI_AUDIO_SAMPLE_FREQUENCY_88200,
+        HDMI_AUDIO_SAMPLE_FREQUENCY_96000,
+        HDMI_AUDIO_SAMPLE_FREQUENCY_176400,
+        HDMI_AUDIO_SAMPLE_FREQUENCY_192000,
+};
+enum hdmi_audio_coding_type_ext {
+        HDMI_AUDIO_CODING_TYPE_EXT_STREAM,
+        HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC,
+        HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2,
+        HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND,
+};
+struct hdmi_audio_infoframe {
+        enum hdmi_infoframe_type type;
+        unsigned char version;
+        unsigned char length;
+        unsigned char channels;
+        enum hdmi_audio_coding_type coding_type;
+        enum hdmi_audio_sample_size sample_size;
+        enum hdmi_audio_sample_frequency sample_frequency;
+        enum hdmi_audio_coding_type_ext coding_type_ext;
+        unsigned char channel_allocation;
+        unsigned char level_shift_value;
+        bool downmix_inhibit;
+};
+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);
+struct hdmi_vendor_infoframe {
+        enum hdmi_infoframe_type type;
+        unsigned char version;
+        unsigned char length;
+        u8 data[27];
+};
+ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
+                                   void *buffer, size_t size);
+#endif /* _DRM_HDMI_H */
diff --git a/include/linux/hsi/hsi.h b/include/linux/hsi/hsi.h
index 56fae865e272..0dca785288cf 100644
--- a/include/linux/hsi/hsi.h
+++ b/include/linux/hsi/hsi.h
@@ -121,9 +121,9 @@ static inline int hsi_register_board_info(struct hsi_board_info const *info,
 * @device: Driver model representation of the device
 * @tx_cfg: HSI TX configuration
 * @rx_cfg: HSI RX configuration
- * @e_handler: Callback for handling port events (RX Wake High/Low)
+ * e_handler: Callback for handling port events (RX Wake High/Low)
- * @pclaimed: Keeps tracks if the clients claimed its associated HSI port
+ * pclaimed: Keeps tracks if the clients claimed its associated HSI port
- * @nb: Notifier block for port events
+ * nb: Notifier block for port events
 */
 struct hsi_client {
        struct device           device;
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index eedc334fb6f5..16e4e9a643fb 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -281,7 +281,7 @@ static inline struct hstate *hstate_inode(struct inode *i)
 static inline struct hstate *hstate_file(struct file *f)
 {
-        return hstate_inode(f->f_dentry->d_inode);
+        return hstate_inode(file_inode(f));
 }
 static inline struct hstate *hstate_vma(struct vm_area_struct *vma)
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 1ff54b114efc..488debbef895 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -39,51 +39,55 @@
 * address each module uses within a given i2c slave.
 */
+/* Module IDs for similar functionalities found in twl4030/twl6030 */
+enum twl_module_ids {
+        TWL_MODULE_USB,
+        TWL_MODULE_PIH,
+        TWL_MODULE_MAIN_CHARGE,
+        TWL_MODULE_PM_MASTER,
+        TWL_MODULE_PM_RECEIVER,
+        TWL_MODULE_RTC,
+        TWL_MODULE_PWM,
+        TWL_MODULE_LED,
+        TWL_MODULE_SECURED_REG,
+        TWL_MODULE_LAST,
+};
+/* Modules only available in twl4030 series */
 enum twl4030_module_ids {
-        TWL4030_MODULE_USB = 0,         /* Slave 0 (i2c address 0x48) */
+        TWL4030_MODULE_AUDIO_VOICE = TWL_MODULE_LAST,
-        TWL4030_MODULE_AUDIO_VOICE,     /* Slave 1 (i2c address 0x49) */
        TWL4030_MODULE_GPIO,
        TWL4030_MODULE_INTBR,
-        TWL4030_MODULE_PIH,
        TWL4030_MODULE_TEST,
-        TWL4030_MODULE_KEYPAD,          /* Slave 2 (i2c address 0x4a) */
+        TWL4030_MODULE_KEYPAD,
        TWL4030_MODULE_MADC,
        TWL4030_MODULE_INTERRUPTS,
-        TWL4030_MODULE_LED,
-        TWL4030_MODULE_MAIN_CHARGE,
        TWL4030_MODULE_PRECHARGE,
-        TWL4030_MODULE_PWM0,
+        TWL4030_MODULE_BACKUP,
-        TWL4030_MODULE_PWM1,
+        TWL4030_MODULE_INT,
-        TWL4030_MODULE_PWMA,
-        TWL4030_MODULE_PWMB,
        TWL5031_MODULE_ACCESSORY,
        TWL5031_MODULE_INTERRUPTS,
-        TWL4030_MODULE_BACKUP,          /* Slave 3 (i2c address 0x4b) */
-        TWL4030_MODULE_INT,
-        TWL4030_MODULE_PM_MASTER,
-        TWL4030_MODULE_PM_RECEIVER,
-        TWL4030_MODULE_RTC,
-        TWL4030_MODULE_SECURED_REG,
        TWL4030_MODULE_LAST,
 };
-/* Similar functionalities implemented in TWL4030/6030 */
+/* Modules only available in twl6030 series */
-#define TWL_MODULE_USB          TWL4030_MODULE_USB
+enum twl6030_module_ids {
-#define TWL_MODULE_PIH          TWL4030_MODULE_PIH
+        TWL6030_MODULE_ID0 = TWL_MODULE_LAST,
-#define TWL_MODULE_MAIN_CHARGE  TWL4030_MODULE_MAIN_CHARGE
+        TWL6030_MODULE_ID1,
-#define TWL_MODULE_PM_MASTER    TWL4030_MODULE_PM_MASTER
+        TWL6030_MODULE_ID2,
-#define TWL_MODULE_PM_RECEIVER  TWL4030_MODULE_PM_RECEIVER
+        TWL6030_MODULE_GPADC,
-#define TWL_MODULE_RTC          TWL4030_MODULE_RTC
+        TWL6030_MODULE_GASGAUGE,
-#define TWL_MODULE_PWM          TWL4030_MODULE_PWM0
-#define TWL_MODULE_LED          TWL4030_MODULE_LED
+        TWL6030_MODULE_LAST,
+};
-#define TWL6030_MODULE_ID0      13
+/* Until the clients has been converted to use TWL_MODULE_LED */
-#define TWL6030_MODULE_ID1      14
+#define TWL4030_MODULE_LED      TWL_MODULE_LED
-#define TWL6030_MODULE_ID2      15
 #define GPIO_INTR_OFFSET        0
 #define KEYPAD_INTR_OFFSET      1
@@ -171,20 +175,22 @@ TWL_CLASS_IS(4030, TWL4030_CLASS_ID)
 TWL_CLASS_IS(6030, TWL6030_CLASS_ID)
 /*
- * Read and write single 8-bit registers
- */
-int twl_i2c_write_u8(u8 mod_no, u8 val, u8 reg);
-int twl_i2c_read_u8(u8 mod_no, u8 *val, u8 reg);
-/*
 * Read and write several 8-bit registers at once.
- *
- * IMPORTANT:  For twl_i2c_write(), allocate num_bytes + 1
- * for the value, and populate your data starting at offset 1.
 */
 int twl_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
 int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
+/*
+ * Read and write single 8-bit registers
+ */
+static inline int twl_i2c_write_u8(u8 mod_no, u8 val, u8 reg) {
+        return twl_i2c_write(mod_no, &val, reg, 1);
+}
+static inline int twl_i2c_read_u8(u8 mod_no, u8 *val, u8 reg) {
+        return twl_i2c_read(mod_no, val, reg, 1);
+}
 int twl_get_type(void);
 int twl_get_version(void);
 int twl_get_hfclk_rate(void);
diff --git a/include/linux/idr.h b/include/linux/idr.h
index e5eb125effe6..a6f38b5c34e4 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -17,69 +17,40 @@
 #include <linux/init.h>
 #include <linux/rcupdate.h>
-#if BITS_PER_LONG == 32
+/*
-# define IDR_BITS 5
+ * We want shallower trees and thus more bits covered at each layer.  8
-# define IDR_FULL 0xfffffffful
+ * bits gives us large enough first layer for most use cases and maximum
-/* We can only use two of the bits in the top level because there is
+ * tree depth of 4.  Each idr_layer is slightly larger than 2k on 64bit and
-   only one possible bit in the top level (5 bits * 7 levels = 35
+ * 1k on 32bit.
-   bits, but you only use 31 bits in the id). */
+ */
-# define TOP_LEVEL_FULL (IDR_FULL >> 30)
+#define IDR_BITS 8
-#elif BITS_PER_LONG == 64
-# define IDR_BITS 6
-# define IDR_FULL 0xfffffffffffffffful
-/* We can only use two of the bits in the top level because there is
-   only one possible bit in the top level (6 bits * 6 levels = 36
-   bits, but you only use 31 bits in the id). */
-# define TOP_LEVEL_FULL (IDR_FULL >> 62)
-#else
-# error "BITS_PER_LONG is not 32 or 64"
-#endif
 #define IDR_SIZE (1 << IDR_BITS)
 #define IDR_MASK ((1 << IDR_BITS)-1)
-#define MAX_IDR_SHIFT (sizeof(int)*8 - 1)
-#define MAX_IDR_BIT (1U << MAX_IDR_SHIFT)
-#define MAX_IDR_MASK (MAX_IDR_BIT - 1)
-/* Leave the possibility of an incomplete final layer */
-#define MAX_IDR_LEVEL ((MAX_IDR_SHIFT + IDR_BITS - 1) / IDR_BITS)
-/* Number of id_layer structs to leave in free list */
-#define MAX_IDR_FREE (MAX_IDR_LEVEL * 2)
 struct idr_layer {
-        unsigned long            bitmap; /* A zero bit means "space here" */
+        int                     prefix; /* the ID prefix of this idr_layer */
+        DECLARE_BITMAP(bitmap, IDR_SIZE); /* A zero bit means "space here" */
        struct idr_layer __rcu  *ary[1<<IDR_BITS];
-        int                      count;  /* When zero, we can release it */
+        int                     count;  /* When zero, we can release it */
-        int                      layer;  /* distance from leaf */
+        int                     layer;  /* distance from leaf */
-        struct rcu_head          rcu_head;
+        struct rcu_head         rcu_head;
 };
 struct idr {
-        struct idr_layer __rcu *top;
+        struct idr_layer __rcu  *hint;  /* the last layer allocated from */
-        struct idr_layer *id_free;
+        struct idr_layer __rcu  *top;
-        int               layers; /* only valid without concurrent changes */
+        struct idr_layer        *id_free;
-        int               id_free_cnt;
+        int                     layers; /* only valid w/o concurrent changes */
-        spinlock_t        lock;
+        int                     id_free_cnt;
+        spinlock_t              lock;
 };
-#define IDR_INIT(name)                                          \
+#define IDR_INIT(name)                                                  \
-{                                                               \
+{                                                                       \
-        .top            = NULL,                                 \
+        .lock                   = __SPIN_LOCK_UNLOCKED(name.lock),      \
-        .id_free        = NULL,                                 \
-        .layers         = 0,                                    \
-        .id_free_cnt    = 0,                                    \
-        .lock           = __SPIN_LOCK_UNLOCKED(name.lock),      \
 }
 #define DEFINE_IDR(name)        struct idr name = IDR_INIT(name)
-/* Actions to be taken after a call to _idr_sub_alloc */
-#define IDR_NEED_TO_GROW -2
-#define IDR_NOMORE_SPACE -3
-#define _idr_rc_to_errno(rc) ((rc) == -1 ? -EAGAIN : -ENOSPC)
 /**
 * DOC: idr sync
 * idr synchronization (stolen from radix-tree.h)
@@ -101,19 +72,90 @@ struct idr {
 * This is what we export.
 */
-void *idr_find(struct idr *idp, int id);
+void *idr_find_slowpath(struct idr *idp, int id);
 int idr_pre_get(struct idr *idp, gfp_t gfp_mask);
-int idr_get_new(struct idr *idp, void *ptr, int *id);
 int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);
+void idr_preload(gfp_t gfp_mask);
+int idr_alloc(struct idr *idp, void *ptr, int start, int end, gfp_t gfp_mask);
 int idr_for_each(struct idr *idp,
                 int (*fn)(int id, void *p, void *data), void *data);
 void *idr_get_next(struct idr *idp, int *nextid);
 void *idr_replace(struct idr *idp, void *ptr, int id);
 void idr_remove(struct idr *idp, int id);
-void idr_remove_all(struct idr *idp);
+void idr_free(struct idr *idp, int id);
 void idr_destroy(struct idr *idp);
 void idr_init(struct idr *idp);
+/**
+ * idr_preload_end - end preload section started with idr_preload()
+ *
+ * Each idr_preload() should be matched with an invocation of this
+ * function.  See idr_preload() for details.
+ */
+static inline void idr_preload_end(void)
+{
+        preempt_enable();
+}
+/**
+ * idr_find - return pointer for given id
+ * @idp: idr handle
+ * @id: lookup key
+ *
+ * Return the pointer given the id it has been registered with.  A %NULL
+ * return indicates that @id is not valid or you passed %NULL in
+ * idr_get_new().
+ *
+ * This function can be called under rcu_read_lock(), given that the leaf
+ * pointers lifetimes are correctly managed.
+ */
+static inline void *idr_find(struct idr *idr, int id)
+{
+        struct idr_layer *hint = rcu_dereference_raw(idr->hint);
+        if (hint && (id & ~IDR_MASK) == hint->prefix)
+                return rcu_dereference_raw(hint->ary[id & IDR_MASK]);
+        return idr_find_slowpath(idr, id);
+}
+/**
+ * idr_get_new - allocate new idr entry
+ * @idp: idr handle
+ * @ptr: pointer you want associated with the id
+ * @id: pointer to the allocated handle
+ *
+ * Simple wrapper around idr_get_new_above() w/ @starting_id of zero.
+ */
+static inline int idr_get_new(struct idr *idp, void *ptr, int *id)
+{
+        return idr_get_new_above(idp, ptr, 0, id);
+}
+/**
+ * idr_for_each_entry - iterate over an idr's elements of a given type
+ * @idp:     idr handle
+ * @entry:   the type * to use as cursor
+ * @id:      id entry's key
+ */
+#define idr_for_each_entry(idp, entry, id)                              \
+        for (id = 0, entry = (typeof(entry))idr_get_next((idp), &(id)); \
+             entry != NULL;                                             \
+             ++id, entry = (typeof(entry))idr_get_next((idp), &(id)))
+void __idr_remove_all(struct idr *idp); /* don't use */
+/**
+ * idr_remove_all - remove all ids from the given idr tree
+ * @idp: idr handle
+ *
+ * If you're trying to destroy @idp, calling idr_destroy() is enough.
+ * This is going away.  Don't use.
+ */
+static inline void __deprecated idr_remove_all(struct idr *idp)
+{
+        __idr_remove_all(idp);
+}
 /*
 * IDA - IDR based id allocator, use when translation from id to
@@ -141,7 +183,6 @@ struct ida {
 int ida_pre_get(struct ida *ida, gfp_t gfp_mask);
 int ida_get_new_above(struct ida *ida, int starting_id, int *p_id);
-int ida_get_new(struct ida *ida, int *p_id);
 void ida_remove(struct ida *ida, int id);
 void ida_destroy(struct ida *ida);
 void ida_init(struct ida *ida);
@@ -150,17 +191,18 @@ int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end,
                   gfp_t gfp_mask);
 void ida_simple_remove(struct ida *ida, unsigned int id);
-void __init idr_init_cache(void);
 /**
- * idr_for_each_entry - iterate over an idr's elements of a given type
+ * ida_get_new - allocate new ID
- * @idp:     idr handle
+ * @ida:        idr handle
- * @entry:   the type * to use as cursor
+ * @p_id:       pointer to the allocated handle
- * @id:      id entry's key
+ *
+ * Simple wrapper around ida_get_new_above() w/ @starting_id of zero.
 */
-#define idr_for_each_entry(idp, entry, id)                              \
+static inline int ida_get_new(struct ida *ida, int *p_id)
-        for (id = 0, entry = (typeof(entry))idr_get_next((idp), &(id)); \
+{
-             entry != NULL;                                             \
+        return ida_get_new_above(ida, 0, p_id);
-             ++id, entry = (typeof(entry))idr_get_next((idp), &(id)))
+}
+void __init idr_init_cache(void);
 #endif /* __IDR_H__ */
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 4648d8021244..cfd21e3d5506 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -216,11 +216,10 @@ static inline struct hlist_head *team_port_index_hash(struct team *team,
 static inline struct team_port *team_get_port_by_index(struct team *team,
                                                       int port_index)
 {
-        struct hlist_node *p;
        struct team_port *port;
        struct hlist_head *head = team_port_index_hash(team, port_index);
-        hlist_for_each_entry(port, p, head, hlist)
+        hlist_for_each_entry(port, head, hlist)
                if (port->index == port_index)
                        return port;
        return NULL;
@@ -228,11 +227,10 @@ static inline struct team_port *team_get_port_by_index(struct team *team,
 static inline struct team_port *team_get_port_by_index_rcu(struct team *team,
                                                           int port_index)
 {
-        struct hlist_node *p;
        struct team_port *port;
        struct hlist_head *head = team_port_index_hash(team, port_index);
-        hlist_for_each_entry_rcu(port, p, head, hlist)
+        hlist_for_each_entry_rcu(port, head, hlist)
                if (port->index == port_index)
                        return port;
        return NULL;
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index d06cc5c8f58c..218a3b686d90 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -331,7 +331,7 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
                                        struct vlan_hdr *vhdr)
 {
        __be16 proto;
-        unsigned char *rawp;
+        unsigned short *rawp;
        /*
         * Was a VLAN packet, grab the encapsulated protocol, which the layer
@@ -344,8 +344,8 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
                return;
        }
-        rawp = skb->data;
+        rawp = (unsigned short *)(vhdr + 1);
-        if (*(unsigned short *) rawp == 0xFFFF)
+        if (*rawp == 0xFFFF)
                /*
                 * This is a magic hack to spot IPX packets. Older Novell
                 * breaks the protocol design and runs IPX over 802.3 without
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index f3b99e1c1042..ba3b8a98a049 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -58,8 +58,10 @@ struct iommu_domain {
 #define IOMMU_CAP_INTR_REMAP            0x2     /* isolates device intrs */
 enum iommu_attr {
-        DOMAIN_ATTR_MAX,
        DOMAIN_ATTR_GEOMETRY,
+        DOMAIN_ATTR_PAGING,
+        DOMAIN_ATTR_WINDOWS,
+        DOMAIN_ATTR_MAX,
 };
 #ifdef CONFIG_IOMMU_API
@@ -100,6 +102,16 @@ struct iommu_ops {
                               enum iommu_attr attr, void *data);
        int (*domain_set_attr)(struct iommu_domain *domain,
                               enum iommu_attr attr, void *data);
+        /* Window handling functions */
+        int (*domain_window_enable)(struct iommu_domain *domain, u32 wnd_nr,
+                                    phys_addr_t paddr, u64 size);
+        void (*domain_window_disable)(struct iommu_domain *domain, u32 wnd_nr);
+        /* Set the numer of window per domain */
+        int (*domain_set_windows)(struct iommu_domain *domain, u32 w_count);
+        /* Get the numer of window per domain */
+        u32 (*domain_get_windows)(struct iommu_domain *domain);
        unsigned long pgsize_bitmap;
 };
@@ -157,6 +169,10 @@ extern int iommu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr,
 extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr,
                                 void *data);
+/* Window handling function prototypes */
+extern int iommu_domain_window_enable(struct iommu_domain *domain, u32 wnd_nr,
+                                      phys_addr_t offset, u64 size);
+extern void iommu_domain_window_disable(struct iommu_domain *domain, u32 wnd_nr);
 /**
 * report_iommu_fault() - report about an IOMMU fault to the IOMMU framework
 * @domain: the iommu domain where the fault has happened
@@ -239,6 +255,18 @@ static inline int iommu_unmap(struct iommu_domain *domain, unsigned long iova,
        return -ENODEV;
 }
+static inline int iommu_domain_window_enable(struct iommu_domain *domain,
+                                             u32 wnd_nr, phys_addr_t paddr,
+                                             u64 size)
+{
+        return -ENODEV;
+}
+static inline void iommu_domain_window_disable(struct iommu_domain *domain,
+                                               u32 wnd_nr)
+{
+}
 static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,
                                             unsigned long iova)
 {
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 1487e7906bbd..1f9f56e28851 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -35,10 +35,6 @@
 #include <uapi/linux/ipmi.h>
-/*
- * The in-kernel interface.
- */
 #include <linux/list.h>
 #include <linux/proc_fs.h>
diff --git a/include/linux/irqchip/metag-ext.h b/include/linux/irqchip/metag-ext.h
new file mode 100644
index 000000000000..697af0fe7c5a
--- /dev/null
+++ b/include/linux/irqchip/metag-ext.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2012 Imagination Technologies
+ */
+#ifndef _LINUX_IRQCHIP_METAG_EXT_H_
+#define _LINUX_IRQCHIP_METAG_EXT_H_
+struct irq_data;
+struct platform_device;
+/* called from core irq code at init */
+int init_external_IRQ(void);
+/*
+ * called from SoC init_irq() callback to dynamically indicate the lack of
+ * HWMASKEXT registers.
+ */
+void meta_intc_no_mask(void);
+/*
+ * These allow SoCs to specialise the interrupt controller from their init_irq
+ * callbacks.
+ */
+extern struct irq_chip meta_intc_edge_chip;
+extern struct irq_chip meta_intc_level_chip;
+/* this should be called in the mask callback */
+void meta_intc_mask_irq_simple(struct irq_data *data);
+/* this should be called in the unmask callback */
+void meta_intc_unmask_irq_simple(struct irq_data *data);
+#endif /* _LINUX_IRQCHIP_METAG_EXT_H_ */
diff --git a/include/linux/irqchip/metag.h b/include/linux/irqchip/metag.h
new file mode 100644
index 000000000000..4ebdfb3101ab
--- /dev/null
+++ b/include/linux/irqchip/metag.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2011 Imagination Technologies
+ */
+#ifndef _LINUX_IRQCHIP_METAG_H_
+#define _LINUX_IRQCHIP_METAG_H_
+#include <linux/errno.h>
+#ifdef CONFIG_METAG_PERFCOUNTER_IRQS
+extern int init_internal_IRQ(void);
+extern int internal_irq_map(unsigned int hw);
+#else
+static inline int init_internal_IRQ(void)
+{
+        return 0;
+}
+static inline int internal_irq_map(unsigned int hw)
+{
+        return -EINVAL;
+}
+#endif
+#endif /* _LINUX_IRQCHIP_METAG_H_ */
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index e30b66346942..50e5a5e6a712 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -20,7 +20,6 @@
 #ifndef __KERNEL__
 #include "jfs_compat.h"
 #define JBD2_DEBUG
-#define jfs_debug jbd_debug
 #else
 #include <linux/types.h>
@@ -57,7 +56,7 @@
 * CONFIG_JBD2_DEBUG is on.
 */
 #define JBD2_EXPENSIVE_CHECKING
-extern u8 jbd2_journal_enable_debug;
+extern ushort jbd2_journal_enable_debug;
 #define jbd_debug(n, f, a...)                                           \
        do {                                                            \
@@ -397,35 +396,18 @@ struct jbd2_journal_handle
        int                     h_err;
        /* Flags [no locking] */
-        unsigned int    h_sync:1;       /* sync-on-close */
+        unsigned int    h_sync:         1;      /* sync-on-close */
-        unsigned int    h_jdata:1;      /* force data journaling */
+        unsigned int    h_jdata:        1;      /* force data journaling */
-        unsigned int    h_aborted:1;    /* fatal error on handle */
+        unsigned int    h_aborted:      1;      /* fatal error on handle */
-        unsigned int    h_cowing:1;     /* COWing block to snapshot */
+        unsigned int    h_type:         8;      /* for handle statistics */
+        unsigned int    h_line_no:      16;     /* for handle statistics */
-        /* Number of buffers requested by user:
-         * (before adding the COW credits factor) */
-        unsigned int    h_base_credits:14;
-        /* Number of buffers the user is allowed to dirty:
-         * (counts only buffers dirtied when !h_cowing) */
-        unsigned int    h_user_credits:14;
+        unsigned long           h_start_jiffies;
+        unsigned int            h_requested_credits;
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
        struct lockdep_map      h_lockdep_map;
 #endif
-#ifdef CONFIG_JBD2_DEBUG
-        /* COW debugging counters: */
-        unsigned int h_cow_moved; /* blocks moved to snapshot */
-        unsigned int h_cow_copied; /* blocks copied to snapshot */
-        unsigned int h_cow_ok_jh; /* blocks already COWed during current
-                                     transaction */
-        unsigned int h_cow_ok_bitmap; /* blocks not set in COW bitmap */
-        unsigned int h_cow_ok_mapped;/* blocks already mapped in snapshot */
-        unsigned int h_cow_bitmaps; /* COW bitmaps created */
-        unsigned int h_cow_excluded; /* blocks set in exclude bitmap */
-#endif
 };
@@ -581,6 +563,11 @@ struct transaction_s
        unsigned long           t_start;
        /*
+         * When commit was requested
+         */
+        unsigned long           t_requested;
+        /*
         * Checkpointing stats [j_checkpoint_sem]
         */
        struct transaction_chp_stats_s t_chp_stats;
@@ -637,6 +624,7 @@ struct transaction_s
 struct transaction_run_stats_s {
        unsigned long           rs_wait;
+        unsigned long           rs_request_delay;
        unsigned long           rs_running;
        unsigned long           rs_locked;
        unsigned long           rs_flushing;
@@ -649,6 +637,7 @@ struct transaction_run_stats_s {
 struct transaction_stats_s {
        unsigned long           ts_tid;
+        unsigned long           ts_requested;
        struct transaction_run_stats_s run;
 };
@@ -1086,7 +1075,8 @@ 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);
+extern handle_t *jbd2__journal_start(journal_t *, int nblocks, 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_extend (handle_t *, int nblocks);
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index c566927efcbd..80d36874689b 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -398,7 +398,11 @@ extern int panic_on_unrecovered_nmi;
 extern int panic_on_io_nmi;
 extern int sysctl_panic_on_stackoverflow;
 extern const char *print_tainted(void);
-extern void add_taint(unsigned flag);
+enum lockdep_ok {
+        LOCKDEP_STILL_OK,
+        LOCKDEP_NOW_UNRELIABLE
+};
+extern void add_taint(unsigned flag, enum lockdep_ok);
 extern int test_taint(unsigned flag);
 extern unsigned long get_taint(void);
 extern int root_mountflags;
diff --git a/include/linux/leds-lp5521.h b/include/linux/leds-lp5521.h
deleted file mode 100644
index 3f071ec019b2..000000000000
--- a/include/linux/leds-lp5521.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * LP5521 LED chip driver.
- *
- * Copyright (C) 2010 Nokia Corporation
- *
- * Contact: Samu Onkalo <samu.p.onkalo@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#ifndef __LINUX_LP5521_H
-#define __LINUX_LP5521_H
-/* See Documentation/leds/leds-lp5521.txt */
-struct lp5521_led_config {
-        char            *name;
-        u8              chan_nr;
-        u8              led_current; /* mA x10, 0 if led is not connected */
-        u8              max_current;
-};
-struct lp5521_led_pattern {
-        u8 *r;
-        u8 *g;
-        u8 *b;
-        u8 size_r;
-        u8 size_g;
-        u8 size_b;
-};
-#define LP5521_CLOCK_AUTO       0
-#define LP5521_CLOCK_INT        1
-#define LP5521_CLOCK_EXT        2
-/* Bits in CONFIG register */
-#define LP5521_PWM_HF                   0x40    /* PWM: 0 = 256Hz, 1 = 558Hz */
-#define LP5521_PWRSAVE_EN               0x20    /* 1 = Power save mode */
-#define LP5521_CP_MODE_OFF              0       /* Charge pump (CP) off */
-#define LP5521_CP_MODE_BYPASS           8       /* CP forced to bypass mode */
-#define LP5521_CP_MODE_1X5              0x10    /* CP forced to 1.5x mode */
-#define LP5521_CP_MODE_AUTO             0x18    /* Automatic mode selection */
-#define LP5521_R_TO_BATT                4       /* R out: 0 = CP, 1 = Vbat */
-#define LP5521_CLK_SRC_EXT              0       /* Ext-clk source (CLK_32K) */
-#define LP5521_CLK_INT                  1       /* Internal clock */
-#define LP5521_CLK_AUTO                 2       /* Automatic clock selection */
-struct lp5521_platform_data {
-        struct lp5521_led_config *led_config;
-        u8      num_channels;
-        u8      clock_mode;
-        int     (*setup_resources)(void);
-        void    (*release_resources)(void);
-        void    (*enable)(bool state);
-        const char *label;
-        u8      update_config;
-        struct lp5521_led_pattern *patterns;
-        int num_patterns;
-};
-#endif /* __LINUX_LP5521_H */
diff --git a/include/linux/leds-lp5523.h b/include/linux/leds-lp5523.h
deleted file mode 100644
index 727877fb406d..000000000000
--- a/include/linux/leds-lp5523.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * LP5523 LED Driver
- *
- * Copyright (C) 2010 Nokia Corporation
- *
- * Contact: Samu Onkalo <samu.p.onkalo@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#ifndef __LINUX_LP5523_H
-#define __LINUX_LP5523_H
-/* See Documentation/leds/leds-lp5523.txt */
-struct lp5523_led_config {
-        const char      *name;
-        u8              chan_nr;
-        u8              led_current; /* mA x10, 0 if led is not connected */
-        u8              max_current;
-};
-#define LP5523_CLOCK_AUTO       0
-#define LP5523_CLOCK_INT        1
-#define LP5523_CLOCK_EXT        2
-struct lp5523_platform_data {
-        struct lp5523_led_config *led_config;
-        u8      num_channels;
-        u8      clock_mode;
-        int     (*setup_resources)(void);
-        void    (*release_resources)(void);
-        void    (*enable)(bool state);
-        const   char *label;
-};
-#endif /* __LINUX_LP5523_H */
diff --git a/include/linux/leds_pwm.h b/include/linux/leds_pwm.h
index 33a071167489..a65e9646e4b1 100644
--- a/include/linux/leds_pwm.h
+++ b/include/linux/leds_pwm.h
@@ -7,7 +7,7 @@
 struct led_pwm {
        const char      *name;
        const char      *default_trigger;
-        unsigned        pwm_id;
+        unsigned        pwm_id __deprecated;
        u8              active_low;
        unsigned        max_brightness;
        unsigned        pwm_period_ns;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 649e5f86b5f0..91c9d109e5f1 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -620,6 +620,9 @@ struct ata_device {
        union acpi_object       *gtf_cache;
        unsigned int            gtf_filter;
 #endif
+#ifdef CONFIG_SATA_ZPODD
+        void                    *zpodd;
+#endif
        struct device           tdev;
        /* n_sector is CLEAR_BEGIN, read comment above CLEAR_BEGIN */
        u64                     n_sectors;      /* size of device, if ATA */
diff --git a/include/linux/list.h b/include/linux/list.h
index cc6d2aa6b415..d991cc147c98 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -666,54 +666,49 @@ static inline void hlist_move_list(struct hlist_head *old,
        for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
             pos = n)
+#define hlist_entry_safe(ptr, type, member) \
+        (ptr) ? hlist_entry(ptr, type, member) : NULL
 /**
 * hlist_for_each_entry - iterate over list of given type
- * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the type * to use as a loop cursor.
- * @pos:        the &struct hlist_node to use as a loop cursor.
 * @head:       the head for your list.
 * @member:     the name of the hlist_node within the struct.
 */
-#define hlist_for_each_entry(tpos, pos, head, member)                    \
+#define hlist_for_each_entry(pos, head, member)                         \
-        for (pos = (head)->first;                                        \
+        for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member);\
-             pos &&                                                      \
+             pos;                                                       \
-                ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+             pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
-             pos = pos->next)
 /**
 * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
- * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the type * to use as a loop cursor.
- * @pos:        the &struct hlist_node to use as a loop cursor.
 * @member:     the name of the hlist_node within the struct.
 */
-#define hlist_for_each_entry_continue(tpos, pos, member)                 \
+#define hlist_for_each_entry_continue(pos, member)                      \
-        for (pos = (pos)->next;                                          \
+        for (pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member);\
-             pos &&                                                      \
+             pos;                                                       \
-                ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+             pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
-             pos = pos->next)
 /**
 * hlist_for_each_entry_from - iterate over a hlist continuing from current point
- * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the type * to use as a loop cursor.
- * @pos:        the &struct hlist_node to use as a loop cursor.
 * @member:     the name of the hlist_node within the struct.
 */
-#define hlist_for_each_entry_from(tpos, pos, member)                     \
+#define hlist_for_each_entry_from(pos, member)                          \
-        for (; pos &&                                                    \
+        for (; pos;                                                     \
-                ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+             pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
-             pos = pos->next)
 /**
 * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the type * to use as a loop cursor.
- * @pos:        the &struct hlist_node to use as a loop cursor.
 * @n:          another &struct hlist_node to use as temporary storage
 * @head:       the head for your list.
 * @member:     the name of the hlist_node within the struct.
 */
-#define hlist_for_each_entry_safe(tpos, pos, n, head, member)            \
+#define hlist_for_each_entry_safe(pos, n, head, member)                 \
-        for (pos = (head)->first;                                        \
+        for (pos = hlist_entry_safe((head)->first, typeof(*pos), member);\
-             pos && ({ n = pos->next; 1; }) &&                           \
+             pos && ({ n = pos->member.next; 1; });                     \
-                ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+             pos = hlist_entry_safe(n, typeof(*pos), member))
-             pos = n)
 #endif
diff --git a/include/linux/llist.h b/include/linux/llist.h
index d0ab98f73d38..a5199f6d0e82 100644
--- a/include/linux/llist.h
+++ b/include/linux/llist.h
@@ -125,31 +125,6 @@ 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 safely against remove over some entries
- * of lock-less list of given type.
- * @pos:        the type * to use as a loop cursor.
- * @n:          another type * to use as a temporary storage.
- * @node:       the fist 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. This variant allows removal of entries
- * as we iterate.
- *
- * 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),       \
-             (n) = (pos)->member.next;                                  \
-             &(pos)->member != NULL;                                    \
-             (pos) = llist_entry(n, typeof(*(pos)), member),            \
-             (n) = (&(pos)->member != NULL) ? (pos)->member.next : NULL)
-/**
 * llist_empty - tests whether a lock-less list is empty
 * @head:       the list to test
 *
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index f5a051a79273..dcaad79f54ed 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -212,7 +212,8 @@ int		  nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout)
 __be32            nlmclnt_grant(const struct sockaddr *addr,
                                const struct nlm_lock *lock);
 void              nlmclnt_recovery(struct nlm_host *);
-int               nlmclnt_reclaim(struct nlm_host *, struct file_lock *);
+int               nlmclnt_reclaim(struct nlm_host *, struct file_lock *,
+                                  struct nlm_rqst *);
 void              nlmclnt_next_cookie(struct nlm_cookie *);
 /*
@@ -291,7 +292,7 @@ int           nlmsvc_unlock_all_by_ip(struct sockaddr *server_addr);
 static inline struct inode *nlmsvc_file_inode(struct nlm_file *file)
 {
-        return file->f_file->f_path.dentry->d_inode;
+        return file_inode(file->f_file);
 }
 static inline int __nlm_privileged_request4(const struct sockaddr *sap)
diff --git a/include/linux/lzo.h b/include/linux/lzo.h
index d793497ec1ca..a0848d9377e5 100644
--- a/include/linux/lzo.h
+++ b/include/linux/lzo.h
@@ -4,28 +4,28 @@
 *  LZO Public Kernel Interface
 *  A mini subset of the LZO real-time data compression library
 *
- *  Copyright (C) 1996-2005 Markus F.X.J. Oberhumer <markus@oberhumer.com>
+ *  Copyright (C) 1996-2012 Markus F.X.J. Oberhumer <markus@oberhumer.com>
 *
 *  The full LZO package can be found at:
 *  http://www.oberhumer.com/opensource/lzo/
 *
- *  Changed for kernel use by:
+ *  Changed for Linux kernel use by:
 *  Nitin Gupta <nitingupta910@gmail.com>
 *  Richard Purdie <rpurdie@openedhand.com>
 */
-#define LZO1X_MEM_COMPRESS      (16384 * sizeof(unsigned char *))
+#define LZO1X_1_MEM_COMPRESS    (8192 * sizeof(unsigned short))
-#define LZO1X_1_MEM_COMPRESS    LZO1X_MEM_COMPRESS
+#define LZO1X_MEM_COMPRESS      LZO1X_1_MEM_COMPRESS
 #define lzo1x_worst_compress(x) ((x) + ((x) / 16) + 64 + 3)
-/* This requires 'workmem' of size LZO1X_1_MEM_COMPRESS */
+/* This requires 'wrkmem' of size LZO1X_1_MEM_COMPRESS */
 int lzo1x_1_compress(const unsigned char *src, size_t src_len,
-                        unsigned char *dst, size_t *dst_len, void *wrkmem);
+                     unsigned char *dst, size_t *dst_len, void *wrkmem);
 /* safe decompression with overrun testing */
 int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,
-                        unsigned char *dst, size_t *dst_len);
+                          unsigned char *dst, size_t *dst_len);
 /*
 * Return values (< 0 = Error)
@@ -40,5 +40,6 @@ int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,
 #define LZO_E_EOF_NOT_FOUND             (-7)
 #define LZO_E_INPUT_NOT_CONSUMED        (-8)
 #define LZO_E_NOT_YET_IMPLEMENTED       (-9)
+#define LZO_E_INVALID_ARGUMENT          (-10)
 #endif
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 3e5ecb2d790e..f388203db7e8 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -42,7 +42,6 @@ struct memblock {
 extern struct memblock memblock;
 extern int memblock_debug;
-extern struct movablemem_map movablemem_map;
 #define memblock_dbg(fmt, ...) \
        if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
@@ -61,7 +60,6 @@ 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
 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/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h
index 478672ed0c3d..e94537befabd 100644
--- a/include/linux/mfd/88pm80x.h
+++ b/include/linux/mfd/88pm80x.h
@@ -365,5 +365,5 @@ static inline int pm80x_dev_resume(struct device *dev)
 extern int pm80x_init(struct i2c_client *client,
                      const struct i2c_device_id *id);
-extern int pm80x_deinit(struct i2c_client *client);
+extern int pm80x_deinit(void);
 #endif /* __LINUX_MFD_88PM80X_H */
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 80e3b8683a84..9ead60bc66b7 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -311,6 +311,7 @@ int abx500_mask_and_set_register_interruptible(struct device *dev, u8 bank,
 int abx500_get_chip_id(struct device *dev);
 int abx500_event_registers_startup_state_get(struct device *dev, u8 *event);
 int abx500_startup_irq_enabled(struct device *dev, unsigned int irq);
+void abx500_dump_all_banks(void);
 struct abx500_ops {
        int (*get_chip_id) (struct device *);
@@ -321,6 +322,7 @@ struct abx500_ops {
        int (*mask_and_set_register) (struct device *, u8, u8, u8, u8);
        int (*event_registers_startup_state_get) (struct device *, u8 *);
        int (*startup_irq_enabled) (struct device *, unsigned int);
+        void (*dump_all_banks) (struct device *);
 };
 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
diff --git a/include/linux/mfd/abx500/ab8500-sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h
index 10eb50973c39..ebf12e793db9 100644
--- a/include/linux/mfd/abx500/ab8500-sysctrl.h
+++ b/include/linux/mfd/abx500/ab8500-sysctrl.h
@@ -37,6 +37,11 @@ static inline int ab8500_sysctrl_clear(u16 reg, u8 bits)
        return ab8500_sysctrl_write(reg, bits, 0);
 }
+/* Configuration data for SysClkReq1RfClkBuf - SysClkReq8RfClkBuf */
+struct ab8500_sysctrl_platform_data {
+        u8 initial_req_buf_config[8];
+};
 /* Registers */
 #define AB8500_TURNONSTATUS             0x100
 #define AB8500_RESETSTATUS              0x101
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index fc0534483c72..9db0bda446a0 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -368,10 +368,12 @@ struct regulator_reg_init;
 struct regulator_init_data;
 struct ab8500_gpio_platform_data;
 struct ab8500_codec_platform_data;
+struct ab8500_sysctrl_platform_data;
 /**
 * struct ab8500_platform_data - AB8500 platform data
 * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used
+ * @pm_power_off: Should machine pm power off hook be registered or not
 * @init: board-specific initialization after detection of ab8500
 * @num_regulator_reg_init: number of regulator init registers
 * @regulator_reg_init: regulator init registers
@@ -380,6 +382,7 @@ struct ab8500_codec_platform_data;
 */
 struct ab8500_platform_data {
        int irq_base;
+        bool pm_power_off;
        void (*init) (struct ab8500 *);
        int num_regulator_reg_init;
        struct ab8500_regulator_reg_init *regulator_reg_init;
@@ -387,6 +390,7 @@ struct ab8500_platform_data {
        struct regulator_init_data *regulator;
        struct abx500_gpio_platform_data *gpio;
        struct ab8500_codec_platform_data *codec;
+        struct ab8500_sysctrl_platform_data *sysctrl;
 };
 extern int ab8500_init(struct ab8500 *ab8500,
@@ -508,4 +512,12 @@ static inline int is_ab9540_2p0_or_earlier(struct ab8500 *ab)
        return (is_ab9540(ab) && (ab->chip_id < AB8500_CUT2P0));
 }
+#ifdef CONFIG_AB8500_DEBUG
+void ab8500_dump_all_banks(struct device *dev);
+void ab8500_debug_register_interrupt(int line);
+#else
+static inline void ab8500_dump_all_banks(struct device *dev) {}
+static inline void ab8500_debug_register_interrupt(int line) {}
+#endif
 #endif /* MFD_AB8500_H */
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 96d64f2b8d78..455c51d22d6b 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -56,6 +56,8 @@
 #define ARIZONA_DMIC_MICBIAS2 2
 #define ARIZONA_DMIC_MICBIAS3 3
+#define ARIZONA_MAX_MICBIAS 3
 #define ARIZONA_INMODE_DIFF 0
 #define ARIZONA_INMODE_SE   1
 #define ARIZONA_INMODE_DMIC 2
@@ -71,6 +73,13 @@
 struct regulator_init_data;
+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 */
+};
 struct arizona_micd_config {
        unsigned int src;
        unsigned int bias;
@@ -136,6 +145,9 @@ struct arizona_pdata {
        /** Reference voltage for DMIC inputs */
        int dmic_ref[ARIZONA_MAX_INPUT];
+        /** MICBIAS configurations */
+        struct arizona_micbias micbias[ARIZONA_MAX_MICBIAS];
        /** Mode of input structures */
        int inmode[ARIZONA_MAX_INPUT];
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index 188d89abd963..340355136069 100644
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -984,18 +984,34 @@
 #define ARIZONA_DSP1_STATUS_1                    0x1104
 #define ARIZONA_DSP1_STATUS_2                    0x1105
 #define ARIZONA_DSP1_STATUS_3                    0x1106
+#define ARIZONA_DSP1_SCRATCH_0                   0x1140
+#define ARIZONA_DSP1_SCRATCH_1                   0x1141
+#define ARIZONA_DSP1_SCRATCH_2                   0x1142
+#define ARIZONA_DSP1_SCRATCH_3                   0x1143
 #define ARIZONA_DSP2_CONTROL_1                   0x1200
 #define ARIZONA_DSP2_CLOCKING_1                  0x1201
 #define ARIZONA_DSP2_STATUS_1                    0x1204
 #define ARIZONA_DSP2_STATUS_2                    0x1205
+#define ARIZONA_DSP2_SCRATCH_0                   0x1240
+#define ARIZONA_DSP2_SCRATCH_1                   0x1241
+#define ARIZONA_DSP2_SCRATCH_2                   0x1242
+#define ARIZONA_DSP2_SCRATCH_3                   0x1243
 #define ARIZONA_DSP3_CONTROL_1                   0x1300
 #define ARIZONA_DSP3_CLOCKING_1                  0x1301
 #define ARIZONA_DSP3_STATUS_1                    0x1304
 #define ARIZONA_DSP3_STATUS_2                    0x1305
+#define ARIZONA_DSP3_SCRATCH_0                   0x1340
+#define ARIZONA_DSP3_SCRATCH_1                   0x1341
+#define ARIZONA_DSP3_SCRATCH_2                   0x1342
+#define ARIZONA_DSP3_SCRATCH_3                   0x1343
 #define ARIZONA_DSP4_CONTROL_1                   0x1400
 #define ARIZONA_DSP4_CLOCKING_1                  0x1401
 #define ARIZONA_DSP4_STATUS_1                    0x1404
 #define ARIZONA_DSP4_STATUS_2                    0x1405
+#define ARIZONA_DSP4_SCRATCH_0                   0x1440
+#define ARIZONA_DSP4_SCRATCH_1                   0x1441
+#define ARIZONA_DSP4_SCRATCH_2                   0x1442
+#define ARIZONA_DSP4_SCRATCH_3                   0x1443
 /*
 * Field Definitions.
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index f8bac7cfc25f..3abcca91eecd 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -151,6 +151,18 @@ enum prcmu_clock {
 };
 /**
+ * enum prcmu_wdog_id - PRCMU watchdog IDs
+ * @PRCMU_WDOG_ALL: use all timers
+ * @PRCMU_WDOG_CPU1: use first CPU timer only
+ * @PRCMU_WDOG_CPU2: use second CPU timer conly
+ */
+enum prcmu_wdog_id {
+        PRCMU_WDOG_ALL = 0x00,
+        PRCMU_WDOG_CPU1 = 0x01,
+        PRCMU_WDOG_CPU2 = 0x02,
+};
+/**
 * enum ape_opp - APE OPP states definition
 * @APE_OPP_INIT:
 * @APE_NO_CHANGE: The APE operating point is unchanged
diff --git a/include/linux/mfd/lp8788.h b/include/linux/mfd/lp8788.h
index 2a32b16f79cb..786bf6679a28 100644
--- a/include/linux/mfd/lp8788.h
+++ b/include/linux/mfd/lp8788.h
@@ -16,6 +16,7 @@
 #include <linux/gpio.h>
 #include <linux/irqdomain.h>
+#include <linux/pwm.h>
 #include <linux/regmap.h>
 #define LP8788_DEV_BUCK         "lp8788-buck"
@@ -124,11 +125,6 @@ enum lp8788_bl_ramp_step {
        LP8788_RAMP_65538us,
 };
-enum lp8788_bl_pwm_polarity {
-        LP8788_PWM_ACTIVE_HIGH,
-        LP8788_PWM_ACTIVE_LOW,
-};
 enum lp8788_isink_scale {
        LP8788_ISINK_SCALE_100mA,
        LP8788_ISINK_SCALE_120mA,
@@ -229,16 +225,6 @@ struct lp8788_charger_platform_data {
 };
 /*
- * struct lp8788_bl_pwm_data
- * @pwm_set_intensity     : set duty of pwm
- * @pwm_get_intensity     : get current duty of pwm
- */
-struct lp8788_bl_pwm_data {
-        void (*pwm_set_intensity) (int brightness, int max_brightness);
-        int (*pwm_get_intensity) (int max_brightness);
-};
-/*
 * struct lp8788_backlight_platform_data
 * @name                  : backlight driver name. (default: "lcd-backlight")
 * @initial_brightness    : initial value of backlight brightness
@@ -248,8 +234,8 @@ struct lp8788_bl_pwm_data {
 * @rise_time             : brightness ramp up step time
 * @fall_time             : brightness ramp down step time
 * @pwm_pol               : pwm polarity setting when bl_mode is pwm based
- * @pwm_data              : platform specific pwm generation functions
+ * @period_ns             : platform specific pwm period value. unit is nano.
- *                          only valid when bl_mode is pwm based
+                            Only valid when bl_mode is LP8788_BL_COMB_PWM_BASED
 */
 struct lp8788_backlight_platform_data {
        char *name;
@@ -259,8 +245,8 @@ struct lp8788_backlight_platform_data {
        enum lp8788_bl_full_scale_current full_scale;
        enum lp8788_bl_ramp_step rise_time;
        enum lp8788_bl_ramp_step fall_time;
-        enum lp8788_bl_pwm_polarity pwm_pol;
+        enum pwm_polarity pwm_pol;
-        struct lp8788_bl_pwm_data pwm_data;
+        unsigned int period_ns;
 };
 /*
diff --git a/include/linux/mfd/max8925.h b/include/linux/mfd/max8925.h
index 74d8e2969630..ce8502e9e7dc 100644
--- a/include/linux/mfd/max8925.h
+++ b/include/linux/mfd/max8925.h
@@ -190,6 +190,8 @@ enum {
        MAX8925_NR_IRQS,
 };
 struct max8925_chip {
        struct device           *dev;
        struct i2c_client       *i2c;
@@ -201,7 +203,6 @@ struct max8925_chip {
        int                     irq_base;
        int                     core_irq;
        int                     tsc_irq;
        unsigned int            wakeup_flag;
 };
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 29f6616e12f0..a4d13d7cd001 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -2789,4 +2789,56 @@ enum usb_irq_events {
 #define PALMAS_GPADC_TRIM15                                     0xE
 #define PALMAS_GPADC_TRIM16                                     0xF
+static inline int palmas_read(struct palmas *palmas, unsigned int base,
+                unsigned int reg, unsigned int *val)
+{
+        unsigned int addr =  PALMAS_BASE_TO_REG(base, reg);
+        int slave_id = PALMAS_BASE_TO_SLAVE(base);
+        return regmap_read(palmas->regmap[slave_id], addr, val);
+}
+static inline int palmas_write(struct palmas *palmas, unsigned int base,
+                unsigned int reg, unsigned int value)
+{
+        unsigned int addr = PALMAS_BASE_TO_REG(base, reg);
+        int slave_id = PALMAS_BASE_TO_SLAVE(base);
+        return regmap_write(palmas->regmap[slave_id], addr, value);
+}
+static inline int palmas_bulk_write(struct palmas *palmas, unsigned int base,
+        unsigned int reg, const void *val, size_t val_count)
+{
+        unsigned int addr = PALMAS_BASE_TO_REG(base, reg);
+        int slave_id = PALMAS_BASE_TO_SLAVE(base);
+        return regmap_bulk_write(palmas->regmap[slave_id], addr,
+                        val, val_count);
+}
+static inline int palmas_bulk_read(struct palmas *palmas, unsigned int base,
+                unsigned int reg, void *val, size_t val_count)
+{
+        unsigned int addr = PALMAS_BASE_TO_REG(base, reg);
+        int slave_id = PALMAS_BASE_TO_SLAVE(base);
+        return regmap_bulk_read(palmas->regmap[slave_id], addr,
+                val, val_count);
+}
+static inline int palmas_update_bits(struct palmas *palmas, unsigned int base,
+        unsigned int reg, unsigned int mask, unsigned int val)
+{
+        unsigned int addr = PALMAS_BASE_TO_REG(base, reg);
+        int slave_id = PALMAS_BASE_TO_SLAVE(base);
+        return regmap_update_bits(palmas->regmap[slave_id], addr, mask, val);
+}
+static inline int palmas_irq_get_virq(struct palmas *palmas, int irq)
+{
+        return regmap_irq_get_virq(palmas->irq_data, irq);
+}
 #endif /*  __LINUX_MFD_PALMAS_H */
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
index 4b117a3f54d4..26ea7f1b7caf 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/mfd/rtsx_pci.h
@@ -465,7 +465,7 @@
 #define SD_RSP_TYPE_R6                  0x01
 #define SD_RSP_TYPE_R7                  0x01
-/* SD_CONFIURE3 */
+/* SD_CONFIGURE3 */
 #define SD_RSP_80CLK_TIMEOUT_EN         0x01
 /* Card Transfer Reset Register */
@@ -581,8 +581,11 @@
 #define CARD_GPIO_DIR                   0xFD57
 #define CARD_GPIO                       0xFD58
 #define CARD_DATA_SOURCE                0xFD5B
+#define SD30_CLK_DRIVE_SEL              0xFD5A
 #define CARD_SELECT                     0xFD5C
 #define SD30_DRIVE_SEL                  0xFD5E
+#define SD30_CMD_DRIVE_SEL              0xFD5E
+#define SD30_DAT_DRIVE_SEL              0xFD5F
 #define CARD_CLK_EN                     0xFD69
 #define SDIO_CTRL                       0xFD6B
 #define CD_PAD_CTL                      0xFD73
@@ -655,6 +658,8 @@
 #define MSGTXDATA3                      0xFE47
 #define MSGTXCTL                        0xFE48
 #define PETXCFG                         0xFE49
+#define LTR_CTL                         0xFE4A
+#define OBFF_CFG                        0xFE4C
 #define CDRESUMECTL                     0xFE52
 #define WAKE_SEL_CTL                    0xFE54
@@ -735,6 +740,7 @@ struct rtsx_pcr {
        unsigned int                    card_inserted;
        unsigned int                    card_removed;
+        unsigned int                    card_exist;
        struct delayed_work             carddet_work;
        struct delayed_work             idle_work;
@@ -799,6 +805,7 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
                u8 ssc_depth, bool initial_mode, bool double_clk, bool vpclk);
 int rtsx_pci_card_power_on(struct rtsx_pcr *pcr, int card);
 int rtsx_pci_card_power_off(struct rtsx_pcr *pcr, int card);
+int rtsx_pci_card_exclusive_check(struct rtsx_pcr *pcr, int card);
 int rtsx_pci_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage);
 unsigned int rtsx_pci_card_exist(struct rtsx_pcr *pcr);
 void rtsx_pci_complete_unfinished_transfer(struct rtsx_pcr *pcr);
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index d83af39815ab..99bf3e665997 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -65,12 +65,6 @@
 */
 #define TMIO_MMC_SDIO_IRQ               (1 << 2)
 /*
- * Some platforms can detect card insertion events with controller powered
- * down, using a GPIO IRQ, in which case they have to fill in cd_irq, cd_gpio,
- * and cd_flags fields of struct tmio_mmc_data.
- */
-#define TMIO_MMC_HAS_COLD_CD            (1 << 3)
-/*
 * Some controllers require waiting for the SD bus to become
 * idle before writing to some registers.
 */
@@ -117,18 +111,6 @@ struct tmio_mmc_data {
 };
 /*
- * This function is deprecated and will be removed soon. Please, convert your
- * platform to use drivers/mmc/core/cd-gpio.c
- */
-#include <linux/mmc/host.h>
-static inline void tmio_mmc_cd_wakeup(struct tmio_mmc_data *pdata)
-{
-        if (pdata)
-                mmc_detect_change(dev_get_drvdata(pdata->dev),
-                                  msecs_to_jiffies(100));
-}
-/*
 * data for the NAND controller
 */
 struct tmio_nand_data {
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 6d48fce06b4a..811f91cf5e8c 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -171,6 +171,7 @@ enum {
 #define MLX4_ATTR_EXTENDED_PORT_INFO    cpu_to_be16(0xff90)
 enum {
+        MLX4_BMME_FLAG_WIN_TYPE_2B      = 1 <<  1,
        MLX4_BMME_FLAG_LOCAL_INV        = 1 <<  6,
        MLX4_BMME_FLAG_REMOTE_INV       = 1 <<  7,
        MLX4_BMME_FLAG_TYPE_2_WIN       = 1 <<  9,
@@ -238,7 +239,8 @@ enum {
        MLX4_PERM_LOCAL_WRITE   = 1 << 11,
        MLX4_PERM_REMOTE_READ   = 1 << 12,
        MLX4_PERM_REMOTE_WRITE  = 1 << 13,
-        MLX4_PERM_ATOMIC        = 1 << 14
+        MLX4_PERM_ATOMIC        = 1 << 14,
+        MLX4_PERM_BIND_MW       = 1 << 15,
 };
 enum {
@@ -504,6 +506,18 @@ struct mlx4_mr {
        int                     enabled;
 };
+enum mlx4_mw_type {
+        MLX4_MW_TYPE_1 = 1,
+        MLX4_MW_TYPE_2 = 2,
+};
+struct mlx4_mw {
+        u32                     key;
+        u32                     pd;
+        enum mlx4_mw_type       type;
+        int                     enabled;
+};
 struct mlx4_fmr {
        struct mlx4_mr          mr;
        struct mlx4_mpt_entry  *mpt;
@@ -802,8 +816,12 @@ u64 mlx4_mtt_addr(struct mlx4_dev *dev, struct mlx4_mtt *mtt);
 int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,
                  int npages, int page_shift, struct mlx4_mr *mr);
-void mlx4_mr_free(struct mlx4_dev *dev, struct mlx4_mr *mr);
+int mlx4_mr_free(struct mlx4_dev *dev, struct mlx4_mr *mr);
 int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr);
+int mlx4_mw_alloc(struct mlx4_dev *dev, u32 pd, enum mlx4_mw_type type,
+                  struct mlx4_mw *mw);
+void mlx4_mw_free(struct mlx4_dev *dev, struct mlx4_mw *mw);
+int mlx4_mw_enable(struct mlx4_dev *dev, struct mlx4_mw *mw);
 int mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
                   int start_index, int npages, u64 *page_list);
 int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 4b4ad6ffef92..67f46ad6920a 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -265,6 +265,11 @@ struct mlx4_wqe_lso_seg {
        __be32                  header[0];
 };
+enum mlx4_wqe_bind_seg_flags2 {
+        MLX4_WQE_BIND_ZERO_BASED = (1 << 30),
+        MLX4_WQE_BIND_TYPE_2     = (1 << 31),
+};
 struct mlx4_wqe_bind_seg {
        __be32                  flags1;
        __be32                  flags2;
@@ -277,9 +282,9 @@ struct mlx4_wqe_bind_seg {
 enum {
        MLX4_WQE_FMR_PERM_LOCAL_READ    = 1 << 27,
        MLX4_WQE_FMR_PERM_LOCAL_WRITE   = 1 << 28,
-        MLX4_WQE_FMR_PERM_REMOTE_READ   = 1 << 29,
+        MLX4_WQE_FMR_AND_BIND_PERM_REMOTE_READ  = 1 << 29,
-        MLX4_WQE_FMR_PERM_REMOTE_WRITE  = 1 << 30,
+        MLX4_WQE_FMR_AND_BIND_PERM_REMOTE_WRITE = 1 << 30,
-        MLX4_WQE_FMR_PERM_ATOMIC        = 1 << 31
+        MLX4_WQE_FMR_AND_BIND_PERM_ATOMIC       = 1 << 31
 };
 struct mlx4_wqe_fmr_seg {
@@ -304,12 +309,10 @@ struct mlx4_wqe_fmr_ext_seg {
 };
 struct mlx4_wqe_local_inval_seg {
-        __be32                  flags;
+        u64                     reserved1;
-        u32                     reserved1;
        __be32                  mem_key;
-        u32                     reserved2[2];
+        u32                     reserved2;
-        __be32                  guest_id;
+        u64                     reserved3[2];
-        __be64                  pa;
 };
 struct mlx4_wqe_raddr_seg {
diff --git a/include/linux/mm.h b/include/linux/mm.h
index e7c3f9a0111a..7acc9dc73c9f 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -115,6 +115,8 @@ extern unsigned int kobjsize(const void *objp);
 # define VM_SAO         VM_ARCH_1       /* Strong Access Ordering (powerpc) */
 #elif defined(CONFIG_PARISC)
 # define VM_GROWSUP     VM_ARCH_1
+#elif defined(CONFIG_METAG)
+# define VM_GROWSUP     VM_ARCH_1
 #elif defined(CONFIG_IA64)
 # define VM_GROWSUP     VM_ARCH_1
 #elif !defined(CONFIG_MMU)
@@ -1333,24 +1335,6 @@ extern void free_bootmem_with_active_regions(int nid,
                                                unsigned long max_low_pfn);
 extern void sparse_memory_present_with_active_regions(int nid);
-#define MOVABLEMEM_MAP_MAX MAX_NUMNODES
-struct movablemem_entry {
-        unsigned long start_pfn;    /* start pfn of memory segment */
-        unsigned long end_pfn;      /* end pfn of memory segment (exclusive) */
-};
-struct movablemem_map {
-        bool acpi;      /* true if using SRAT info */
-        int nr_map;
-        struct movablemem_entry map[MOVABLEMEM_MAP_MAX];
-        nodemask_t numa_nodes_hotplug;  /* on which nodes we specify memory */
-        nodemask_t numa_nodes_kernel;   /* on which nodes kernel resides in */
-};
-extern void __init insert_movablemem_map(unsigned long start_pfn,
-                                         unsigned long end_pfn);
-extern int __init movablemem_map_overlap(unsigned long start_pfn,
-                                         unsigned long end_pfn);
 #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
 #if !defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) && \
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 5c69315d60cc..61b2c30c903b 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -53,6 +53,9 @@ struct mmc_ext_csd {
        u8                      part_config;
        u8                      cache_ctrl;
        u8                      rst_n_function;
+        u8                      max_packed_writes;
+        u8                      max_packed_reads;
+        u8                      packed_event_en;
        unsigned int            part_time;              /* Units: ms */
        unsigned int            sa_timeout;             /* Units: 100ns */
        unsigned int            generic_cmd6_time;      /* Units: 10ms */
@@ -83,7 +86,7 @@ struct mmc_ext_csd {
        unsigned int            data_tag_unit_size;     /* DATA TAG UNIT size */
        unsigned int            boot_ro_lock;           /* ro lock support */
        bool                    boot_ro_lockable;
-        u8                      raw_exception_status;   /* 53 */
+        u8                      raw_exception_status;   /* 54 */
        u8                      raw_partition_support;  /* 160 */
        u8                      raw_rpmb_size_mult;     /* 168 */
        u8                      raw_erased_mem_count;   /* 181 */
@@ -187,6 +190,18 @@ struct sdio_func_tuple;
 #define SDIO_MAX_FUNCS          7
+enum mmc_blk_status {
+        MMC_BLK_SUCCESS = 0,
+        MMC_BLK_PARTIAL,
+        MMC_BLK_CMD_ERR,
+        MMC_BLK_RETRY,
+        MMC_BLK_ABORT,
+        MMC_BLK_DATA_ERR,
+        MMC_BLK_ECC_ERR,
+        MMC_BLK_NOMEDIUM,
+        MMC_BLK_NEW_REQUEST,
+};
 /* The number of MMC physical partitions.  These consist of:
 * boot partitions (2), general purpose partitions (4) in MMC v4.4.
 */
@@ -295,6 +310,11 @@ static inline void mmc_part_add(struct mmc_card *card, unsigned int size,
        card->nr_parts++;
 }
+static inline bool mmc_large_sector(struct mmc_card *card)
+{
+        return card->ext_csd.data_sector_size == 4096;
+}
 /*
 *  The world is not perfect and supplies us with broken mmc/sdio devices.
 *  For at least some of these bugs we need a work-around.
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 5bf7c2274fcb..39613b9a6fc5 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -18,6 +18,9 @@ struct mmc_request;
 struct mmc_command {
        u32                     opcode;
        u32                     arg;
+#define MMC_CMD23_ARG_REL_WR    (1 << 31)
+#define MMC_CMD23_ARG_PACKED    ((0 << 31) | (1 << 30))
+#define MMC_CMD23_ARG_TAG_REQ   (1 << 29)
        u32                     resp[4];
        unsigned int            flags;          /* expected response type */
 #define MMC_RSP_PRESENT (1 << 0)
@@ -120,6 +123,7 @@ struct mmc_data {
        s32                     host_cookie;    /* host private data */
 };
+struct mmc_host;
 struct mmc_request {
        struct mmc_command      *sbc;           /* SET_BLOCK_COUNT for multiblock */
        struct mmc_command      *cmd;
@@ -128,9 +132,9 @@ struct mmc_request {
        struct completion       completion;
        void                    (*done)(struct mmc_request *);/* completion function */
+        struct mmc_host         *host;
 };
-struct mmc_host;
 struct mmc_card;
 struct mmc_async_req;
@@ -147,6 +151,7 @@ extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
 extern void mmc_start_bkops(struct mmc_card *card, bool from_exception);
 extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool);
 extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int);
+extern int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd);
 #define MMC_ERASE_ARG           0x00000000
 #define MMC_SECURE_ERASE_ARG    0x80000000
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 34be4f47293c..198f0fa44e9f 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -209,8 +209,10 @@ struct dw_mci_dma_ops {
 #define DW_MCI_QUIRK_HIGHSPEED                  BIT(2)
 /* Unreliable card detection */
 #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION      BIT(3)
-/* Write Protect detection not available */
-#define DW_MCI_QUIRK_NO_WRITE_PROTECT           BIT(4)
+/* Slot level quirks */
+/* This slot has no write protect */
+#define DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT      BIT(0)
 struct dma_pdata;
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 61a10c17aabd..d6f20cc6415e 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -131,9 +131,11 @@ struct mmc_host_ops {
        int     (*start_signal_voltage_switch)(struct mmc_host *host, struct mmc_ios *ios);
+        /* Check if the card is pulling dat[0:3] low */
+        int     (*card_busy)(struct mmc_host *host);
        /* The tuning command opcode value is different for SD and eMMC cards */
        int     (*execute_tuning)(struct mmc_host *host, u32 opcode);
-        void    (*enable_preset_value)(struct mmc_host *host, bool enable);
        int     (*select_drive_strength)(unsigned int max_dtr, int host_drv, int card_drv);
        void    (*hw_reset)(struct mmc_host *host);
        void    (*card_event)(struct mmc_host *host);
@@ -170,6 +172,22 @@ struct mmc_slot {
        void *handler_priv;
 };
+/**
+ * mmc_context_info - synchronization details for mmc context
+ * @is_done_rcv         wake up reason was done request
+ * @is_new_req          wake up reason was new request
+ * @is_waiting_last_req mmc context waiting for single running request
+ * @wait                wait queue
+ * @lock                lock to protect data fields
+ */
+struct mmc_context_info {
+        bool                    is_done_rcv;
+        bool                    is_new_req;
+        bool                    is_waiting_last_req;
+        wait_queue_head_t       wait;
+        spinlock_t              lock;
+};
 struct regulator;
 struct mmc_supply {
@@ -258,6 +276,10 @@ struct mmc_host {
 #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 */
+#define MMC_CAP2_PACKED_RD      (1 << 12)       /* Allow packed read */
+#define MMC_CAP2_PACKED_WR      (1 << 13)       /* Allow packed write */
+#define MMC_CAP2_PACKED_CMD     (MMC_CAP2_PACKED_RD | \
+                                 MMC_CAP2_PACKED_WR)
        mmc_pm_flag_t           pm_caps;        /* supported pm features */
@@ -331,6 +353,7 @@ struct mmc_host {
        struct dentry           *debugfs_root;
        struct mmc_async_req    *areq;          /* active async req */
+        struct mmc_context_info context_info;   /* async synchronization info */
 #ifdef CONFIG_FAIL_MMC_REQUEST
        struct fault_attr       fail_mmc_request;
@@ -341,10 +364,11 @@ struct mmc_host {
        unsigned long           private[0] ____cacheline_aligned;
 };
-extern struct mmc_host *mmc_alloc_host(int extra, struct device *);
+struct mmc_host *mmc_alloc_host(int extra, struct device *);
-extern int mmc_add_host(struct mmc_host *);
+int mmc_add_host(struct mmc_host *);
-extern void mmc_remove_host(struct mmc_host *);
+void mmc_remove_host(struct mmc_host *);
-extern void mmc_free_host(struct mmc_host *);
+void mmc_free_host(struct mmc_host *);
+void mmc_of_parse(struct mmc_host *host);
 static inline void *mmc_priv(struct mmc_host *host)
 {
@@ -357,16 +381,16 @@ static inline void *mmc_priv(struct mmc_host *host)
 #define mmc_classdev(x) (&(x)->class_dev)
 #define mmc_hostname(x) (dev_name(&(x)->class_dev))
-extern int mmc_suspend_host(struct mmc_host *);
+int mmc_suspend_host(struct mmc_host *);
-extern int mmc_resume_host(struct mmc_host *);
+int mmc_resume_host(struct mmc_host *);
-extern int mmc_power_save_host(struct mmc_host *host);
+int mmc_power_save_host(struct mmc_host *host);
-extern int mmc_power_restore_host(struct mmc_host *host);
+int mmc_power_restore_host(struct mmc_host *host);
-extern void mmc_detect_change(struct mmc_host *, unsigned long delay);
+void mmc_detect_change(struct mmc_host *, unsigned long delay);
-extern void mmc_request_done(struct mmc_host *, struct mmc_request *);
+void mmc_request_done(struct mmc_host *, struct mmc_request *);
-extern int mmc_cache_ctrl(struct mmc_host *, u8);
+int mmc_cache_ctrl(struct mmc_host *, u8);
 static inline void mmc_signal_sdio_irq(struct mmc_host *host)
 {
@@ -434,6 +458,19 @@ static inline int mmc_boot_partition_access(struct mmc_host *host)
        return !(host->caps2 & MMC_CAP2_BOOTPART_NOACC);
 }
+static inline int mmc_host_uhs(struct mmc_host *host)
+{
+        return host->caps &
+                (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |
+                 MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 |
+                 MMC_CAP_UHS_DDR50);
+}
+static inline int mmc_host_packed_wr(struct mmc_host *host)
+{
+        return host->caps2 & MMC_CAP2_PACKED_WR;
+}
 #ifdef CONFIG_MMC_CLKGATE
 void mmc_host_clk_hold(struct mmc_host *host);
 void mmc_host_clk_release(struct mmc_host *host);
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 94d532e41c61..50bcde3677ca 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -139,7 +139,7 @@ static inline bool mmc_op_multi(u32 opcode)
 #define R1_CURRENT_STATE(x)     ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
 #define R1_READY_FOR_DATA       (1 << 8)        /* sx, a */
 #define R1_SWITCH_ERROR         (1 << 7)        /* sx, c */
-#define R1_EXCEPTION_EVENT      (1 << 6)        /* sx, a */
+#define R1_EXCEPTION_EVENT      (1 << 6)        /* sr, a */
 #define R1_APP_CMD              (1 << 5)        /* sr, c */
 #define R1_STATE_IDLE   0
@@ -275,7 +275,10 @@ struct _mmc_csd {
 #define EXT_CSD_FLUSH_CACHE             32      /* W */
 #define EXT_CSD_CACHE_CTRL              33      /* R/W */
 #define EXT_CSD_POWER_OFF_NOTIFICATION  34      /* R/W */
-#define EXT_CSD_EXP_EVENTS_STATUS       54      /* RO */
+#define EXT_CSD_PACKED_FAILURE_INDEX    35      /* RO */
+#define EXT_CSD_PACKED_CMD_STATUS       36      /* RO */
+#define EXT_CSD_EXP_EVENTS_STATUS       54      /* RO, 2 bytes */
+#define EXT_CSD_EXP_EVENTS_CTRL         56      /* R/W, 2 bytes */
 #define EXT_CSD_DATA_SECTOR_SIZE        61      /* R */
 #define EXT_CSD_GP_SIZE_MULT            143     /* R/W */
 #define EXT_CSD_PARTITION_ATTRIBUTE     156     /* R/W */
@@ -324,6 +327,8 @@ struct _mmc_csd {
 #define EXT_CSD_CACHE_SIZE              249     /* RO, 4 bytes */
 #define EXT_CSD_TAG_UNIT_SIZE           498     /* RO */
 #define EXT_CSD_DATA_TAG_SUPPORT        499     /* RO */
+#define EXT_CSD_MAX_PACKED_WRITES       500     /* RO */
+#define EXT_CSD_MAX_PACKED_READS        501     /* RO */
 #define EXT_CSD_BKOPS_SUPPORT           502     /* RO */
 #define EXT_CSD_HPI_FEATURES            503     /* RO */
@@ -385,6 +390,9 @@ struct _mmc_csd {
 #define EXT_CSD_PWR_CL_4BIT_MASK        0x0F    /* 8 bit PWR CLS */
 #define EXT_CSD_PWR_CL_8BIT_SHIFT       4
 #define EXT_CSD_PWR_CL_4BIT_SHIFT       0
+#define EXT_CSD_PACKED_EVENT_EN BIT(3)
 /*
 * EXCEPTION_EVENT_STATUS field
 */
@@ -393,6 +401,9 @@ struct _mmc_csd {
 #define EXT_CSD_SYSPOOL_EXHAUSTED       BIT(2)
 #define EXT_CSD_PACKED_FAILURE          BIT(3)
+#define EXT_CSD_PACKED_GENERIC_ERROR    BIT(0)
+#define EXT_CSD_PACKED_INDEXED_ERROR    BIT(1)
 /*
 * BKOPS status level
 */
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 4bbc3301fbbf..b838ffc49e4a 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -94,6 +94,7 @@ struct sdhci_host {
 #define SDHCI_QUIRK2_HOST_NO_CMD23                      (1<<1)
 /* The system physically doesn't support 1.8v, even if the host does */
 #define SDHCI_QUIRK2_NO_1_8_V                           (1<<2)
+#define SDHCI_QUIRK2_PRESET_VALUE_BROKEN                (1<<3)
        int irq;                /* Device IRQ */
        void __iomem *ioaddr;   /* Mapped address */
diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h
index b65679ffa880..b76bcf0621f6 100644
--- a/include/linux/mmc/sh_mobile_sdhi.h
+++ b/include/linux/mmc/sh_mobile_sdhi.h
@@ -4,7 +4,6 @@
 #include <linux/types.h>
 struct platform_device;
-struct tmio_mmc_data;
 #define SH_MOBILE_SDHI_IRQ_CARD_DETECT  "card_detect"
 #define SH_MOBILE_SDHI_IRQ_SDCARD       "sdcard"
@@ -26,7 +25,6 @@ struct sh_mobile_sdhi_info {
        unsigned long tmio_caps2;
        u32 tmio_ocr_mask;      /* available MMC voltages */
        unsigned int cd_gpio;
-        struct tmio_mmc_data *pdata;
        void (*set_pwr)(struct platform_device *pdev, int state);
        int (*get_cd)(struct platform_device *pdev);
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index fed3def62818..779cf7c4a3d1 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -33,8 +33,7 @@ struct ieee1394_device_id {
        __u32 model_id;
        __u32 specifier_id;
        __u32 version;
-        kernel_ulong_t driver_data
+        kernel_ulong_t driver_data;
-                __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
@@ -148,8 +147,7 @@ struct hid_device_id {
        __u16 group;
        __u32 vendor;
        __u32 product;
-        kernel_ulong_t driver_data
+        kernel_ulong_t driver_data;
-                __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 /* s390 CCW devices */
@@ -173,8 +171,6 @@ struct ccw_device_id {
 struct ap_device_id {
        __u16 match_flags;      /* which fields to match against */
        __u8 dev_type;          /* device type */
-        __u8 pad1;
-        __u32 pad2;
        kernel_ulong_t driver_info;
 };
@@ -184,13 +180,10 @@ struct ap_device_id {
 struct css_device_id {
        __u8 match_flags;
        __u8 type; /* subchannel type */
-        __u16 pad2;
-        __u32 pad3;
        kernel_ulong_t driver_data;
 };
-#define ACPI_ID_LEN     16 /* only 9 bytes needed here, 16 bytes are used */
+#define ACPI_ID_LEN     9
-                           /* to workaround crosscompile issues */
 struct acpi_device_id {
        __u8 id[ACPI_ID_LEN];
@@ -231,11 +224,7 @@ struct of_device_id
        char    name[32];
        char    type[32];
        char    compatible[128];
-#ifdef __KERNEL__
        const void *data;
-#else
-        kernel_ulong_t data;
-#endif
 };
 /* VIO */
@@ -260,24 +249,14 @@ struct pcmcia_device_id {
        /* for pseudo multi-function devices */
        __u8            device_no;
-        __u32           prod_id_hash[4]
+        __u32           prod_id_hash[4];
-                __attribute__((aligned(sizeof(__u32))));
        /* not matched against in kernelspace*/
-#ifdef __KERNEL__
        const char *    prod_id[4];
-#else
-        kernel_ulong_t  prod_id[4]
-                __attribute__((aligned(sizeof(kernel_ulong_t))));
-#endif
        /* not matched against */
        kernel_ulong_t  driver_info;
-#ifdef __KERNEL__
        char *          cisfile;
-#else
-        kernel_ulong_t  cisfile;
-#endif
 };
 #define PCMCIA_DEV_ID_MATCH_MANF_ID     0x0001
@@ -373,8 +352,7 @@ struct sdio_device_id {
        __u8    class;                  /* Standard interface or SDIO_ANY_ID */
        __u16   vendor;                 /* Vendor or SDIO_ANY_ID */
        __u16   device;                 /* Device ID or SDIO_ANY_ID */
-        kernel_ulong_t driver_data      /* Data private to the driver */
+        kernel_ulong_t driver_data;     /* Data private to the driver */
-                __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 /* SSB core, see drivers/ssb/ */
@@ -420,8 +398,7 @@ struct virtio_device_id {
 */
 struct hv_vmbus_device_id {
        __u8 guid[16];
-        kernel_ulong_t driver_data      /* Data private to the driver */
+        kernel_ulong_t driver_data;     /* Data private to the driver */
-                        __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 /* rpmsg */
@@ -440,8 +417,7 @@ struct rpmsg_device_id {
 struct i2c_device_id {
        char name[I2C_NAME_SIZE];
-        kernel_ulong_t driver_data      /* Data private to the driver */
+        kernel_ulong_t driver_data;     /* Data private to the driver */
-                        __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 /* spi */
@@ -451,8 +427,7 @@ struct i2c_device_id {
 struct spi_device_id {
        char name[SPI_NAME_SIZE];
-        kernel_ulong_t driver_data      /* Data private to the driver */
+        kernel_ulong_t driver_data;     /* Data private to the driver */
-                        __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 /* dmi */
@@ -484,15 +459,6 @@ struct dmi_strmatch {
        char substr[79];
 };
-#ifndef __KERNEL__
-struct dmi_system_id {
-        kernel_ulong_t callback;
-        kernel_ulong_t ident;
-        struct dmi_strmatch matches[4];
-        kernel_ulong_t driver_data
-                        __attribute__((aligned(sizeof(kernel_ulong_t))));
-};
-#else
 struct dmi_system_id {
        int (*callback)(const struct dmi_system_id *);
        const char *ident;
@@ -506,7 +472,6 @@ struct dmi_system_id {
 *      error: storage size of '__mod_dmi_device_table' isn't known
 */
 #define dmi_device_id dmi_system_id
-#endif
 #define DMI_MATCH(a, b) { a, b }
@@ -515,8 +480,7 @@ struct dmi_system_id {
 struct platform_device_id {
        char name[PLATFORM_NAME_SIZE];
-        kernel_ulong_t driver_data
+        kernel_ulong_t driver_data;
-                        __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 #define MDIO_MODULE_PREFIX      "mdio:"
@@ -572,11 +536,7 @@ struct isapnp_device_id {
 struct amba_id {
        unsigned int            id;
        unsigned int            mask;
-#ifndef __KERNEL__
-        kernel_ulong_t          data;
-#else
        void                    *data;
-#endif
 };
 /*
diff --git a/include/linux/module.h b/include/linux/module.h
index 1375ee3f03aa..ead1b5719a12 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -396,13 +396,13 @@ bool is_module_address(unsigned long addr);
 bool is_module_percpu_address(unsigned long addr);
 bool is_module_text_address(unsigned long addr);
-static inline int within_module_core(unsigned long addr, struct module *mod)
+static inline int within_module_core(unsigned long addr, const struct module *mod)
 {
        return (unsigned long)mod->module_core <= addr &&
               addr < (unsigned long)mod->module_core + mod->core_size;
 }
-static inline int within_module_init(unsigned long addr, struct module *mod)
+static inline int within_module_init(unsigned long addr, const struct module *mod)
 {
        return (unsigned long)mod->module_init <= addr &&
               addr < (unsigned long)mod->module_init + mod->init_size;
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index f6eb4332ac92..4b02512e421c 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -245,6 +245,7 @@ struct map_info {
        unsigned long pfow_base;
        unsigned long map_priv_1;
        unsigned long map_priv_2;
+        struct device_node *device_node;
        void *fldrv_priv;
        struct mtd_chip_driver *fldrv;
 };
@@ -328,7 +329,7 @@ static inline int map_word_bitsset(struct map_info *map, map_word val1, map_word
 static inline map_word map_word_load(struct map_info *map, const void *ptr)
 {
-        map_word r = {{0} };
+        map_word r;
        if (map_bankwidth_is_1(map))
                r.x[0] = *(unsigned char *)ptr;
@@ -342,6 +343,8 @@ static inline map_word map_word_load(struct map_info *map, const void *ptr)
 #endif
        else if (map_bankwidth_is_large(map))
                memcpy(r.x, ptr, map->bankwidth);
+        else
+                BUG();
        return r;
 }
@@ -391,7 +394,7 @@ static inline map_word map_word_ff(struct map_info *map)
 static inline map_word inline_map_read(struct map_info *map, unsigned long ofs)
 {
-        map_word uninitialized_var(r);
+        map_word r;
        if (map_bankwidth_is_1(map))
                r.x[0] = __raw_readb(map->virt + ofs);
@@ -425,6 +428,8 @@ static inline void inline_map_write(struct map_info *map, const map_word datum,
 #endif
        else if (map_bankwidth_is_large(map))
                memcpy_toio(map->virt+ofs, datum.x, map->bankwidth);
+        else
+                BUG();
        mb();
 }
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index e111fa419a4e..7b8fc73810ad 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -13,6 +13,7 @@
 #define _LINUX_NFS4_H
 #include <linux/list.h>
+#include <linux/uidgid.h>
 #include <uapi/linux/nfs4.h>
 struct nfs4_ace {
@@ -20,7 +21,10 @@ struct nfs4_ace {
        uint32_t        flag;
        uint32_t        access_mask;
        int             whotype;
-        uid_t           who;
+        union {
+                kuid_t  who_uid;
+                kgid_t  who_gid;
+        };
 };
 struct nfs4_acl {
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index 2dcef3ab58b6..0f4b79da6584 100644
--- a/include/linux/nfs_idmap.h
+++ b/include/linux/nfs_idmap.h
@@ -36,6 +36,7 @@
 #ifndef NFS_IDMAP_H
 #define NFS_IDMAP_H
+#include <linux/uidgid.h>
 #include <uapi/linux/nfs_idmap.h>
@@ -67,10 +68,10 @@ void nfs_fattr_init_names(struct nfs_fattr *fattr,
 void nfs_fattr_free_names(struct nfs_fattr *);
 void nfs_fattr_map_and_free_names(struct nfs_server *, struct nfs_fattr *);
-int nfs_map_name_to_uid(const struct nfs_server *, const char *, size_t, __u32 *);
+int nfs_map_name_to_uid(const struct nfs_server *, const char *, size_t, kuid_t *);
-int nfs_map_group_to_gid(const struct nfs_server *, const char *, size_t, __u32 *);
+int nfs_map_group_to_gid(const struct nfs_server *, const char *, size_t, kgid_t *);
-int nfs_map_uid_to_name(const struct nfs_server *, __u32, char *, size_t);
+int nfs_map_uid_to_name(const struct nfs_server *, kuid_t, char *, size_t);
-int nfs_map_gid_to_group(const struct nfs_server *, __u32, char *, size_t);
+int nfs_map_gid_to_group(const struct nfs_server *, kgid_t, char *, size_t);
 extern unsigned int nfs_idmap_cache_timeout;
 #endif /* NFS_IDMAP_H */
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 29adb12c7ecf..4b993d358dad 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -48,8 +48,8 @@ struct nfs_fattr {
        unsigned int            valid;          /* which fields are valid */
        umode_t                 mode;
        __u32                   nlink;
-        __u32                   uid;
+        kuid_t                  uid;
-        __u32                   gid;
+        kgid_t                  gid;
        dev_t                   rdev;
        __u64                   size;
        union {
@@ -233,6 +233,7 @@ struct nfs4_layoutget_args {
        struct inode *inode;
        struct nfs_open_context *ctx;
        nfs4_stateid stateid;
+        unsigned long timestamp;
        struct nfs4_layoutdriver_data layout;
 };
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 24c139288db4..7898c997dfea 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -49,8 +49,8 @@ struct svc_export {
        struct auth_domain *    ex_client;
        int                     ex_flags;
        struct path             ex_path;
-        uid_t                   ex_anon_uid;
+        kuid_t                  ex_anon_uid;
-        gid_t                   ex_anon_gid;
+        kgid_t                  ex_anon_gid;
        int                     ex_fsid;
        unsigned char *         ex_uuid; /* 16 byte fsid */
        struct nfsd4_fs_locations ex_fslocs;
diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
new file mode 100644
index 000000000000..d15073e080dd
--- /dev/null
+++ b/include/linux/of_dma.h
@@ -0,0 +1,74 @@
+/*
+ * OF helpers for DMA request / controller
+ *
+ * Based on of_gpio.h
+ *
+ * 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 version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __LINUX_OF_DMA_H
+#define __LINUX_OF_DMA_H
+#include <linux/of.h>
+#include <linux/dmaengine.h>
+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;
+        int                     use_count;
+};
+struct of_dma_filter_info {
+        dma_cap_mask_t  dma_cap;
+        dma_filter_fn   filter_fn;
+};
+#ifdef CONFIG_OF
+extern int of_dma_controller_register(struct device_node *np,
+                struct dma_chan *(*of_dma_xlate)
+                (struct of_phandle_args *, struct of_dma *),
+                void *data);
+extern int of_dma_controller_free(struct device_node *np);
+extern struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
+                                                     char *name);
+extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
+                struct of_dma *ofdma);
+#else
+static inline int of_dma_controller_register(struct device_node *np,
+                struct dma_chan *(*of_dma_xlate)
+                (struct of_phandle_args *, struct of_dma *),
+                void *data)
+{
+        return -ENODEV;
+}
+static inline int of_dma_controller_free(struct device_node *np)
+{
+        return -ENODEV;
+}
+static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
+                                                     char *name)
+{
+        return NULL;
+}
+static inline struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
+                struct of_dma *ofdma)
+{
+        return NULL;
+}
+#endif
+#endif /* __LINUX_OF_DMA_H */
diff --git a/include/linux/opp.h b/include/linux/opp.h
index 214e0ebcb84d..3aca2b8def33 100644
--- a/include/linux/opp.h
+++ b/include/linux/opp.h
@@ -47,15 +47,6 @@ int opp_enable(struct device *dev, unsigned long freq);
 int opp_disable(struct device *dev, unsigned long freq);
 struct srcu_notifier_head *opp_get_notifier(struct device *dev);
-#ifdef CONFIG_OF
-int of_init_opp_table(struct device *dev);
-#else
-static inline int of_init_opp_table(struct device *dev)
-{
-        return -EINVAL;
-}
-#endif /* CONFIG_OF */
 #else
 static inline unsigned long opp_get_voltage(struct opp *opp)
 {
@@ -112,6 +103,15 @@ static inline struct srcu_notifier_head *opp_get_notifier(struct device *dev)
 }
 #endif          /* CONFIG_PM_OPP */
+#if defined(CONFIG_PM_OPP) && defined(CONFIG_OF)
+int of_init_opp_table(struct device *dev);
+#else
+static inline int of_init_opp_table(struct device *dev)
+{
+        return -EINVAL;
+}
+#endif
 #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
 int opp_init_cpufreq_table(struct device *dev,
                            struct cpufreq_frequency_table **table);
diff --git a/include/linux/path.h b/include/linux/path.h
index edc98dec6266..d1372186f431 100644
--- a/include/linux/path.h
+++ b/include/linux/path.h
@@ -9,8 +9,8 @@ struct path {
        struct dentry *dentry;
 };
-extern void path_get(struct path *);
+extern void path_get(const struct path *);
-extern void path_put(struct path *);
+extern void path_put(const struct path *);
 static inline int path_equal(const struct path *path1, const struct path *path2)
 {
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 6fa4dd2a3b9e..2461033a7987 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -286,6 +286,7 @@ struct pci_dev {
        unsigned int    irq;
        struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */
+        bool match_driver;              /* Skip attaching driver */
        /* These fields are used by common fixups */
        unsigned int    transparent:1;  /* Transparent PCI bridge */
        unsigned int    multifunction:1;/* Part of multi-function device */
@@ -378,6 +379,8 @@ void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
                     void (*release_fn)(struct pci_host_bridge *),
                     void *release_data);
+int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge);
 /*
 * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond
 * to P2P or CardBus bridge windows) go in a table.  Additional ones (for
@@ -674,6 +677,7 @@ extern struct list_head pci_root_buses;	/* list of all known PCI buses */
 /* Some device drivers need know if pci is initiated */
 extern int no_pci_devices(void);
+void pcibios_resource_survey_bus(struct pci_bus *bus);
 void pcibios_fixup_bus(struct pci_bus *);
 int __must_check pcibios_enable_device(struct pci_dev *, int mask);
 /* Architecture specific versions may override this (weak) */
@@ -1700,12 +1704,21 @@ static inline bool pci_is_pcie(struct pci_dev *dev)
 }
 /**
+ * pcie_caps_reg - get the PCIe Capabilities Register
+ * @dev: PCI device
+ */
+static inline u16 pcie_caps_reg(const struct pci_dev *dev)
+{
+        return dev->pcie_flags_reg;
+}
+/**
 * pci_pcie_type - get the PCIe device/port type
 * @dev: PCI device
 */
 static inline int pci_pcie_type(const struct pci_dev *dev)
 {
-        return (dev->pcie_flags_reg & PCI_EXP_FLAGS_TYPE) >> 4;
+        return (pcie_caps_reg(dev) & PCI_EXP_FLAGS_TYPE) >> 4;
 }
 void pci_request_acs(void);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 31717bd287fd..f11c1c2609d5 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2802,6 +2802,7 @@
 #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX       0x3ce0
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB    0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16     0x65f0
+#define PCI_DEVICE_ID_INTEL_5100_19     0x65f3
 #define PCI_DEVICE_ID_INTEL_5100_21     0x65f5
 #define PCI_DEVICE_ID_INTEL_5100_22     0x65f6
 #define PCI_DEVICE_ID_INTEL_5400_ERR    0x4030
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 2381c973d897..a089a3c447fc 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -176,9 +176,8 @@ pid_t pid_vnr(struct pid *pid);
 #define do_each_pid_task(pid, type, task)                               \
        do {                                                            \
-                struct hlist_node *pos___;                              \
                if ((pid) != NULL)                                      \
-                        hlist_for_each_entry_rcu((task), pos___,        \
+                        hlist_for_each_entry_rcu((task),                \
                                &(pid)->tasks[type], pids[type].node) {
                        /*
diff --git a/include/linux/platform_data/dma-ste-dma40.h b/include/linux/platform_data/dma-ste-dma40.h
index 9ff93b065686..4b781014b0a0 100644
--- a/include/linux/platform_data/dma-ste-dma40.h
+++ b/include/linux/platform_data/dma-ste-dma40.h
@@ -147,6 +147,16 @@ struct stedma40_chan_cfg {
 * @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
+ * which avoids HW bug that exists in some versions of the controller.
+ * SoftLLI introduces relink overhead that could impact performace for
+ * certain use cases.
+ * @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_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;
@@ -157,7 +167,10 @@ struct stedma40_platform_data {
        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_phy_chans;
 };
 #ifdef CONFIG_STE_DMA40
diff --git a/include/linux/platform_data/elm.h b/include/linux/platform_data/elm.h
new file mode 100644
index 000000000000..1bd5244d1dcd
--- /dev/null
+++ b/include/linux/platform_data/elm.h
@@ -0,0 +1,54 @@
+/*
+ * BCH Error Location Module
+ *
+ * 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.
+ *
+ * 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 __ELM_H
+#define __ELM_H
+enum bch_ecc {
+        BCH4_ECC = 0,
+        BCH8_ECC,
+};
+/* ELM support 8 error syndrome process */
+#define ERROR_VECTOR_MAX                8
+#define BCH8_ECC_OOB_BYTES              13
+#define BCH4_ECC_OOB_BYTES              7
+/* RBL requires 14 byte even though BCH8 uses only 13 byte */
+#define BCH8_SIZE                       (BCH8_ECC_OOB_BYTES + 1)
+/* Uses 1 extra byte to handle erased pages */
+#define BCH4_SIZE                       (BCH4_ECC_OOB_BYTES + 1)
+/**
+ * struct elm_errorvec - error vector for elm
+ * @error_reported:             set true for vectors error is reported
+ * @error_uncorrectable:        number of uncorrectable errors
+ * @error_count:                number of correctable errors in the sector
+ * @error_loc:                  buffer for error location
+ *
+ */
+struct elm_errorvec {
+        bool error_reported;
+        bool error_uncorrectable;
+        int error_count;
+        int error_loc[ERROR_VECTOR_MAX];
+};
+void elm_decode_bch_error_page(struct device *dev, u8 *ecc_calc,
+                struct elm_errorvec *err_vec);
+void elm_config(struct device *dev, enum bch_ecc bch_type);
+#endif /* __ELM_H */
diff --git a/include/linux/platform_data/exynos_thermal.h b/include/linux/platform_data/exynos_thermal.h
index a7bdb2f63b73..da7e6274b175 100644
--- a/include/linux/platform_data/exynos_thermal.h
+++ b/include/linux/platform_data/exynos_thermal.h
@@ -53,6 +53,8 @@ struct freq_clip_table {
 * 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
@@ -97,6 +99,7 @@ struct freq_clip_table {
 */
 struct exynos_tmu_platform_data {
        u8 threshold;
+        u8 threshold_falling;
        u8 trigger_levels[4];
        bool trigger_level0_en;
        bool trigger_level1_en;
diff --git a/include/linux/platform_data/leds-lp55xx.h b/include/linux/platform_data/leds-lp55xx.h
new file mode 100644
index 000000000000..1509570d5a3f
--- /dev/null
+++ b/include/linux/platform_data/leds-lp55xx.h
@@ -0,0 +1,87 @@
+/*
+ * LP55XX Platform Data Header
+ *
+ * Copyright (C) 2012 Texas Instruments
+ *
+ * Author: Milo(Woogyom) Kim <milo.kim@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.
+ *
+ * Derived from leds-lp5521.h, leds-lp5523.h
+ */
+#ifndef _LEDS_LP55XX_H
+#define _LEDS_LP55XX_H
+/* Clock configuration */
+#define LP55XX_CLOCK_AUTO       0
+#define LP55XX_CLOCK_INT        1
+#define LP55XX_CLOCK_EXT        2
+/* Bits in LP5521 CONFIG register. 'update_config' in lp55xx_platform_data */
+#define LP5521_PWM_HF                   0x40    /* PWM: 0 = 256Hz, 1 = 558Hz */
+#define LP5521_PWRSAVE_EN               0x20    /* 1 = Power save mode */
+#define LP5521_CP_MODE_OFF              0       /* Charge pump (CP) off */
+#define LP5521_CP_MODE_BYPASS           8       /* CP forced to bypass mode */
+#define LP5521_CP_MODE_1X5              0x10    /* CP forced to 1.5x mode */
+#define LP5521_CP_MODE_AUTO             0x18    /* Automatic mode selection */
+#define LP5521_R_TO_BATT                4       /* R out: 0 = CP, 1 = Vbat */
+#define LP5521_CLK_SRC_EXT              0       /* Ext-clk source (CLK_32K) */
+#define LP5521_CLK_INT                  1       /* Internal clock */
+#define LP5521_CLK_AUTO                 2       /* Automatic clock selection */
+struct lp55xx_led_config {
+        const char *name;
+        u8 chan_nr;
+        u8 led_current; /* mA x10, 0 if led is not connected */
+        u8 max_current;
+};
+struct lp55xx_predef_pattern {
+        u8 *r;
+        u8 *g;
+        u8 *b;
+        u8 size_r;
+        u8 size_g;
+        u8 size_b;
+};
+/*
+ * struct lp55xx_platform_data
+ * @led_config        : Configurable led class device
+ * @num_channels      : Number of LED channels
+ * @label             : Used for naming LEDs
+ * @clock_mode        : Input clock mode. LP55XX_CLOCK_AUTO or _INT or _EXT
+ * @setup_resources   : Platform specific function before enabling the chip
+ * @release_resources : Platform specific function after  disabling the chip
+ * @enable            : EN pin control by platform side
+ * @patterns          : Predefined pattern data for RGB channels
+ * @num_patterns      : Number of patterns
+ * @update_config     : Value of CONFIG register
+ */
+struct lp55xx_platform_data {
+        /* LED channel configuration */
+        struct lp55xx_led_config *led_config;
+        u8 num_channels;
+        const char *label;
+        /* Clock configuration */
+        u8 clock_mode;
+        /* Platform specific functions */
+        int (*setup_resources)(void);
+        void (*release_resources)(void);
+        void (*enable)(bool state);
+        /* Predefined pattern data */
+        struct lp55xx_predef_pattern *patterns;
+        unsigned int num_patterns;
+        /* _CONFIG register */
+        u8 update_config;
+};
+#endif /* _LEDS_LP55XX_H */
diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
index aaf97481f413..b4a0521ce411 100644
--- a/include/linux/platform_data/mmc-esdhc-imx.h
+++ b/include/linux/platform_data/mmc-esdhc-imx.h
@@ -39,5 +39,6 @@ struct esdhc_platform_data {
        unsigned int cd_gpio;
        enum wp_types wp_type;
        enum cd_types cd_type;
+        int max_bus_width;
 };
 #endif /* __ASM_ARCH_IMX_ESDHC_H */
diff --git a/include/linux/platform_data/mmc-sdhci-tegra.h b/include/linux/platform_data/mmc-sdhci-tegra.h
deleted file mode 100644
index 8f8430697686..000000000000
--- a/include/linux/platform_data/mmc-sdhci-tegra.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 Palm, Inc.
- * Author: Yvonne Yip <y@palm.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-#ifndef __PLATFORM_DATA_TEGRA_SDHCI_H
-#define __PLATFORM_DATA_TEGRA_SDHCI_H
-#include <linux/mmc/host.h>
-struct tegra_sdhci_platform_data {
-        int cd_gpio;
-        int wp_gpio;
-        int power_gpio;
-        int is_8bit;
-        int pm_flags;
-};
-#endif
diff --git a/include/linux/platform_data/sh_ipmmu.h b/include/linux/platform_data/sh_ipmmu.h
new file mode 100644
index 000000000000..39f7405cdac5
--- /dev/null
+++ b/include/linux/platform_data/sh_ipmmu.h
@@ -0,0 +1,18 @@
+/* sh_ipmmu.h
+ *
+ * Copyright (C) 2012  Hideki EIRAKU
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+#ifndef __SH_IPMMU_H__
+#define __SH_IPMMU_H__
+struct shmobile_ipmmu_platform_data {
+        const char * const *dev_names;
+        unsigned int num_dev_names;
+};
+#endif /* __SH_IPMMU_H__ */
diff --git a/include/linux/platform_data/usb-omap.h b/include/linux/platform_data/usb-omap.h
index e697c85ad3bc..fa579b4c666b 100644
--- a/include/linux/platform_data/usb-omap.h
+++ b/include/linux/platform_data/usb-omap.h
@@ -55,6 +55,7 @@ struct ohci_hcd_omap_platform_data {
 };
 struct usbhs_omap_platform_data {
+        int                             nports;
        enum usbhs_omap_port_mode       port_mode[OMAP3_HS_USB_PORTS];
        int                             reset_gpio_port[OMAP3_HS_USB_PORTS];
        struct regulator                *regulator[OMAP3_HS_USB_PORTS];
diff --git a/include/linux/platform_data/ux500_wdt.h b/include/linux/platform_data/ux500_wdt.h
new file mode 100644
index 000000000000..1689ff4c3bfd
--- /dev/null
+++ b/include/linux/platform_data/ux500_wdt.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) ST Ericsson SA 2011
+ *
+ * License Terms: GNU General Public License v2
+ *
+ * STE Ux500 Watchdog platform data
+ */
+#ifndef __UX500_WDT_H
+#define __UX500_WDT_H
+/**
+ * struct ux500_wdt_data
+ */
+struct ux500_wdt_data {
+        unsigned int timeout;
+        bool has_28_bits_resolution;
+};
+#endif /* __UX500_WDT_H */
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index 6d661f32e0e4..a4df2042b79c 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -146,6 +146,8 @@ struct pwm_ops {
 * @base: number of first PWM controlled by this chip
 * @npwm: number of PWMs controlled by this chip
 * @pwms: array of PWM devices allocated by the framework
+ * @can_sleep: must be true if the .config(), .enable() or .disable()
+ *             operations may sleep
 */
 struct pwm_chip {
        struct device           *dev;
@@ -159,6 +161,7 @@ struct pwm_chip {
        struct pwm_device *     (*of_xlate)(struct pwm_chip *pc,
                                            const struct of_phandle_args *args);
        unsigned int            of_pwm_n_cells;
+        bool                    can_sleep;
 };
 #if IS_ENABLED(CONFIG_PWM)
@@ -174,11 +177,16 @@ struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,
 struct pwm_device *of_pwm_xlate_with_flags(struct pwm_chip *pc,
                const struct of_phandle_args *args);
-struct pwm_device *pwm_get(struct device *dev, const char *consumer);
+struct pwm_device *pwm_get(struct device *dev, const char *con_id);
+struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id);
 void pwm_put(struct pwm_device *pwm);
-struct pwm_device *devm_pwm_get(struct device *dev, const char *consumer);
+struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id);
+struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np,
+                                   const char *con_id);
 void devm_pwm_put(struct device *dev, struct pwm_device *pwm);
+bool pwm_can_sleep(struct pwm_device *pwm);
 #else
 static inline int pwm_set_chip_data(struct pwm_device *pwm, void *data)
 {
@@ -213,6 +221,12 @@ static inline struct pwm_device *pwm_get(struct device *dev,
        return ERR_PTR(-ENODEV);
 }
+static inline struct pwm_device *of_pwm_get(struct device_node *np,
+                                            const char *con_id)
+{
+        return ERR_PTR(-ENODEV);
+}
 static inline void pwm_put(struct pwm_device *pwm)
 {
 }
@@ -223,9 +237,21 @@ static inline struct pwm_device *devm_pwm_get(struct device *dev,
        return ERR_PTR(-ENODEV);
 }
+static inline struct pwm_device *devm_of_pwm_get(struct device *dev,
+                                                 struct device_node *np,
+                                                 const char *con_id)
+{
+        return ERR_PTR(-ENODEV);
+}
 static inline void devm_pwm_put(struct device *dev, struct pwm_device *pwm)
 {
 }
+static inline bool pwm_can_sleep(struct pwm_device *pwm)
+{
+        return false;
+}
 #endif
 struct pwm_lookup {
diff --git a/include/linux/quota.h b/include/linux/quota.h
index 58fdef125252..d13371134c59 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -405,6 +405,7 @@ struct quota_module_name {
 #define INIT_QUOTA_MODULE_NAMES {\
        {QFMT_VFS_OLD, "quota_v1"},\
        {QFMT_VFS_V0, "quota_v2"},\
+        {QFMT_VFS_V1, "quota_v2"},\
        {0, NULL}}
 #endif /* _QUOTA_ */
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index c92dd28eaa6c..8089e35d47ac 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -445,8 +445,7 @@ static inline void hlist_add_after_rcu(struct hlist_node *prev,
 /**
 * hlist_for_each_entry_rcu - iterate over rcu list of given type
- * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the type * to use as a loop cursor.
- * @pos:        the &struct hlist_node to use as a loop cursor.
 * @head:       the head for your list.
 * @member:     the name of the hlist_node within the struct.
 *
@@ -454,16 +453,16 @@ static inline void hlist_add_after_rcu(struct hlist_node *prev,
 * the _rcu list-mutation primitives such as hlist_add_head_rcu()
 * as long as the traversal is guarded by rcu_read_lock().
 */
-#define hlist_for_each_entry_rcu(tpos, pos, head, member)               \
+#define hlist_for_each_entry_rcu(pos, head, member)                     \
-        for (pos = rcu_dereference_raw(hlist_first_rcu(head));          \
+        for (pos = hlist_entry_safe (rcu_dereference_raw(hlist_first_rcu(head)),\
-                pos &&                                                   \
+                        typeof(*(pos)), member);                        \
-                ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1; }); \
+                pos;                                                    \
-                pos = rcu_dereference_raw(hlist_next_rcu(pos)))
+                pos = hlist_entry_safe(rcu_dereference_raw(hlist_next_rcu(\
+                        &(pos)->member)), typeof(*(pos)), member))
 /**
 * hlist_for_each_entry_rcu_bh - iterate over rcu list of given type
- * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the type * to use as a loop cursor.
- * @pos:        the &struct hlist_node to use as a loop cursor.
 * @head:       the head for your list.
 * @member:     the name of the hlist_node within the struct.
 *
@@ -471,35 +470,36 @@ static inline void hlist_add_after_rcu(struct hlist_node *prev,
 * the _rcu list-mutation primitives such as hlist_add_head_rcu()
 * as long as the traversal is guarded by rcu_read_lock().
 */
-#define hlist_for_each_entry_rcu_bh(tpos, pos, head, member)             \
+#define hlist_for_each_entry_rcu_bh(pos, head, member)                  \
-        for (pos = rcu_dereference_bh((head)->first);                    \
+        for (pos = hlist_entry_safe(rcu_dereference_bh(hlist_first_rcu(head)),\
-                pos &&                                                   \
+                        typeof(*(pos)), member);                        \
-                ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1; }); \
+                pos;                                                    \
-                pos = rcu_dereference_bh(pos->next))
+                pos = hlist_entry_safe(rcu_dereference_bh(hlist_next_rcu(\
+                        &(pos)->member)), typeof(*(pos)), member))
 /**
 * hlist_for_each_entry_continue_rcu - iterate over a hlist continuing after current point
- * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the type * to use as a loop cursor.
- * @pos:        the &struct hlist_node to use as a loop cursor.
 * @member:     the name of the hlist_node within the struct.
 */
-#define hlist_for_each_entry_continue_rcu(tpos, pos, member)            \
+#define hlist_for_each_entry_continue_rcu(pos, member)                  \
-        for (pos = rcu_dereference((pos)->next);                        \
+        for (pos = hlist_entry_safe(rcu_dereference((pos)->member.next),\
-             pos &&                                                     \
+                        typeof(*(pos)), member);                        \
-             ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1; });  \
+             pos;                                                       \
-             pos = rcu_dereference(pos->next))
+             pos = hlist_entry_safe(rcu_dereference((pos)->member.next),\
+                        typeof(*(pos)), member))
 /**
 * hlist_for_each_entry_continue_rcu_bh - iterate over a hlist continuing after current point
- * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the type * to use as a loop cursor.
- * @pos:        the &struct hlist_node to use as a loop cursor.
 * @member:     the name of the hlist_node within the struct.
 */
-#define hlist_for_each_entry_continue_rcu_bh(tpos, pos, member)         \
+#define hlist_for_each_entry_continue_rcu_bh(pos, member)               \
-        for (pos = rcu_dereference_bh((pos)->next);                     \
+        for (pos = hlist_entry_safe(rcu_dereference_bh((pos)->member.next),\
-             pos &&                                                     \
+                        typeof(*(pos)), member);                        \
-             ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1; });  \
+             pos;                                                       \
-             pos = rcu_dereference_bh(pos->next))
+             pos = hlist_entry_safe(rcu_dereference_bh((pos)->member.next),\
+                        typeof(*(pos)), member))
 #endif  /* __KERNEL__ */
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
index 4bd6c06eb28e..2d8bdaef9611 100644
--- a/include/linux/scatterlist.h
+++ b/include/linux/scatterlist.h
@@ -231,6 +231,41 @@ size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents,
 */
 #define SG_MAX_SINGLE_ALLOC             (PAGE_SIZE / sizeof(struct scatterlist))
+/*
+ * sg page iterator
+ *
+ * Iterates over sg entries page-by-page.  On each successful iteration,
+ * @piter->page points to the current page, @piter->sg to the sg holding this
+ * page and @piter->sg_pgoffset to the page's page offset within the sg. The
+ * iteration will stop either when a maximum number of sg entries was reached
+ * or a terminating sg (sg_last(sg) == true) was reached.
+ */
+struct sg_page_iter {
+        struct page             *page;          /* current page */
+        struct scatterlist      *sg;            /* sg holding the page */
+        unsigned int            sg_pgoffset;    /* page offset within the sg */
+        /* these are internal states, keep away */
+        unsigned int            __nents;        /* remaining sg entries */
+        int                     __pg_advance;   /* nr pages to advance at the
+                                                 * next step */
+};
+bool __sg_page_iter_next(struct sg_page_iter *piter);
+void __sg_page_iter_start(struct sg_page_iter *piter,
+                          struct scatterlist *sglist, unsigned int nents,
+                          unsigned long pgoffset);
+/**
+ * for_each_sg_page - iterate over the pages of the given sg list
+ * @sglist:     sglist to iterate over
+ * @piter:      page iterator to hold current page, sg, sg_pgoffset
+ * @nents:      maximum number of sg entries to iterate over
+ * @pgoffset:   starting page offset
+ */
+#define for_each_sg_page(sglist, piter, nents, pgoffset)                   \
+        for (__sg_page_iter_start((piter), (sglist), (nents), (pgoffset)); \
+             __sg_page_iter_next(piter);)
 /*
 * Mapping sg iterator
@@ -258,11 +293,11 @@ struct sg_mapping_iter {
        void                    *addr;          /* pointer to the mapped area */
        size_t                  length;         /* length of the mapped area */
        size_t                  consumed;       /* number of consumed bytes */
+        struct sg_page_iter     piter;          /* page iterator */
        /* these are internal states, keep away */
-        struct scatterlist      *__sg;          /* current entry */
+        unsigned int            __offset;       /* offset within page */
-        unsigned int            __nents;        /* nr of remaining entries */
+        unsigned int            __remaining;    /* remaining bytes on page */
-        unsigned int            __offset;       /* offset within sg */
        unsigned int            __flags;
 };
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 0655570c67eb..d35d2b6ddbfb 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -99,7 +99,6 @@ extern int nr_threads;
 DECLARE_PER_CPU(unsigned long, process_counts);
 extern int nr_processes(void);
 extern unsigned long nr_running(void);
-extern unsigned long nr_uninterruptible(void);
 extern unsigned long nr_iowait(void);
 extern unsigned long nr_iowait_cpu(int cpu);
 extern unsigned long this_cpu_load(void);
@@ -347,11 +346,6 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm) {}
 extern void set_dumpable(struct mm_struct *mm, int value);
 extern int get_dumpable(struct mm_struct *mm);
-/* get/set_dumpable() values */
-#define SUID_DUMPABLE_DISABLED  0
-#define SUID_DUMPABLE_ENABLED   1
-#define SUID_DUMPABLE_SAFE      2
 /* mm flags */
 /* dumpable bits */
 #define MMF_DUMPABLE      0  /* core dump is permitted */
diff --git a/include/linux/stmp3xxx_rtc_wdt.h b/include/linux/stmp3xxx_rtc_wdt.h
new file mode 100644
index 000000000000..1dd12c96231b
--- /dev/null
+++ b/include/linux/stmp3xxx_rtc_wdt.h
@@ -0,0 +1,15 @@
+/*
+ * stmp3xxx_rtc_wdt.h
+ *
+ * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K.
+ *
+ * This file is released under the GPLv2.
+ */
+#ifndef __LINUX_STMP3XXX_RTC_WDT_H
+#define __LINUX_STMP3XXX_RTC_WDT_H
+struct stmp3xxx_wdt_pdata {
+        void (*wdt_set_timeout)(struct device *dev, u32 timeout);
+};
+#endif /* __LINUX_STMP3XXX_RTC_WDT_H */
diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
new file mode 100644
index 000000000000..07d8e53bedfc
--- /dev/null
+++ b/include/linux/sunrpc/addr.h
@@ -0,0 +1,170 @@
+/*
+ * linux/include/linux/sunrpc/addr.h
+ *
+ * Various routines for copying and comparing sockaddrs and for
+ * converting them to and from presentation format.
+ */
+#ifndef _LINUX_SUNRPC_ADDR_H
+#define _LINUX_SUNRPC_ADDR_H
+#include <linux/socket.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <net/ipv6.h>
+size_t          rpc_ntop(const struct sockaddr *, char *, const size_t);
+size_t          rpc_pton(struct net *, const char *, const size_t,
+                         struct sockaddr *, const size_t);
+char *          rpc_sockaddr2uaddr(const struct sockaddr *, gfp_t);
+size_t          rpc_uaddr2sockaddr(struct net *, const char *, const size_t,
+                                   struct sockaddr *, const size_t);
+static inline unsigned short rpc_get_port(const struct sockaddr *sap)
+{
+        switch (sap->sa_family) {
+        case AF_INET:
+                return ntohs(((struct sockaddr_in *)sap)->sin_port);
+        case AF_INET6:
+                return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
+        }
+        return 0;
+}
+static inline void rpc_set_port(struct sockaddr *sap,
+                                const unsigned short port)
+{
+        switch (sap->sa_family) {
+        case AF_INET:
+                ((struct sockaddr_in *)sap)->sin_port = htons(port);
+                break;
+        case AF_INET6:
+                ((struct sockaddr_in6 *)sap)->sin6_port = htons(port);
+                break;
+        }
+}
+#define IPV6_SCOPE_DELIMITER            '%'
+#define IPV6_SCOPE_ID_LEN               sizeof("%nnnnnnnnnn")
+static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
+                                   const struct sockaddr *sap2)
+{
+        const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
+        const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
+        return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
+}
+static inline bool __rpc_copy_addr4(struct sockaddr *dst,
+                                    const struct sockaddr *src)
+{
+        const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
+        struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
+        dsin->sin_family = ssin->sin_family;
+        dsin->sin_addr.s_addr = ssin->sin_addr.s_addr;
+        return true;
+}
+#if IS_ENABLED(CONFIG_IPV6)
+static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
+                                   const struct sockaddr *sap2)
+{
+        const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
+        const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
+        if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr))
+                return false;
+        else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL)
+                return sin1->sin6_scope_id == sin2->sin6_scope_id;
+        return true;
+}
+static inline bool __rpc_copy_addr6(struct sockaddr *dst,
+                                    const struct sockaddr *src)
+{
+        const struct sockaddr_in6 *ssin6 = (const struct sockaddr_in6 *) src;
+        struct sockaddr_in6 *dsin6 = (struct sockaddr_in6 *) dst;
+        dsin6->sin6_family = ssin6->sin6_family;
+        dsin6->sin6_addr = ssin6->sin6_addr;
+        dsin6->sin6_scope_id = ssin6->sin6_scope_id;
+        return true;
+}
+#else   /* !(IS_ENABLED(CONFIG_IPV6) */
+static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
+                                   const struct sockaddr *sap2)
+{
+        return false;
+}
+static inline bool __rpc_copy_addr6(struct sockaddr *dst,
+                                    const struct sockaddr *src)
+{
+        return false;
+}
+#endif  /* !(IS_ENABLED(CONFIG_IPV6) */
+/**
+ * rpc_cmp_addr - compare the address portion of two sockaddrs.
+ * @sap1: first sockaddr
+ * @sap2: second sockaddr
+ *
+ * Just compares the family and address portion. Ignores port, but
+ * compares the scope if it's a link-local address.
+ *
+ * Returns true if the addrs are equal, false if they aren't.
+ */
+static inline bool rpc_cmp_addr(const struct sockaddr *sap1,
+                                const struct sockaddr *sap2)
+{
+        if (sap1->sa_family == sap2->sa_family) {
+                switch (sap1->sa_family) {
+                case AF_INET:
+                        return __rpc_cmp_addr4(sap1, sap2);
+                case AF_INET6:
+                        return __rpc_cmp_addr6(sap1, sap2);
+                }
+        }
+        return false;
+}
+/**
+ * rpc_copy_addr - copy the address portion of one sockaddr to another
+ * @dst: destination sockaddr
+ * @src: source sockaddr
+ *
+ * Just copies the address portion and family. Ignores port, scope, etc.
+ * Caller is responsible for making certain that dst is large enough to hold
+ * the address in src. Returns true if address family is supported. Returns
+ * false otherwise.
+ */
+static inline bool rpc_copy_addr(struct sockaddr *dst,
+                                 const struct sockaddr *src)
+{
+        switch (src->sa_family) {
+        case AF_INET:
+                return __rpc_copy_addr4(dst, src);
+        case AF_INET6:
+                return __rpc_copy_addr6(dst, src);
+        }
+        return false;
+}
+/**
+ * rpc_get_scope_id - return scopeid for a given sockaddr
+ * @sa: sockaddr to get scopeid from
+ *
+ * Returns the value of the sin6_scope_id for AF_INET6 addrs, or 0 if
+ * not an AF_INET6 address.
+ */
+static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
+{
+        if (sa->sa_family != AF_INET6)
+                return 0;
+        return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
+}
+#endif /* _LINUX_SUNRPC_ADDR_H */
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index f25ba922baaf..58fda1c3c783 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -17,14 +17,15 @@
 #include <linux/atomic.h>
 #include <linux/rcupdate.h>
+#include <linux/uidgid.h>
 /* size of the nodename buffer */
 #define UNX_MAXNODENAME 32
 /* Work around the lack of a VFS credential */
 struct auth_cred {
-        uid_t   uid;
+        kuid_t  uid;
-        gid_t   gid;
+        kgid_t  gid;
        struct group_info *group_info;
        const char *principal;
        unsigned char machine_cred : 1;
@@ -48,7 +49,7 @@ struct rpc_cred {
        unsigned long           cr_flags;       /* various flags */
        atomic_t                cr_count;       /* ref count */
-        uid_t                   cr_uid;
+        kuid_t                  cr_uid;
        /* per-flavor data */
 };
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 5dc9ee4d616e..303399b1ba59 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -83,6 +83,10 @@ struct cache_detail {
        int                     (*cache_upcall)(struct cache_detail *,
                                                struct cache_head *);
+        void                    (*cache_request)(struct cache_detail *cd,
+                                                 struct cache_head *ch,
+                                                 char **bpp, int *blen);
        int                     (*cache_parse)(struct cache_detail *,
                                               char *buf, int len);
@@ -157,11 +161,7 @@ sunrpc_cache_update(struct cache_detail *detail,
                    struct cache_head *new, struct cache_head *old, int hash);
 extern int
-sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h,
+sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h);
-                void (*cache_request)(struct cache_detail *,
-                                      struct cache_head *,
-                                      char **,
-                                      int *));
 extern void cache_clean_deferred(void *owner);
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 34206b84d8da..2cf4ffaa3cd4 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -160,162 +160,11 @@ void		rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int);
 int             rpc_protocol(struct rpc_clnt *);
 struct net *    rpc_net_ns(struct rpc_clnt *);
 size_t          rpc_max_payload(struct rpc_clnt *);
+unsigned long   rpc_get_timeout(struct rpc_clnt *clnt);
 void            rpc_force_rebind(struct rpc_clnt *);
 size_t          rpc_peeraddr(struct rpc_clnt *, struct sockaddr *, size_t);
 const char      *rpc_peeraddr2str(struct rpc_clnt *, enum rpc_display_format_t);
 int             rpc_localaddr(struct rpc_clnt *, struct sockaddr *, size_t);
-size_t          rpc_ntop(const struct sockaddr *, char *, const size_t);
-size_t          rpc_pton(struct net *, const char *, const size_t,
-                         struct sockaddr *, const size_t);
-char *          rpc_sockaddr2uaddr(const struct sockaddr *, gfp_t);
-size_t          rpc_uaddr2sockaddr(struct net *, const char *, const size_t,
-                                   struct sockaddr *, const size_t);
-static inline unsigned short rpc_get_port(const struct sockaddr *sap)
-{
-        switch (sap->sa_family) {
-        case AF_INET:
-                return ntohs(((struct sockaddr_in *)sap)->sin_port);
-        case AF_INET6:
-                return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
-        }
-        return 0;
-}
-static inline void rpc_set_port(struct sockaddr *sap,
-                                const unsigned short port)
-{
-        switch (sap->sa_family) {
-        case AF_INET:
-                ((struct sockaddr_in *)sap)->sin_port = htons(port);
-                break;
-        case AF_INET6:
-                ((struct sockaddr_in6 *)sap)->sin6_port = htons(port);
-                break;
-        }
-}
-#define IPV6_SCOPE_DELIMITER            '%'
-#define IPV6_SCOPE_ID_LEN               sizeof("%nnnnnnnnnn")
-static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
-                                   const struct sockaddr *sap2)
-{
-        const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
-        const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
-        return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
-}
-static inline bool __rpc_copy_addr4(struct sockaddr *dst,
-                                    const struct sockaddr *src)
-{
-        const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
-        struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
-        dsin->sin_family = ssin->sin_family;
-        dsin->sin_addr.s_addr = ssin->sin_addr.s_addr;
-        return true;
-}
-#if IS_ENABLED(CONFIG_IPV6)
-static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
-                                   const struct sockaddr *sap2)
-{
-        const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
-        const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
-        if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr))
-                return false;
-        else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL)
-                return sin1->sin6_scope_id == sin2->sin6_scope_id;
-        return true;
-}
-static inline bool __rpc_copy_addr6(struct sockaddr *dst,
-                                    const struct sockaddr *src)
-{
-        const struct sockaddr_in6 *ssin6 = (const struct sockaddr_in6 *) src;
-        struct sockaddr_in6 *dsin6 = (struct sockaddr_in6 *) dst;
-        dsin6->sin6_family = ssin6->sin6_family;
-        dsin6->sin6_addr = ssin6->sin6_addr;
-        return true;
-}
-#else   /* !(IS_ENABLED(CONFIG_IPV6) */
-static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
-                                   const struct sockaddr *sap2)
-{
-        return false;
-}
-static inline bool __rpc_copy_addr6(struct sockaddr *dst,
-                                    const struct sockaddr *src)
-{
-        return false;
-}
-#endif  /* !(IS_ENABLED(CONFIG_IPV6) */
-/**
- * rpc_cmp_addr - compare the address portion of two sockaddrs.
- * @sap1: first sockaddr
- * @sap2: second sockaddr
- *
- * Just compares the family and address portion. Ignores port, scope, etc.
- * Returns true if the addrs are equal, false if they aren't.
- */
-static inline bool rpc_cmp_addr(const struct sockaddr *sap1,
-                                const struct sockaddr *sap2)
-{
-        if (sap1->sa_family == sap2->sa_family) {
-                switch (sap1->sa_family) {
-                case AF_INET:
-                        return __rpc_cmp_addr4(sap1, sap2);
-                case AF_INET6:
-                        return __rpc_cmp_addr6(sap1, sap2);
-                }
-        }
-        return false;
-}
-/**
- * rpc_copy_addr - copy the address portion of one sockaddr to another
- * @dst: destination sockaddr
- * @src: source sockaddr
- *
- * Just copies the address portion and family. Ignores port, scope, etc.
- * Caller is responsible for making certain that dst is large enough to hold
- * the address in src. Returns true if address family is supported. Returns
- * false otherwise.
- */
-static inline bool rpc_copy_addr(struct sockaddr *dst,
-                                 const struct sockaddr *src)
-{
-        switch (src->sa_family) {
-        case AF_INET:
-                return __rpc_copy_addr4(dst, src);
-        case AF_INET6:
-                return __rpc_copy_addr6(dst, src);
-        }
-        return false;
-}
-/**
- * rpc_get_scope_id - return scopeid for a given sockaddr
- * @sa: sockaddr to get scopeid from
- *
- * Returns the value of the sin6_scope_id for AF_INET6 addrs, or 0 if
- * not an AF_INET6 address.
- */
-static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
-{
-        if (sa->sa_family != AF_INET6)
-                return 0;
-        return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
-}
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_CLNT_H */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 676ddf53b3ee..1f0216b9a6c9 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -50,6 +50,7 @@ struct svc_pool {
        unsigned int            sp_nrthreads;   /* # of threads in pool */
        struct list_head        sp_all_threads; /* all server threads */
        struct svc_pool_stats   sp_stats;       /* statistics on pool operation */
+        int                     sp_task_pending;/* has pending task */
 } ____cacheline_aligned_in_smp;
 /*
diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
index dd74084a9799..ff374ab30839 100644
--- a/include/linux/sunrpc/svcauth.h
+++ b/include/linux/sunrpc/svcauth.h
@@ -18,8 +18,8 @@
 #include <linux/cred.h>
 struct svc_cred {
-        uid_t                   cr_uid;
+        kuid_t                  cr_uid;
-        gid_t                   cr_gid;
+        kgid_t                  cr_gid;
        struct group_info       *cr_group_info;
        u32                     cr_flavor; /* pseudoflavor */
        char                    *cr_principal; /* for gss */
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 63988990bd36..15f9204ee70b 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -56,7 +56,7 @@ struct xdr_buf {
        struct kvec     head[1],        /* RPC header + non-page data */
                        tail[1];        /* Appended after page data */
-        struct page **  pages;          /* Array of contiguous pages */
+        struct page **  pages;          /* Array of pages */
        unsigned int    page_base,      /* Start of page data */
                        page_len,       /* Length of page data */
                        flags;          /* Flags for data disposition */
@@ -152,6 +152,7 @@ xdr_adjust_iovec(struct kvec *iov, __be32 *p)
 extern void xdr_shift_buf(struct xdr_buf *, size_t);
 extern void xdr_buf_from_iov(struct kvec *, struct xdr_buf *);
 extern int xdr_buf_subsegment(struct xdr_buf *, struct xdr_buf *, unsigned int, unsigned int);
+extern void xdr_buf_trim(struct xdr_buf *, unsigned int);
 extern int xdr_buf_read_netobj(struct xdr_buf *, struct xdr_netobj *, unsigned int);
 extern int read_bytes_from_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int);
 extern int write_bytes_to_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int);
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index fe82022478e7..f0bd7f90a90d 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -74,6 +74,8 @@ enum thermal_trend {
        THERMAL_TREND_STABLE, /* temperature is stable */
        THERMAL_TREND_RAISING, /* temperature is raising */
        THERMAL_TREND_DROPPING, /* temperature is dropping */
+        THERMAL_TREND_RAISE_FULL, /* apply highest cooling action */
+        THERMAL_TREND_DROP_FULL, /* apply lowest cooling action */
 };
 /* Events supported by Thermal Netlink */
@@ -121,6 +123,7 @@ struct thermal_zone_device_ops {
        int (*set_trip_hyst) (struct thermal_zone_device *, int,
                              unsigned long);
        int (*get_crit_temp) (struct thermal_zone_device *, unsigned long *);
+        int (*set_emul_temp) (struct thermal_zone_device *, unsigned long);
        int (*get_trend) (struct thermal_zone_device *, int,
                          enum thermal_trend *);
        int (*notify) (struct thermal_zone_device *, int,
@@ -163,6 +166,7 @@ struct thermal_zone_device {
        int polling_delay;
        int temperature;
        int last_temperature;
+        int emul_temperature;
        int passive;
        unsigned int forced_passive;
        const struct thermal_zone_device_ops *ops;
@@ -244,9 +248,11 @@ int thermal_register_governor(struct thermal_governor *);
 void thermal_unregister_governor(struct thermal_governor *);
 #ifdef CONFIG_NET
-extern int thermal_generate_netlink_event(u32 orig, enum events event);
+extern int thermal_generate_netlink_event(struct thermal_zone_device *tz,
+                                                enum events event);
 #else
-static inline int thermal_generate_netlink_event(u32 orig, enum events event)
+static int thermal_generate_netlink_event(struct thermal_zone_device *tz,
+                                                enum events event)
 {
        return 0;
 }
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index b9bd2e6c73cc..4ce009324933 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -21,7 +21,7 @@ struct user_namespace {
        struct uid_gid_map      uid_map;
        struct uid_gid_map      gid_map;
        struct uid_gid_map      projid_map;
-        struct kref             kref;
+        atomic_t                count;
        struct user_namespace   *parent;
        kuid_t                  owner;
        kgid_t                  group;
@@ -35,18 +35,18 @@ extern struct user_namespace init_user_ns;
 static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
 {
        if (ns)
-                kref_get(&ns->kref);
+                atomic_inc(&ns->count);
        return ns;
 }
 extern int create_user_ns(struct cred *new);
 extern int unshare_userns(unsigned long unshare_flags, struct cred **new_cred);
-extern void free_user_ns(struct kref *kref);
+extern void free_user_ns(struct user_namespace *ns);
 static inline void put_user_ns(struct user_namespace *ns)
 {
-        if (ns)
+        if (ns && atomic_dec_and_test(&ns->count))
-                kref_put(&ns->kref, free_user_ns);
+                free_user_ns(ns);
 }
 struct seq_operations;
diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h
index c52215ff4245..75818744ab59 100644
--- a/include/linux/vexpress.h
+++ b/include/linux/vexpress.h
@@ -27,6 +27,14 @@
 #define VEXPRESS_GPIO_MMC_CARDIN        0
 #define VEXPRESS_GPIO_MMC_WPROT         1
 #define VEXPRESS_GPIO_FLASH_WPn         2
+#define VEXPRESS_GPIO_LED0              3
+#define VEXPRESS_GPIO_LED1              4
+#define VEXPRESS_GPIO_LED2              5
+#define VEXPRESS_GPIO_LED3              6
+#define VEXPRESS_GPIO_LED4              7
+#define VEXPRESS_GPIO_LED5              8
+#define VEXPRESS_GPIO_LED6              9
+#define VEXPRESS_GPIO_LED7              10
 #define VEXPRESS_RES_FUNC(_site, _func) \
 {                                       \
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index cf8adb1f5b2c..ff6714e6d0f5 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -78,7 +78,7 @@ struct virtio_device {
        int index;
        struct device dev;
        struct virtio_device_id id;
-        struct virtio_config_ops *config;
+        const struct virtio_config_ops *config;
        struct list_head vqs;
        /* Note that this is a Linux set_bit-style bitmap. */
        unsigned long features[1];
@@ -126,4 +126,13 @@ static inline struct virtio_driver *drv_to_virtio(struct device_driver *drv)
 int register_virtio_driver(struct virtio_driver *drv);
 void unregister_virtio_driver(struct virtio_driver *drv);
+/* module_virtio_driver() - Helper macro for drivers that don't do
+ * anything special in module init/exit.  This eliminates a lot of
+ * boilerplate.  Each module may only use this macro once, and
+ * calling it replaces module_init() and module_exit()
+ */
+#define module_virtio_driver(__virtio_driver) \
+        module_driver(__virtio_driver, register_virtio_driver, \
+                        unregister_virtio_driver)
 #endif /* _LINUX_VIRTIO_H */
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 50ae7d0c279e..e8d65718560b 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -47,6 +47,7 @@ int con_set_cmap(unsigned char __user *cmap);
 int con_get_cmap(unsigned char __user *cmap);
 void scrollback(struct vc_data *vc, int lines);
 void scrollfront(struct vc_data *vc, int lines);
+void clear_buffer_attributes(struct vc_data *vc);
 void update_region(struct vc_data *vc, unsigned long start, int count);
 void redraw_screen(struct vc_data *vc, int is_switch);
 #define update_screen(x) redraw_screen(x, 0)
@@ -130,6 +131,8 @@ void vt_event_post(unsigned int event, unsigned int old, unsigned int new);
 int vt_waitactive(int n);
 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);
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index 3a9df2f43be6..2a3038ee17a3 100644
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -118,6 +118,13 @@ static inline void watchdog_set_nowayout(struct watchdog_device *wdd, bool noway
                set_bit(WDOG_NO_WAY_OUT, &wdd->status);
 }
+/* Use the following function to check if a timeout value is invalid */
+static inline bool watchdog_timeout_invalid(struct watchdog_device *wdd, unsigned int t)
+{
+        return ((wdd->max_timeout != 0) &&
+                (t < wdd->min_timeout || t > wdd->max_timeout));
+}
 /* Use the following functions to manipulate watchdog driver specific data */
 static inline void watchdog_set_drvdata(struct watchdog_device *wdd, void *data)
 {
@@ -130,6 +137,8 @@ static inline void *watchdog_get_drvdata(struct watchdog_device *wdd)
 }
 /* drivers/watchdog/watchdog_core.c */
+extern int watchdog_init_timeout(struct watchdog_device *wdd,
+                                  unsigned int timeout_parm, struct device *dev);
 extern int watchdog_register_device(struct watchdog_device *);
 extern void watchdog_unregister_device(struct watchdog_device *);
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index b82a83aba311..9a9367c0c076 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -87,9 +87,9 @@ int inode_wait(void *);
 void writeback_inodes_sb(struct super_block *, enum wb_reason reason);
 void writeback_inodes_sb_nr(struct super_block *, unsigned long nr,
                                                        enum wb_reason reason);
-int writeback_inodes_sb_if_idle(struct super_block *, enum wb_reason reason);
+int try_to_writeback_inodes_sb(struct super_block *, enum wb_reason reason);
-int writeback_inodes_sb_nr_if_idle(struct super_block *, unsigned long nr,
+int try_to_writeback_inodes_sb_nr(struct super_block *, unsigned long nr,
-                                                        enum wb_reason reason);
+                                  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);