215 files changed, 5184 insertions, 1326 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 4f3d75e1ad39..c7376bf80b06 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -31,6 +31,7 @@ static inline int gpio_is_valid(int number)
 struct device;
 struct seq_file;
 struct module;
+struct device_node;
 /**
 * struct gpio_chip - abstract a GPIO controller
@@ -106,6 +107,17 @@ struct gpio_chip {
        const char              *const *names;
        unsigned                can_sleep:1;
        unsigned                exported:1;
+#if defined(CONFIG_OF_GPIO)
+        /*
+         * If CONFIG_OF is enabled, then all GPIO controllers described in the
+         * device tree automatically may have an OF translation
+         */
+        struct device_node *of_node;
+        int of_gpio_n_cells;
+        int (*of_xlate)(struct gpio_chip *gc, struct device_node *np,
+                        const void *gpio_spec, u32 *flags);
+#endif
 };
 extern const char *gpiochip_is_requested(struct gpio_chip *chip,
@@ -115,6 +127,9 @@ extern int __must_check gpiochip_reserve(int start, int ngpio);
 /* add/remove chips */
 extern int gpiochip_add(struct gpio_chip *chip);
 extern int __must_check gpiochip_remove(struct gpio_chip *chip);
+extern struct gpio_chip *gpiochip_find(void *data,
+                                        int (*match)(struct gpio_chip *chip,
+                                                     void *data));
 /* Always use the library code for GPIO management calls,
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 030a954ed292..4e7ae6002056 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -653,6 +653,7 @@
        EXIT_DATA                                                       \
        EXIT_CALL                                                       \
        *(.discard)                                                     \
+        *(.discard.*)                                                   \
        }
 /**
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 7f0028e1010b..8f8b072c4c7b 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -33,6 +33,15 @@
 * subject to backwards-compatibility constraints.
 */
+#ifdef __KERNEL__
+/* For use by IPS driver */
+extern unsigned long i915_read_mch_val(void);
+extern bool i915_gpu_raise(void);
+extern bool i915_gpu_lower(void);
+extern bool i915_gpu_busy(void);
+extern bool i915_gpu_turbo_disable(void);
+#endif
 /* Each region is a minimum of 16k, and there are at most 255 of them.
 */
 #define I915_NR_TEX_REGIONS 255 /* table size 2k - maximum due to use
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 2fc8e14cc24a..9aa9bcadf869 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -276,6 +276,7 @@ ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
                  $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
 unifdef-y += kvm_para.h
 endif
+unifdef-y += l2tp.h
 unifdef-y += llc.h
 unifdef-y += loop.h
 unifdef-y += lp.h
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 8b1038607831..b0c174012436 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -14,14 +14,19 @@
 #ifndef ASMARM_AMBA_H
 #define ASMARM_AMBA_H
+#include <linux/clk.h>
 #include <linux/device.h>
+#include <linux/err.h>
 #include <linux/resource.h>
 #define AMBA_NR_IRQS    2
+struct clk;
 struct amba_device {
        struct device           dev;
        struct resource         res;
+        struct clk              *pclk;
        u64                     dma_mask;
        unsigned int            periphid;
        unsigned int            irq[AMBA_NR_IRQS];
@@ -59,6 +64,12 @@ struct amba_device *amba_find_device(const char *, struct device *, unsigned int
 int amba_request_regions(struct amba_device *, const char *);
 void amba_release_regions(struct amba_device *);
+#define amba_pclk_enable(d)     \
+        (IS_ERR((d)->pclk) ? 0 : clk_enable((d)->pclk))
+#define amba_pclk_disable(d)    \
+        do { if (!IS_ERR((d)->pclk)) clk_disable((d)->pclk); } while (0)
 #define amba_config(d)  (((d)->periphid >> 24) & 0xff)
 #define amba_rev(d)     (((d)->periphid >> 20) & 0x0f)
 #define amba_manf(d)    (((d)->periphid >> 12) & 0xff)
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h
index 7e466fe72025..ca84ce70d5d5 100644
--- a/include/linux/amba/mmci.h
+++ b/include/linux/amba/mmci.h
@@ -15,9 +15,10 @@
 * @ocr_mask: available voltages on the 4 pins from the block, this
 * is ignored if a regulator is used, see the MMC_VDD_* masks in
 * mmc/host.h
- * @translate_vdd: a callback function to translate a MMC_VDD_*
+ * @vdd_handler: a callback function to translate a MMC_VDD_*
- * mask into a value to be binary or:ed and written into the
+ * mask into a value to be binary (or set some other custom bits
- * MMCIPWR register of the block
+ * in MMCIPWR) or:ed and written into the MMCIPWR register of the
+ * block.  May also control external power based on the power_mode.
 * @status: if no GPIO read function was given to the block in
 * gpio_wp (below) this function will be called to determine
 * whether a card is present in the MMC slot or not
@@ -29,7 +30,8 @@
 struct mmci_platform_data {
        unsigned int f_max;
        unsigned int ocr_mask;
-        u32 (*translate_vdd)(struct device *, unsigned int);
+        u32 (*vdd_handler)(struct device *, unsigned int vdd,
+                           unsigned char power_mode);
        unsigned int (*status)(struct device *);
        int     gpio_wp;
        int     gpio_cd;
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
index 5a5a7fd62490..e1b634b635f2 100644
--- a/include/linux/amba/serial.h
+++ b/include/linux/amba/serial.h
@@ -38,10 +38,12 @@
 #define UART01x_FR              0x18    /* Flag register (Read only). */
 #define UART010_IIR             0x1C    /* Interrupt indentification register (Read). */
 #define UART010_ICR             0x1C    /* Interrupt clear register (Write). */
+#define ST_UART011_LCRH_RX      0x1C    /* Rx line control register. */
 #define UART01x_ILPR            0x20    /* IrDA low power counter register. */
 #define UART011_IBRD            0x24    /* Integer baud rate divisor register. */
 #define UART011_FBRD            0x28    /* Fractional baud rate divisor register. */
 #define UART011_LCRH            0x2c    /* Line control register. */
+#define ST_UART011_LCRH_TX      0x2c    /* Tx Line control register. */
 #define UART011_CR              0x30    /* Control register. */
 #define UART011_IFLS            0x34    /* Interrupt fifo level select. */
 #define UART011_IMSC            0x38    /* Interrupt mask. */
@@ -84,6 +86,7 @@
 #define UART010_CR_TIE          0x0020
 #define UART010_CR_RIE          0x0010
 #define UART010_CR_MSIE         0x0008
+#define ST_UART011_CR_OVSFACT   0x0008  /* Oversampling factor */
 #define UART01x_CR_IIRLP        0x0004  /* SIR low power mode */
 #define UART01x_CR_SIREN        0x0002  /* SIR enable */
 #define UART01x_CR_UARTEN       0x0001  /* UART enable */
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 817b23705c91..f6481daf6e52 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -431,6 +431,14 @@ struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
    int number,unsigned long *flags); /* number == -1: pick first available */
 struct atm_dev *atm_dev_lookup(int number);
 void atm_dev_deregister(struct atm_dev *dev);
+/* atm_dev_signal_change
+ *
+ * Propagate lower layer signal change in atm_dev->signal to netdevice.
+ * The event will be sent via a notifier call chain.
+ */
+void atm_dev_signal_change(struct atm_dev *dev, char signal);
 void vcc_insert_socket(struct sock *sk);
@@ -510,6 +518,15 @@ void register_atm_ioctl(struct atm_ioctl *);
 */
 void deregister_atm_ioctl(struct atm_ioctl *);
+/* register_atmdevice_notifier - register atm_dev notify events
+ *
+ * Clients like br2684 will register notify events
+ * Currently we notify of signal found/lost
+ */
+int register_atmdevice_notifier(struct notifier_block *nb);
+void unregister_atmdevice_notifier(struct notifier_block *nb);
 #endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 7f437ca1ed44..b840a4960282 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -1,6 +1,13 @@
 #define PHY_ID_BCM50610                 0x0143bd60
 #define PHY_ID_BCM50610M                0x0143bd70
+#define PHY_ID_BCM5241                  0x0143bc30
 #define PHY_ID_BCMAC131                 0x0143bc70
+#define PHY_ID_BCM5481                  0x0143bca0
+#define PHY_ID_BCM5482                  0x0143bcb0
+#define PHY_ID_BCM5411                  0x00206070
+#define PHY_ID_BCM5421                  0x002060e0
+#define PHY_ID_BCM5464                  0x002060b0
+#define PHY_ID_BCM5461                  0x002060c0
 #define PHY_ID_BCM57780                 0x03625d90
 #define PHY_BCM_OUI_MASK                0xfffffc00
diff --git a/include/linux/caif/caif_socket.h b/include/linux/caif/caif_socket.h
index 2a61eb1beb85..d9cb19b7cff7 100644
--- a/include/linux/caif/caif_socket.h
+++ b/include/linux/caif/caif_socket.h
@@ -62,6 +62,7 @@ enum caif_channel_priority {
 * @CAIFPROTO_DATAGRAM_LOOP:    Datagram loopback channel, used for testing.
 * @CAIFPROTO_UTIL:             Utility (Psock) channel.
 * @CAIFPROTO_RFM:              Remote File Manager
+ * @CAIFPROTO_DEBUG:            Debug link
 *
 * This enum defines the CAIF Channel type to be used. This defines
 * the service to connect to on the modem.
@@ -72,6 +73,7 @@ enum caif_protocol_type {
        CAIFPROTO_DATAGRAM_LOOP,
        CAIFPROTO_UTIL,
        CAIFPROTO_RFM,
+        CAIFPROTO_DEBUG,
        _CAIFPROTO_MAX
 };
 #define CAIFPROTO_MAX _CAIFPROTO_MAX
@@ -83,6 +85,28 @@ enum caif_protocol_type {
 enum caif_at_type {
        CAIF_ATTYPE_PLAIN = 2
 };
+ /**
+ * enum caif_debug_type - Content selection for debug connection
+ * @CAIF_DEBUG_TRACE_INTERACTIVE: Connection will contain
+ *                              both trace and interactive debug.
+ * @CAIF_DEBUG_TRACE:           Connection contains trace only.
+ * @CAIF_DEBUG_INTERACTIVE:     Connection to interactive debug.
+ */
+enum caif_debug_type {
+        CAIF_DEBUG_TRACE_INTERACTIVE = 0,
+        CAIF_DEBUG_TRACE,
+        CAIF_DEBUG_INTERACTIVE,
+};
+/**
+ * enum caif_debug_service - Debug Service Endpoint
+ * @CAIF_RADIO_DEBUG_SERVICE:   Debug service on the Radio sub-system
+ * @CAIF_APP_DEBUG_SERVICE:     Debug for the applications sub-system
+ */
+enum caif_debug_service {
+        CAIF_RADIO_DEBUG_SERVICE = 1,
+        CAIF_APP_DEBUG_SERVICE
+};
 /**
 * struct sockaddr_caif - the sockaddr structure for CAIF sockets.
@@ -109,6 +133,12 @@ enum caif_at_type {
 *
 * @u.rfm.volume:            Volume to mount.
 *
+ * @u.dbg:                    Applies when family = CAIFPROTO_DEBUG.
+ *
+ * @u.dbg.type:                      Type of debug connection to set up
+ *                            (caif_debug_type).
+ *
+ * @u.dbg.service:            Service sub-system to connect (caif_debug_service
 * Description:
 * This structure holds the connect parameters used for setting up a
 * CAIF Channel. It defines the service to connect to on the modem.
@@ -130,6 +160,10 @@ struct sockaddr_caif {
                        __u32 connection_id;
                        char      volume[16];
                } rfm;                          /* CAIFPROTO_RFM */
+                struct {
+                        __u8  type;             /* type:enum caif_debug_type */
+                        __u8  service;          /* service:caif_debug_service */
+                } dbg;                          /* CAIFPROTO_DEBUG */
        } u;
 };
diff --git a/include/linux/can/platform/flexcan.h b/include/linux/can/platform/flexcan.h
new file mode 100644
index 000000000000..72b713ab57e9
--- /dev/null
+++ b/include/linux/can/platform/flexcan.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2010 Marc Kleine-Budde <kernel@pengutronix.de>
+ *
+ * This file is released under the GPLv2
+ *
+ */
+#ifndef __CAN_PLATFORM_FLEXCAN_H
+#define __CAN_PLATFORM_FLEXCAN_H
+/**
+ * struct flexcan_platform_data - flex CAN controller platform data
+ * @transceiver_enable:         - called to power on/off the transceiver
+ *
+ */
+struct flexcan_platform_data {
+        void (*transceiver_switch)(int enable);
+};
+#endif /* __CAN_PLATFORM_FLEXCAN_H */
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 39e5ff512fbe..90012b9ddbf3 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -49,9 +49,6 @@ typedef struct __user_cap_data_struct {
 } __user *cap_user_data_t;
-#define XATTR_CAPS_SUFFIX "capability"
-#define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX
 #define VFS_CAP_REVISION_MASK   0xFF000000
 #define VFS_CAP_REVISION_SHIFT  24
 #define VFS_CAP_FLAGS_MASK      ~VFS_CAP_REVISION_MASK
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index e3d00fdb858d..ed3e92e41c6e 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -578,6 +578,7 @@ struct task_struct *cgroup_iter_next(struct cgroup *cgrp,
 void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it);
 int cgroup_scan_tasks(struct cgroup_scanner *scan);
 int cgroup_attach_task(struct cgroup *, struct task_struct *);
+int cgroup_attach_task_current_cg(struct task_struct *);
 /*
 * CSS ID is ID for cgroup_subsys_state structs under subsys. This only works
@@ -634,6 +635,12 @@ static inline int cgroupstats_build(struct cgroupstats *stats,
        return -EINVAL;
 }
+/* No cgroups - nothing to do */
+static inline int cgroup_attach_task_current_cg(struct task_struct *t)
+{
+        return 0;
+}
 #endif /* !CONFIG_CGROUPS */
 #endif /* _LINUX_CGROUP_H */
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 9f15150ce8d6..c3e9de8321c6 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -196,11 +196,6 @@ extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy,
 int cpufreq_register_governor(struct cpufreq_governor *governor);
 void cpufreq_unregister_governor(struct cpufreq_governor *governor);
-int lock_policy_rwsem_read(int cpu);
-int lock_policy_rwsem_write(int cpu);
-void unlock_policy_rwsem_read(int cpu);
-void unlock_policy_rwsem_write(int cpu);
 /*********************************************************************
 *                      CPUFREQ DRIVER INTERFACE                     *
diff --git a/include/linux/device.h b/include/linux/device.h
index 0713e10571dd..6a8276f683b6 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -638,43 +638,103 @@ extern void sysdev_shutdown(void);
 /* debugging and troubleshooting/diagnostic helpers. */
 extern const char *dev_driver_string(const struct device *dev);
-#define dev_printk(level, dev, format, arg...)  \
-        printk(level "%s %s: " format , dev_driver_string(dev) , \
-               dev_name(dev) , ## arg)
+#ifdef CONFIG_PRINTK
-#define dev_emerg(dev, format, arg...)          \
+extern int dev_printk(const char *level, const struct device *dev,
-        dev_printk(KERN_EMERG , dev , format , ## arg)
+                      const char *fmt, ...)
-#define dev_alert(dev, format, arg...)          \
+        __attribute__ ((format (printf, 3, 4)));
-        dev_printk(KERN_ALERT , dev , format , ## arg)
+extern int dev_emerg(const struct device *dev, const char *fmt, ...)
-#define dev_crit(dev, format, arg...)           \
+        __attribute__ ((format (printf, 2, 3)));
-        dev_printk(KERN_CRIT , dev , format , ## arg)
+extern int dev_alert(const struct device *dev, const char *fmt, ...)
-#define dev_err(dev, format, arg...)            \
+        __attribute__ ((format (printf, 2, 3)));
-        dev_printk(KERN_ERR , dev , format , ## arg)
+extern int dev_crit(const struct device *dev, const char *fmt, ...)
-#define dev_warn(dev, format, arg...)           \
+        __attribute__ ((format (printf, 2, 3)));
-        dev_printk(KERN_WARNING , dev , format , ## arg)
+extern int dev_err(const struct device *dev, const char *fmt, ...)
-#define dev_notice(dev, format, arg...)         \
+        __attribute__ ((format (printf, 2, 3)));
-        dev_printk(KERN_NOTICE , dev , format , ## arg)
+extern int dev_warn(const struct device *dev, const char *fmt, ...)
-#define dev_info(dev, format, arg...)           \
+        __attribute__ ((format (printf, 2, 3)));
-        dev_printk(KERN_INFO , dev , format , ## arg)
+extern int dev_notice(const struct device *dev, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+extern int _dev_info(const struct device *dev, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+#else
+static inline int dev_printk(const char *level, const struct device *dev,
+                      const char *fmt, ...)
+        __attribute__ ((format (printf, 3, 4)));
+static inline int dev_printk(const char *level, const struct device *dev,
+                      const char *fmt, ...)
+         { return 0; }
+static inline int dev_emerg(const struct device *dev, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+static inline int dev_emerg(const struct device *dev, const char *fmt, ...)
+        { return 0; }
+static inline int dev_crit(const struct device *dev, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+static inline int dev_crit(const struct device *dev, const char *fmt, ...)
+        { return 0; }
+static inline int dev_alert(const struct device *dev, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+static inline int dev_alert(const struct device *dev, const char *fmt, ...)
+        { return 0; }
+static inline int dev_err(const struct device *dev, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+static inline int dev_err(const struct device *dev, const char *fmt, ...)
+        { return 0; }
+static inline int dev_warn(const struct device *dev, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+static inline int dev_warn(const struct device *dev, const char *fmt, ...)
+        { return 0; }
+static inline int dev_notice(const struct device *dev, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+static inline int dev_notice(const struct device *dev, const char *fmt, ...)
+        { return 0; }
+static inline int _dev_info(const struct device *dev, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+static inline int _dev_info(const struct device *dev, const char *fmt, ...)
+        { return 0; }
+#endif
+/*
+ * Stupid hackaround for existing uses of non-printk uses dev_info
+ *
+ * Note that the definition of dev_info below is actually _dev_info
+ * and a macro is used to avoid redefining dev_info
+ */
+#define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg)
 #if defined(DEBUG)
 #define dev_dbg(dev, format, arg...)            \
-        dev_printk(KERN_DEBUG , dev , format , ## arg)
+        dev_printk(KERN_DEBUG, dev, format, ##arg)
 #elif defined(CONFIG_DYNAMIC_DEBUG)
-#define dev_dbg(dev, format, ...) do { \
+#define dev_dbg(dev, format, ...)                    \
+do {                                                 \
        dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \
-        } while (0)
+} while (0)
 #else
-#define dev_dbg(dev, format, arg...)            \
+#define dev_dbg(dev, format, arg...)                            \
-        ({ if (0) dev_printk(KERN_DEBUG, dev, format, ##arg); 0; })
+({                                                              \
+        if (0)                                                  \
+                dev_printk(KERN_DEBUG, dev, format, ##arg);     \
+        0;                                                      \
+})
 #endif
 #ifdef VERBOSE_DEBUG
 #define dev_vdbg        dev_dbg
 #else
+#define dev_vdbg(dev, format, arg...)                           \
-#define dev_vdbg(dev, format, arg...)           \
+({                                                              \
-        ({ if (0) dev_printk(KERN_DEBUG, dev, format, ##arg); 0; })
+        if (0)                                                  \
+                dev_printk(KERN_DEBUG, dev, format, ##arg);     \
+        0;                                                      \
+})
 #endif
 /*
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index b6cb5425cde3..493a2bf85f62 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -62,6 +62,7 @@ typedef enum fe_caps {
        FE_CAN_8VSB                     = 0x200000,
        FE_CAN_16VSB                    = 0x400000,
        FE_HAS_EXTENDED_CAPS            = 0x800000,   /* We need more bitspace for newer APIs, indicate this. */
+        FE_CAN_TURBO_FEC                = 0x8000000,  /* frontend supports "turbo fec modulation" */
        FE_CAN_2G_MODULATION            = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */
        FE_NEEDS_BENDING                = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */
        FE_CAN_RECOVER                  = 0x40000000, /* frontend can recover from a cable unplug automatically */
diff --git a/include/linux/dvb/version.h b/include/linux/dvb/version.h
index 540b0583d9fb..5a7546c12688 100644
--- a/include/linux/dvb/version.h
+++ b/include/linux/dvb/version.h
@@ -24,6 +24,6 @@
 #define _DVBVERSION_H_
 #define DVB_API_VERSION 5
-#define DVB_API_VERSION_MINOR 1
+#define DVB_API_VERSION_MINOR 2
 #endif /*_DVBVERSION_H_*/
diff --git a/include/linux/eeprom_93cx6.h b/include/linux/eeprom_93cx6.h
index a55c873e8b66..c4627cbdb8e0 100644
--- a/include/linux/eeprom_93cx6.h
+++ b/include/linux/eeprom_93cx6.h
@@ -30,6 +30,7 @@
 #define PCI_EEPROM_WIDTH_93C46  6
 #define PCI_EEPROM_WIDTH_93C56  8
 #define PCI_EEPROM_WIDTH_93C66  8
+#define PCI_EEPROM_WIDTH_93C86  8
 #define PCI_EEPROM_WIDTH_OPCODE 3
 #define PCI_EEPROM_WRITE_OPCODE 0x05
 #define PCI_EEPROM_READ_OPCODE  0x06
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 3d7a6687d247..848480bc2bf9 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -127,6 +127,20 @@ static inline void random_ether_addr(u8 *addr)
 }
 /**
+ * dev_hw_addr_random - Create random MAC and set device flag
+ * @dev: pointer to net_device structure
+ * @addr: Pointer to a six-byte array containing the Ethernet address
+ *
+ * Generate random MAC to be used by a device and set addr_assign_type
+ * so the state can be read by sysfs and be used by udev.
+ */
+static inline void dev_hw_addr_random(struct net_device *dev, u8 *hwaddr)
+{
+        dev->addr_assign_type |= NET_ADDR_RANDOM;
+        random_ether_addr(hwaddr);
+}
+/**
 * compare_ether_addr - Compare two Ethernet addresses
 * @addr1: Pointer to a six-byte array containing the Ethernet address
 * @addr2: Pointer other six-byte array containing the Ethernet address
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index b4207ca3ad52..991269e5b152 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -386,6 +386,15 @@ struct ethtool_rxnfc {
        __u32                           rule_locs[0];
 };
+struct ethtool_rxfh_indir {
+        __u32   cmd;
+        /* On entry, this is the array size of the user buffer.  On
+         * return from ETHTOOL_GRXFHINDIR, this is the array size of
+         * the hardware indirection table. */
+        __u32   size;
+        __u32   ring_index[0];  /* ring/queue index for each hash value */
+};
 struct ethtool_rx_ntuple_flow_spec {
        __u32            flow_type;
        union {
@@ -459,7 +468,7 @@ int ethtool_op_set_tso(struct net_device *dev, u32 data);
 u32 ethtool_op_get_ufo(struct net_device *dev);
 int ethtool_op_set_ufo(struct net_device *dev, u32 data);
 u32 ethtool_op_get_flags(struct net_device *dev);
-int ethtool_op_set_flags(struct net_device *dev, u32 data);
+int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported);
 void ethtool_ntuple_flush(struct net_device *dev);
 /**
@@ -578,6 +587,10 @@ struct ethtool_ops {
        int     (*set_rx_ntuple)(struct net_device *,
                                 struct ethtool_rx_ntuple *);
        int     (*get_rx_ntuple)(struct net_device *, u32 stringset, void *);
+        int     (*get_rxfh_indir)(struct net_device *,
+                                  struct ethtool_rxfh_indir *);
+        int     (*set_rxfh_indir)(struct net_device *,
+                                  const struct ethtool_rxfh_indir *);
 };
 #endif /* __KERNEL__ */
@@ -588,29 +601,29 @@ struct ethtool_ops {
 #define ETHTOOL_GREGS           0x00000004 /* Get NIC registers. */
 #define ETHTOOL_GWOL            0x00000005 /* Get wake-on-lan options. */
 #define ETHTOOL_SWOL            0x00000006 /* Set wake-on-lan options. */
-#define ETHTOOL_GMSGLVL 0x00000007 /* Get driver message level */
+#define ETHTOOL_GMSGLVL         0x00000007 /* Get driver message level */
-#define ETHTOOL_SMSGLVL 0x00000008 /* Set driver msg level. */
+#define ETHTOOL_SMSGLVL         0x00000008 /* Set driver msg level. */
 #define ETHTOOL_NWAY_RST        0x00000009 /* Restart autonegotiation. */
 #define ETHTOOL_GLINK           0x0000000a /* Get link status (ethtool_value) */
-#define ETHTOOL_GEEPROM 0x0000000b /* Get EEPROM data */
+#define ETHTOOL_GEEPROM         0x0000000b /* Get EEPROM data */
-#define ETHTOOL_SEEPROM 0x0000000c /* Set EEPROM data. */
+#define ETHTOOL_SEEPROM         0x0000000c /* Set EEPROM data. */
 #define ETHTOOL_GCOALESCE       0x0000000e /* Get coalesce config */
 #define ETHTOOL_SCOALESCE       0x0000000f /* Set coalesce config. */
 #define ETHTOOL_GRINGPARAM      0x00000010 /* Get ring parameters */
 #define ETHTOOL_SRINGPARAM      0x00000011 /* Set ring parameters. */
 #define ETHTOOL_GPAUSEPARAM     0x00000012 /* Get pause parameters */
 #define ETHTOOL_SPAUSEPARAM     0x00000013 /* Set pause parameters. */
-#define ETHTOOL_GRXCSUM 0x00000014 /* Get RX hw csum enable (ethtool_value) */
+#define ETHTOOL_GRXCSUM         0x00000014 /* Get RX hw csum enable (ethtool_value) */
-#define ETHTOOL_SRXCSUM 0x00000015 /* Set RX hw csum enable (ethtool_value) */
+#define ETHTOOL_SRXCSUM         0x00000015 /* Set RX hw csum enable (ethtool_value) */
-#define ETHTOOL_GTXCSUM 0x00000016 /* Get TX hw csum enable (ethtool_value) */
+#define ETHTOOL_GTXCSUM         0x00000016 /* Get TX hw csum enable (ethtool_value) */
-#define ETHTOOL_STXCSUM 0x00000017 /* Set TX hw csum enable (ethtool_value) */
+#define ETHTOOL_STXCSUM         0x00000017 /* Set TX hw csum enable (ethtool_value) */
 #define ETHTOOL_GSG             0x00000018 /* Get scatter-gather enable
                                            * (ethtool_value) */
 #define ETHTOOL_SSG             0x00000019 /* Set scatter-gather enable
                                            * (ethtool_value). */
 #define ETHTOOL_TEST            0x0000001a /* execute NIC self-test. */
 #define ETHTOOL_GSTRINGS        0x0000001b /* get specified string set */
-#define ETHTOOL_PHYS_ID 0x0000001c /* identify the NIC */
+#define ETHTOOL_PHYS_ID         0x0000001c /* identify the NIC */
 #define ETHTOOL_GSTATS          0x0000001d /* get NIC-specific statistics */
 #define ETHTOOL_GTSO            0x0000001e /* Get TSO enable (ethtool_value) */
 #define ETHTOOL_STSO            0x0000001f /* Set TSO enable (ethtool_value) */
@@ -621,8 +634,8 @@ struct ethtool_ops {
 #define ETHTOOL_SGSO            0x00000024 /* Set GSO enable (ethtool_value) */
 #define ETHTOOL_GFLAGS          0x00000025 /* Get flags bitmap(ethtool_value) */
 #define ETHTOOL_SFLAGS          0x00000026 /* Set flags bitmap(ethtool_value) */
-#define ETHTOOL_GPFLAGS 0x00000027 /* Get driver-private flags bitmap */
+#define ETHTOOL_GPFLAGS         0x00000027 /* Get driver-private flags bitmap */
-#define ETHTOOL_SPFLAGS 0x00000028 /* Set driver-private flags bitmap */
+#define ETHTOOL_SPFLAGS         0x00000028 /* Set driver-private flags bitmap */
 #define ETHTOOL_GRXFH           0x00000029 /* Get RX flow hash configuration */
 #define ETHTOOL_SRXFH           0x0000002a /* Set RX flow hash configuration */
@@ -639,6 +652,8 @@ struct ethtool_ops {
 #define ETHTOOL_SRXNTUPLE       0x00000035 /* Add an n-tuple filter to device */
 #define ETHTOOL_GRXNTUPLE       0x00000036 /* Get n-tuple filters from device */
 #define ETHTOOL_GSSET_INFO      0x00000037 /* Get string set info */
+#define ETHTOOL_GRXFHINDIR      0x00000038 /* Get RX flow hash indir'n table */
+#define ETHTOOL_SRXFHINDIR      0x00000039 /* Set RX flow hash indir'n table */
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
@@ -647,18 +662,18 @@ struct ethtool_ops {
 /* Indicates what features are supported by the interface. */
 #define SUPPORTED_10baseT_Half          (1 << 0)
 #define SUPPORTED_10baseT_Full          (1 << 1)
-#define SUPPORTED_100baseT_Half (1 << 2)
+#define SUPPORTED_100baseT_Half         (1 << 2)
-#define SUPPORTED_100baseT_Full (1 << 3)
+#define SUPPORTED_100baseT_Full         (1 << 3)
 #define SUPPORTED_1000baseT_Half        (1 << 4)
 #define SUPPORTED_1000baseT_Full        (1 << 5)
 #define SUPPORTED_Autoneg               (1 << 6)
 #define SUPPORTED_TP                    (1 << 7)
 #define SUPPORTED_AUI                   (1 << 8)
 #define SUPPORTED_MII                   (1 << 9)
-#define SUPPORTED_FIBRE         (1 << 10)
+#define SUPPORTED_FIBRE                 (1 << 10)
 #define SUPPORTED_BNC                   (1 << 11)
 #define SUPPORTED_10000baseT_Full       (1 << 12)
-#define SUPPORTED_Pause         (1 << 13)
+#define SUPPORTED_Pause                 (1 << 13)
 #define SUPPORTED_Asym_Pause            (1 << 14)
 #define SUPPORTED_2500baseX_Full        (1 << 15)
 #define SUPPORTED_Backplane             (1 << 16)
@@ -668,8 +683,8 @@ struct ethtool_ops {
 #define SUPPORTED_10000baseR_FEC        (1 << 20)
 /* Indicates what features are advertised by the interface. */
-#define ADVERTISED_10baseT_Half (1 << 0)
+#define ADVERTISED_10baseT_Half         (1 << 0)
-#define ADVERTISED_10baseT_Full (1 << 1)
+#define ADVERTISED_10baseT_Full         (1 << 1)
 #define ADVERTISED_100baseT_Half        (1 << 2)
 #define ADVERTISED_100baseT_Full        (1 << 3)
 #define ADVERTISED_1000baseT_Half       (1 << 4)
@@ -708,12 +723,12 @@ struct ethtool_ops {
 #define DUPLEX_FULL             0x01
 /* Which connector port. */
-#define PORT_TP         0x00
+#define PORT_TP                 0x00
 #define PORT_AUI                0x01
 #define PORT_MII                0x02
 #define PORT_FIBRE              0x03
 #define PORT_BNC                0x04
-#define PORT_DA         0x05
+#define PORT_DA                 0x05
 #define PORT_NONE               0xef
 #define PORT_OTHER              0xff
@@ -727,7 +742,7 @@ struct ethtool_ops {
 /* Enable or disable autonegotiation.  If this is set to enable,
 * the forced link modes above are completely ignored.
 */
-#define AUTONEG_DISABLE 0x00
+#define AUTONEG_DISABLE         0x00
 #define AUTONEG_ENABLE          0x01
 /* Mode MDI or MDI-X */
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 151f5d703b7e..69b43dbea6c6 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -91,6 +91,54 @@ struct sock_fprog {	/* Required for SO_ATTACH_FILTER. */
 #define         BPF_TAX         0x00
 #define         BPF_TXA         0x80
+enum {
+        BPF_S_RET_K = 0,
+        BPF_S_RET_A,
+        BPF_S_ALU_ADD_K,
+        BPF_S_ALU_ADD_X,
+        BPF_S_ALU_SUB_K,
+        BPF_S_ALU_SUB_X,
+        BPF_S_ALU_MUL_K,
+        BPF_S_ALU_MUL_X,
+        BPF_S_ALU_DIV_X,
+        BPF_S_ALU_AND_K,
+        BPF_S_ALU_AND_X,
+        BPF_S_ALU_OR_K,
+        BPF_S_ALU_OR_X,
+        BPF_S_ALU_LSH_K,
+        BPF_S_ALU_LSH_X,
+        BPF_S_ALU_RSH_K,
+        BPF_S_ALU_RSH_X,
+        BPF_S_ALU_NEG,
+        BPF_S_LD_W_ABS,
+        BPF_S_LD_H_ABS,
+        BPF_S_LD_B_ABS,
+        BPF_S_LD_W_LEN,
+        BPF_S_LD_W_IND,
+        BPF_S_LD_H_IND,
+        BPF_S_LD_B_IND,
+        BPF_S_LD_IMM,
+        BPF_S_LDX_W_LEN,
+        BPF_S_LDX_B_MSH,
+        BPF_S_LDX_IMM,
+        BPF_S_MISC_TAX,
+        BPF_S_MISC_TXA,
+        BPF_S_ALU_DIV_K,
+        BPF_S_LD_MEM,
+        BPF_S_LDX_MEM,
+        BPF_S_ST,
+        BPF_S_STX,
+        BPF_S_JMP_JA,
+        BPF_S_JMP_JEQ_K,
+        BPF_S_JMP_JEQ_X,
+        BPF_S_JMP_JGE_K,
+        BPF_S_JMP_JGE_X,
+        BPF_S_JMP_JGT_K,
+        BPF_S_JMP_JGT_X,
+        BPF_S_JMP_JSET_K,
+        BPF_S_JMP_JSET_X,
+};
 #ifndef BPF_MAXINSNS
 #define BPF_MAXINSNS 4096
 #endif
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 68ca1b0491af..e5106e49bd2c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -53,6 +53,7 @@ struct inodes_stat_t {
 #define MAY_APPEND 8
 #define MAY_ACCESS 16
 #define MAY_OPEN 32
+#define MAY_CHDIR 64
 /*
 * flags in file.f_mode.  Note that FMODE_READ and FMODE_WRITE must correspond
@@ -415,7 +416,8 @@ struct buffer_head;
 typedef int (get_block_t)(struct inode *inode, sector_t iblock,
                        struct buffer_head *bh_result, int create);
 typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
-                        ssize_t bytes, void *private);
+                        ssize_t bytes, void *private, int ret,
+                        bool is_async);
 /*
 * Attribute flags.  These should be or-ed together to figure out what
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
index 595ce49288b7..ec0dad5ab90f 100644
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
@@ -85,7 +85,7 @@ struct fscache_cookie_def {
        /* get an index key
         * - should store the key data in the buffer
-         * - should return the amount of amount stored
+         * - should return the amount of data stored
         * - not permitted to return an error
         * - the netfs data from the cookie being used as the source is
         *   presented
@@ -454,6 +454,7 @@ int fscache_read_or_alloc_page(struct fscache_cookie *cookie,
 * @cookie: The cookie representing the cache object
 * @mapping: The netfs inode mapping to which the pages will be attached
 * @pages: A list of potential netfs pages to be filled
+ * @nr_pages: Number of pages to be read and/or allocated
 * @end_io_func: The callback to invoke when and if each page is filled
 * @context: An arbitrary piece of data to pass on to end_io_func()
 * @gfp: The conditions under which memory allocation should be made
diff --git a/include/linux/fsl-diu-fb.h b/include/linux/fsl-diu-fb.h
new file mode 100644
index 000000000000..fc295d7ea463
--- /dev/null
+++ b/include/linux/fsl-diu-fb.h
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ *  Freescale DIU Frame Buffer device driver
+ *
+ *  Authors: Hongjun Chen <hong-jun.chen@freescale.com>
+ *           Paul Widmer <paul.widmer@freescale.com>
+ *           Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
+ *           York Sun <yorksun@freescale.com>
+ *
+ *   Based on imxfb.c Copyright (C) 2004 S.Hauer, Pengutronix
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+#ifndef __FSL_DIU_FB_H__
+#define __FSL_DIU_FB_H__
+/* Arbitrary threshold to determine the allocation method
+ * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory()
+ */
+#define MEM_ALLOC_THRESHOLD (1024*768*4+32)
+/* Minimum value that the pixel clock can be set to in pico seconds
+ * This is determined by platform clock/3 where the minimum platform
+ * clock is 533MHz. This gives 5629 pico seconds.
+ */
+#define MIN_PIX_CLK 5629
+#define MAX_PIX_CLK 96096
+#include <linux/types.h>
+struct mfb_alpha {
+        int enable;
+        int alpha;
+};
+struct mfb_chroma_key {
+        int enable;
+        __u8  red_max;
+        __u8  green_max;
+        __u8  blue_max;
+        __u8  red_min;
+        __u8  green_min;
+        __u8  blue_min;
+};
+struct aoi_display_offset {
+        int x_aoi_d;
+        int y_aoi_d;
+};
+#define MFB_SET_CHROMA_KEY      _IOW('M', 1, struct mfb_chroma_key)
+#define MFB_WAIT_FOR_VSYNC      _IOW('F', 0x20, u_int32_t)
+#define MFB_SET_BRIGHTNESS      _IOW('M', 3, __u8)
+#define MFB_SET_ALPHA           0x80014d00
+#define MFB_GET_ALPHA           0x40014d00
+#define MFB_SET_AOID            0x80084d04
+#define MFB_GET_AOID            0x40084d04
+#define MFB_SET_PIXFMT          0x80014d08
+#define MFB_GET_PIXFMT          0x40014d08
+#define FBIOGET_GWINFO          0x46E0
+#define FBIOPUT_GWINFO          0x46E1
+#ifdef __KERNEL__
+#include <linux/spinlock.h>
+/*
+ * These are the fields of area descriptor(in DDR memory) for every plane
+ */
+struct diu_ad {
+        /* Word 0(32-bit) in DDR memory */
+/*      __u16 comp; */
+/*      __u16 pixel_s:2; */
+/*      __u16 pallete:1; */
+/*      __u16 red_c:2; */
+/*      __u16 green_c:2; */
+/*      __u16 blue_c:2; */
+/*      __u16 alpha_c:3; */
+/*      __u16 byte_f:1; */
+/*      __u16 res0:3; */
+        __be32 pix_fmt; /* hard coding pixel format */
+        /* Word 1(32-bit) in DDR memory */
+        __le32 addr;
+        /* Word 2(32-bit) in DDR memory */
+/*      __u32 delta_xs:11; */
+/*      __u32 res1:1; */
+/*      __u32 delta_ys:11; */
+/*      __u32 res2:1; */
+/*      __u32 g_alpha:8; */
+        __le32 src_size_g_alpha;
+        /* Word 3(32-bit) in DDR memory */
+/*      __u32 delta_xi:11; */
+/*      __u32 res3:5; */
+/*      __u32 delta_yi:11; */
+/*      __u32 res4:3; */
+/*      __u32 flip:2; */
+        __le32 aoi_size;
+        /* Word 4(32-bit) in DDR memory */
+        /*__u32 offset_xi:11;
+        __u32 res5:5;
+        __u32 offset_yi:11;
+        __u32 res6:5;
+        */
+        __le32 offset_xyi;
+        /* Word 5(32-bit) in DDR memory */
+        /*__u32 offset_xd:11;
+        __u32 res7:5;
+        __u32 offset_yd:11;
+        __u32 res8:5; */
+        __le32 offset_xyd;
+        /* Word 6(32-bit) in DDR memory */
+        __u8 ckmax_r;
+        __u8 ckmax_g;
+        __u8 ckmax_b;
+        __u8 res9;
+        /* Word 7(32-bit) in DDR memory */
+        __u8 ckmin_r;
+        __u8 ckmin_g;
+        __u8 ckmin_b;
+        __u8 res10;
+/*      __u32 res10:8; */
+        /* Word 8(32-bit) in DDR memory */
+        __le32 next_ad;
+        /* Word 9(32-bit) in DDR memory, just for 64-bit aligned */
+        __u32 paddr;
+} __attribute__ ((packed));
+/* DIU register map */
+struct diu {
+        __be32 desc[3];
+        __be32 gamma;
+        __be32 pallete;
+        __be32 cursor;
+        __be32 curs_pos;
+        __be32 diu_mode;
+        __be32 bgnd;
+        __be32 bgnd_wb;
+        __be32 disp_size;
+        __be32 wb_size;
+        __be32 wb_mem_addr;
+        __be32 hsyn_para;
+        __be32 vsyn_para;
+        __be32 syn_pol;
+        __be32 thresholds;
+        __be32 int_status;
+        __be32 int_mask;
+        __be32 colorbar[8];
+        __be32 filling;
+        __be32 plut;
+} __attribute__ ((packed));
+struct diu_hw {
+        struct diu *diu_reg;
+        spinlock_t reg_lock;
+        __u32 mode;             /* DIU operation mode */
+};
+struct diu_addr {
+        __u8 __iomem *vaddr;    /* Virtual address */
+        dma_addr_t paddr;       /* Physical address */
+        __u32      offset;
+};
+struct diu_pool {
+        struct diu_addr ad;
+        struct diu_addr gamma;
+        struct diu_addr pallete;
+        struct diu_addr cursor;
+};
+#define FSL_DIU_BASE_OFFSET     0x2C000 /* Offset of DIU */
+#define INT_LCDC                64      /* DIU interrupt number */
+#define FSL_AOI_NUM     6       /* 5 AOIs and one dummy AOI */
+                                /* 1 for plane 0, 2 for plane 1&2 each */
+/* Minimum X and Y resolutions */
+#define MIN_XRES        64
+#define MIN_YRES        64
+/* HW cursor parameters */
+#define MAX_CURS                32
+/* Modes of operation of DIU */
+#define MFB_MODE0       0       /* DIU off */
+#define MFB_MODE1       1       /* All three planes output to display */
+#define MFB_MODE2       2       /* Plane 1 to display, planes 2+3 written back*/
+#define MFB_MODE3       3       /* All three planes written back to memory */
+#define MFB_MODE4       4       /* Color bar generation */
+/* INT_STATUS/INT_MASK field descriptions */
+#define INT_VSYNC       0x01    /* Vsync interrupt  */
+#define INT_VSYNC_WB    0x02    /* Vsync interrupt for write back operation */
+#define INT_UNDRUN      0x04    /* Under run exception interrupt */
+#define INT_PARERR      0x08    /* Display parameters error interrupt */
+#define INT_LS_BF_VS    0x10    /* Lines before vsync. interrupt */
+/* Panels'operation modes */
+#define MFB_TYPE_OUTPUT 0       /* Panel output to display */
+#define MFB_TYPE_OFF    1       /* Panel off */
+#define MFB_TYPE_WB     2       /* Panel written back to memory */
+#define MFB_TYPE_TEST   3       /* Panel generate color bar */
+#endif /* __KERNEL__ */
+#endif /* __FSL_DIU_FB_H__ */
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 895001f7f4b2..42a0f1d11365 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -311,6 +311,7 @@ struct hid_item {
 #define HID_QUIRK_HIDDEV_FORCE                  0x00000010
 #define HID_QUIRK_BADPAD                        0x00000020
 #define HID_QUIRK_MULTI_INPUT                   0x00000040
+#define HID_QUIRK_HIDINPUT_FORCE                0x00000080
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS           0x00010000
 #define HID_QUIRK_FULLSPEED_INTERVAL            0x10000000
 #define HID_QUIRK_NO_INIT_REPORTS               0x20000000
diff --git a/include/linux/i2c/adp5588.h b/include/linux/i2c/adp5588.h
index 02c9af374741..269181b8f623 100644
--- a/include/linux/i2c/adp5588.h
+++ b/include/linux/i2c/adp5588.h
@@ -78,6 +78,40 @@
 #define ADP5588_KEYMAPSIZE      80
+#define GPI_PIN_ROW0 97
+#define GPI_PIN_ROW1 98
+#define GPI_PIN_ROW2 99
+#define GPI_PIN_ROW3 100
+#define GPI_PIN_ROW4 101
+#define GPI_PIN_ROW5 102
+#define GPI_PIN_ROW6 103
+#define GPI_PIN_ROW7 104
+#define GPI_PIN_COL0 105
+#define GPI_PIN_COL1 106
+#define GPI_PIN_COL2 107
+#define GPI_PIN_COL3 108
+#define GPI_PIN_COL4 109
+#define GPI_PIN_COL5 110
+#define GPI_PIN_COL6 111
+#define GPI_PIN_COL7 112
+#define GPI_PIN_COL8 113
+#define GPI_PIN_COL9 114
+#define GPI_PIN_ROW_BASE GPI_PIN_ROW0
+#define GPI_PIN_ROW_END GPI_PIN_ROW7
+#define GPI_PIN_COL_BASE GPI_PIN_COL0
+#define GPI_PIN_COL_END GPI_PIN_COL9
+#define GPI_PIN_BASE GPI_PIN_ROW_BASE
+#define GPI_PIN_END GPI_PIN_COL_END
+#define ADP5588_GPIMAPSIZE_MAX (GPI_PIN_END - GPI_PIN_BASE + 1)
+struct adp5588_gpi_map {
+        unsigned short pin;
+        unsigned short sw_evt;
+};
 struct adp5588_kpad_platform_data {
        int rows;                       /* Number of rows */
        int cols;                       /* Number of columns */
@@ -87,6 +121,9 @@ struct adp5588_kpad_platform_data {
        unsigned en_keylock:1;          /* Enable Key Lock feature */
        unsigned short unlock_key1;     /* Unlock Key 1 */
        unsigned short unlock_key2;     /* Unlock Key 2 */
+        const struct adp5588_gpi_map *gpimap;
+        unsigned short gpimapsize;
+        const struct adp5588_gpio_platform_data *gpio_data;
 };
 struct adp5588_gpio_platform_data {
diff --git a/include/linux/i2c/mcs.h b/include/linux/i2c/mcs.h
new file mode 100644
index 000000000000..725ae7c313ff
--- /dev/null
+++ b/include/linux/i2c/mcs.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2009 - 2010 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ * Author: HeungJun Kim <riverful.kim@samsung.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+#ifndef __LINUX_MCS_H
+#define __LINUX_MCS_H
+#define MCS_KEY_MAP(v, c)       ((((v) & 0xff) << 16) | ((c) & 0xffff))
+#define MCS_KEY_VAL(v)          (((v) >> 16) & 0xff)
+#define MCS_KEY_CODE(v)         ((v) & 0xffff)
+struct mcs_platform_data {
+        void (*cfg_pin)(void);
+        /* touchscreen */
+        unsigned int x_size;
+        unsigned int y_size;
+        /* touchkey */
+        const u32 *keymap;
+        unsigned int keymap_size;
+        unsigned int key_maxval;
+        bool no_autorepeat;
+};
+#endif  /* __LINUX_MCS_H */
diff --git a/include/linux/i2c/mcs5000_ts.h b/include/linux/i2c/mcs5000_ts.h
deleted file mode 100644
index 5a117b5ca15e..000000000000
--- a/include/linux/i2c/mcs5000_ts.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * mcs5000_ts.h
- *
- * Copyright (C) 2009 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- */
-#ifndef __LINUX_MCS5000_TS_H
-#define __LINUX_MCS5000_TS_H
-/* platform data for the MELFAS MCS-5000 touchscreen driver */
-struct mcs5000_ts_platform_data {
-        void (*cfg_pin)(void);
-        int x_size;
-        int y_size;
-};
-#endif  /* __LINUX_MCS5000_TS_H */
diff --git a/include/linux/i2c/qt602240_ts.h b/include/linux/i2c/qt602240_ts.h
new file mode 100644
index 000000000000..c5033e101094
--- /dev/null
+++ b/include/linux/i2c/qt602240_ts.h
@@ -0,0 +1,38 @@
+/*
+ * AT42QT602240/ATMXT224 Touchscreen driver
+ *
+ * Copyright (C) 2010 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#ifndef __LINUX_QT602240_TS_H
+#define __LINUX_QT602240_TS_H
+/* Orient */
+#define QT602240_NORMAL                 0x0
+#define QT602240_DIAGONAL               0x1
+#define QT602240_HORIZONTAL_FLIP        0x2
+#define QT602240_ROTATED_90_COUNTER     0x3
+#define QT602240_VERTICAL_FLIP          0x4
+#define QT602240_ROTATED_90             0x5
+#define QT602240_ROTATED_180            0x6
+#define QT602240_DIAGONAL_COUNTER       0x7
+/* The platform data for the AT42QT602240/ATMXT224 touchscreen driver */
+struct qt602240_platform_data {
+        unsigned int x_line;
+        unsigned int y_line;
+        unsigned int x_size;
+        unsigned int y_size;
+        unsigned int blen;
+        unsigned int threshold;
+        unsigned int voltage;
+        unsigned char orient;
+};
+#endif /* __LINUX_QT602240_TS_H */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 7b02aa5ce9b4..072fe8c93e6f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -458,7 +458,7 @@ enum {
        IDE_DFLAG_DOORLOCKING           = (1 << 15),
        /* disallow DMA */
        IDE_DFLAG_NODMA                 = (1 << 16),
-        /* powermanagment told us not to do anything, so sleep nicely */
+        /* powermanagement told us not to do anything, so sleep nicely */
        IDE_DFLAG_BLOCKED               = (1 << 17),
        /* sleeping & sleep field valid */
        IDE_DFLAG_SLEEPING              = (1 << 18),
diff --git a/include/linux/if.h b/include/linux/if.h
index be350e62a905..53558ec59e1b 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -73,6 +73,8 @@
 #define IFF_DONT_BRIDGE 0x800           /* disallow bridging this ether dev */
 #define IFF_IN_NETPOLL  0x1000          /* whether we are processing netpoll */
 #define IFF_DISABLE_NETPOLL     0x2000  /* disable netpoll at run-time */
+#define IFF_MACVLAN_PORT        0x4000  /* device used as macvlan port */
+#define IFF_BRIDGE_PORT 0x8000          /* device used as bridge port */
 #define IF_GET_IFACE    0x0001          /* for querying only */
 #define IF_GET_PROTO    0x0002
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h
index cd525fae3c98..2c7994372bde 100644
--- a/include/linux/if_bonding.h
+++ b/include/linux/if_bonding.h
@@ -83,6 +83,7 @@
 #define BOND_DEFAULT_MAX_BONDS  1   /* Default maximum number of devices to support */
+#define BOND_DEFAULT_TX_QUEUES 16   /* Default number of tx queues per device */
 /* hashing types */
 #define BOND_XMIT_POLICY_LAYER2         0 /* layer 2 (MAC only), default */
 #define BOND_XMIT_POLICY_LAYER34        1 /* layer 3+4 (IP ^ (TCP || UDP)) */
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 938b7e81df95..0d241a5c4909 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -102,8 +102,6 @@ struct __fdb_entry {
 #include <linux/netdevice.h>
 extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));
-extern struct sk_buff *(*br_handle_frame_hook)(struct net_bridge_port *p,
-                                               struct sk_buff *skb);
 extern int (*br_should_route_hook)(struct sk_buff *skb);
 #endif
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index bed7a4682b90..c831467774d0 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -119,7 +119,7 @@ struct ethhdr {
        unsigned char   h_dest[ETH_ALEN];       /* destination eth addr */
        unsigned char   h_source[ETH_ALEN];     /* source ether addr    */
        __be16          h_proto;                /* packet type ID field */
-} __attribute__((packed));
+} __packed;
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h
index 5459c5c09930..9947c39e62f6 100644
--- a/include/linux/if_fddi.h
+++ b/include/linux/if_fddi.h
@@ -67,7 +67,7 @@ struct fddi_8022_1_hdr {
        __u8    dsap;                                   /* destination service access point */
        __u8    ssap;                                   /* source service access point */
        __u8    ctrl;                                   /* control byte #1 */
-} __attribute__ ((packed));
+} __packed;
 /* Define 802.2 Type 2 header */
 struct fddi_8022_2_hdr {
@@ -75,7 +75,7 @@ struct fddi_8022_2_hdr {
        __u8    ssap;                                   /* source service access point */
        __u8    ctrl_1;                                 /* control byte #1 */
        __u8    ctrl_2;                                 /* control byte #2 */
-} __attribute__ ((packed));
+} __packed;
 /* Define 802.2 SNAP header */
 #define FDDI_K_OUI_LEN  3
@@ -85,7 +85,7 @@ struct fddi_snap_hdr {
        __u8    ctrl;                                   /* always 0x03 */
        __u8    oui[FDDI_K_OUI_LEN];    /* organizational universal id */
        __be16  ethertype;                              /* packet type ID field */
-} __attribute__ ((packed));
+} __packed;
 /* Define FDDI LLC frame header */
 struct fddihdr {
@@ -98,7 +98,7 @@ struct fddihdr {
                struct fddi_8022_2_hdr          llc_8022_2;
                struct fddi_snap_hdr            llc_snap;
                } hdr;
-} __attribute__ ((packed));
+} __packed;
 #ifdef __KERNEL__
 #include <linux/netdevice.h>
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 80b3a1056a5f..191ee0869bc1 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -135,7 +135,7 @@ struct frhdr
   __be16 PID;
 #define IP_NLPID pad 
-} __attribute__((packed));
+} __packed;
 /* see RFC 1490 for the definition of the following */
 #define FRAD_I_UI               0x03
diff --git a/include/linux/if_hippi.h b/include/linux/if_hippi.h
index 8d038eb8db5c..5fe5f307c6f5 100644
--- a/include/linux/if_hippi.h
+++ b/include/linux/if_hippi.h
@@ -104,7 +104,7 @@ struct hippi_fp_hdr {
        __be32          fixed;
 #endif
        __be32          d2_size;
-} __attribute__ ((packed));
+} __packed;
 struct hippi_le_hdr {
 #if defined (__BIG_ENDIAN_BITFIELD)
@@ -129,7 +129,7 @@ struct hippi_le_hdr {
        __u8            daddr[HIPPI_ALEN];
        __u16           locally_administered;
        __u8            saddr[HIPPI_ALEN];
-} __attribute__ ((packed));
+} __packed;
 #define HIPPI_OUI_LEN   3
 /*
@@ -142,12 +142,12 @@ struct hippi_snap_hdr {
        __u8    ctrl;                   /* always 0x03 */
        __u8    oui[HIPPI_OUI_LEN];     /* organizational universal id (zero)*/
        __be16  ethertype;              /* packet type ID field */
-} __attribute__ ((packed));
+} __packed;
 struct hippi_hdr {
        struct hippi_fp_hdr     fp;
        struct hippi_le_hdr     le;
        struct hippi_snap_hdr   snap;
-} __attribute__ ((packed));
+} __packed;
 #endif  /* _LINUX_IF_HIPPI_H */
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 85c812db5a3f..2fc66dd783ee 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -4,7 +4,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
-/* The struct should be in sync with struct net_device_stats */
+/* This struct should be in sync with struct rtnl_link_stats64 */
 struct rtnl_link_stats {
        __u32   rx_packets;             /* total packets received       */
        __u32   tx_packets;             /* total packets transmitted    */
@@ -37,6 +37,7 @@ struct rtnl_link_stats {
        __u32   tx_compressed;
 };
+/* The main device statistics structure */
 struct rtnl_link_stats64 {
        __u64   rx_packets;             /* total packets received       */
        __u64   tx_packets;             /* total packets transmitted    */
@@ -233,7 +234,7 @@ enum macvlan_mode {
        MACVLAN_MODE_BRIDGE  = 4, /* talk to bridge ports directly */
 };
-/* SR-IOV virtual function managment section */
+/* SR-IOV virtual function management section */
 enum {
        IFLA_VF_INFO_UNSPEC,
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index 1ffaeffeff74..35280b302290 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -6,6 +6,7 @@
 #include <linux/netdevice.h>
 #include <linux/netlink.h>
 #include <net/netlink.h>
+#include <linux/u64_stats_sync.h>
 #if defined(CONFIG_MACVTAP) || defined(CONFIG_MACVTAP_MODULE)
 struct socket *macvtap_get_socket(struct file *);
@@ -27,14 +28,16 @@ struct macvtap_queue;
 *      struct macvlan_rx_stats - MACVLAN percpu rx stats
 *      @rx_packets: number of received packets
 *      @rx_bytes: number of received bytes
- *      @multicast: number of received multicast packets
+ *      @rx_multicast: number of received multicast packets
+ *      @syncp: synchronization point for 64bit counters
 *      @rx_errors: number of errors
 */
 struct macvlan_rx_stats {
-        unsigned long rx_packets;
+        u64                     rx_packets;
-        unsigned long rx_bytes;
+        u64                     rx_bytes;
-        unsigned long multicast;
+        u64                     rx_multicast;
-        unsigned long rx_errors;
+        struct u64_stats_sync   syncp;
+        unsigned long           rx_errors;
 };
 struct macvlan_dev {
@@ -56,12 +59,14 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan,
 {
        struct macvlan_rx_stats *rx_stats;
-        rx_stats = per_cpu_ptr(vlan->rx_stats, smp_processor_id());
+        rx_stats = this_cpu_ptr(vlan->rx_stats);
        if (likely(success)) {
+                u64_stats_update_begin(&rx_stats->syncp);
                rx_stats->rx_packets++;;
                rx_stats->rx_bytes += len;
                if (multicast)
-                        rx_stats->multicast++;
+                        rx_stats->rx_multicast++;
+                u64_stats_update_end(&rx_stats->syncp);
        } else {
                rx_stats->rx_errors++;
        }
@@ -86,8 +91,4 @@ extern int macvlan_link_register(struct rtnl_link_ops *ops);
 extern netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
                                      struct net_device *dev);
-extern struct sk_buff *(*macvlan_handle_frame_hook)(struct macvlan_port *,
-                                                    struct sk_buff *);
 #endif /* _LINUX_IF_MACVLAN_H */
diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index 6ac23ef1801a..72bfa5a034dd 100644
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -48,6 +48,7 @@ struct sockaddr_ll {
 #define PACKET_LOSS                     14
 #define PACKET_VNET_HDR                 15
 #define PACKET_TX_TIMESTAMP             16
+#define PACKET_TIMESTAMP                17
 struct tpacket_stats {
        unsigned int    tp_packets;
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index a6577af0c4e6..1925e0c3f162 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -59,7 +59,7 @@ struct sockaddr_pppox {
       union{ 
               struct pppoe_addr       pppoe; 
       }sa_addr; 
-}__attribute__ ((packed)); 
+} __packed;
 /* The use of the above union isn't viable because the size of this
 * struct must stay fixed over time -- applications use sizeof(struct
@@ -70,7 +70,7 @@ struct sockaddr_pppol2tp {
        sa_family_t     sa_family;      /* address family, AF_PPPOX */
        unsigned int    sa_protocol;    /* protocol identifier */
        struct pppol2tp_addr pppol2tp;
-}__attribute__ ((packed));
+} __packed;
 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
 * bits. So we need a different sockaddr structure.
@@ -79,7 +79,7 @@ struct sockaddr_pppol2tpv3 {
        sa_family_t     sa_family;      /* address family, AF_PPPOX */
        unsigned int    sa_protocol;    /* protocol identifier */
        struct pppol2tpv3_addr pppol2tp;
-} __attribute__ ((packed));
+} __packed;
 /*********************************************************************
 *
@@ -129,7 +129,7 @@ struct pppoe_hdr {
        __be16 sid;
        __be16 length;
        struct pppoe_tag tag[0];
-} __attribute__ ((packed));
+} __packed;
 /* Length of entire PPPoE + PPP header */
 #define PPPOE_SES_HLEN  8
diff --git a/include/linux/in.h b/include/linux/in.h
index 583c76f9c30f..41d88a4689af 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -85,6 +85,7 @@ struct in_addr {
 #define IP_RECVORIGDSTADDR   IP_ORIGDSTADDR
 #define IP_MINTTL       21
+#define IP_NODEFRAG     22
 /* IP_MTU_DISCOVER values */
 #define IP_PMTUDISC_DONT                0       /* Never send DF frames */
diff --git a/include/linux/input.h b/include/linux/input.h
index 6fcc9101beeb..339d043ccb53 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -691,9 +691,12 @@ struct input_absinfo {
 #define ABS_TILT_X              0x1a
 #define ABS_TILT_Y              0x1b
 #define ABS_TOOL_WIDTH          0x1c
 #define ABS_VOLUME              0x20
 #define ABS_MISC                0x28
+#define ABS_MT_SLOT             0x2f    /* MT slot being modified */
 #define ABS_MT_TOUCH_MAJOR      0x30    /* Major axis of touching ellipse */
 #define ABS_MT_TOUCH_MINOR      0x31    /* Minor axis (omit if circular) */
 #define ABS_MT_WIDTH_MAJOR      0x32    /* Major axis of approaching ellipse */
@@ -706,6 +709,12 @@ struct input_absinfo {
 #define ABS_MT_TRACKING_ID      0x39    /* Unique ID of initiated contact */
 #define ABS_MT_PRESSURE         0x3a    /* Pressure on contact area */
+#ifdef __KERNEL__
+/* Implementation details, userspace should not care about these */
+#define ABS_MT_FIRST            ABS_MT_TOUCH_MAJOR
+#define ABS_MT_LAST             ABS_MT_PRESSURE
+#endif
 #define ABS_MAX                 0x3f
 #define ABS_CNT                 (ABS_MAX+1)
@@ -1048,6 +1057,14 @@ struct ff_effect {
 #include <linux/mod_devicetable.h>
 /**
+ * struct input_mt_slot - represents the state of an input MT slot
+ * @abs: holds current values of ABS_MT axes for this slot
+ */
+struct input_mt_slot {
+        int abs[ABS_MT_LAST - ABS_MT_FIRST + 1];
+};
+/**
 * struct input_dev - represents an input device
 * @name: name of the device
 * @phys: physical path to the device in the system hierarchy
@@ -1063,6 +1080,10 @@ struct ff_effect {
 * @sndbit: bitmap of sound effects supported by the device
 * @ffbit: bitmap of force feedback effects supported by the device
 * @swbit: bitmap of switches present on the device
+ * @hint_events_per_packet: average number of events generated by the
+ *      device in a packet (between EV_SYN/SYN_REPORT events). Used by
+ *      event handlers to estimate size of the buffer needed to hold
+ *      events.
 * @keycodemax: size of keycode table
 * @keycodesize: size of elements in keycode table
 * @keycode: map of scancodes to keycodes for this device
@@ -1078,9 +1099,12 @@ struct ff_effect {
 * @repeat_key: stores key code of the last key pressed; used to implement
 *      software autorepeat
 * @timer: timer for software autorepeat
- * @sync: set to 1 when there were no new events since last EV_SYNC
 * @abs: current values for reports from absolute axes
 * @rep: current values for autorepeat parameters (delay, rate)
+ * @mt: pointer to array of struct input_mt_slot holding current values
+ *      of tracked contacts
+ * @mtsize: number of MT slots the device uses
+ * @slot: MT slot currently being transmitted
 * @key: reflects current state of device's keys/buttons
 * @led: reflects current state of device's LEDs
 * @snd: reflects current state of sound effects
@@ -1119,6 +1143,7 @@ struct ff_effect {
 *      last user closes the device
 * @going_away: marks devices that are in a middle of unregistering and
 *      causes input_open_device*() fail with -ENODEV.
+ * @sync: set to %true when there were no new events since last EV_SYN
 * @dev: driver model's view of this device
 * @h_list: list of input handles associated with the device. When
 *      accessing the list dev->mutex must be held
@@ -1140,6 +1165,8 @@ struct input_dev {
        unsigned long ffbit[BITS_TO_LONGS(FF_CNT)];
        unsigned long swbit[BITS_TO_LONGS(SW_CNT)];
+        unsigned int hint_events_per_packet;
        unsigned int keycodemax;
        unsigned int keycodesize;
        void *keycode;
@@ -1153,11 +1180,13 @@ struct input_dev {
        unsigned int repeat_key;
        struct timer_list timer;
-        int sync;
        int abs[ABS_CNT];
        int rep[REP_MAX + 1];
+        struct input_mt_slot *mt;
+        int mtsize;
+        int slot;
        unsigned long key[BITS_TO_LONGS(KEY_CNT)];
        unsigned long led[BITS_TO_LONGS(LED_CNT)];
        unsigned long snd[BITS_TO_LONGS(SND_CNT)];
@@ -1182,6 +1211,8 @@ struct input_dev {
        unsigned int users;
        bool going_away;
+        bool sync;
        struct device dev;
        struct list_head        h_list;
@@ -1406,8 +1437,28 @@ static inline void input_mt_sync(struct input_dev *dev)
        input_event(dev, EV_SYN, SYN_MT_REPORT, 0);
 }
+static inline void input_mt_slot(struct input_dev *dev, int slot)
+{
+        input_event(dev, EV_ABS, ABS_MT_SLOT, slot);
+}
 void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int code);
+/**
+ * input_set_events_per_packet - tell handlers about the driver event rate
+ * @dev: the input device used by the driver
+ * @n_events: the average number of events between calls to input_sync()
+ *
+ * If the event rate sent from a device is unusually large, use this
+ * function to set the expected event rate. This will allow handlers
+ * to set up an appropriate buffer size for the event stream, in order
+ * to minimize information loss.
+ */
+static inline void input_set_events_per_packet(struct input_dev *dev, int n_events)
+{
+        dev->hint_events_per_packet = n_events;
+}
 static inline void input_set_abs_params(struct input_dev *dev, int axis, int min, int max, int fuzz, int flat)
 {
        dev->absmin[axis] = min;
@@ -1485,5 +1536,8 @@ int input_ff_erase(struct input_dev *dev, int effect_id, struct file *file);
 int input_ff_create_memless(struct input_dev *dev, void *data,
                int (*play_effect)(struct input_dev *, void *, struct ff_effect *));
+int input_mt_create_slots(struct input_dev *dev, unsigned int num_slots);
+void input_mt_destroy_slots(struct input_dev *dev);
 #endif
 #endif
diff --git a/include/linux/input/adxl34x.h b/include/linux/input/adxl34x.h
new file mode 100644
index 000000000000..df00d998a44a
--- /dev/null
+++ b/include/linux/input/adxl34x.h
@@ -0,0 +1,349 @@
+/*
+ * include/linux/input/adxl34x.h
+ *
+ * Digital Accelerometer characteristics are highly application specific
+ * and may vary between boards and models. The platform_data for the
+ * device's "struct device" holds this information.
+ *
+ * Copyright 2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef __LINUX_INPUT_ADXL34X_H__
+#define __LINUX_INPUT_ADXL34X_H__
+struct adxl34x_platform_data {
+        /*
+         * X,Y,Z Axis Offset:
+         * offer user offset adjustments in twoscompliment
+         * form with a scale factor of 15.6 mg/LSB (i.e. 0x7F = +2 g)
+         */
+        s8 x_axis_offset;
+        s8 y_axis_offset;
+        s8 z_axis_offset;
+        /*
+         * TAP_X/Y/Z Enable: Setting TAP_X, Y, or Z Enable enables X,
+         * Y, or Z participation in Tap detection. A '0' excludes the
+         * selected axis from participation in Tap detection.
+         * Setting the SUPPRESS bit suppresses Double Tap detection if
+         * acceleration greater than tap_threshold is present between
+         * taps.
+         */
+#define ADXL_SUPPRESS   (1 << 3)
+#define ADXL_TAP_X_EN   (1 << 2)
+#define ADXL_TAP_Y_EN   (1 << 1)
+#define ADXL_TAP_Z_EN   (1 << 0)
+        u8 tap_axis_control;
+        /*
+         * tap_threshold:
+         * holds the threshold value for tap detection/interrupts.
+         * The data format is unsigned. The scale factor is 62.5 mg/LSB
+         * (i.e. 0xFF = +16 g). A zero value may result in undesirable
+         * behavior if Tap/Double Tap is enabled.
+         */
+        u8 tap_threshold;
+        /*
+         * tap_duration:
+         * is an unsigned time value representing the maximum
+         * time that an event must be above the tap_threshold threshold
+         * to qualify as a tap event. The scale factor is 625 us/LSB. A zero
+         * value will prevent Tap/Double Tap functions from working.
+         */
+        u8 tap_duration;
+        /*
+         * tap_latency:
+         * is an unsigned time value representing the wait time
+         * from the detection of a tap event to the opening of the time
+         * window tap_window for a possible second tap event. The scale
+         * factor is 1.25 ms/LSB. A zero value will disable the Double Tap
+         * function.
+         */
+        u8 tap_latency;
+        /*
+         * tap_window:
+         * is an unsigned time value representing the amount
+         * of time after the expiration of tap_latency during which a second
+         * tap can begin. The scale factor is 1.25 ms/LSB. A zero value will
+         * disable the Double Tap function.
+         */
+        u8 tap_window;
+        /*
+         * act_axis_control:
+         * X/Y/Z Enable: A '1' enables X, Y, or Z participation in activity
+         * or inactivity detection. A '0' excludes the selected axis from
+         * participation. If all of the axes are excluded, the function is
+         * disabled.
+         * AC/DC: A '0' = DC coupled operation and a '1' = AC coupled
+         * operation. In DC coupled operation, the current acceleration is
+         * compared with activity_threshold and inactivity_threshold directly
+         * to determine whether activity or inactivity is detected. In AC
+         * coupled operation for activity detection, the acceleration value
+         * at the start of activity detection is taken as a reference value.
+         * New samples of acceleration are then compared to this
+         * reference value and if the magnitude of the difference exceeds
+         * activity_threshold the device will trigger an activity interrupt. In
+         * AC coupled operation for inactivity detection, a reference value
+         * is used again for comparison and is updated whenever the
+         * device exceeds the inactivity threshold. Once the reference
+         * value is selected, the device compares the magnitude of the
+         * difference between the reference value and the current
+         * acceleration with inactivity_threshold. If the difference is below
+         * inactivity_threshold for a total of inactivity_time, the device is
+         * considered inactive and the inactivity interrupt is triggered.
+         */
+#define ADXL_ACT_ACDC           (1 << 7)
+#define ADXL_ACT_X_EN           (1 << 6)
+#define ADXL_ACT_Y_EN           (1 << 5)
+#define ADXL_ACT_Z_EN           (1 << 4)
+#define ADXL_INACT_ACDC         (1 << 3)
+#define ADXL_INACT_X_EN         (1 << 2)
+#define ADXL_INACT_Y_EN         (1 << 1)
+#define ADXL_INACT_Z_EN         (1 << 0)
+        u8 act_axis_control;
+        /*
+         * activity_threshold:
+         * holds the threshold value for activity detection.
+         * The data format is unsigned. The scale factor is
+         * 62.5 mg/LSB. A zero value may result in undesirable behavior if
+         * Activity interrupt is enabled.
+         */
+        u8 activity_threshold;
+        /*
+         * inactivity_threshold:
+         * holds the threshold value for inactivity
+         * detection. The data format is unsigned. The scale
+         * factor is 62.5 mg/LSB. A zero value may result in undesirable
+         * behavior if Inactivity interrupt is enabled.
+         */
+        u8 inactivity_threshold;
+        /*
+         * inactivity_time:
+         * is an unsigned time value representing the
+         * amount of time that acceleration must be below the value in
+         * inactivity_threshold for inactivity to be declared. The scale factor
+         * is 1 second/LSB. Unlike the other interrupt functions, which
+         * operate on unfiltered data, the inactivity function operates on the
+         * filtered output data. At least one output sample must be
+         * generated for the inactivity interrupt to be triggered. This will
+         * result in the function appearing un-responsive if the
+         * inactivity_time register is set with a value less than the time
+         * constant of the Output Data Rate. A zero value will result in an
+         * interrupt when the output data is below inactivity_threshold.
+         */
+        u8 inactivity_time;
+        /*
+         * free_fall_threshold:
+         * holds the threshold value for Free-Fall detection.
+         * The data format is unsigned. The root-sum-square(RSS) value
+         * of all axes is calculated and compared to the value in
+         * free_fall_threshold to determine if a free fall event may be
+         * occurring.  The scale factor is 62.5 mg/LSB. A zero value may
+         * result in undesirable behavior if Free-Fall interrupt is
+         * enabled. Values between 300 and 600 mg (0x05 to 0x09) are
+         * recommended.
+         */
+        u8 free_fall_threshold;
+        /*
+         * free_fall_time:
+         * is an unsigned time value representing the minimum
+         * time that the RSS value of all axes must be less than
+         * free_fall_threshold to generate a Free-Fall interrupt. The
+         * scale factor is 5 ms/LSB. A zero value may result in
+         * undesirable behavior if Free-Fall interrupt is enabled.
+         * Values between 100 to 350 ms (0x14 to 0x46) are recommended.
+         */
+        u8 free_fall_time;
+        /*
+         * data_rate:
+         * Selects device bandwidth and output data rate.
+         * RATE = 3200 Hz / (2^(15 - x)). Default value is 0x0A, or 100 Hz
+         * Output Data Rate. An Output Data Rate should be selected that
+         * is appropriate for the communication protocol and frequency
+         * selected. Selecting too high of an Output Data Rate with a low
+         * communication speed will result in samples being discarded.
+         */
+        u8 data_rate;
+        /*
+         * data_range:
+         * FULL_RES: When this bit is set with the device is
+         * in Full-Resolution Mode, where the output resolution increases
+         * with RANGE to maintain a 4 mg/LSB scale factor. When this
+         * bit is cleared the device is in 10-bit Mode and RANGE determine the
+         * maximum g-Range and scale factor.
+         */
+#define ADXL_FULL_RES           (1 << 3)
+#define ADXL_RANGE_PM_2g        0
+#define ADXL_RANGE_PM_4g        1
+#define ADXL_RANGE_PM_8g        2
+#define ADXL_RANGE_PM_16g       3
+        u8 data_range;
+        /*
+         * low_power_mode:
+         * A '0' = Normal operation and a '1' = Reduced
+         * power operation with somewhat higher noise.
+         */
+        u8 low_power_mode;
+        /*
+         * power_mode:
+         * LINK: A '1' with both the activity and inactivity functions
+         * enabled will delay the start of the activity function until
+         * inactivity is detected. Once activity is detected, inactivity
+         * detection will begin and prevent the detection of activity. This
+         * bit serially links the activity and inactivity functions. When '0'
+         * the inactivity and activity functions are concurrent. Additional
+         * information can be found in the Application section under Link
+         * Mode.
+         * AUTO_SLEEP: A '1' sets the ADXL34x to switch to Sleep Mode
+         * when inactivity (acceleration has been below inactivity_threshold
+         * for at least inactivity_time) is detected and the LINK bit is set.
+         * A '0' disables automatic switching to Sleep Mode. See SLEEP
+         * for further description.
+         */
+#define ADXL_LINK       (1 << 5)
+#define ADXL_AUTO_SLEEP (1 << 4)
+        u8 power_mode;
+        /*
+         * fifo_mode:
+         * BYPASS The FIFO is bypassed
+         * FIFO   FIFO collects up to 32 values then stops collecting data
+         * STREAM FIFO holds the last 32 data values. Once full, the FIFO's
+         *        oldest data is lost as it is replaced with newer data
+         *
+         * DEFAULT should be ADXL_FIFO_STREAM
+         */
+#define ADXL_FIFO_BYPASS        0
+#define ADXL_FIFO_FIFO          1
+#define ADXL_FIFO_STREAM        2
+        u8 fifo_mode;
+        /*
+         * watermark:
+         * The Watermark feature can be used to reduce the interrupt load
+         * of the system. The FIFO fills up to the value stored in watermark
+         * [1..32] and then generates an interrupt.
+         * A '0' disables the watermark feature.
+         */
+        u8 watermark;
+        u32 ev_type;    /* EV_ABS or EV_REL */
+        u32 ev_code_x;  /* ABS_X,Y,Z or REL_X,Y,Z */
+        u32 ev_code_y;  /* ABS_X,Y,Z or REL_X,Y,Z */
+        u32 ev_code_z;  /* ABS_X,Y,Z or REL_X,Y,Z */
+        /*
+         * A valid BTN or KEY Code; use tap_axis_control to disable
+         * event reporting
+         */
+        u32 ev_code_tap[3];     /* EV_KEY {X-Axis, Y-Axis, Z-Axis} */
+        /*
+         * A valid BTN or KEY Code for Free-Fall or Activity enables
+         * input event reporting. A '0' disables the Free-Fall or
+         * Activity reporting.
+         */
+        u32 ev_code_ff; /* EV_KEY */
+        u32 ev_code_act_inactivity;     /* EV_KEY */
+        /*
+         * Use ADXL34x INT2 instead of INT1
+         */
+        u8 use_int2;
+        /*
+         * ADXL346 only ORIENTATION SENSING feature
+         * The orientation function of the ADXL346 reports both 2-D and
+         * 3-D orientation concurrently.
+         */
+#define ADXL_EN_ORIENTATION_2D          1
+#define ADXL_EN_ORIENTATION_3D          2
+#define ADXL_EN_ORIENTATION_2D_3D       3
+        u8 orientation_enable;
+        /*
+         * The width of the deadzone region between two or more
+         * orientation positions is determined by setting the Deadzone
+         * value. The deadzone region size can be specified with a
+         * resolution of 3.6deg. The deadzone angle represents the total
+         * angle where the orientation is considered invalid.
+         */
+#define ADXL_DEADZONE_ANGLE_0p0         0       /* !!!0.0 [deg] */
+#define ADXL_DEADZONE_ANGLE_3p6         1       /* 3.6 [deg] */
+#define ADXL_DEADZONE_ANGLE_7p2         2       /* 7.2 [deg] */
+#define ADXL_DEADZONE_ANGLE_10p8        3       /* 10.8 [deg] */
+#define ADXL_DEADZONE_ANGLE_14p4        4       /* 14.4 [deg] */
+#define ADXL_DEADZONE_ANGLE_18p0        5       /* 18.0 [deg] */
+#define ADXL_DEADZONE_ANGLE_21p6        6       /* 21.6 [deg] */
+#define ADXL_DEADZONE_ANGLE_25p2        7       /* 25.2 [deg] */
+        u8 deadzone_angle;
+        /*
+         * To eliminate most human motion such as walking or shaking,
+         * a Divisor value should be selected to effectively limit the
+         * orientation bandwidth. Set the depth of the filter used to
+         * low-pass filter the measured acceleration for stable
+         * orientation sensing
+         */
+#define ADXL_LP_FILTER_DIVISOR_2        0
+#define ADXL_LP_FILTER_DIVISOR_4        1
+#define ADXL_LP_FILTER_DIVISOR_8        2
+#define ADXL_LP_FILTER_DIVISOR_16       3
+#define ADXL_LP_FILTER_DIVISOR_32       4
+#define ADXL_LP_FILTER_DIVISOR_64       5
+#define ADXL_LP_FILTER_DIVISOR_128      6
+#define ADXL_LP_FILTER_DIVISOR_256      7
+        u8 divisor_length;
+        u32 ev_codes_orient_2d[4];      /* EV_KEY {+X, -X, +Y, -Y} */
+        u32 ev_codes_orient_3d[6];      /* EV_KEY {+Z, +Y, +X, -X, -Y, -Z} */
+};
+#endif
diff --git a/include/linux/input/cy8ctmg110_pdata.h b/include/linux/input/cy8ctmg110_pdata.h
new file mode 100644
index 000000000000..09522cb59910
--- /dev/null
+++ b/include/linux/input/cy8ctmg110_pdata.h
@@ -0,0 +1,10 @@
+#ifndef _LINUX_CY8CTMG110_PDATA_H
+#define _LINUX_CY8CTMG110_PDATA_H
+struct cy8ctmg110_pdata
+{
+        int reset_pin;          /* Reset pin is wired to this GPIO (optional) */
+        int irq_pin;            /* IRQ pin is wired to this GPIO */
+};
+#endif
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h
index c964cd7f436a..80352ad6581a 100644
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
@@ -41,6 +41,9 @@ struct matrix_keymap_data {
 * @col_scan_delay_us: delay, measured in microseconds, that is
 *      needed before we can keypad after activating column gpio
 * @debounce_ms: debounce interval in milliseconds
+ * @clustered_irq: may be specified if interrupts of all row/column GPIOs
+ *      are bundled to one single irq
+ * @clustered_irq_flags: flags that are needed for the clustered irq
 * @active_low: gpio polarity
 * @wakeup: controls whether the device should be set up as wakeup
 *      source
@@ -63,6 +66,9 @@ struct matrix_keypad_platform_data {
        /* key debounce interval in milli-second */
        unsigned int    debounce_ms;
+        unsigned int    clustered_irq;
+        unsigned int    clustered_irq_flags;
        bool            active_low;
        bool            wakeup;
        bool            no_autorepeat;
diff --git a/include/linux/intel_pmic_gpio.h b/include/linux/intel_pmic_gpio.h
new file mode 100644
index 000000000000..920109a29191
--- /dev/null
+++ b/include/linux/intel_pmic_gpio.h
@@ -0,0 +1,15 @@
+#ifndef LINUX_INTEL_PMIC_H
+#define LINUX_INTEL_PMIC_H
+struct intel_pmic_gpio_platform_data {
+        /* the first IRQ of the chip */
+        unsigned        irq_base;
+        /* number assigned to the first GPIO */
+        unsigned        gpio_base;
+        /* sram address for gpiointr register, the langwell chip will map
+         * the PMIC spi GPIO expander's GPIOINTR register in sram.
+         */
+        unsigned        gpiointr;
+};
+#endif
diff --git a/include/linux/ip_vs.h b/include/linux/ip_vs.h
index dfc170362842..9708de265bb1 100644
--- a/include/linux/ip_vs.h
+++ b/include/linux/ip_vs.h
@@ -19,6 +19,7 @@
 */
 #define IP_VS_SVC_F_PERSISTENT  0x0001          /* persistent port */
 #define IP_VS_SVC_F_HASHED      0x0002          /* hashed entry */
+#define IP_VS_SVC_F_ONEPACKET   0x0004          /* one-packet scheduling */
 /*
 *      Destination Server Flags
@@ -85,6 +86,7 @@
 #define IP_VS_CONN_F_SEQ_MASK   0x0600          /* in/out sequence mask */
 #define IP_VS_CONN_F_NO_CPORT   0x0800          /* no client port set yet */
 #define IP_VS_CONN_F_TEMPLATE   0x1000          /* template, not connection */
+#define IP_VS_CONN_F_ONE_PACKET 0x2000          /* forward only one packet */
 #define IP_VS_SCHEDNAME_MAXLEN  16
 #define IP_VS_IFNAME_MAXLEN     16
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 99e1ab7e3eec..ab9e9e89e407 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -58,7 +58,7 @@ struct ipv6_opt_hdr {
        /* 
         * TLV encoded option data follows.
         */
-} __attribute__ ((packed));     /* required for some archs */
+} __packed;     /* required for some archs */
 #define ipv6_destopt_hdr ipv6_opt_hdr
 #define ipv6_hopopt_hdr  ipv6_opt_hdr
@@ -99,7 +99,7 @@ struct ipv6_destopt_hao {
        __u8                    type;
        __u8                    length;
        struct in6_addr         addr;
-} __attribute__ ((__packed__));
+} __packed;
 /*
 *      IPv6 fixed header
@@ -246,7 +246,7 @@ struct inet6_skb_parm {
        __u16                   srcrt;
        __u16                   dst1;
        __u16                   lastopt;
-        __u32                   nhoff;
+        __u16                   nhoff;
        __u16                   flags;
 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
        __u16                   dsthao;
diff --git a/include/linux/iscsi_boot_sysfs.h b/include/linux/iscsi_boot_sysfs.h
new file mode 100644
index 000000000000..f1e6c184f14f
--- /dev/null
+++ b/include/linux/iscsi_boot_sysfs.h
@@ -0,0 +1,123 @@
+/*
+ * Export the iSCSI boot info to userland via sysfs.
+ *
+ * Copyright (C) 2010 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2010 Mike Christie
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License v2.0 as published by
+ * the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef _ISCSI_BOOT_SYSFS_
+#define _ISCSI_BOOT_SYSFS_
+/*
+ * The text attributes names for each of the kobjects.
+*/
+enum iscsi_boot_eth_properties_enum {
+        ISCSI_BOOT_ETH_INDEX,
+        ISCSI_BOOT_ETH_FLAGS,
+        ISCSI_BOOT_ETH_IP_ADDR,
+        ISCSI_BOOT_ETH_SUBNET_MASK,
+        ISCSI_BOOT_ETH_ORIGIN,
+        ISCSI_BOOT_ETH_GATEWAY,
+        ISCSI_BOOT_ETH_PRIMARY_DNS,
+        ISCSI_BOOT_ETH_SECONDARY_DNS,
+        ISCSI_BOOT_ETH_DHCP,
+        ISCSI_BOOT_ETH_VLAN,
+        ISCSI_BOOT_ETH_MAC,
+        /* eth_pci_bdf - this is replaced by link to the device itself. */
+        ISCSI_BOOT_ETH_HOSTNAME,
+        ISCSI_BOOT_ETH_END_MARKER,
+};
+enum iscsi_boot_tgt_properties_enum {
+        ISCSI_BOOT_TGT_INDEX,
+        ISCSI_BOOT_TGT_FLAGS,
+        ISCSI_BOOT_TGT_IP_ADDR,
+        ISCSI_BOOT_TGT_PORT,
+        ISCSI_BOOT_TGT_LUN,
+        ISCSI_BOOT_TGT_CHAP_TYPE,
+        ISCSI_BOOT_TGT_NIC_ASSOC,
+        ISCSI_BOOT_TGT_NAME,
+        ISCSI_BOOT_TGT_CHAP_NAME,
+        ISCSI_BOOT_TGT_CHAP_SECRET,
+        ISCSI_BOOT_TGT_REV_CHAP_NAME,
+        ISCSI_BOOT_TGT_REV_CHAP_SECRET,
+        ISCSI_BOOT_TGT_END_MARKER,
+};
+enum iscsi_boot_initiator_properties_enum {
+        ISCSI_BOOT_INI_INDEX,
+        ISCSI_BOOT_INI_FLAGS,
+        ISCSI_BOOT_INI_ISNS_SERVER,
+        ISCSI_BOOT_INI_SLP_SERVER,
+        ISCSI_BOOT_INI_PRI_RADIUS_SERVER,
+        ISCSI_BOOT_INI_SEC_RADIUS_SERVER,
+        ISCSI_BOOT_INI_INITIATOR_NAME,
+        ISCSI_BOOT_INI_END_MARKER,
+};
+struct attribute_group;
+struct iscsi_boot_kobj {
+        struct kobject kobj;
+        struct attribute_group *attr_group;
+        struct list_head list;
+        /*
+         * Pointer to store driver specific info. If set this will
+         * be freed for the LLD when the kobj release function is called.
+         */
+        void *data;
+        /*
+         * Driver specific show function.
+         *
+         * The enum of the type. This can be any value of the above
+         * properties.
+         */
+        ssize_t (*show) (void *data, int type, char *buf);
+        /*
+         * Drivers specific visibility function.
+         * The function should return if they the attr should be readable
+         * writable or should not be shown.
+         *
+         * The enum of the type. This can be any value of the above
+         * properties.
+         */
+        mode_t (*is_visible) (void *data, int type);
+};
+struct iscsi_boot_kset {
+        struct list_head kobj_list;
+        struct kset *kset;
+};
+struct iscsi_boot_kobj *
+iscsi_boot_create_initiator(struct iscsi_boot_kset *boot_kset, int index,
+                            void *data,
+                            ssize_t (*show) (void *data, int type, char *buf),
+                            mode_t (*is_visible) (void *data, int type));
+struct iscsi_boot_kobj *
+iscsi_boot_create_ethernet(struct iscsi_boot_kset *boot_kset, int index,
+                           void *data,
+                           ssize_t (*show) (void *data, int type, char *buf),
+                           mode_t (*is_visible) (void *data, int type));
+struct iscsi_boot_kobj *
+iscsi_boot_create_target(struct iscsi_boot_kset *boot_kset, int index,
+                         void *data,
+                         ssize_t (*show) (void *data, int type, char *buf),
+                         mode_t (*is_visible) (void *data, int type));
+struct iscsi_boot_kset *iscsi_boot_create_kset(const char *set_name);
+struct iscsi_boot_kset *iscsi_boot_create_host_kset(unsigned int hostno);
+void iscsi_boot_destroy_kset(struct iscsi_boot_kset *boot_kset);
+#endif
diff --git a/include/linux/iscsi_ibft.h b/include/linux/iscsi_ibft.h
index d2e4042f8f5e..8ba7e5b9d62c 100644
--- a/include/linux/iscsi_ibft.h
+++ b/include/linux/iscsi_ibft.h
@@ -21,21 +21,13 @@
 #ifndef ISCSI_IBFT_H
 #define ISCSI_IBFT_H
-struct ibft_table_header {
+#include <acpi/acpi.h>
-        char signature[4];
-        u32 length;
-        u8 revision;
-        u8 checksum;
-        char oem_id[6];
-        char oem_table_id[8];
-        char reserved[24];
-} __attribute__((__packed__));
 /*
 * Logical location of iSCSI Boot Format Table.
 * If the value is NULL there is no iBFT on the machine.
 */
-extern struct ibft_table_header *ibft_addr;
+extern struct acpi_table_ibft *ibft_addr;
 /*
 * Routine used to find and reserve the iSCSI Boot Format Table. The
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h
index b9b5a684ed69..b8c23f88dd54 100644
--- a/include/linux/isdnif.h
+++ b/include/linux/isdnif.h
@@ -317,7 +317,7 @@ typedef struct T30_s {
        __u8 r_scantime;
        __u8 r_id[FAXIDLEN];
        __u8 r_code;
-} __attribute__((packed)) T30_s;
+} __packed T30_s;
 #define ISDN_TTY_FAX_CONN_IN    0
 #define ISDN_TTY_FAX_CONN_OUT   1
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h
index 0874ab59ffef..edb9231f1898 100644
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@ -185,7 +185,7 @@ struct jffs2_raw_xref
        jint32_t hdr_crc;
        jint32_t ino;           /* inode number */
        jint32_t xid;           /* XATTR identifier number */
-        jint32_t xseqno;        /* xref sequencial number */
+        jint32_t xseqno;        /* xref sequential number */
        jint32_t node_crc;
 } __attribute__((packed));
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 8317ec4b9f3b..5de838b0fc1a 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -171,6 +171,11 @@ static inline void might_fault(void)
 }
 #endif
+struct va_format {
+        const char *fmt;
+        va_list *va;
+};
 extern struct atomic_notifier_head panic_notifier_list;
 extern long (*panic_blink)(long time);
 NORET_TYPE void panic(const char * fmt, ...)
@@ -728,12 +733,6 @@ extern int do_sysinfo(struct sysinfo *info);
 #endif /* __KERNEL__ */
-#ifndef __EXPORTED_HEADERS__
-#ifndef __KERNEL__
-#warning Attempt to use kernel headers from user space, see http://kernelnewbies.org/KernelHeaders
-#endif /* __KERNEL__ */
-#endif /* __EXPORTED_HEADERS__ */
 #define SI_LOAD_SHIFT   16
 struct sysinfo {
        long uptime;                    /* Seconds since boot */
diff --git a/include/linux/ks8842.h b/include/linux/ks8842.h
index da0341b8ca0a..14ba4452296e 100644
--- a/include/linux/ks8842.h
+++ b/include/linux/ks8842.h
@@ -25,10 +25,14 @@
 * struct ks8842_platform_data - Platform data of the KS8842 network driver
 * @macaddr:    The MAC address of the device, set to all 0:s to use the on in
 *              the chip.
+ * @rx_dma_channel:     The DMA channel to use for RX, -1 for none.
+ * @tx_dma_channel:     The DMA channel to use for TX, -1 for none.
 *
 */
 struct ks8842_platform_data {
        u8 macaddr[ETH_ALEN];
+        int rx_dma_channel;
+        int tx_dma_channel;
 };
 #endif
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 23ea02253900..636fc381c897 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -524,6 +524,12 @@ struct kvm_enable_cap {
 #define KVM_CAP_PPC_OSI 52
 #define KVM_CAP_PPC_UNSET_IRQ 53
 #define KVM_CAP_ENABLE_CAP 54
+#ifdef __KVM_HAVE_XSAVE
+#define KVM_CAP_XSAVE 55
+#endif
+#ifdef __KVM_HAVE_XCRS
+#define KVM_CAP_XCRS 56
+#endif
 #ifdef KVM_CAP_IRQ_ROUTING
@@ -613,6 +619,7 @@ struct kvm_clock_data {
 */
 #define KVM_CREATE_VCPU           _IO(KVMIO,   0x41)
 #define KVM_GET_DIRTY_LOG         _IOW(KVMIO,  0x42, struct kvm_dirty_log)
+/* KVM_SET_MEMORY_ALIAS is obsolete: */
 #define KVM_SET_MEMORY_ALIAS      _IOW(KVMIO,  0x43, struct kvm_memory_alias)
 #define KVM_SET_NR_MMU_PAGES      _IO(KVMIO,   0x44)
 #define KVM_GET_NR_MMU_PAGES      _IO(KVMIO,   0x45)
@@ -714,6 +721,12 @@ struct kvm_clock_data {
 #define KVM_GET_DEBUGREGS         _IOR(KVMIO,  0xa1, struct kvm_debugregs)
 #define KVM_SET_DEBUGREGS         _IOW(KVMIO,  0xa2, struct kvm_debugregs)
 #define KVM_ENABLE_CAP            _IOW(KVMIO,  0xa3, struct kvm_enable_cap)
+/* Available with KVM_CAP_XSAVE */
+#define KVM_GET_XSAVE             _IOR(KVMIO,  0xa4, struct kvm_xsave)
+#define KVM_SET_XSAVE             _IOW(KVMIO,  0xa5, struct kvm_xsave)
+/* Available with KVM_CAP_XCRS */
+#define KVM_GET_XCRS              _IOR(KVMIO,  0xa6, struct kvm_xcrs)
+#define KVM_SET_XCRS              _IOW(KVMIO,  0xa7, struct kvm_xcrs)
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU     (1 << 0)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 7cb116afa1cd..c13cc48697aa 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -81,13 +81,14 @@ struct kvm_vcpu {
        int vcpu_id;
        struct mutex mutex;
        int   cpu;
+        atomic_t guest_mode;
        struct kvm_run *run;
        unsigned long requests;
        unsigned long guest_debug;
        int srcu_idx;
        int fpu_active;
-        int guest_fpu_loaded;
+        int guest_fpu_loaded, guest_xcr0_loaded;
        wait_queue_head_t wq;
        int sigset_active;
        sigset_t sigset;
@@ -123,6 +124,7 @@ struct kvm_memory_slot {
        } *lpage_info[KVM_NR_PAGE_SIZES - 1];
        unsigned long userspace_addr;
        int user_alloc;
+        int id;
 };
 static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot)
@@ -266,6 +268,8 @@ extern pfn_t bad_pfn;
 int is_error_page(struct page *page);
 int is_error_pfn(pfn_t pfn);
+int is_hwpoison_pfn(pfn_t pfn);
+int is_fault_pfn(pfn_t pfn);
 int kvm_is_error_hva(unsigned long addr);
 int kvm_set_memory_region(struct kvm *kvm,
                          struct kvm_userspace_memory_region *mem,
@@ -284,8 +288,6 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
                                int user_alloc);
 void kvm_disable_largepages(void);
 void kvm_arch_flush_shadow(struct kvm *kvm);
-gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn);
-gfn_t unalias_gfn_instantiation(struct kvm *kvm, gfn_t gfn);
 struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn);
 unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn);
@@ -445,7 +447,8 @@ void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq,
                                    struct kvm_irq_mask_notifier *kimn);
 void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
                                      struct kvm_irq_mask_notifier *kimn);
-void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);
+void kvm_fire_mask_notifiers(struct kvm *kvm, unsigned irqchip, unsigned pin,
+                             bool mask);
 #ifdef __KVM_HAVE_IOAPIC
 void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic,
@@ -562,10 +565,6 @@ static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_se
 }
 #endif
-#ifndef KVM_ARCH_HAS_UNALIAS_INSTANTIATION
-#define unalias_gfn_instantiation unalias_gfn
-#endif
 #ifdef CONFIG_HAVE_KVM_IRQCHIP
 #define KVM_MAX_IRQ_ROUTES 1024
@@ -628,5 +627,25 @@ static inline long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
 #endif
+static inline void kvm_make_request(int req, struct kvm_vcpu *vcpu)
+{
+        set_bit(req, &vcpu->requests);
+}
+static inline bool kvm_make_check_request(int req, struct kvm_vcpu *vcpu)
+{
+        return test_and_set_bit(req, &vcpu->requests);
+}
+static inline bool kvm_check_request(int req, struct kvm_vcpu *vcpu)
+{
+        if (test_bit(req, &vcpu->requests)) {
+                clear_bit(req, &vcpu->requests);
+                return true;
+        } else {
+                return false;
+        }
+}
 #endif
diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h
index fb46efbeabec..7ac0d4eee430 100644
--- a/include/linux/kvm_types.h
+++ b/include/linux/kvm_types.h
@@ -32,11 +32,11 @@
 typedef unsigned long  gva_t;
 typedef u64            gpa_t;
-typedef unsigned long  gfn_t;
+typedef u64            gfn_t;
 typedef unsigned long  hva_t;
 typedef u64            hpa_t;
-typedef unsigned long  hfn_t;
+typedef u64            hfn_t;
 typedef hfn_t pfn_t;
diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h
index de48d167568b..78fbf24f357a 100644
--- a/include/linux/lru_cache.h
+++ b/include/linux/lru_cache.h
@@ -262,7 +262,7 @@ extern void lc_seq_dump_details(struct seq_file *seq, struct lru_cache *lc, char
 * @lc: the lru cache to operate on
 *
 * Note that the reference counts and order on the active and lru lists may
- * still change.  Returns true if we aquired the lock.
+ * still change.  Returns true if we acquired the lock.
 */
 static inline int lc_try_lock(struct lru_cache *lc)
 {
diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index 6907251d5200..112a55033352 100644
--- a/include/linux/lsm_audit.h
+++ b/include/linux/lsm_audit.h
@@ -90,10 +90,42 @@ struct common_audit_data {
                        u32 requested;
                        u32 audited;
                        u32 denied;
+                        /*
+                         * auditdeny is a bit tricky and unintuitive.  See the
+                         * comments in avc.c for it's meaning and usage.
+                         */
+                        u32 auditdeny;
                        struct av_decision *avd;
                        int result;
                } selinux_audit_data;
 #endif
+#ifdef CONFIG_SECURITY_APPARMOR
+                struct {
+                        int error;
+                        int op;
+                        int type;
+                        void *profile;
+                        const char *name;
+                        const char *info;
+                        union {
+                                void *target;
+                                struct {
+                                        long pos;
+                                        void *target;
+                                } iface;
+                                struct {
+                                        int rlim;
+                                        unsigned long max;
+                                } rlim;
+                                struct {
+                                        const char *target;
+                                        u32 request;
+                                        u32 denied;
+                                        uid_t ouid;
+                                } fs;
+                        };
+                } apparmor_audit_data;
+#endif
        };
        /* these callback will be implemented by a specific LSM */
        void (*lsm_pre_audit)(struct audit_buffer *, void *);
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index 78c3bed1c3f5..b5e7f2202484 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -251,7 +251,7 @@
 struct mISDNhead {
        unsigned int    prim;
        unsigned int    id;
-}  __attribute__((packed));
+}  __packed;
 #define MISDN_HEADER_LEN        sizeof(struct mISDNhead)
 #define MAX_DATA_SIZE           2048
diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h
new file mode 100644
index 000000000000..d0f08018335d
--- /dev/null
+++ b/include/linux/marvell_phy.h
@@ -0,0 +1,21 @@
+#ifndef _MARVELL_PHY_H
+#define _MARVELL_PHY_H
+/* Mask used for ID comparisons */
+#define MARVELL_PHY_ID_MASK             0xfffffff0
+/* Known PHY IDs */
+#define MARVELL_PHY_ID_88E1101          0x01410c60
+#define MARVELL_PHY_ID_88E1112          0x01410c90
+#define MARVELL_PHY_ID_88E1111          0x01410cc0
+#define MARVELL_PHY_ID_88E1118          0x01410e10
+#define MARVELL_PHY_ID_88E1121R         0x01410cb0
+#define MARVELL_PHY_ID_88E1145          0x01410cd0
+#define MARVELL_PHY_ID_88E1240          0x01410e30
+#define MARVELL_PHY_ID_88EC048          0x01410e90
+/* struct phy_device dev_flags definitions */
+#define MARVELL_PHY_M1145_FLAGS_RESISTANCE      0x00000001
+#define MARVELL_PHY_M1118_DNS323_LEDS           0x00000002
+#endif /* _MARVELL_PHY_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index a2b48041b910..7a9ab7db1975 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1465,6 +1465,14 @@ extern int sysctl_memory_failure_recovery;
 extern void shake_page(struct page *p, int access);
 extern atomic_long_t mce_bad_pages;
 extern int soft_offline_page(struct page *page, int flags);
+#ifdef CONFIG_MEMORY_FAILURE
+int is_hwpoison_address(unsigned long addr);
+#else
+static inline int is_hwpoison_address(unsigned long addr)
+{
+        return 0;
+}
+#endif
 extern void dump_page(struct page *page);
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index 155719dab813..bb58854a8061 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -88,7 +88,7 @@ struct nbd_request {
        char handle[8];
        __be64 from;
        __be32 len;
-} __attribute__ ((packed));
+} __packed;
 /*
 * This is the reply packet that nbd-server sends back to the client after
diff --git a/include/linux/ncp.h b/include/linux/ncp.h
index 99f0adeeb3f3..3ace8370e61e 100644
--- a/include/linux/ncp.h
+++ b/include/linux/ncp.h
@@ -27,7 +27,7 @@ struct ncp_request_header {
        __u8 conn_high;
        __u8 function;
        __u8 data[0];
-} __attribute__((packed));
+} __packed;
 #define NCP_REPLY                (0x3333)
 #define NCP_WATCHDOG             (0x3E3E)
@@ -42,7 +42,7 @@ struct ncp_reply_header {
        __u8 completion_code;
        __u8 connection_state;
        __u8 data[0];
-} __attribute__((packed));
+} __packed;
 #define NCP_VOLNAME_LEN (16)
 #define NCP_NUMBER_OF_VOLUMES (256)
@@ -158,7 +158,7 @@ struct nw_info_struct {
 #ifdef __KERNEL__
        struct nw_nfs_info nfs;
 #endif
-} __attribute__((packed));
+} __packed;
 /* modify mask - use with MODIFY_DOS_INFO structure */
 #define DM_ATTRIBUTES             (cpu_to_le32(0x02))
@@ -190,12 +190,12 @@ struct nw_modify_dos_info {
        __u16 inheritanceGrantMask;
        __u16 inheritanceRevokeMask;
        __u32 maximumSpace;
-} __attribute__((packed));
+} __packed;
 struct nw_search_sequence {
        __u8 volNumber;
        __u32 dirBase;
        __u32 sequence;
-} __attribute__((packed));
+} __packed;
 #endif                          /* _LINUX_NCP_H */
diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
index 5ec9ca671687..8da05bc098ca 100644
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.h
@@ -104,13 +104,13 @@ struct ncp_server {
                unsigned int state;             /* STREAM only: receiver state */
                struct {
-                        __u32 magic __attribute__((packed));
+                        __u32 magic __packed;
-                        __u32 len __attribute__((packed));
+                        __u32 len __packed;
-                        __u16 type __attribute__((packed));
+                        __u16 type __packed;
-                        __u16 p1 __attribute__((packed));
+                        __u16 p1 __packed;
-                        __u16 p2 __attribute__((packed));
+                        __u16 p2 __packed;
-                        __u16 p3 __attribute__((packed));
+                        __u16 p3 __packed;
-                        __u16 type2 __attribute__((packed));
+                        __u16 type2 __packed;
                } buf;                          /* STREAM only: temporary buffer */
                unsigned char* ptr;             /* STREAM only: pointer to data */
                size_t len;                     /* STREAM only: length of data to receive */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b21e4054c12c..46c36ffe20ee 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -54,6 +54,7 @@
 struct vlan_group;
 struct netpoll_info;
+struct phy_device;
 /* 802.11 specific */
 struct wireless_dev;
                                        /* source back-compat hooks */
@@ -65,6 +66,11 @@ struct wireless_dev;
 #define HAVE_FREE_NETDEV                /* free_netdev() */
 #define HAVE_NETDEV_PRIV                /* netdev_priv() */
+/* hardware address assignment types */
+#define NET_ADDR_PERM           0       /* address is permanent (default) */
+#define NET_ADDR_RANDOM         1       /* address is generated randomly */
+#define NET_ADDR_STOLEN         2       /* address is stolen from other device */
 /* Backlog congestion levels */
 #define NET_RX_SUCCESS          0       /* keep 'em coming, baby */
 #define NET_RX_DROP             1       /* packet dropped */
@@ -159,45 +165,39 @@ static inline bool dev_xmit_complete(int rc)
 #define MAX_HEADER (LL_MAX_HEADER + 48)
 #endif
-#endif  /*  __KERNEL__  */
 /*
- *      Network device statistics. Akin to the 2.0 ether stats but
+ *      Old network device statistics. Fields are native words
- *      with byte counters.
+ *      (unsigned long) so they can be read and written atomically.
 */
 struct net_device_stats {
-        unsigned long   rx_packets;             /* total packets received       */
+        unsigned long   rx_packets;
-        unsigned long   tx_packets;             /* total packets transmitted    */
+        unsigned long   tx_packets;
-        unsigned long   rx_bytes;               /* total bytes received         */
+        unsigned long   rx_bytes;
-        unsigned long   tx_bytes;               /* total bytes transmitted      */
+        unsigned long   tx_bytes;
-        unsigned long   rx_errors;              /* bad packets received         */
+        unsigned long   rx_errors;
-        unsigned long   tx_errors;              /* packet transmit problems     */
+        unsigned long   tx_errors;
-        unsigned long   rx_dropped;             /* no space in linux buffers    */
+        unsigned long   rx_dropped;
-        unsigned long   tx_dropped;             /* no space available in linux  */
+        unsigned long   tx_dropped;
-        unsigned long   multicast;              /* multicast packets received   */
+        unsigned long   multicast;
        unsigned long   collisions;
-        /* detailed rx_errors: */
        unsigned long   rx_length_errors;
-        unsigned long   rx_over_errors;         /* receiver ring buff overflow  */
+        unsigned long   rx_over_errors;
-        unsigned long   rx_crc_errors;          /* recved pkt with crc error    */
+        unsigned long   rx_crc_errors;
-        unsigned long   rx_frame_errors;        /* recv'd frame alignment error */
+        unsigned long   rx_frame_errors;
-        unsigned long   rx_fifo_errors;         /* recv'r fifo overrun          */
+        unsigned long   rx_fifo_errors;
-        unsigned long   rx_missed_errors;       /* receiver missed packet       */
+        unsigned long   rx_missed_errors;
-        /* detailed tx_errors */
        unsigned long   tx_aborted_errors;
        unsigned long   tx_carrier_errors;
        unsigned long   tx_fifo_errors;
        unsigned long   tx_heartbeat_errors;
        unsigned long   tx_window_errors;
-        
-        /* for cslip etc */
        unsigned long   rx_compressed;
        unsigned long   tx_compressed;
 };
+#endif  /*  __KERNEL__  */
 /* Media selection options. */
 enum {
@@ -381,6 +381,8 @@ enum gro_result {
 };
 typedef enum gro_result gro_result_t;
+typedef struct sk_buff *rx_handler_func_t(struct sk_buff *skb);
 extern void __napi_schedule(struct napi_struct *n);
 static inline int napi_disable_pending(struct napi_struct *n)
@@ -504,9 +506,9 @@ struct netdev_queue {
         * please use this field instead of dev->trans_start
         */
        unsigned long           trans_start;
-        unsigned long           tx_bytes;
+        u64                     tx_bytes;
-        unsigned long           tx_packets;
+        u64                     tx_packets;
-        unsigned long           tx_dropped;
+        u64                     tx_dropped;
 } ____cacheline_aligned_in_smp;
 #ifdef CONFIG_RPS
@@ -660,10 +662,19 @@ struct netdev_rx_queue {
 *      Callback uses when the transmitter has not made any progress
 *      for dev->watchdog ticks.
 *
+ * struct rtnl_link_stats64* (*ndo_get_stats64)(struct net_device *dev,
+ *                      struct rtnl_link_stats64 *storage);
 * struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
 *      Called when a user wants to get the network device usage
- *      statistics. If not defined, the counters in dev->stats will
+ *      statistics. Drivers must do one of the following:
- *      be used.
+ *      1. Define @ndo_get_stats64 to fill in a zero-initialised
+ *         rtnl_link_stats64 structure passed by the caller.
+ *      2. Define @ndo_get_stats to update a net_device_stats structure
+ *         (which should normally be dev->stats) and return a pointer to
+ *         it. The structure may be changed asynchronously only if each
+ *         field is written atomically.
+ *      3. Update dev->stats asynchronously and atomically, and define
+ *         neither operation.
 *
 * void (*ndo_vlan_rx_register)(struct net_device *dev, struct vlan_group *grp);
 *      If device support VLAN receive accleration
@@ -718,6 +729,8 @@ struct net_device_ops {
                                                   struct neigh_parms *);
        void                    (*ndo_tx_timeout) (struct net_device *dev);
+        struct rtnl_link_stats64* (*ndo_get_stats64)(struct net_device *dev,
+                                                     struct rtnl_link_stats64 *storage);
        struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
        void                    (*ndo_vlan_rx_register)(struct net_device *dev,
@@ -728,6 +741,8 @@ struct net_device_ops {
                                                        unsigned short vid);
 #ifdef CONFIG_NET_POLL_CONTROLLER
        void                    (*ndo_poll_controller)(struct net_device *dev);
+        int                     (*ndo_netpoll_setup)(struct net_device *dev,
+                                                     struct netpoll_info *info);
        void                    (*ndo_netpoll_cleanup)(struct net_device *dev);
 #endif
        int                     (*ndo_set_vf_mac)(struct net_device *dev,
@@ -775,11 +790,11 @@ struct net_device {
        /*
         * This is the first field of the "visible" part of this structure
         * (i.e. as seen by users in the "Space.c" file).  It is the name
-         * the interface.
+         * of the interface.
         */
        char                    name[IFNAMSIZ];
-        struct pm_qos_request_list *pm_qos_req;
+        struct pm_qos_request_list pm_qos_req;
        /* device name hash chain */
        struct hlist_node       name_hlist;
@@ -847,7 +862,8 @@ struct net_device {
 #define NETIF_F_FSO             (SKB_GSO_FCOE << NETIF_F_GSO_SHIFT)
        /* List of features with software fallbacks. */
-#define NETIF_F_GSO_SOFTWARE    (NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
+#define NETIF_F_GSO_SOFTWARE    (NETIF_F_TSO | NETIF_F_TSO_ECN | \
+                                 NETIF_F_TSO6 | NETIF_F_UFO)
 #define NETIF_F_GEN_CSUM        (NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
@@ -908,6 +924,7 @@ struct net_device {
        /* Interface address info. */
        unsigned char           perm_addr[MAX_ADDR_LEN]; /* permanent hw address */
+        unsigned char           addr_assign_type; /* hw address assignment type */
        unsigned char           addr_len;       /* hardware address length      */
        unsigned short          dev_id;         /* for shared network cards */
@@ -957,6 +974,8 @@ struct net_device {
 #endif
        struct netdev_queue     rx_queue;
+        rx_handler_func_t       *rx_handler;
+        void                    *rx_handler_data;
        struct netdev_queue     *_tx ____cacheline_aligned_in_smp;
@@ -1024,10 +1043,6 @@ struct net_device {
        /* mid-layer private */
        void                    *ml_priv;
-        /* bridge stuff */
-        struct net_bridge_port  *br_port;
-        /* macvlan */
-        struct macvlan_port     *macvlan_port;
        /* GARP */
        struct garp_port        *garp_port;
@@ -1057,6 +1072,9 @@ struct net_device {
 #endif
        /* n-tuple filter list attached to this device */
        struct ethtool_rx_ntuple_list ethtool_ntuple_list;
+        /* phy device may attach itself for hardware timestamping */
+        struct phy_device *phydev;
 };
 #define to_net_dev(d) container_of(d, struct net_device, dev)
@@ -1087,11 +1105,7 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev,
 static inline
 struct net *dev_net(const struct net_device *dev)
 {
-#ifdef CONFIG_NET_NS
+        return read_pnet(&dev->nd_net);
-        return dev->nd_net;
-#else
-        return &init_net;
-#endif
 }
 static inline
@@ -1272,8 +1286,8 @@ extern void		dev_add_pack(struct packet_type *pt);
 extern void             dev_remove_pack(struct packet_type *pt);
 extern void             __dev_remove_pack(struct packet_type *pt);
-extern struct net_device        *dev_get_by_flags(struct net *net, unsigned short flags,
+extern struct net_device        *dev_get_by_flags_rcu(struct net *net, unsigned short flags,
-                                                  unsigned short mask);
+                                                      unsigned short mask);
 extern struct net_device        *dev_get_by_name(struct net *net, const char *name);
 extern struct net_device        *dev_get_by_name_rcu(struct net *net, const char *name);
 extern struct net_device        *__dev_get_by_name(struct net *net, const char *name);
@@ -1696,6 +1710,11 @@ static inline void napi_free_frags(struct napi_struct *napi)
        napi->skb = NULL;
 }
+extern int netdev_rx_handler_register(struct net_device *dev,
+                                      rx_handler_func_t *rx_handler,
+                                      void *rx_handler_data);
+extern void netdev_rx_handler_unregister(struct net_device *dev);
 extern void             netif_nit_deliver(struct sk_buff *skb);
 extern int              dev_valid_name(const char *name);
 extern int              dev_ioctl(struct net *net, unsigned int cmd, void __user *);
@@ -1775,6 +1794,8 @@ extern void netif_carrier_on(struct net_device *dev);
 extern void netif_carrier_off(struct net_device *dev);
+extern void netif_notify_peers(struct net_device *dev);
 /**
 *      netif_dormant_on - mark device as dormant.
 *      @dev: network device
@@ -2119,8 +2140,10 @@ extern void		netdev_features_change(struct net_device *dev);
 /* Load a device via the kmod */
 extern void             dev_load(struct net *net, const char *name);
 extern void             dev_mcast_init(void);
-extern const struct net_device_stats *dev_get_stats(struct net_device *dev);
+extern struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
-extern void             dev_txq_stats_fold(const struct net_device *dev, struct net_device_stats *stats);
+                                               struct rtnl_link_stats64 *storage);
+extern void             dev_txq_stats_fold(const struct net_device *dev,
+                                           struct rtnl_link_stats64 *stats);
 extern int              netdev_max_backlog;
 extern int              netdev_tstamp_prequeue;
@@ -2230,25 +2253,23 @@ static inline const char *netdev_name(const struct net_device *dev)
        return dev->name;
 }
-#define netdev_printk(level, netdev, format, args...)           \
+extern int netdev_printk(const char *level, const struct net_device *dev,
-        dev_printk(level, (netdev)->dev.parent,                 \
+                         const char *format, ...)
-                   "%s: " format,                               \
+        __attribute__ ((format (printf, 3, 4)));
-                   netdev_name(netdev), ##args)
+extern int netdev_emerg(const struct net_device *dev, const char *format, ...)
+        __attribute__ ((format (printf, 2, 3)));
-#define netdev_emerg(dev, format, args...)                      \
+extern int netdev_alert(const struct net_device *dev, const char *format, ...)
-        netdev_printk(KERN_EMERG, dev, format, ##args)
+        __attribute__ ((format (printf, 2, 3)));
-#define netdev_alert(dev, format, args...)                      \
+extern int netdev_crit(const struct net_device *dev, const char *format, ...)
-        netdev_printk(KERN_ALERT, dev, format, ##args)
+        __attribute__ ((format (printf, 2, 3)));
-#define netdev_crit(dev, format, args...)                       \
+extern int netdev_err(const struct net_device *dev, const char *format, ...)
-        netdev_printk(KERN_CRIT, dev, format, ##args)
+        __attribute__ ((format (printf, 2, 3)));
-#define netdev_err(dev, format, args...)                        \
+extern int netdev_warn(const struct net_device *dev, const char *format, ...)
-        netdev_printk(KERN_ERR, dev, format, ##args)
+        __attribute__ ((format (printf, 2, 3)));
-#define netdev_warn(dev, format, args...)                       \
+extern int netdev_notice(const struct net_device *dev, const char *format, ...)
-        netdev_printk(KERN_WARNING, dev, format, ##args)
+        __attribute__ ((format (printf, 2, 3)));
-#define netdev_notice(dev, format, args...)                     \
+extern int netdev_info(const struct net_device *dev, const char *format, ...)
-        netdev_printk(KERN_NOTICE, dev, format, ##args)
+        __attribute__ ((format (printf, 2, 3)));
-#define netdev_info(dev, format, args...)                       \
-        netdev_printk(KERN_INFO, dev, format, ##args)
 #if defined(DEBUG)
 #define netdev_dbg(__dev, format, args...)                      \
@@ -2296,20 +2317,26 @@ do {					  			\
                netdev_printk(level, (dev), fmt, ##args);       \
 } while (0)
+#define netif_level(level, priv, type, dev, fmt, args...)       \
+do {                                                            \
+        if (netif_msg_##type(priv))                             \
+                netdev_##level(dev, fmt, ##args);               \
+} while (0)
 #define netif_emerg(priv, type, dev, fmt, args...)              \
-        netif_printk(priv, type, KERN_EMERG, dev, fmt, ##args)
+        netif_level(emerg, priv, type, dev, fmt, ##args)
 #define netif_alert(priv, type, dev, fmt, args...)              \
-        netif_printk(priv, type, KERN_ALERT, dev, fmt, ##args)
+        netif_level(alert, priv, type, dev, fmt, ##args)
 #define netif_crit(priv, type, dev, fmt, args...)               \
-        netif_printk(priv, type, KERN_CRIT, dev, fmt, ##args)
+        netif_level(crit, priv, type, dev, fmt, ##args)
 #define netif_err(priv, type, dev, fmt, args...)                \
-        netif_printk(priv, type, KERN_ERR, dev, fmt, ##args)
+        netif_level(err, priv, type, dev, fmt, ##args)
 #define netif_warn(priv, type, dev, fmt, args...)               \
-        netif_printk(priv, type, KERN_WARNING, dev, fmt, ##args)
+        netif_level(warn, priv, type, dev, fmt, ##args)
 #define netif_notice(priv, type, dev, fmt, args...)             \
-        netif_printk(priv, type, KERN_NOTICE, dev, fmt, ##args)
+        netif_level(notice, priv, type, dev, fmt, ##args)
 #define netif_info(priv, type, dev, fmt, args...)               \
-        netif_printk(priv, type, KERN_INFO, (dev), fmt, ##args)
+        netif_level(info, priv, type, dev, fmt, ##args)
 #if defined(DEBUG)
 #define netif_dbg(priv, type, dev, format, args...)             \
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index 48767cd16453..edeeabdc1500 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -3,11 +3,13 @@ header-y += nf_conntrack_tuple_common.h
 header-y += nfnetlink_conntrack.h
 header-y += nfnetlink_log.h
 header-y += nfnetlink_queue.h
+header-y += xt_CHECKSUM.h
 header-y += xt_CLASSIFY.h
 header-y += xt_CONNMARK.h
 header-y += xt_CONNSECMARK.h
 header-y += xt_CT.h
 header-y += xt_DSCP.h
+header-y += xt_IDLETIMER.h
 header-y += xt_LED.h
 header-y += xt_MARK.h
 header-y += xt_NFLOG.h
@@ -18,17 +20,19 @@ header-y += xt_TCPMSS.h
 header-y += xt_TCPOPTSTRIP.h
 header-y += xt_TEE.h
 header-y += xt_TPROXY.h
+header-y += xt_cluster.h
 header-y += xt_comment.h
 header-y += xt_connbytes.h
 header-y += xt_connlimit.h
 header-y += xt_connmark.h
 header-y += xt_conntrack.h
-header-y += xt_cluster.h
+header-y += xt_cpu.h
 header-y += xt_dccp.h
 header-y += xt_dscp.h
 header-y += xt_esp.h
 header-y += xt_hashlimit.h
 header-y += xt_iprange.h
+header-y += xt_ipvs.h
 header-y += xt_helper.h
 header-y += xt_length.h
 header-y += xt_limit.h
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h
index 14e6d32002c4..1afd18c855ec 100644
--- a/include/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
@@ -76,6 +76,10 @@ enum ip_conntrack_status {
        /* Conntrack is a template */
        IPS_TEMPLATE_BIT = 11,
        IPS_TEMPLATE = (1 << IPS_TEMPLATE_BIT),
+        /* Conntrack is a fake untracked entry */
+        IPS_UNTRACKED_BIT = 12,
+        IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),
 };
 /* Connection tracking event types */
diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
index d3bab7a2c9b7..ea9b8d380527 100644
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/linux/netfilter/nfnetlink_log.h
@@ -89,6 +89,7 @@ enum nfulnl_attr_config {
 #define NFULNL_COPY_NONE        0x00
 #define NFULNL_COPY_META        0x01
 #define NFULNL_COPY_PACKET      0x02
+/* 0xff is reserved, don't use it for new copy modes. */
 #define NFULNL_CFG_F_SEQ        0x0001
 #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
diff --git a/include/linux/netfilter/xt_CHECKSUM.h b/include/linux/netfilter/xt_CHECKSUM.h
new file mode 100644
index 000000000000..9a2e4661654e
--- /dev/null
+++ b/include/linux/netfilter/xt_CHECKSUM.h
@@ -0,0 +1,20 @@
+/* Header file for iptables ipt_CHECKSUM target
+ *
+ * (C) 2002 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2010 Red Hat Inc
+ * Author: Michael S. Tsirkin <mst@redhat.com>
+ *
+ * This software is distributed under GNU GPL v2, 1991
+*/
+#ifndef _XT_CHECKSUM_TARGET_H
+#define _XT_CHECKSUM_TARGET_H
+#include <linux/types.h>
+#define XT_CHECKSUM_OP_FILL     0x01    /* fill in checksum in IP header */
+struct xt_CHECKSUM_info {
+        __u8 operation; /* bitset of operations */
+};
+#endif /* _XT_CHECKSUM_TARGET_H */
diff --git a/include/linux/netfilter/xt_IDLETIMER.h b/include/linux/netfilter/xt_IDLETIMER.h
new file mode 100644
index 000000000000..3e1aa1be942e
--- /dev/null
+++ b/include/linux/netfilter/xt_IDLETIMER.h
@@ -0,0 +1,45 @@
+/*
+ * linux/include/linux/netfilter/xt_IDLETIMER.h
+ *
+ * Header file for Xtables timer target module.
+ *
+ * Copyright (C) 2004, 2010 Nokia Corporation
+ * Written by Timo Teras <ext-timo.teras@nokia.com>
+ *
+ * Converted to x_tables and forward-ported to 2.6.34
+ * by Luciano Coelho <luciano.coelho@nokia.com>
+ *
+ * Contact: Luciano Coelho <luciano.coelho@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 _XT_IDLETIMER_H
+#define _XT_IDLETIMER_H
+#include <linux/types.h>
+#define MAX_IDLETIMER_LABEL_SIZE 28
+struct idletimer_tg_info {
+        __u32 timeout;
+        char label[MAX_IDLETIMER_LABEL_SIZE];
+        /* for kernel module internal use only */
+        struct idletimer_tg *timer __attribute((aligned(8)));
+};
+#endif
diff --git a/include/linux/netfilter/xt_cpu.h b/include/linux/netfilter/xt_cpu.h
new file mode 100644
index 000000000000..93c7f11d8f42
--- /dev/null
+++ b/include/linux/netfilter/xt_cpu.h
@@ -0,0 +1,11 @@
+#ifndef _XT_CPU_H
+#define _XT_CPU_H
+#include <linux/types.h>
+struct xt_cpu_info {
+        __u32   cpu;
+        __u32   invert;
+};
+#endif /*_XT_CPU_H*/
diff --git a/include/linux/netfilter/xt_ipvs.h b/include/linux/netfilter/xt_ipvs.h
new file mode 100644
index 000000000000..1167aeb7a347
--- /dev/null
+++ b/include/linux/netfilter/xt_ipvs.h
@@ -0,0 +1,27 @@
+#ifndef _XT_IPVS_H
+#define _XT_IPVS_H
+enum {
+        XT_IPVS_IPVS_PROPERTY = 1 << 0, /* all other options imply this one */
+        XT_IPVS_PROTO =         1 << 1,
+        XT_IPVS_VADDR =         1 << 2,
+        XT_IPVS_VPORT =         1 << 3,
+        XT_IPVS_DIR =           1 << 4,
+        XT_IPVS_METHOD =        1 << 5,
+        XT_IPVS_VPORTCTL =      1 << 6,
+        XT_IPVS_MASK =          (1 << 7) - 1,
+        XT_IPVS_ONCE_MASK =     XT_IPVS_MASK & ~XT_IPVS_IPVS_PROPERTY
+};
+struct xt_ipvs_mtinfo {
+        union nf_inet_addr      vaddr, vmask;
+        __be16                  vport;
+        __u8                    l4proto;
+        __u8                    fwd_method;
+        __be16                  vportctl;
+        __u8                    invert;
+        __u8                    bitmask;
+};
+#endif /* _XT_IPVS_H */
diff --git a/include/linux/netfilter/xt_quota.h b/include/linux/netfilter/xt_quota.h
index 8dc89dfc1361..b0d28c659ab7 100644
--- a/include/linux/netfilter/xt_quota.h
+++ b/include/linux/netfilter/xt_quota.h
@@ -11,9 +11,9 @@ struct xt_quota_priv;
 struct xt_quota_info {
        u_int32_t               flags;
        u_int32_t               pad;
+        aligned_u64             quota;
        /* Used internally by the kernel */
-        aligned_u64             quota;
        struct xt_quota_priv    *master;
 };
diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/linux/netfilter_ipv4/ipt_LOG.h
index 90fa6525ef9c..dcdbadf9fd4a 100644
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
+++ b/include/linux/netfilter_ipv4/ipt_LOG.h
@@ -7,7 +7,8 @@
 #define IPT_LOG_IPOPT           0x04    /* Log IP options */
 #define IPT_LOG_UID             0x08    /* Log UID owning local socket */
 #define IPT_LOG_NFLOG           0x10    /* Unsupported, don't reuse */
-#define IPT_LOG_MASK            0x1f
+#define IPT_LOG_MACDECODE       0x20    /* Decode MAC header */
+#define IPT_LOG_MASK            0x2f
 struct ipt_log_info {
        unsigned char level;
diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/linux/netfilter_ipv6/ip6t_LOG.h
index 0d0119b0458c..9dd5579e02ec 100644
--- a/include/linux/netfilter_ipv6/ip6t_LOG.h
+++ b/include/linux/netfilter_ipv6/ip6t_LOG.h
@@ -7,7 +7,8 @@
 #define IP6T_LOG_IPOPT          0x04    /* Log IP options */
 #define IP6T_LOG_UID            0x08    /* Log UID owning local socket */
 #define IP6T_LOG_NFLOG          0x10    /* Unsupported, don't use */
-#define IP6T_LOG_MASK           0x1f
+#define IP6T_LOG_MACDECODE      0x20    /* Decode MAC header */
+#define IP6T_LOG_MASK           0x2f
 struct ip6t_log_info {
        unsigned char level;
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index e9e231215865..413742c92d14 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -46,9 +46,11 @@ void netpoll_poll(struct netpoll *np);
 void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
 void netpoll_print_options(struct netpoll *np);
 int netpoll_parse_options(struct netpoll *np, char *opt);
+int __netpoll_setup(struct netpoll *np);
 int netpoll_setup(struct netpoll *np);
 int netpoll_trap(void);
 void netpoll_set_trap(int trap);
+void __netpoll_cleanup(struct netpoll *np);
 void netpoll_cleanup(struct netpoll *np);
 int __netpoll_rx(struct sk_buff *skb);
 void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);
@@ -57,12 +59,15 @@ void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);
 #ifdef CONFIG_NETPOLL
 static inline bool netpoll_rx(struct sk_buff *skb)
 {
-        struct netpoll_info *npinfo = skb->dev->npinfo;
+        struct netpoll_info *npinfo;
        unsigned long flags;
        bool ret = false;
+        rcu_read_lock_bh();
+        npinfo = rcu_dereference_bh(skb->dev->npinfo);
        if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags))
-                return false;
+                goto out;
        spin_lock_irqsave(&npinfo->rx_lock, flags);
        /* check rx_flags again with the lock held */
@@ -70,12 +75,14 @@ static inline bool netpoll_rx(struct sk_buff *skb)
                ret = true;
        spin_unlock_irqrestore(&npinfo->rx_lock, flags);
+out:
+        rcu_read_unlock_bh();
        return ret;
 }
 static inline int netpoll_rx_on(struct sk_buff *skb)
 {
-        struct netpoll_info *npinfo = skb->dev->npinfo;
+        struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
        return npinfo && (!list_empty(&npinfo->rx_np) || npinfo->rx_flags);
 }
@@ -91,7 +98,6 @@ static inline void *netpoll_poll_lock(struct napi_struct *napi)
 {
        struct net_device *dev = napi->dev;
-        rcu_read_lock(); /* deal with race on ->npinfo */
        if (dev && dev->npinfo) {
                spin_lock(&napi->poll_lock);
                napi->poll_owner = smp_processor_id();
@@ -108,7 +114,11 @@ static inline void netpoll_poll_unlock(void *have)
                napi->poll_owner = -1;
                spin_unlock(&napi->poll_lock);
        }
-        rcu_read_unlock();
+}
+static inline int netpoll_tx_running(struct net_device *dev)
+{
+        return irqs_disabled();
 }
 #else
@@ -134,6 +144,10 @@ static inline void netpoll_poll_unlock(void *have)
 static inline void netpoll_netdev_init(struct net_device *dev)
 {
 }
+static inline int netpoll_tx_running(struct net_device *dev)
+{
+        return 0;
+}
 #endif
 #endif
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index b7c77f9712f4..2c8701687336 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -132,7 +132,7 @@
 *      %NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and
 *      %NL80211_ATTR_REG_RULE_POWER_MAX_EIRP.
 * @NL80211_CMD_REQ_SET_REG: ask the wireless core to set the regulatory domain
- *      to the the specified ISO/IEC 3166-1 alpha2 country code. The core will
+ *      to the specified ISO/IEC 3166-1 alpha2 country code. The core will
 *      store this as a valid request and then query userspace for it.
 *
 * @NL80211_CMD_GET_MESH_PARAMS: Get mesh networking properties for the
@@ -725,6 +725,12 @@ enum nl80211_commands {
 * @NL80211_ATTR_AP_ISOLATE: (AP mode) Do not forward traffic between stations
 *      connected to this BSS.
 *
+ * @NL80211_ATTR_WIPHY_TX_POWER_SETTING: Transmit power setting type. See
+ *      &enum nl80211_tx_power_setting for possible values.
+ * @NL80211_ATTR_WIPHY_TX_POWER_LEVEL: Transmit power level in signed mBm units.
+ *      This is used in association with @NL80211_ATTR_WIPHY_TX_POWER_SETTING
+ *      for non-automatic settings.
+ *
 * @NL80211_ATTR_MAX: highest attribute number currently defined
 * @__NL80211_ATTR_AFTER_LAST: internal use
 */
@@ -882,6 +888,9 @@ enum nl80211_attrs {
        NL80211_ATTR_AP_ISOLATE,
+        NL80211_ATTR_WIPHY_TX_POWER_SETTING,
+        NL80211_ATTR_WIPHY_TX_POWER_LEVEL,
        /* add attributes here, update the policy in nl80211.c */
        __NL80211_ATTR_AFTER_LAST,
@@ -1659,4 +1668,17 @@ enum nl80211_cqm_rssi_threshold_event {
        NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,
 };
+/**
+ * enum nl80211_tx_power_setting - TX power adjustment
+ * @NL80211_TX_POWER_AUTOMATIC: automatically determine transmit power
+ * @NL80211_TX_POWER_LIMITED: limit TX power by the mBm parameter
+ * @NL80211_TX_POWER_FIXED: fix TX power to the mBm parameter
+ */
+enum nl80211_tx_power_setting {
+        NL80211_TX_POWER_AUTOMATIC,
+        NL80211_TX_POWER_LIMITED,
+        NL80211_TX_POWER_FIXED,
+};
 #endif /* __LINUX_NL80211_H */
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 540703b555cb..b2f1a4d83550 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -210,6 +210,7 @@ static inline int notifier_to_errno(int ret)
 #define NETDEV_POST_INIT        0x0010
 #define NETDEV_UNREGISTER_BATCH 0x0011
 #define NETDEV_BONDING_DESLAVE  0x0012
+#define NETDEV_NOTIFY_PEERS     0x0013
 #define SYS_DOWN        0x0001  /* Notify of system down */
 #define SYS_RESTART     SYS_DOWN
diff --git a/include/linux/of.h b/include/linux/of.h
index a367e19bb3af..cad7cf0ab278 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -70,6 +70,11 @@ extern struct device_node *allnodes;
 extern struct device_node *of_chosen;
 extern rwlock_t devtree_lock;
+static inline bool of_node_is_root(const struct device_node *node)
+{
+        return node && (node->parent == NULL);
+}
 static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
 {
        return test_bit(flag, &n->_flags);
@@ -141,6 +146,11 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
 #define OF_BAD_ADDR     ((u64)-1)
+#ifndef of_node_to_nid
+static inline int of_node_to_nid(struct device_node *np) { return -1; }
+#define of_node_to_nid of_node_to_nid
+#endif
 extern struct device_node *of_find_node_by_name(struct device_node *from,
        const char *name);
 #define for_each_node_by_name(dn, name) \
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
new file mode 100644
index 000000000000..8aea06f0564c
--- /dev/null
+++ b/include/linux/of_address.h
@@ -0,0 +1,44 @@
+#ifndef __OF_ADDRESS_H
+#define __OF_ADDRESS_H
+#include <linux/ioport.h>
+#include <linux/of.h>
+extern u64 of_translate_address(struct device_node *np, const u32 *addr);
+extern int of_address_to_resource(struct device_node *dev, int index,
+                                  struct resource *r);
+extern void __iomem *of_iomap(struct device_node *device, int index);
+/* Extract an address from a device, returns the region size and
+ * the address space flags too. The PCI version uses a BAR number
+ * instead of an absolute index
+ */
+extern const u32 *of_get_address(struct device_node *dev, int index,
+                           u64 *size, unsigned int *flags);
+#ifndef pci_address_to_pio
+static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; }
+#define pci_address_to_pio pci_address_to_pio
+#endif
+#ifdef CONFIG_PCI
+extern const u32 *of_get_pci_address(struct device_node *dev, int bar_no,
+                               u64 *size, unsigned int *flags);
+extern int of_pci_address_to_resource(struct device_node *dev, int bar,
+                                      struct resource *r);
+#else /* CONFIG_PCI */
+static inline int of_pci_address_to_resource(struct device_node *dev, int bar,
+                                             struct resource *r)
+{
+        return -ENOSYS;
+}
+static inline const u32 *of_get_pci_address(struct device_node *dev,
+                int bar_no, u64 *size, unsigned int *flags)
+{
+        return NULL;
+}
+#endif /* CONFIG_PCI */
+#endif /* __OF_ADDRESS_H */
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 11651facc5f1..35aa44ad9f2c 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -1,32 +1,77 @@
 #ifndef _LINUX_OF_DEVICE_H
 #define _LINUX_OF_DEVICE_H
+/*
+ * The of_device *was* a kind of "base class" that was a superset of
+ * struct device for use by devices attached to an OF node and probed
+ * using OF properties.  However, the important bit of OF-style
+ * probing, namely the device node pointer, has been moved into the
+ * common struct device when CONFIG_OF is set to make OF-style probing
+ * available to all bus types.  So now, just make of_device and
+ * platform_device equivalent so that current of_platform bus users
+ * can be transparently migrated over to using the platform bus.
+ *
+ * This line will go away once all references to of_device are removed
+ * from the kernel.
+ */
+#define of_device platform_device
+#include <linux/platform_device.h>
+#include <linux/of_platform.h> /* temporary until merge */
 #ifdef CONFIG_OF_DEVICE
 #include <linux/device.h>
 #include <linux/of.h>
 #include <linux/mod_devicetable.h>
-#include <asm/of_device.h>
 #define to_of_device(d) container_of(d, struct of_device, dev)
 extern const struct of_device_id *of_match_device(
        const struct of_device_id *matches, const struct device *dev);
+extern void of_device_make_bus_id(struct device *dev);
+/**
+ * of_driver_match_device - Tell if a driver's of_match_table matches a device.
+ * @drv: the device_driver structure to test
+ * @dev: the device structure to match against
+ */
+static inline int of_driver_match_device(const struct device *dev,
+                                         const struct device_driver *drv)
+{
+        return of_match_device(drv->of_match_table, dev) != NULL;
+}
-extern struct of_device *of_dev_get(struct of_device *dev);
+extern struct platform_device *of_dev_get(struct platform_device *dev);
-extern void of_dev_put(struct of_device *dev);
+extern void of_dev_put(struct platform_device *dev);
-extern int of_device_register(struct of_device *ofdev);
+extern int of_device_register(struct platform_device *ofdev);
-extern void of_device_unregister(struct of_device *ofdev);
+extern void of_device_unregister(struct platform_device *ofdev);
 extern void of_release_dev(struct device *dev);
-static inline void of_device_free(struct of_device *dev)
+static inline void of_device_free(struct platform_device *dev)
 {
        of_release_dev(&dev->dev);
 }
-extern ssize_t of_device_get_modalias(struct of_device *ofdev,
+extern ssize_t of_device_get_modalias(struct device *dev,
                                        char *str, ssize_t len);
+extern int of_device_uevent(struct device *dev, struct kobj_uevent_env *env);
+#else /* CONFIG_OF_DEVICE */
+static inline int of_driver_match_device(struct device *dev,
+                                         struct device_driver *drv)
+{
+        return 0;
+}
+static inline int of_device_uevent(struct device *dev,
+                                   struct kobj_uevent_env *env)
+{
+        return -ENODEV;
+}
 #endif /* CONFIG_OF_DEVICE */
 #endif /* _LINUX_OF_DEVICE_H */
diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h
index fc2472c3c254..6598c04dab01 100644
--- a/include/linux/of_gpio.h
+++ b/include/linux/of_gpio.h
@@ -33,34 +33,17 @@ enum of_gpio_flags {
 #ifdef CONFIG_OF_GPIO
 /*
- * Generic OF GPIO chip
- */
-struct of_gpio_chip {
-        struct gpio_chip gc;
-        int gpio_cells;
-        int (*xlate)(struct of_gpio_chip *of_gc, struct device_node *np,
-                     const void *gpio_spec, enum of_gpio_flags *flags);
-};
-static inline struct of_gpio_chip *to_of_gpio_chip(struct gpio_chip *gc)
-{
-        return container_of(gc, struct of_gpio_chip, gc);
-}
-/*
 * OF GPIO chip for memory mapped banks
 */
 struct of_mm_gpio_chip {
-        struct of_gpio_chip of_gc;
+        struct gpio_chip gc;
        void (*save_regs)(struct of_mm_gpio_chip *mm_gc);
        void __iomem *regs;
 };
 static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc)
 {
-        struct of_gpio_chip *of_gc = to_of_gpio_chip(gc);
+        return container_of(gc, struct of_mm_gpio_chip, gc);
-        return container_of(of_gc, struct of_mm_gpio_chip, of_gc);
 }
 extern int of_get_gpio_flags(struct device_node *np, int index,
@@ -69,11 +52,12 @@ extern unsigned int of_gpio_count(struct device_node *np);
 extern int of_mm_gpiochip_add(struct device_node *np,
                              struct of_mm_gpio_chip *mm_gc);
-extern int of_gpio_simple_xlate(struct of_gpio_chip *of_gc,
-                                struct device_node *np,
+extern void of_gpiochip_add(struct gpio_chip *gc);
-                                const void *gpio_spec,
+extern void of_gpiochip_remove(struct gpio_chip *gc);
-                                enum of_gpio_flags *flags);
+extern struct gpio_chip *of_node_to_gpiochip(struct device_node *np);
-#else
+#else /* CONFIG_OF_GPIO */
 /* Drivers may not strictly depend on the GPIO support, so let them link. */
 static inline int of_get_gpio_flags(struct device_node *np, int index,
@@ -87,6 +71,9 @@ static inline unsigned int of_gpio_count(struct device_node *np)
        return 0;
 }
+static inline void of_gpiochip_add(struct gpio_chip *gc) { }
+static inline void of_gpiochip_remove(struct gpio_chip *gc) { }
 #endif /* CONFIG_OF_GPIO */
 /**
diff --git a/include/linux/of_i2c.h b/include/linux/of_i2c.h
index 34974b5a76f7..0efe8d465f55 100644
--- a/include/linux/of_i2c.h
+++ b/include/linux/of_i2c.h
@@ -12,12 +12,19 @@
 #ifndef __LINUX_OF_I2C_H
 #define __LINUX_OF_I2C_H
+#if defined(CONFIG_OF_I2C) || defined(CONFIG_OF_I2C_MODULE)
 #include <linux/i2c.h>
-void of_register_i2c_devices(struct i2c_adapter *adap,
+extern void of_i2c_register_devices(struct i2c_adapter *adap);
-                             struct device_node *adap_node);
 /* must call put_device() when done with returned i2c_client device */
-struct i2c_client *of_find_i2c_device_by_node(struct device_node *node);
+extern struct i2c_client *of_find_i2c_device_by_node(struct device_node *node);
+#else
+static inline void of_i2c_register_devices(struct i2c_adapter *adap)
+{
+        return;
+}
+#endif /* CONFIG_OF_I2C */
 #endif /* __LINUX_OF_I2C_H */
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
new file mode 100644
index 000000000000..5929781c104d
--- /dev/null
+++ b/include/linux/of_irq.h
@@ -0,0 +1,70 @@
+#ifndef __OF_IRQ_H
+#define __OF_IRQ_H
+#if defined(CONFIG_OF)
+struct of_irq;
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/of.h>
+/*
+ * irq_of_parse_and_map() is used ba all OF enabled platforms; but SPARC
+ * implements it differently.  However, the prototype is the same for all,
+ * so declare it here regardless of the CONFIG_OF_IRQ setting.
+ */
+extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
+#if defined(CONFIG_OF_IRQ)
+/**
+ * of_irq - container for device_node/irq_specifier pair for an irq controller
+ * @controller: pointer to interrupt controller device tree node
+ * @size: size of interrupt specifier
+ * @specifier: array of cells @size long specifing the specific interrupt
+ *
+ * This structure is returned when an interrupt is mapped. The controller
+ * field needs to be put() after use
+ */
+#define OF_MAX_IRQ_SPEC         4 /* We handle specifiers of at most 4 cells */
+struct of_irq {
+        struct device_node *controller; /* Interrupt controller node */
+        u32 size; /* Specifier size */
+        u32 specifier[OF_MAX_IRQ_SPEC]; /* Specifier copy */
+};
+/*
+ * Workarounds only applied to 32bit powermac machines
+ */
+#define OF_IMAP_OLDWORLD_MAC    0x00000001
+#define OF_IMAP_NO_PHANDLE      0x00000002
+#if defined(CONFIG_PPC32) && defined(CONFIG_PPC_PMAC)
+extern unsigned int of_irq_workarounds;
+extern struct device_node *of_irq_dflt_pic;
+extern int of_irq_map_oldworld(struct device_node *device, int index,
+                               struct of_irq *out_irq);
+#else /* CONFIG_PPC32 && CONFIG_PPC_PMAC */
+#define of_irq_workarounds (0)
+#define of_irq_dflt_pic (NULL)
+static inline int of_irq_map_oldworld(struct device_node *device, int index,
+                                      struct of_irq *out_irq)
+{
+        return -EINVAL;
+}
+#endif /* CONFIG_PPC32 && CONFIG_PPC_PMAC */
+extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
+                          u32 ointsize, const u32 *addr,
+                          struct of_irq *out_irq);
+extern int of_irq_map_one(struct device_node *device, int index,
+                          struct of_irq *out_irq);
+extern unsigned int irq_create_of_mapping(struct device_node *controller,
+                                          const u32 *intspec,
+                                          unsigned int intsize);
+extern int of_irq_to_resource(struct device_node *dev, int index,
+                              struct resource *r);
+#endif /* CONFIG_OF_IRQ */
+#endif /* CONFIG_OF */
+#endif /* __OF_IRQ_H */
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 1643d3761eb4..4e6d989c06df 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -17,29 +17,24 @@
 #include <linux/mod_devicetable.h>
 #include <linux/pm.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
-/*
- * The of_platform_bus_type is a bus type used by drivers that do not
- * attach to a macio or similar bus but still use OF probing
- * mechanism
- */
-extern struct bus_type of_platform_bus_type;
 /*
 * An of_platform_driver driver is attached to a basic of_device on
- * the "platform bus" (of_platform_bus_type).
+ * the "platform bus" (platform_bus_type).
 */
 struct of_platform_driver
 {
-        int     (*probe)(struct of_device* dev,
+        int     (*probe)(struct platform_device* dev,
                         const struct of_device_id *match);
-        int     (*remove)(struct of_device* dev);
+        int     (*remove)(struct platform_device* dev);
-        int     (*suspend)(struct of_device* dev, pm_message_t state);
+        int     (*suspend)(struct platform_device* dev, pm_message_t state);
-        int     (*resume)(struct of_device* dev);
+        int     (*resume)(struct platform_device* dev);
-        int     (*shutdown)(struct of_device* dev);
+        int     (*shutdown)(struct platform_device* dev);
        struct device_driver    driver;
+        struct platform_driver  platform_driver;
 };
 #define to_of_platform_driver(drv) \
        container_of(drv,struct of_platform_driver, driver)
@@ -49,20 +44,30 @@ extern int of_register_driver(struct of_platform_driver *drv,
 extern void of_unregister_driver(struct of_platform_driver *drv);
 /* Platform drivers register/unregister */
-static inline int of_register_platform_driver(struct of_platform_driver *drv)
+extern int of_register_platform_driver(struct of_platform_driver *drv);
-{
+extern void of_unregister_platform_driver(struct of_platform_driver *drv);
-        return of_register_driver(drv, &of_platform_bus_type);
-}
-static inline void of_unregister_platform_driver(struct of_platform_driver *drv)
-{
-        of_unregister_driver(drv);
-}
-#include <asm/of_platform.h>
+extern struct platform_device *of_device_alloc(struct device_node *np,
+                                         const char *bus_id,
-extern struct of_device *of_find_device_by_node(struct device_node *np);
+                                         struct device *parent);
+extern struct platform_device *of_find_device_by_node(struct device_node *np);
 extern int of_bus_type_init(struct bus_type *bus, const char *name);
+#if !defined(CONFIG_SPARC) /* SPARC has its own device registration method */
+/* Platform devices and busses creation */
+extern struct platform_device *of_platform_device_create(struct device_node *np,
+                                                   const char *bus_id,
+                                                   struct device *parent);
+/* pseudo "matches" value to not do deep probe */
+#define OF_NO_DEEP_PROBE ((struct of_device_id *)-1)
+extern int of_platform_bus_probe(struct device_node *root,
+                                 const struct of_device_id *matches,
+                                 struct device *parent);
+#endif /* !CONFIG_SPARC */
 #endif /* CONFIG_OF_DEVICE */
 #endif  /* _LINUX_OF_PLATFORM_H */
diff --git a/include/linux/of_spi.h b/include/linux/of_spi.h
index 5f71ee8c0868..9e3e70f78ae6 100644
--- a/include/linux/of_spi.h
+++ b/include/linux/of_spi.h
@@ -9,10 +9,15 @@
 #ifndef __LINUX_OF_SPI_H
 #define __LINUX_OF_SPI_H
-#include <linux/of.h>
 #include <linux/spi/spi.h>
-extern void of_register_spi_devices(struct spi_master *master,
+#if defined(CONFIG_OF_SPI) || defined(CONFIG_OF_SPI_MODULE)
-                                    struct device_node *np);
+extern void of_register_spi_devices(struct spi_master *master);
+#else
+static inline void of_register_spi_devices(struct spi_master *master)
+{
+        return;
+}
+#endif /* CONFIG_OF_SPI */
 #endif /* __LINUX_OF_SPI */
diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h
index 9bdd91486b49..7e4cd616bcb5 100644
--- a/include/linux/omapfb.h
+++ b/include/linux/omapfb.h
@@ -253,7 +253,7 @@ struct omapfb_platform_data {
 /* in arch/arm/plat-omap/fb.c */
 extern void omapfb_set_platform_data(struct omapfb_platform_data *data);
 extern void omapfb_set_ctrl_platform_data(void *pdata);
-extern void omapfb_reserve_sdram(void);
+extern void omapfb_reserve_sdram_memblock(void);
 #endif
diff --git a/include/linux/padata.h b/include/linux/padata.h
index 8d8406246eef..bdcd1e9eacea 100644
--- a/include/linux/padata.h
+++ b/include/linux/padata.h
@@ -25,6 +25,11 @@
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <linux/timer.h>
+#include <linux/notifier.h>
+#include <linux/kobject.h>
+#define PADATA_CPU_SERIAL   0x01
+#define PADATA_CPU_PARALLEL 0x02
 /**
 * struct padata_priv -  Embedded to the users data structure.
@@ -59,7 +64,20 @@ struct padata_list {
 };
 /**
- * struct padata_queue - The percpu padata queues.
+* struct padata_serial_queue - The percpu padata serial queue
+*
+* @serial: List to wait for serialization after reordering.
+* @work: work struct for serialization.
+* @pd: Backpointer to the internal control structure.
+*/
+struct padata_serial_queue {
+       struct padata_list    serial;
+       struct work_struct    work;
+       struct parallel_data *pd;
+};
+/**
+ * struct padata_parallel_queue - The percpu padata parallel queue
 *
 * @parallel: List to wait for parallelization.
 * @reorder: List to wait for reordering after parallel processing.
@@ -67,18 +85,28 @@ struct padata_list {
 * @pwork: work struct for parallelization.
 * @swork: work struct for serialization.
 * @pd: Backpointer to the internal control structure.
+ * @work: work struct for parallelization.
 * @num_obj: Number of objects that are processed by this cpu.
 * @cpu_index: Index of the cpu.
 */
-struct padata_queue {
+struct padata_parallel_queue {
-        struct padata_list      parallel;
+       struct padata_list    parallel;
-        struct padata_list      reorder;
+       struct padata_list    reorder;
-        struct padata_list      serial;
+       struct parallel_data *pd;
-        struct work_struct      pwork;
+       struct work_struct    work;
-        struct work_struct      swork;
+       atomic_t              num_obj;
-        struct parallel_data    *pd;
+       int                   cpu_index;
-        atomic_t                num_obj;
+};
-        int                     cpu_index;
+/**
+ * struct padata_cpumask - The cpumasks for the parallel/serial workers
+ *
+ * @pcpu: cpumask for the parallel workers.
+ * @cbcpu: cpumask for the serial (callback) workers.
+ */
+struct padata_cpumask {
+        cpumask_var_t   pcpu;
+        cpumask_var_t   cbcpu;
 };
 /**
@@ -86,25 +114,29 @@ struct padata_queue {
 * that depends on the cpumask in use.
 *
 * @pinst: padata instance.
- * @queue: percpu padata queues.
+ * @pqueue: percpu padata queues used for parallelization.
+ * @squeue: percpu padata queues used for serialuzation.
 * @seq_nr: The sequence number that will be attached to the next object.
 * @reorder_objects: Number of objects waiting in the reorder queues.
 * @refcnt: Number of objects holding a reference on this parallel_data.
 * @max_seq_nr:  Maximal used sequence number.
- * @cpumask: cpumask in use.
+ * @cpumask: The cpumasks in use for parallel and serial workers.
 * @lock: Reorder lock.
+ * @processed: Number of already processed objects.
 * @timer: Reorder timer.
 */
 struct parallel_data {
-        struct padata_instance  *pinst;
+        struct padata_instance          *pinst;
-        struct padata_queue     *queue;
+        struct padata_parallel_queue    *pqueue;
-        atomic_t                seq_nr;
+        struct padata_serial_queue      *squeue;
-        atomic_t                reorder_objects;
+        atomic_t                        seq_nr;
-        atomic_t                refcnt;
+        atomic_t                        reorder_objects;
-        unsigned int            max_seq_nr;
+        atomic_t                        refcnt;
-        cpumask_var_t           cpumask;
+        unsigned int                    max_seq_nr;
-        spinlock_t              lock;
+        struct padata_cpumask           cpumask;
-        struct timer_list       timer;
+        spinlock_t                      lock ____cacheline_aligned;
+        unsigned int                    processed;
+        struct timer_list               timer;
 };
 /**
@@ -113,31 +145,48 @@ struct parallel_data {
 * @cpu_notifier: cpu hotplug notifier.
 * @wq: The workqueue in use.
 * @pd: The internal control structure.
- * @cpumask: User supplied cpumask.
+ * @cpumask: User supplied cpumasks for parallel and serial works.
+ * @cpumask_change_notifier: Notifiers chain for user-defined notify
+ *            callbacks that will be called when either @pcpu or @cbcpu
+ *            or both cpumasks change.
+ * @kobj: padata instance kernel object.
 * @lock: padata instance lock.
 * @flags: padata flags.
 */
 struct padata_instance {
-        struct notifier_block   cpu_notifier;
+        struct notifier_block            cpu_notifier;
-        struct workqueue_struct *wq;
+        struct workqueue_struct         *wq;
-        struct parallel_data    *pd;
+        struct parallel_data            *pd;
-        cpumask_var_t           cpumask;
+        struct padata_cpumask           cpumask;
-        struct mutex            lock;
+        struct blocking_notifier_head    cpumask_change_notifier;
-        u8                      flags;
+        struct kobject                   kobj;
-#define PADATA_INIT             1
+        struct mutex                     lock;
-#define PADATA_RESET            2
+        u8                               flags;
+#define PADATA_INIT     1
+#define PADATA_RESET    2
+#define PADATA_INVALID  4
 };
-extern struct padata_instance *padata_alloc(const struct cpumask *cpumask,
+extern struct padata_instance *padata_alloc_possible(
-                                            struct workqueue_struct *wq);
+                                        struct workqueue_struct *wq);
+extern struct padata_instance *padata_alloc(struct workqueue_struct *wq,
+                                            const struct cpumask *pcpumask,
+                                            const struct cpumask *cbcpumask);
 extern void padata_free(struct padata_instance *pinst);
 extern int padata_do_parallel(struct padata_instance *pinst,
                              struct padata_priv *padata, int cb_cpu);
 extern void padata_do_serial(struct padata_priv *padata);
-extern int padata_set_cpumask(struct padata_instance *pinst,
+extern int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type,
                              cpumask_var_t cpumask);
-extern int padata_add_cpu(struct padata_instance *pinst, int cpu);
+extern int padata_set_cpumasks(struct padata_instance *pinst,
-extern int padata_remove_cpu(struct padata_instance *pinst, int cpu);
+                               cpumask_var_t pcpumask,
-extern void padata_start(struct padata_instance *pinst);
+                               cpumask_var_t cbcpumask);
+extern int padata_add_cpu(struct padata_instance *pinst, int cpu, int mask);
+extern int padata_remove_cpu(struct padata_instance *pinst, int cpu, int mask);
+extern int padata_start(struct padata_instance *pinst);
 extern void padata_stop(struct padata_instance *pinst);
+extern int padata_register_cpumask_notifier(struct padata_instance *pinst,
+                                            struct notifier_block *nblock);
+extern int padata_unregister_cpumask_notifier(struct padata_instance *pinst,
+                                              struct notifier_block *nblock);
 #endif
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3bedcc149c84..40c804d484ca 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1494,6 +1494,9 @@
 #define PCI_DEVICE_ID_SBE_WANXL100      0x0301
 #define PCI_DEVICE_ID_SBE_WANXL200      0x0302
 #define PCI_DEVICE_ID_SBE_WANXL400      0x0104
+#define PCI_SUBDEVICE_ID_SBE_T3E3       0x0009
+#define PCI_SUBDEVICE_ID_SBE_2T3E3_P0   0x0901
+#define PCI_SUBDEVICE_ID_SBE_2T3E3_P1   0x0902
 #define PCI_VENDOR_ID_TOSHIBA           0x1179
 #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0101
@@ -2054,7 +2057,6 @@
 #define PCI_DEVICE_ID_NX2_57711E        0x1650
 #define PCI_DEVICE_ID_TIGON3_5705       0x1653
 #define PCI_DEVICE_ID_TIGON3_5705_2     0x1654
-#define PCI_DEVICE_ID_TIGON3_5720       0x1658
 #define PCI_DEVICE_ID_TIGON3_5721       0x1659
 #define PCI_DEVICE_ID_TIGON3_5722       0x165a
 #define PCI_DEVICE_ID_TIGON3_5723       0x165b
@@ -2068,13 +2070,11 @@
 #define PCI_DEVICE_ID_TIGON3_5754M      0x1672
 #define PCI_DEVICE_ID_TIGON3_5755M      0x1673
 #define PCI_DEVICE_ID_TIGON3_5756       0x1674
-#define PCI_DEVICE_ID_TIGON3_5750       0x1676
 #define PCI_DEVICE_ID_TIGON3_5751       0x1677
 #define PCI_DEVICE_ID_TIGON3_5715       0x1678
 #define PCI_DEVICE_ID_TIGON3_5715S      0x1679
 #define PCI_DEVICE_ID_TIGON3_5754       0x167a
 #define PCI_DEVICE_ID_TIGON3_5755       0x167b
-#define PCI_DEVICE_ID_TIGON3_5750M      0x167c
 #define PCI_DEVICE_ID_TIGON3_5751M      0x167d
 #define PCI_DEVICE_ID_TIGON3_5751F      0x167e
 #define PCI_DEVICE_ID_TIGON3_5787F      0x167f
@@ -2264,6 +2264,7 @@
 #define PCI_DEVICE_ID_TDI_EHCI          0x0101
 #define PCI_VENDOR_ID_FREESCALE         0x1957
+#define PCI_DEVICE_ID_MPC8308           0xc006
 #define PCI_DEVICE_ID_MPC8315E          0x00b4
 #define PCI_DEVICE_ID_MPC8315           0x00b5
 #define PCI_DEVICE_ID_MPC8314E          0x00b6
@@ -2772,3 +2773,6 @@
 #define PCI_DEVICE_ID_RME_DIGI32        0x9896
 #define PCI_DEVICE_ID_RME_DIGI32_PRO    0x9897
 #define PCI_DEVICE_ID_RME_DIGI32_8      0x9898
+#define PCI_VENDOR_ID_XEN               0x5853
+#define PCI_DEVICE_ID_XEN_PLATFORM      0x0001
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index d3a38d687104..b8b9084527b1 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -45,6 +45,16 @@
 #define PCPU_MIN_UNIT_SIZE              PFN_ALIGN(64 << 10)
 /*
+ * Percpu allocator can serve percpu allocations before slab is
+ * initialized which allows slab to depend on the percpu allocator.
+ * The following two parameters decide how much resource to
+ * preallocate for this.  Keep PERCPU_DYNAMIC_RESERVE equal to or
+ * larger than PERCPU_DYNAMIC_EARLY_SIZE.
+ */
+#define PERCPU_DYNAMIC_EARLY_SLOTS      128
+#define PERCPU_DYNAMIC_EARLY_SIZE       (12 << 10)
+/*
 * PERCPU_DYNAMIC_RESERVE indicates the amount of free area to piggy
 * back on the first chunk for dynamic percpu allocation if arch is
 * manually allocating and mapping it for faster access (as a part of
@@ -104,16 +114,11 @@ extern struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups,
                                                             int nr_units);
 extern void __init pcpu_free_alloc_info(struct pcpu_alloc_info *ai);
-extern struct pcpu_alloc_info * __init pcpu_build_alloc_info(
-                                size_t reserved_size, ssize_t dyn_size,
-                                size_t atom_size,
-                                pcpu_fc_cpu_distance_fn_t cpu_distance_fn);
 extern int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
                                         void *base_addr);
 #ifdef CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK
-extern int __init pcpu_embed_first_chunk(size_t reserved_size, ssize_t dyn_size,
+extern int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
                                size_t atom_size,
                                pcpu_fc_cpu_distance_fn_t cpu_distance_fn,
                                pcpu_fc_alloc_fn_t alloc_fn,
@@ -140,6 +145,7 @@ extern bool is_kernel_percpu_address(unsigned long addr);
 #ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA
 extern void __init setup_per_cpu_areas(void);
 #endif
+extern void __init percpu_init_late(void);
 #else /* CONFIG_SMP */
@@ -153,6 +159,8 @@ static inline bool is_kernel_percpu_address(unsigned long addr)
 static inline void __init setup_per_cpu_areas(void) { }
+static inline void __init percpu_init_late(void) { }
 static inline void *pcpu_lpage_remapped(void *kaddr)
 {
        return NULL;
diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index e5126cff9b2a..24426c3d6b5a 100644
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -56,7 +56,7 @@ struct phonethdr {
        __be16  pn_length;
        __u8    pn_robj;
        __u8    pn_sobj;
-} __attribute__((packed));
+} __packed;
 /* Common Phonet payload header */
 struct phonetmsg {
@@ -98,7 +98,7 @@ struct sockaddr_pn {
        __u8 spn_dev;
        __u8 spn_resource;
        __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3];
-} __attribute__ ((packed));
+} __packed;
 /* Well known address */
 #define PN_DEV_PC       0x10
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 987e111f7b11..6b0a782c6224 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -234,6 +234,8 @@ enum phy_state {
        PHY_RESUMING
 };
+struct sk_buff;
 /* phy_device: An instance of a PHY
 *
 * drv: Pointer to the driver for this PHY instance
@@ -402,6 +404,26 @@ struct phy_driver {
        /* Clears up any memory if needed */
        void (*remove)(struct phy_device *phydev);
+        /* Handles SIOCSHWTSTAMP ioctl for hardware time stamping. */
+        int  (*hwtstamp)(struct phy_device *phydev, struct ifreq *ifr);
+        /*
+         * Requests a Rx timestamp for 'skb'. If the skb is accepted,
+         * the phy driver promises to deliver it using netif_rx() as
+         * soon as a timestamp becomes available. One of the
+         * PTP_CLASS_ values is passed in 'type'. The function must
+         * return true if the skb is accepted for delivery.
+         */
+        bool (*rxtstamp)(struct phy_device *dev, struct sk_buff *skb, int type);
+        /*
+         * Requests a Tx timestamp for 'skb'. The phy driver promises
+         * to deliver it to the socket's error queue as soon as a
+         * timestamp becomes available. One of the PTP_CLASS_ values
+         * is passed in 'type'.
+         */
+        void (*txtstamp)(struct phy_device *dev, struct sk_buff *skb, int type);
        struct device_driver driver;
 };
 #define to_phy_driver(d) container_of(d, struct phy_driver, driver)
@@ -498,7 +520,7 @@ void phy_stop_machine(struct phy_device *phydev);
 int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
 int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
 int phy_mii_ioctl(struct phy_device *phydev,
-                struct mii_ioctl_data *mii_data, int cmd);
+                struct ifreq *ifr, int cmd);
 int phy_start_interrupts(struct phy_device *phydev);
 void phy_print_status(struct phy_device *phydev);
 struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id);
diff --git a/include/linux/plist.h b/include/linux/plist.h
index 6898985e7b38..7254eda078e5 100644
--- a/include/linux/plist.h
+++ b/include/linux/plist.h
@@ -260,6 +260,23 @@ static inline int plist_node_empty(const struct plist_node *node)
 #endif
 /**
+ * plist_last_entry - get the struct for the last entry
+ * @head:       the &struct plist_head pointer
+ * @type:       the type of the struct this is embedded in
+ * @member:     the name of the list_struct within the struct
+ */
+#ifdef CONFIG_DEBUG_PI_LIST
+# define plist_last_entry(head, type, member)   \
+({ \
+        WARN_ON(plist_head_empty(head)); \
+        container_of(plist_last(head), type, member); \
+})
+#else
+# define plist_last_entry(head, type, member)   \
+        container_of(plist_last(head), type, member)
+#endif
+/**
 * plist_first - return the first node (and thus, highest priority)
 * @head:       the &struct plist_head pointer
 *
@@ -271,4 +288,16 @@ static inline struct plist_node *plist_first(const struct plist_head *head)
                          struct plist_node, plist.node_list);
 }
+/**
+ * plist_last - return the last node (and thus, lowest priority)
+ * @head:       the &struct plist_head pointer
+ *
+ * Assumes the plist is _not_ empty.
+ */
+static inline struct plist_node *plist_last(const struct plist_head *head)
+{
+        return list_entry(head->node_list.prev,
+                          struct plist_node, plist.node_list);
+}
 #endif
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 8e258c727971..52e8c55ff314 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -457,6 +457,7 @@ struct dev_pm_info {
 #ifdef CONFIG_PM_SLEEP
        struct list_head        entry;
        struct completion       completion;
+        unsigned long           wakeup_count;
 #endif
 #ifdef CONFIG_PM_RUNTIME
        struct timer_list       suspend_timer;
@@ -476,9 +477,15 @@ struct dev_pm_info {
        enum rpm_request        request;
        enum rpm_status         runtime_status;
        int                     runtime_error;
+        unsigned long           active_jiffies;
+        unsigned long           suspended_jiffies;
+        unsigned long           accounting_timestamp;
 #endif
 };
+extern void update_pm_runtime_accounting(struct device *dev);
 /*
 * The PM_EVENT_ messages are also used by drivers implementing the legacy
 * suspend framework, based on the ->suspend() and ->resume() callbacks common
@@ -552,6 +559,11 @@ extern void __suspend_report_result(const char *function, void *fn, int ret);
        } while (0)
 extern void device_pm_wait_for_dev(struct device *sub, struct device *dev);
+/* drivers/base/power/wakeup.c */
+extern void pm_wakeup_event(struct device *dev, unsigned int msec);
+extern void pm_stay_awake(struct device *dev);
+extern void pm_relax(void);
 #else /* !CONFIG_PM_SLEEP */
 #define device_pm_lock() do {} while (0)
@@ -565,6 +577,10 @@ static inline int dpm_suspend_start(pm_message_t state)
 #define suspend_report_result(fn, ret)          do {} while (0)
 static inline void device_pm_wait_for_dev(struct device *a, struct device *b) {}
+static inline void pm_wakeup_event(struct device *dev, unsigned int msec) {}
+static inline void pm_stay_awake(struct device *dev) {}
+static inline void pm_relax(void) {}
 #endif /* !CONFIG_PM_SLEEP */
 /* How to reorder dpm_list after device_move() */
diff --git a/include/linux/pm_qos_params.h b/include/linux/pm_qos_params.h
index 8ba440e5eb7f..77cbddb3784c 100644
--- a/include/linux/pm_qos_params.h
+++ b/include/linux/pm_qos_params.h
@@ -1,8 +1,10 @@
+#ifndef _LINUX_PM_QOS_PARAMS_H
+#define _LINUX_PM_QOS_PARAMS_H
 /* interface for the pm_qos_power infrastructure of the linux kernel.
 *
 * Mark Gross <mgross@linux.intel.com>
 */
-#include <linux/list.h>
+#include <linux/plist.h>
 #include <linux/notifier.h>
 #include <linux/miscdevice.h>
@@ -14,9 +16,12 @@
 #define PM_QOS_NUM_CLASSES 4
 #define PM_QOS_DEFAULT_VALUE -1
-struct pm_qos_request_list;
+struct pm_qos_request_list {
+        struct plist_node list;
+        int pm_qos_class;
+};
-struct pm_qos_request_list *pm_qos_add_request(int pm_qos_class, s32 value);
+void pm_qos_add_request(struct pm_qos_request_list *l, int pm_qos_class, s32 value);
 void pm_qos_update_request(struct pm_qos_request_list *pm_qos_req,
                s32 new_value);
 void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req);
@@ -24,4 +29,6 @@ void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req);
 int pm_qos_request(int pm_qos_class);
 int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier);
 int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier);
+int pm_qos_request_active(struct pm_qos_request_list *req);
+#endif
diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h
index 22d64c18056c..76aca48722ae 100644
--- a/include/linux/pm_wakeup.h
+++ b/include/linux/pm_wakeup.h
@@ -29,8 +29,11 @@
 #ifdef CONFIG_PM
-/* changes to device_may_wakeup take effect on the next pm state change.
+/* Changes to device_may_wakeup take effect on the next pm state change.
- * by default, devices should wakeup if they can.
+ *
+ * By default, most devices should leave wakeup disabled.  The exceptions
+ * are devices that everyone expects to be wakeup sources: keyboards,
+ * power buttons, possibly network interfaces, etc.
 */
 static inline void device_init_wakeup(struct device *dev, bool val)
 {
@@ -59,7 +62,7 @@ static inline bool device_may_wakeup(struct device *dev)
 #else /* !CONFIG_PM */
-/* For some reason the next two routines work even without CONFIG_PM */
+/* For some reason the following routines work even without CONFIG_PM */
 static inline void device_init_wakeup(struct device *dev, bool val)
 {
        dev->power.can_wakeup = val;
@@ -67,6 +70,7 @@ static inline void device_init_wakeup(struct device *dev, bool val)
 static inline void device_set_wakeup_capable(struct device *dev, bool capable)
 {
+        dev->power.can_wakeup = capable;
 }
 static inline bool device_can_wakeup(struct device *dev)
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 7c4193eb0072..1bc1338b817b 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -414,6 +414,7 @@ struct pnp_protocol {
        int (*disable) (struct pnp_dev *dev);
        /* protocol specific suspend/resume */
+        bool (*can_wakeup) (struct pnp_dev *dev);
        int (*suspend) (struct pnp_dev * dev, pm_message_t state);
        int (*resume) (struct pnp_dev * dev);
diff --git a/include/linux/power/jz4740-battery.h b/include/linux/power/jz4740-battery.h
new file mode 100644
index 000000000000..19c9610c720a
--- /dev/null
+++ b/include/linux/power/jz4740-battery.h
@@ -0,0 +1,24 @@
+/*
+ *  Copyright (C) 2009, Jiejing Zhang <kzjeef@gmail.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#ifndef __JZ4740_BATTERY_H
+#define __JZ4740_BATTERY_H
+struct jz_battery_platform_data {
+        struct power_supply_info info;
+        int gpio_charge;        /* GPIO port of Charger state */
+        int gpio_charge_active_low;
+};
+#endif
diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h
new file mode 100644
index 000000000000..943a85ab0020
--- /dev/null
+++ b/include/linux/ptp_classify.h
@@ -0,0 +1,126 @@
+/*
+ * PTP 1588 support
+ *
+ * This file implements a BPF that recognizes PTP event messages.
+ *
+ * Copyright (C) 2010 OMICRON electronics GmbH
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef _PTP_CLASSIFY_H_
+#define _PTP_CLASSIFY_H_
+#include <linux/if_ether.h>
+#include <linux/if_vlan.h>
+#include <linux/filter.h>
+#ifdef __KERNEL__
+#include <linux/in.h>
+#else
+#include <netinet/in.h>
+#endif
+#define PTP_CLASS_NONE  0x00 /* not a PTP event message */
+#define PTP_CLASS_V1    0x01 /* protocol version 1 */
+#define PTP_CLASS_V2    0x02 /* protocol version 2 */
+#define PTP_CLASS_VMASK 0x0f /* max protocol version is 15 */
+#define PTP_CLASS_IPV4  0x10 /* event in an IPV4 UDP packet */
+#define PTP_CLASS_IPV6  0x20 /* event in an IPV6 UDP packet */
+#define PTP_CLASS_L2    0x30 /* event in a L2 packet */
+#define PTP_CLASS_VLAN  0x40 /* event in a VLAN tagged L2 packet */
+#define PTP_CLASS_PMASK 0xf0 /* mask for the packet type field */
+#define PTP_CLASS_V1_IPV4 (PTP_CLASS_V1 | PTP_CLASS_IPV4)
+#define PTP_CLASS_V1_IPV6 (PTP_CLASS_V1 | PTP_CLASS_IPV6) /*probably DNE*/
+#define PTP_CLASS_V2_IPV4 (PTP_CLASS_V2 | PTP_CLASS_IPV4)
+#define PTP_CLASS_V2_IPV6 (PTP_CLASS_V2 | PTP_CLASS_IPV6)
+#define PTP_CLASS_V2_L2   (PTP_CLASS_V2 | PTP_CLASS_L2)
+#define PTP_CLASS_V2_VLAN (PTP_CLASS_V2 | PTP_CLASS_VLAN)
+#define PTP_EV_PORT 319
+#define OFF_ETYPE       12
+#define OFF_IHL         14
+#define OFF_FRAG        20
+#define OFF_PROTO4      23
+#define OFF_NEXT        6
+#define OFF_UDP_DST     2
+#define IP6_HLEN        40
+#define UDP_HLEN        8
+#define RELOFF_DST4     (ETH_HLEN + OFF_UDP_DST)
+#define OFF_DST6        (ETH_HLEN + IP6_HLEN + OFF_UDP_DST)
+#define OFF_PTP6        (ETH_HLEN + IP6_HLEN + UDP_HLEN)
+#define OP_AND  (BPF_ALU | BPF_AND  | BPF_K)
+#define OP_JEQ  (BPF_JMP | BPF_JEQ  | BPF_K)
+#define OP_JSET (BPF_JMP | BPF_JSET | BPF_K)
+#define OP_LDB  (BPF_LD  | BPF_B    | BPF_ABS)
+#define OP_LDH  (BPF_LD  | BPF_H    | BPF_ABS)
+#define OP_LDHI (BPF_LD  | BPF_H    | BPF_IND)
+#define OP_LDX  (BPF_LDX | BPF_B    | BPF_MSH)
+#define OP_OR   (BPF_ALU | BPF_OR   | BPF_K)
+#define OP_RETA (BPF_RET | BPF_A)
+#define OP_RETK (BPF_RET | BPF_K)
+static inline int ptp_filter_init(struct sock_filter *f, int len)
+{
+        if (OP_LDH == f[0].code)
+                return sk_chk_filter(f, len);
+        else
+                return 0;
+}
+#define PTP_FILTER \
+        {OP_LDH,        0,   0, OFF_ETYPE               }, /*              */ \
+        {OP_JEQ,        0,  12, ETH_P_IP                }, /* f goto L20   */ \
+        {OP_LDB,        0,   0, OFF_PROTO4              }, /*              */ \
+        {OP_JEQ,        0,   9, IPPROTO_UDP             }, /* f goto L10   */ \
+        {OP_LDH,        0,   0, OFF_FRAG                }, /*              */ \
+        {OP_JSET,       7,   0, 0x1fff                  }, /* t goto L11   */ \
+        {OP_LDX,        0,   0, OFF_IHL                 }, /*              */ \
+        {OP_LDHI,       0,   0, RELOFF_DST4             }, /*              */ \
+        {OP_JEQ,        0,   4, PTP_EV_PORT             }, /* f goto L12   */ \
+        {OP_LDHI,       0,   0, ETH_HLEN + UDP_HLEN     }, /*              */ \
+        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
+        {OP_OR,         0,   0, PTP_CLASS_IPV4          }, /*              */ \
+        {OP_RETA,       0,   0, 0                       }, /*              */ \
+/*L1x*/ {OP_RETK,       0,   0, PTP_CLASS_NONE          }, /*              */ \
+/*L20*/ {OP_JEQ,        0,   9, ETH_P_IPV6              }, /* f goto L40   */ \
+        {OP_LDB,        0,   0, ETH_HLEN + OFF_NEXT     }, /*              */ \
+        {OP_JEQ,        0,   6, IPPROTO_UDP             }, /* f goto L30   */ \
+        {OP_LDH,        0,   0, OFF_DST6                }, /*              */ \
+        {OP_JEQ,        0,   4, PTP_EV_PORT             }, /* f goto L31   */ \
+        {OP_LDH,        0,   0, OFF_PTP6                }, /*              */ \
+        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
+        {OP_OR,         0,   0, PTP_CLASS_IPV6          }, /*              */ \
+        {OP_RETA,       0,   0, 0                       }, /*              */ \
+/*L3x*/ {OP_RETK,       0,   0, PTP_CLASS_NONE          }, /*              */ \
+/*L40*/ {OP_JEQ,        0,   6, ETH_P_8021Q             }, /* f goto L50   */ \
+        {OP_LDH,        0,   0, OFF_ETYPE + 4           }, /*              */ \
+        {OP_JEQ,        0,   9, ETH_P_1588              }, /* f goto L60   */ \
+        {OP_LDH,        0,   0, ETH_HLEN + VLAN_HLEN    }, /*              */ \
+        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
+        {OP_OR,         0,   0, PTP_CLASS_VLAN          }, /*              */ \
+        {OP_RETA,       0,   0, 0                       }, /*              */ \
+/*L50*/ {OP_JEQ,        0,   4, ETH_P_1588              }, /* f goto L61   */ \
+        {OP_LDH,        0,   0, ETH_HLEN                }, /*              */ \
+        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
+        {OP_OR,         0,   0, PTP_CLASS_L2            }, /*              */ \
+        {OP_RETA,       0,   0, 0                       }, /*              */ \
+/*L6x*/ {OP_RETK,       0,   0, PTP_CLASS_NONE          },
+#endif
diff --git a/include/linux/rar_register.h b/include/linux/rar_register.h
new file mode 100644
index 000000000000..ffa805780f85
--- /dev/null
+++ b/include/linux/rar_register.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2010 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General
+ * Public License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA  02111-1307, USA.
+ * The full GNU General Public License is included in this
+ * distribution in the file called COPYING.
+ */
+#ifndef _RAR_REGISTER_H
+#define _RAR_REGISTER_H
+#include <linux/types.h>
+/* following are used both in drivers as well as user space apps */
+#define RAR_TYPE_VIDEO  0
+#define RAR_TYPE_AUDIO  1
+#define RAR_TYPE_IMAGE  2
+#define RAR_TYPE_DATA   3
+#ifdef __KERNEL__
+struct rar_device;
+int register_rar(int num,
+                int (*callback)(unsigned long data), unsigned long data);
+void unregister_rar(int num);
+int rar_get_address(int rar_index, dma_addr_t *start, dma_addr_t *end);
+int rar_lock(int rar_index);
+#endif  /* __KERNEL__ */
+#endif  /* _RAR_REGISTER_H */
diff --git a/include/linux/rds.h b/include/linux/rds.h
index cab4994c2f63..24bce3ded9ea 100644
--- a/include/linux/rds.h
+++ b/include/linux/rds.h
@@ -100,7 +100,7 @@
 struct rds_info_counter {
        u_int8_t        name[32];
        u_int64_t       value;
-} __attribute__((packed));
+} __packed;
 #define RDS_INFO_CONNECTION_FLAG_SENDING        0x01
 #define RDS_INFO_CONNECTION_FLAG_CONNECTING     0x02
@@ -115,7 +115,7 @@ struct rds_info_connection {
        __be32          faddr;
        u_int8_t        transport[TRANSNAMSIZ];         /* null term ascii */
        u_int8_t        flags;
-} __attribute__((packed));
+} __packed;
 struct rds_info_flow {
        __be32          laddr;
@@ -123,7 +123,7 @@ struct rds_info_flow {
        u_int32_t       bytes;
        __be16          lport;
        __be16          fport;
-} __attribute__((packed));
+} __packed;
 #define RDS_INFO_MESSAGE_FLAG_ACK               0x01
 #define RDS_INFO_MESSAGE_FLAG_FAST_ACK          0x02
@@ -136,7 +136,7 @@ struct rds_info_message {
        __be16          lport;
        __be16          fport;
        u_int8_t        flags;
-} __attribute__((packed));
+} __packed;
 struct rds_info_socket {
        u_int32_t       sndbuf;
@@ -146,7 +146,7 @@ struct rds_info_socket {
        __be16          connected_port;
        u_int32_t       rcvbuf;
        u_int64_t       inum;
-} __attribute__((packed));
+} __packed;
 struct rds_info_tcp_socket {
        __be32          local_addr;
@@ -158,7 +158,7 @@ struct rds_info_tcp_socket {
        u_int32_t       last_sent_nxt;
        u_int32_t       last_expected_una;
        u_int32_t       last_seen_una;
-} __attribute__((packed));
+} __packed;
 #define RDS_IB_GID_LEN  16
 struct rds_info_rdma_connection {
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 3b603f474186..ba394163dea1 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -360,7 +360,7 @@ int is_reiserfs_jr(struct reiserfs_super_block *rs);
 /* the spot for the super in versions 3.5 - 3.5.10 (inclusive) */
 #define REISERFS_OLD_DISK_OFFSET_IN_BYTES (8 * 1024)
-// reiserfs internal error code (used by search_by_key adn fix_nodes))
+/* reiserfs internal error code (used by search_by_key and fix_nodes)) */
 #define CARRY_ON      0
 #define REPEAT_SEARCH -1
 #define IO_ERROR      -2
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index fbc8cb0d48c3..58d44491880f 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -282,6 +282,7 @@ enum rtattr_type_t {
        RTA_SESSION, /* no longer used */
        RTA_MP_ALGO, /* no longer used */
        RTA_TABLE,
+        RTA_MARK,
        __RTA_MAX
 };
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index c20d3ce673c0..c11a28706fa4 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -61,7 +61,7 @@ typedef struct sctphdr {
        __be16 dest;
        __be32 vtag;
        __le32 checksum;
-} __attribute__((packed)) sctp_sctphdr_t;
+} __packed sctp_sctphdr_t;
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
@@ -77,7 +77,7 @@ typedef struct sctp_chunkhdr {
        __u8 type;
        __u8 flags;
        __be16 length;
-} __attribute__((packed)) sctp_chunkhdr_t;
+} __packed sctp_chunkhdr_t;
 /* Section 3.2.  Chunk Type Values.
@@ -167,7 +167,7 @@ enum { SCTP_CHUNK_FLAG_T = 0x01 };
 typedef struct sctp_paramhdr {
        __be16 type;
        __be16 length;
-} __attribute__((packed)) sctp_paramhdr_t;
+} __packed sctp_paramhdr_t;
 typedef enum {
@@ -228,12 +228,12 @@ typedef struct sctp_datahdr {
        __be16 ssn;
        __be32 ppid;
        __u8  payload[0];
-} __attribute__((packed)) sctp_datahdr_t;
+} __packed sctp_datahdr_t;
 typedef struct sctp_data_chunk {
        sctp_chunkhdr_t chunk_hdr;
        sctp_datahdr_t  data_hdr;
-} __attribute__((packed)) sctp_data_chunk_t;
+} __packed sctp_data_chunk_t;
 /* DATA Chuck Specific Flags */
 enum {
@@ -259,78 +259,78 @@ typedef struct sctp_inithdr {
        __be16 num_inbound_streams;
        __be32 initial_tsn;
        __u8  params[0];
-} __attribute__((packed)) sctp_inithdr_t;
+} __packed sctp_inithdr_t;
 typedef struct sctp_init_chunk {
        sctp_chunkhdr_t chunk_hdr;
        sctp_inithdr_t init_hdr;
-} __attribute__((packed)) sctp_init_chunk_t;
+} __packed sctp_init_chunk_t;
 /* Section 3.3.2.1. IPv4 Address Parameter (5) */
 typedef struct sctp_ipv4addr_param {
        sctp_paramhdr_t param_hdr;
        struct in_addr  addr;
-} __attribute__((packed)) sctp_ipv4addr_param_t;
+} __packed sctp_ipv4addr_param_t;
 /* Section 3.3.2.1. IPv6 Address Parameter (6) */
 typedef struct sctp_ipv6addr_param {
        sctp_paramhdr_t param_hdr;
        struct in6_addr addr;
-} __attribute__((packed)) sctp_ipv6addr_param_t;
+} __packed sctp_ipv6addr_param_t;
 /* Section 3.3.2.1 Cookie Preservative (9) */
 typedef struct sctp_cookie_preserve_param {
        sctp_paramhdr_t param_hdr;
        __be32          lifespan_increment;
-} __attribute__((packed)) sctp_cookie_preserve_param_t;
+} __packed sctp_cookie_preserve_param_t;
 /* Section 3.3.2.1 Host Name Address (11) */
 typedef struct sctp_hostname_param {
        sctp_paramhdr_t param_hdr;
        uint8_t hostname[0];
-} __attribute__((packed)) sctp_hostname_param_t;
+} __packed sctp_hostname_param_t;
 /* Section 3.3.2.1 Supported Address Types (12) */
 typedef struct sctp_supported_addrs_param {
        sctp_paramhdr_t param_hdr;
        __be16 types[0];
-} __attribute__((packed)) sctp_supported_addrs_param_t;
+} __packed sctp_supported_addrs_param_t;
 /* Appendix A. ECN Capable (32768) */
 typedef struct sctp_ecn_capable_param {
        sctp_paramhdr_t param_hdr;
-} __attribute__((packed)) sctp_ecn_capable_param_t;
+} __packed sctp_ecn_capable_param_t;
 /* ADDIP Section 3.2.6 Adaptation Layer Indication */
 typedef struct sctp_adaptation_ind_param {
        struct sctp_paramhdr param_hdr;
        __be32 adaptation_ind;
-} __attribute__((packed)) sctp_adaptation_ind_param_t;
+} __packed sctp_adaptation_ind_param_t;
 /* ADDIP Section 4.2.7 Supported Extensions Parameter */
 typedef struct sctp_supported_ext_param {
        struct sctp_paramhdr param_hdr;
        __u8 chunks[0];
-} __attribute__((packed)) sctp_supported_ext_param_t;
+} __packed sctp_supported_ext_param_t;
 /* AUTH Section 3.1 Random */
 typedef struct sctp_random_param {
        sctp_paramhdr_t param_hdr;
        __u8 random_val[0];
-} __attribute__((packed)) sctp_random_param_t;
+} __packed sctp_random_param_t;
 /* AUTH Section 3.2 Chunk List */
 typedef struct sctp_chunks_param {
        sctp_paramhdr_t param_hdr;
        __u8 chunks[0];
-} __attribute__((packed)) sctp_chunks_param_t;
+} __packed sctp_chunks_param_t;
 /* AUTH Section 3.3 HMAC Algorithm */
 typedef struct sctp_hmac_algo_param {
        sctp_paramhdr_t param_hdr;
        __be16 hmac_ids[0];
-} __attribute__((packed)) sctp_hmac_algo_param_t;
+} __packed sctp_hmac_algo_param_t;
 /* RFC 2960.  Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):
 *   The INIT ACK chunk is used to acknowledge the initiation of an SCTP
@@ -342,13 +342,13 @@ typedef sctp_init_chunk_t sctp_initack_chunk_t;
 typedef struct sctp_cookie_param {
        sctp_paramhdr_t p;
        __u8 body[0];
-} __attribute__((packed)) sctp_cookie_param_t;
+} __packed sctp_cookie_param_t;
 /* Section 3.3.3.1 Unrecognized Parameters (8) */
 typedef struct sctp_unrecognized_param {
        sctp_paramhdr_t param_hdr;
        sctp_paramhdr_t unrecognized;
-} __attribute__((packed)) sctp_unrecognized_param_t;
+} __packed sctp_unrecognized_param_t;
@@ -363,7 +363,7 @@ typedef struct sctp_unrecognized_param {
 typedef struct sctp_gap_ack_block {
        __be16 start;
        __be16 end;
-} __attribute__((packed)) sctp_gap_ack_block_t;
+} __packed sctp_gap_ack_block_t;
 typedef __be32 sctp_dup_tsn_t;
@@ -378,12 +378,12 @@ typedef struct sctp_sackhdr {
        __be16 num_gap_ack_blocks;
        __be16 num_dup_tsns;
        sctp_sack_variable_t variable[0];
-} __attribute__((packed)) sctp_sackhdr_t;
+} __packed sctp_sackhdr_t;
 typedef struct sctp_sack_chunk {
        sctp_chunkhdr_t chunk_hdr;
        sctp_sackhdr_t sack_hdr;
-} __attribute__((packed)) sctp_sack_chunk_t;
+} __packed sctp_sack_chunk_t;
 /* RFC 2960.  Section 3.3.5 Heartbeat Request (HEARTBEAT) (4):
@@ -395,12 +395,12 @@ typedef struct sctp_sack_chunk {
 typedef struct sctp_heartbeathdr {
        sctp_paramhdr_t info;
-} __attribute__((packed)) sctp_heartbeathdr_t;
+} __packed sctp_heartbeathdr_t;
 typedef struct sctp_heartbeat_chunk {
        sctp_chunkhdr_t chunk_hdr;
        sctp_heartbeathdr_t hb_hdr;
-} __attribute__((packed)) sctp_heartbeat_chunk_t;
+} __packed sctp_heartbeat_chunk_t;
 /* For the abort and shutdown ACK we must carry the init tag in the
@@ -409,7 +409,7 @@ typedef struct sctp_heartbeat_chunk {
 */
 typedef struct sctp_abort_chunk {
        sctp_chunkhdr_t uh;
-} __attribute__((packed)) sctp_abort_chunk_t;
+} __packed sctp_abort_chunk_t;
 /* For the graceful shutdown we must carry the tag (in common header)
@@ -417,12 +417,12 @@ typedef struct sctp_abort_chunk {
 */
 typedef struct sctp_shutdownhdr {
        __be32 cum_tsn_ack;
-} __attribute__((packed)) sctp_shutdownhdr_t;
+} __packed sctp_shutdownhdr_t;
 struct sctp_shutdown_chunk_t {
        sctp_chunkhdr_t    chunk_hdr;
        sctp_shutdownhdr_t shutdown_hdr;
-} __attribute__ ((packed));
+} __packed;
 /* RFC 2960.  Section 3.3.10 Operation Error (ERROR) (9) */
@@ -430,12 +430,12 @@ typedef struct sctp_errhdr {
        __be16 cause;
        __be16 length;
        __u8  variable[0];
-} __attribute__((packed)) sctp_errhdr_t;
+} __packed sctp_errhdr_t;
 typedef struct sctp_operr_chunk {
        sctp_chunkhdr_t chunk_hdr;
        sctp_errhdr_t   err_hdr;
-} __attribute__((packed)) sctp_operr_chunk_t;
+} __packed sctp_operr_chunk_t;
 /* RFC 2960 3.3.10 - Operation Error
 *
@@ -525,7 +525,7 @@ typedef struct sctp_ecnehdr {
 typedef struct sctp_ecne_chunk {
        sctp_chunkhdr_t chunk_hdr;
        sctp_ecnehdr_t ence_hdr;
-} __attribute__((packed)) sctp_ecne_chunk_t;
+} __packed sctp_ecne_chunk_t;
 /* RFC 2960.  Appendix A.  Explicit Congestion Notification.
 *   Congestion Window Reduced (CWR) (13)
@@ -537,7 +537,7 @@ typedef struct sctp_cwrhdr {
 typedef struct sctp_cwr_chunk {
        sctp_chunkhdr_t chunk_hdr;
        sctp_cwrhdr_t cwr_hdr;
-} __attribute__((packed)) sctp_cwr_chunk_t;
+} __packed sctp_cwr_chunk_t;
 /* PR-SCTP
 * 3.2 Forward Cumulative TSN Chunk Definition (FORWARD TSN)
@@ -588,17 +588,17 @@ typedef struct sctp_cwr_chunk {
 struct sctp_fwdtsn_skip {
        __be16 stream;
        __be16 ssn;
-} __attribute__((packed));
+} __packed;
 struct sctp_fwdtsn_hdr {
        __be32 new_cum_tsn;
        struct sctp_fwdtsn_skip skip[0];
-} __attribute((packed));
+} __packed;
 struct sctp_fwdtsn_chunk {
        struct sctp_chunkhdr chunk_hdr;
        struct sctp_fwdtsn_hdr fwdtsn_hdr;
-} __attribute((packed));
+} __packed;
 /* ADDIP
@@ -636,17 +636,17 @@ struct sctp_fwdtsn_chunk {
 typedef struct sctp_addip_param {
        sctp_paramhdr_t param_hdr;
        __be32          crr_id;
-} __attribute__((packed)) sctp_addip_param_t;
+} __packed sctp_addip_param_t;
 typedef struct sctp_addiphdr {
        __be32  serial;
        __u8    params[0];
-} __attribute__((packed)) sctp_addiphdr_t;
+} __packed sctp_addiphdr_t;
 typedef struct sctp_addip_chunk {
        sctp_chunkhdr_t chunk_hdr;
        sctp_addiphdr_t addip_hdr;
-} __attribute__((packed)) sctp_addip_chunk_t;
+} __packed sctp_addip_chunk_t;
 /* AUTH
 * Section 4.1  Authentication Chunk (AUTH)
@@ -701,11 +701,11 @@ typedef struct sctp_authhdr {
        __be16 shkey_id;
        __be16 hmac_id;
        __u8   hmac[0];
-} __attribute__((packed)) sctp_authhdr_t;
+} __packed sctp_authhdr_t;
 typedef struct sctp_auth_chunk {
        sctp_chunkhdr_t chunk_hdr;
        sctp_authhdr_t auth_hdr;
-} __attribute__((packed)) sctp_auth_chunk_t;
+} __packed sctp_auth_chunk_t;
 #endif /* __LINUX_SCTP_H__ */
diff --git a/include/linux/security.h b/include/linux/security.h
index 0c8819170463..723a93df756a 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -470,8 +470,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 * @path_truncate:
 *      Check permission before truncating a file.
 *      @path contains the path structure for the file.
- *      @length is the new length of the file.
- *      @time_attrs is the flags passed to do_truncate().
 *      Return 0 if permission is granted.
 * @inode_getattr:
 *      Check permission before obtaining file attributes.
@@ -1412,8 +1410,7 @@ struct security_operations {
        int (*path_rmdir) (struct path *dir, struct dentry *dentry);
        int (*path_mknod) (struct path *dir, struct dentry *dentry, int mode,
                           unsigned int dev);
-        int (*path_truncate) (struct path *path, loff_t length,
+        int (*path_truncate) (struct path *path);
-                              unsigned int time_attrs);
        int (*path_symlink) (struct path *dir, struct dentry *dentry,
                             const char *old_name);
        int (*path_link) (struct dentry *old_dentry, struct path *new_dir,
@@ -2806,8 +2803,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode);
 int security_path_rmdir(struct path *dir, struct dentry *dentry);
 int security_path_mknod(struct path *dir, struct dentry *dentry, int mode,
                        unsigned int dev);
-int security_path_truncate(struct path *path, loff_t length,
+int security_path_truncate(struct path *path);
-                           unsigned int time_attrs);
 int security_path_symlink(struct path *dir, struct dentry *dentry,
                          const char *old_name);
 int security_path_link(struct dentry *old_dentry, struct path *new_dir,
@@ -2841,8 +2837,7 @@ static inline int security_path_mknod(struct path *dir, struct dentry *dentry,
        return 0;
 }
-static inline int security_path_truncate(struct path *path, loff_t length,
+static inline int security_path_truncate(struct path *path)
-                                         unsigned int time_attrs)
 {
        return 0;
 }
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index f89e7fd59a4c..d20d9e7a9bbd 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -169,6 +169,7 @@ struct skb_shared_hwtstamps {
 * @software:           generate software time stamp
 * @in_progress:        device driver is going to provide
 *                      hardware time stamp
+ * @prevent_sk_orphan:  make sk reference available on driver level
 * @flags:              all shared_tx flags
 *
 * These flags are attached to packets as part of the
@@ -178,7 +179,8 @@ union skb_shared_tx {
        struct {
                __u8    hardware:1,
                        software:1,
-                        in_progress:1;
+                        in_progress:1,
+                        prevent_sk_orphan:1;
        };
        __u8 flags;
 };
@@ -202,10 +204,11 @@ struct skb_shared_info {
         */
        atomic_t        dataref;
-        skb_frag_t      frags[MAX_SKB_FRAGS];
        /* Intermediate layers must ensure that destructor_arg
         * remains valid until skb destructor */
        void *          destructor_arg;
+        /* must be last field, see pskb_expand_head() */
+        skb_frag_t      frags[MAX_SKB_FRAGS];
 };
 /* We divide dataref into two halves.  The higher 16 bits hold references
@@ -1414,12 +1417,14 @@ static inline int skb_network_offset(const struct sk_buff *skb)
 *
 * Various parts of the networking layer expect at least 32 bytes of
 * headroom, you should not reduce this.
- * With RPS, we raised NET_SKB_PAD to 64 so that get_rps_cpus() fetches span
+ *
- * a 64 bytes aligned block to fit modern (>= 64 bytes) cache line sizes
+ * Using max(32, L1_CACHE_BYTES) makes sense (especially with RPS)
+ * to reduce average number of cache lines per packet.
+ * get_rps_cpus() for example only access one 64 bytes aligned block :
 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
 */
 #ifndef NET_SKB_PAD
-#define NET_SKB_PAD     64
+#define NET_SKB_PAD     max(32, L1_CACHE_BYTES)
 #endif
 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
@@ -1931,6 +1936,36 @@ static inline ktime_t net_invalid_timestamp(void)
        return ktime_set(0, 0);
 }
+extern void skb_timestamping_init(void);
+#ifdef CONFIG_NETWORK_PHY_TIMESTAMPING
+extern void skb_clone_tx_timestamp(struct sk_buff *skb);
+extern bool skb_defer_rx_timestamp(struct sk_buff *skb);
+#else /* CONFIG_NETWORK_PHY_TIMESTAMPING */
+static inline void skb_clone_tx_timestamp(struct sk_buff *skb)
+{
+}
+static inline bool skb_defer_rx_timestamp(struct sk_buff *skb)
+{
+        return false;
+}
+#endif /* !CONFIG_NETWORK_PHY_TIMESTAMPING */
+/**
+ * skb_complete_tx_timestamp() - deliver cloned skb with tx timestamps
+ *
+ * @skb: clone of the the original outgoing packet
+ * @hwtstamps: hardware time stamps
+ *
+ */
+void skb_complete_tx_timestamp(struct sk_buff *skb,
+                               struct skb_shared_hwtstamps *hwtstamps);
 /**
 * skb_tstamp_tx - queue clone of skb with send time stamps
 * @orig_skb:   the original outgoing packet
@@ -1945,6 +1980,28 @@ static inline ktime_t net_invalid_timestamp(void)
 extern void skb_tstamp_tx(struct sk_buff *orig_skb,
                        struct skb_shared_hwtstamps *hwtstamps);
+static inline void sw_tx_timestamp(struct sk_buff *skb)
+{
+        union skb_shared_tx *shtx = skb_tx(skb);
+        if (shtx->software && !shtx->in_progress)
+                skb_tstamp_tx(skb, NULL);
+}
+/**
+ * skb_tx_timestamp() - Driver hook for transmit timestamping
+ *
+ * Ethernet MAC Drivers should call this function in their hard_xmit()
+ * function as soon as possible after giving the sk_buff to the MAC
+ * hardware, but before freeing the sk_buff.
+ *
+ * @skb: A socket buffer.
+ */
+static inline void skb_tx_timestamp(struct sk_buff *skb)
+{
+        skb_clone_tx_timestamp(skb);
+        sw_tx_timestamp(skb);
+}
 extern __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len);
 extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
@@ -2132,7 +2189,8 @@ static inline bool skb_warn_if_lro(const struct sk_buff *skb)
        /* LRO sets gso_size but not gso_type, whereas if GSO is really
         * wanted then gso_type will be set. */
        struct skb_shared_info *shinfo = skb_shinfo(skb);
-        if (shinfo->gso_size != 0 && unlikely(shinfo->gso_type == 0)) {
+        if (skb_is_nonlinear(skb) && shinfo->gso_size != 0 &&
+            unlikely(shinfo->gso_type == 0)) {
                __skb_warn_lro_forwarding(skb);
                return true;
        }
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index 52797714ade7..ebb0c80ffd6e 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -229,6 +229,7 @@ enum
        LINUX_MIB_TCPBACKLOGDROP,
        LINUX_MIB_TCPMINTTLDROP, /* RFC 5082 */
        LINUX_MIB_TCPDEFERACCEPTDROP,
+        LINUX_MIB_IPRPFILTER, /* IP Reverse Path Filter (rp_filter) */
        __LINUX_MIB_MAX
 };
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 032a19eb61b1..a2fada9becb6 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -24,6 +24,9 @@ struct __kernel_sockaddr_storage {
 #include <linux/types.h>                /* pid_t                        */
 #include <linux/compiler.h>             /* __user                       */
+struct pid;
+struct cred;
 #define __sockaddr_check_size(size)     \
        BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
@@ -309,6 +312,8 @@ struct ucred {
 #define IPX_TYPE        1
 #ifdef __KERNEL__
+extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred);
 extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);
 extern int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,
                               int offset, int len);
diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index b4ae570d3c98..92bd0839d5b4 100644
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
@@ -48,11 +48,12 @@ struct ads7846_platform_data {
                                         * state if get_pendown_state == NULL
                                         */
        int     (*get_pendown_state)(void);
-        int     (*filter_init)  (struct ads7846_platform_data *pdata,
+        int     (*filter_init)  (const struct ads7846_platform_data *pdata,
                                 void **filter_data);
        int     (*filter)       (void *filter_data, int data_idx, int *val);
        void    (*filter_cleanup)(void *filter_data);
        void    (*wait_for_sync)(void);
        bool    wakeup;
+        unsigned long irq_flags;
 };
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index a2608bff9c78..623b704fdc42 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -167,7 +167,7 @@ struct ssb_device {
         * is an optimization. */
        const struct ssb_bus_ops *ops;
-        struct device *dev;
+        struct device *dev, *dma_dev;
        struct ssb_bus *bus;
        struct ssb_device_id id;
@@ -470,14 +470,6 @@ extern u32 ssb_dma_translation(struct ssb_device *dev);
 #define SSB_DMA_TRANSLATION_MASK        0xC0000000
 #define SSB_DMA_TRANSLATION_SHIFT       30
-extern int ssb_dma_set_mask(struct ssb_device *dev, u64 mask);
-extern void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,
-                                       dma_addr_t *dma_handle, gfp_t gfp_flags);
-extern void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,
-                                    void *vaddr, dma_addr_t dma_handle,
-                                    gfp_t gfp_flags);
 static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev)
 {
 #ifdef CONFIG_SSB_DEBUG
@@ -486,155 +478,6 @@ static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev)
 #endif /* DEBUG */
 }
-static inline int ssb_dma_mapping_error(struct ssb_device *dev, dma_addr_t addr)
-{
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                return pci_dma_mapping_error(dev->bus->host_pci, addr);
-#endif
-                break;
-        case SSB_BUSTYPE_SSB:
-                return dma_mapping_error(dev->dev, addr);
-        default:
-                break;
-        }
-        __ssb_dma_not_implemented(dev);
-        return -ENOSYS;
-}
-static inline dma_addr_t ssb_dma_map_single(struct ssb_device *dev, void *p,
-                                            size_t size, enum dma_data_direction dir)
-{
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                return pci_map_single(dev->bus->host_pci, p, size, dir);
-#endif
-                break;
-        case SSB_BUSTYPE_SSB:
-                return dma_map_single(dev->dev, p, size, dir);
-        default:
-                break;
-        }
-        __ssb_dma_not_implemented(dev);
-        return 0;
-}
-static inline void ssb_dma_unmap_single(struct ssb_device *dev, dma_addr_t dma_addr,
-                                        size_t size, enum dma_data_direction dir)
-{
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                pci_unmap_single(dev->bus->host_pci, dma_addr, size, dir);
-                return;
-#endif
-                break;
-        case SSB_BUSTYPE_SSB:
-                dma_unmap_single(dev->dev, dma_addr, size, dir);
-                return;
-        default:
-                break;
-        }
-        __ssb_dma_not_implemented(dev);
-}
-static inline void ssb_dma_sync_single_for_cpu(struct ssb_device *dev,
-                                               dma_addr_t dma_addr,
-                                               size_t size,
-                                               enum dma_data_direction dir)
-{
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                pci_dma_sync_single_for_cpu(dev->bus->host_pci, dma_addr,
-                                            size, dir);
-                return;
-#endif
-                break;
-        case SSB_BUSTYPE_SSB:
-                dma_sync_single_for_cpu(dev->dev, dma_addr, size, dir);
-                return;
-        default:
-                break;
-        }
-        __ssb_dma_not_implemented(dev);
-}
-static inline void ssb_dma_sync_single_for_device(struct ssb_device *dev,
-                                                  dma_addr_t dma_addr,
-                                                  size_t size,
-                                                  enum dma_data_direction dir)
-{
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                pci_dma_sync_single_for_device(dev->bus->host_pci, dma_addr,
-                                               size, dir);
-                return;
-#endif
-                break;
-        case SSB_BUSTYPE_SSB:
-                dma_sync_single_for_device(dev->dev, dma_addr, size, dir);
-                return;
-        default:
-                break;
-        }
-        __ssb_dma_not_implemented(dev);
-}
-static inline void ssb_dma_sync_single_range_for_cpu(struct ssb_device *dev,
-                                                     dma_addr_t dma_addr,
-                                                     unsigned long offset,
-                                                     size_t size,
-                                                     enum dma_data_direction dir)
-{
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                /* Just sync everything. That's all the PCI API can do. */
-                pci_dma_sync_single_for_cpu(dev->bus->host_pci, dma_addr,
-                                            offset + size, dir);
-                return;
-#endif
-                break;
-        case SSB_BUSTYPE_SSB:
-                dma_sync_single_range_for_cpu(dev->dev, dma_addr, offset,
-                                              size, dir);
-                return;
-        default:
-                break;
-        }
-        __ssb_dma_not_implemented(dev);
-}
-static inline void ssb_dma_sync_single_range_for_device(struct ssb_device *dev,
-                                                        dma_addr_t dma_addr,
-                                                        unsigned long offset,
-                                                        size_t size,
-                                                        enum dma_data_direction dir)
-{
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                /* Just sync everything. That's all the PCI API can do. */
-                pci_dma_sync_single_for_device(dev->bus->host_pci, dma_addr,
-                                               offset + size, dir);
-                return;
-#endif
-                break;
-        case SSB_BUSTYPE_SSB:
-                dma_sync_single_range_for_device(dev->dev, dma_addr, offset,
-                                                 size, dir);
-                return;
-        default:
-                break;
-        }
-        __ssb_dma_not_implemented(dev);
-}
 #ifdef CONFIG_SSB_PCIHOST
 /* PCI-host wrapper driver */
 extern int ssb_pcihost_register(struct pci_driver *driver);
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index bc7d6bb4cd8e..4af270ec2204 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -61,14 +61,15 @@ typedef int __bitwise suspend_state_t;
 *      before device drivers' late suspend callbacks are executed.  It returns
 *      0 on success or a negative error code otherwise, in which case the
 *      system cannot enter the desired sleep state (@prepare_late(), @enter(),
- *      @wake(), and @finish() will not be called in that case).
+ *      and @wake() will not be called in that case).
 *
 * @prepare_late: Finish preparing the platform for entering the system sleep
 *      state indicated by @begin().
 *      @prepare_late is called before disabling nonboot CPUs and after
 *      device drivers' late suspend callbacks have been executed.  It returns
 *      0 on success or a negative error code otherwise, in which case the
- *      system cannot enter the desired sleep state (@enter() and @wake()).
+ *      system cannot enter the desired sleep state (@enter() will not be
+ *      executed).
 *
 * @enter: Enter the system sleep state indicated by @begin() or represented by
 *      the argument if @begin() is not implemented.
@@ -81,14 +82,15 @@ typedef int __bitwise suspend_state_t;
 *      resume callbacks are executed.
 *      This callback is optional, but should be implemented by the platforms
 *      that implement @prepare_late().  If implemented, it is always called
- *      after @enter(), even if @enter() fails.
+ *      after @prepare_late and @enter(), even if one of them fails.
 *
 * @finish: Finish wake-up of the platform.
 *      @finish is called right prior to calling device drivers' regular suspend
 *      callbacks.
 *      This callback is optional, but should be implemented by the platforms
 *      that implement @prepare().  If implemented, it is always called after
- *      @enter() and @wake(), if implemented, even if any of them fails.
+ *      @enter() and @wake(), even if any of them fails.  It is executed after
+ *      a failing @prepare.
 *
 * @end: Called by the PM core right after resuming devices, to indicate to
 *      the platform that the system has returned to the working state or
@@ -286,6 +288,13 @@ extern int unregister_pm_notifier(struct notifier_block *nb);
                { .notifier_call = fn, .priority = pri };       \
        register_pm_notifier(&fn##_nb);                 \
 }
+/* drivers/base/power/wakeup.c */
+extern bool events_check_enabled;
+extern bool pm_check_wakeup_events(void);
+extern bool pm_get_wakeup_count(unsigned long *count);
+extern bool pm_save_wakeup_count(unsigned long count);
 #else /* !CONFIG_PM_SLEEP */
 static inline int register_pm_notifier(struct notifier_block *nb)
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 81a4e213c6cf..8c0e349f4a6c 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -23,6 +23,29 @@ extern int swiotlb_force;
 #define IO_TLB_SHIFT 11
 extern void swiotlb_init(int verbose);
+extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
+/*
+ * Enumeration for sync targets
+ */
+enum dma_sync_target {
+        SYNC_FOR_CPU = 0,
+        SYNC_FOR_DEVICE = 1,
+};
+extern void *swiotlb_tbl_map_single(struct device *hwdev, dma_addr_t tbl_dma_addr,
+                                    phys_addr_t phys, size_t size,
+                                    enum dma_data_direction dir);
+extern void swiotlb_tbl_unmap_single(struct device *hwdev, char *dma_addr,
+                                     size_t size, enum dma_data_direction dir);
+extern void swiotlb_tbl_sync_single(struct device *hwdev, char *dma_addr,
+                                    size_t size, enum dma_data_direction dir,
+                                    enum dma_sync_target target);
+/* Accessory functions. */
+extern void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
+                           enum dma_data_direction dir);
 extern void
 *swiotlb_alloc_coherent(struct device *hwdev, size_t size,
@@ -42,11 +65,11 @@ extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
 extern int
 swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nents,
-               int direction);
+               enum dma_data_direction dir);
 extern void
 swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,
-                 int direction);
+                 enum dma_data_direction dir);
 extern int
 swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
diff --git a/include/linux/timer.h b/include/linux/timer.h
index ea965b857a50..38cf093ef62c 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -100,6 +100,13 @@ void init_timer_deferrable_key(struct timer_list *timer,
                setup_timer_on_stack_key((timer), #timer, &__key,       \
                                         (fn), (data));                 \
        } while (0)
+#define setup_deferrable_timer_on_stack(timer, fn, data)                \
+        do {                                                            \
+                static struct lock_class_key __key;                     \
+                setup_deferrable_timer_on_stack_key((timer), #timer,    \
+                                                    &__key, (fn),       \
+                                                    (data));            \
+        } while (0)
 #else
 #define init_timer(timer)\
        init_timer_key((timer), NULL, NULL)
@@ -111,6 +118,8 @@ void init_timer_deferrable_key(struct timer_list *timer,
        setup_timer_key((timer), NULL, NULL, (fn), (data))
 #define setup_timer_on_stack(timer, fn, data)\
        setup_timer_on_stack_key((timer), NULL, NULL, (fn), (data))
+#define setup_deferrable_timer_on_stack(timer, fn, data)\
+        setup_deferrable_timer_on_stack_key((timer), NULL, NULL, (fn), (data))
 #endif
 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
@@ -150,6 +159,12 @@ static inline void setup_timer_on_stack_key(struct timer_list *timer,
        init_timer_on_stack_key(timer, name, key);
 }
+extern void setup_deferrable_timer_on_stack_key(struct timer_list *timer,
+                                                const char *name,
+                                                struct lock_class_key *key,
+                                                void (*function)(unsigned long),
+                                                unsigned long data);
 /**
 * timer_pending - is a timer pending?
 * @timer: the timer in question
diff --git a/include/linux/types.h b/include/linux/types.h
index 23d237a075e2..331d8baabcf2 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -8,7 +8,10 @@
 #define DECLARE_BITMAP(name,bits) \
        unsigned long name[BITS_TO_LONGS(bits)]
+#else
+#ifndef __EXPORTED_HEADERS__
+#warning "Attempt to use kernel headers from user space, see http://kernelnewbies.org/KernelHeaders"
+#endif /* __EXPORTED_HEADERS__ */
 #endif
 #include <linux/posix_types.h>
diff --git a/include/linux/u64_stats_sync.h b/include/linux/u64_stats_sync.h
new file mode 100644
index 000000000000..fa261a0da280
--- /dev/null
+++ b/include/linux/u64_stats_sync.h
@@ -0,0 +1,140 @@
+#ifndef _LINUX_U64_STATS_SYNC_H
+#define _LINUX_U64_STATS_SYNC_H
+/*
+ * To properly implement 64bits network statistics on 32bit and 64bit hosts,
+ * we provide a synchronization point, that is a noop on 64bit or UP kernels.
+ *
+ * Key points :
+ * 1) Use a seqcount on SMP 32bits, with low overhead.
+ * 2) Whole thing is a noop on 64bit arches or UP kernels.
+ * 3) Write side must ensure mutual exclusion or one seqcount update could
+ *    be lost, thus blocking readers forever.
+ *    If this synchronization point is not a mutex, but a spinlock or
+ *    spinlock_bh() or disable_bh() :
+ * 3.1) Write side should not sleep.
+ * 3.2) Write side should not allow preemption.
+ * 3.3) If applicable, interrupts should be disabled.
+ *
+ * 4) If reader fetches several counters, there is no guarantee the whole values
+ *    are consistent (remember point 1) : this is a noop on 64bit arches anyway)
+ *
+ * 5) readers are allowed to sleep or be preempted/interrupted : They perform
+ *    pure reads. But if they have to fetch many values, it's better to not allow
+ *    preemptions/interruptions to avoid many retries.
+ *
+ * 6) If counter might be written by an interrupt, readers should block interrupts.
+ *    (On UP, there is no seqcount_t protection, a reader allowing interrupts could
+ *     read partial values)
+ *
+ * 7) For softirq uses, readers can use u64_stats_fetch_begin_bh() and
+ *    u64_stats_fetch_retry_bh() helpers
+ *
+ * Usage :
+ *
+ * Stats producer (writer) should use following template granted it already got
+ * an exclusive access to counters (a lock is already taken, or per cpu
+ * data is used [in a non preemptable context])
+ *
+ *   spin_lock_bh(...) or other synchronization to get exclusive access
+ *   ...
+ *   u64_stats_update_begin(&stats->syncp);
+ *   stats->bytes64 += len; // non atomic operation
+ *   stats->packets64++;    // non atomic operation
+ *   u64_stats_update_end(&stats->syncp);
+ *
+ * While a consumer (reader) should use following template to get consistent
+ * snapshot for each variable (but no guarantee on several ones)
+ *
+ * u64 tbytes, tpackets;
+ * unsigned int start;
+ *
+ * do {
+ *         start = u64_stats_fetch_begin(&stats->syncp);
+ *         tbytes = stats->bytes64; // non atomic operation
+ *         tpackets = stats->packets64; // non atomic operation
+ * } while (u64_stats_fetch_retry(&stats->syncp, start));
+ *
+ *
+ * Example of use in drivers/net/loopback.c, using per_cpu containers,
+ * in BH disabled context.
+ */
+#include <linux/seqlock.h>
+struct u64_stats_sync {
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+        seqcount_t      seq;
+#endif
+};
+static void inline u64_stats_update_begin(struct u64_stats_sync *syncp)
+{
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+        write_seqcount_begin(&syncp->seq);
+#endif
+}
+static void inline u64_stats_update_end(struct u64_stats_sync *syncp)
+{
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+        write_seqcount_end(&syncp->seq);
+#endif
+}
+static unsigned int inline u64_stats_fetch_begin(const struct u64_stats_sync *syncp)
+{
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+        return read_seqcount_begin(&syncp->seq);
+#else
+#if BITS_PER_LONG==32
+        preempt_disable();
+#endif
+        return 0;
+#endif
+}
+static bool inline u64_stats_fetch_retry(const struct u64_stats_sync *syncp,
+                                         unsigned int start)
+{
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+        return read_seqcount_retry(&syncp->seq, start);
+#else
+#if BITS_PER_LONG==32
+        preempt_enable();
+#endif
+        return false;
+#endif
+}
+/*
+ * In case softirq handlers can update u64 counters, readers can use following helpers
+ * - SMP 32bit arches use seqcount protection, irq safe.
+ * - UP 32bit must disable BH.
+ * - 64bit have no problem atomically reading u64 values, irq safe.
+ */
+static unsigned int inline u64_stats_fetch_begin_bh(const struct u64_stats_sync *syncp)
+{
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+        return read_seqcount_begin(&syncp->seq);
+#else
+#if BITS_PER_LONG==32
+        local_bh_disable();
+#endif
+        return 0;
+#endif
+}
+static bool inline u64_stats_fetch_retry_bh(const struct u64_stats_sync *syncp,
+                                         unsigned int start)
+{
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+        return read_seqcount_retry(&syncp->seq, start);
+#else
+#if BITS_PER_LONG==32
+        local_bh_enable();
+#endif
+        return false;
+#endif
+}
+#endif /* _LINUX_U64_STATS_SYNC_H */
diff --git a/include/linux/usb/video.h b/include/linux/usb/video.h
index be436d9ee479..3b3b95e01f71 100644
--- a/include/linux/usb/video.h
+++ b/include/linux/usb/video.h
@@ -160,5 +160,409 @@
 #define UVC_STATUS_TYPE_CONTROL                         1
 #define UVC_STATUS_TYPE_STREAMING                       2
+/* 2.4.3.3. Payload Header Information */
+#define UVC_STREAM_EOH                                  (1 << 7)
+#define UVC_STREAM_ERR                                  (1 << 6)
+#define UVC_STREAM_STI                                  (1 << 5)
+#define UVC_STREAM_RES                                  (1 << 4)
+#define UVC_STREAM_SCR                                  (1 << 3)
+#define UVC_STREAM_PTS                                  (1 << 2)
+#define UVC_STREAM_EOF                                  (1 << 1)
+#define UVC_STREAM_FID                                  (1 << 0)
+/* 4.1.2. Control Capabilities */
+#define UVC_CONTROL_CAP_GET                             (1 << 0)
+#define UVC_CONTROL_CAP_SET                             (1 << 1)
+#define UVC_CONTROL_CAP_DISABLED                        (1 << 2)
+#define UVC_CONTROL_CAP_AUTOUPDATE                      (1 << 3)
+#define UVC_CONTROL_CAP_ASYNCHRONOUS                    (1 << 4)
+/* ------------------------------------------------------------------------
+ * UVC structures
+ */
+/* All UVC descriptors have these 3 fields at the beginning */
+struct uvc_descriptor_header {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+} __attribute__((packed));
+/* 3.7.2. Video Control Interface Header Descriptor */
+struct uvc_header_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u16 bcdUVC;
+        __u16 wTotalLength;
+        __u32 dwClockFrequency;
+        __u8  bInCollection;
+        __u8  baInterfaceNr[];
+} __attribute__((__packed__));
+#define UVC_DT_HEADER_SIZE(n)                           (12+(n))
+#define UVC_HEADER_DESCRIPTOR(n) \
+        uvc_header_descriptor_##n
+#define DECLARE_UVC_HEADER_DESCRIPTOR(n)                \
+struct UVC_HEADER_DESCRIPTOR(n) {                       \
+        __u8  bLength;                                  \
+        __u8  bDescriptorType;                          \
+        __u8  bDescriptorSubType;                       \
+        __u16 bcdUVC;                                   \
+        __u16 wTotalLength;                             \
+        __u32 dwClockFrequency;                         \
+        __u8  bInCollection;                            \
+        __u8  baInterfaceNr[n];                         \
+} __attribute__ ((packed))
+/* 3.7.2.1. Input Terminal Descriptor */
+struct uvc_input_terminal_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bTerminalID;
+        __u16 wTerminalType;
+        __u8  bAssocTerminal;
+        __u8  iTerminal;
+} __attribute__((__packed__));
+#define UVC_DT_INPUT_TERMINAL_SIZE                      8
+/* 3.7.2.2. Output Terminal Descriptor */
+struct uvc_output_terminal_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bTerminalID;
+        __u16 wTerminalType;
+        __u8  bAssocTerminal;
+        __u8  bSourceID;
+        __u8  iTerminal;
+} __attribute__((__packed__));
+#define UVC_DT_OUTPUT_TERMINAL_SIZE                     9
+/* 3.7.2.3. Camera Terminal Descriptor */
+struct uvc_camera_terminal_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bTerminalID;
+        __u16 wTerminalType;
+        __u8  bAssocTerminal;
+        __u8  iTerminal;
+        __u16 wObjectiveFocalLengthMin;
+        __u16 wObjectiveFocalLengthMax;
+        __u16 wOcularFocalLength;
+        __u8  bControlSize;
+        __u8  bmControls[3];
+} __attribute__((__packed__));
+#define UVC_DT_CAMERA_TERMINAL_SIZE(n)                  (15+(n))
+/* 3.7.2.4. Selector Unit Descriptor */
+struct uvc_selector_unit_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bUnitID;
+        __u8  bNrInPins;
+        __u8  baSourceID[0];
+        __u8  iSelector;
+} __attribute__((__packed__));
+#define UVC_DT_SELECTOR_UNIT_SIZE(n)                    (6+(n))
+#define UVC_SELECTOR_UNIT_DESCRIPTOR(n) \
+        uvc_selector_unit_descriptor_##n
+#define DECLARE_UVC_SELECTOR_UNIT_DESCRIPTOR(n) \
+struct UVC_SELECTOR_UNIT_DESCRIPTOR(n) {                \
+        __u8  bLength;                                  \
+        __u8  bDescriptorType;                          \
+        __u8  bDescriptorSubType;                       \
+        __u8  bUnitID;                                  \
+        __u8  bNrInPins;                                \
+        __u8  baSourceID[n];                            \
+        __u8  iSelector;                                \
+} __attribute__ ((packed))
+/* 3.7.2.5. Processing Unit Descriptor */
+struct uvc_processing_unit_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bUnitID;
+        __u8  bSourceID;
+        __u16 wMaxMultiplier;
+        __u8  bControlSize;
+        __u8  bmControls[2];
+        __u8  iProcessing;
+} __attribute__((__packed__));
+#define UVC_DT_PROCESSING_UNIT_SIZE(n)                  (9+(n))
+/* 3.7.2.6. Extension Unit Descriptor */
+struct uvc_extension_unit_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bUnitID;
+        __u8  guidExtensionCode[16];
+        __u8  bNumControls;
+        __u8  bNrInPins;
+        __u8  baSourceID[0];
+        __u8  bControlSize;
+        __u8  bmControls[0];
+        __u8  iExtension;
+} __attribute__((__packed__));
+#define UVC_DT_EXTENSION_UNIT_SIZE(p, n)                (24+(p)+(n))
+#define UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) \
+        uvc_extension_unit_descriptor_##p_##n
+#define DECLARE_UVC_EXTENSION_UNIT_DESCRIPTOR(p, n)     \
+struct UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) {            \
+        __u8  bLength;                                  \
+        __u8  bDescriptorType;                          \
+        __u8  bDescriptorSubType;                       \
+        __u8  bUnitID;                                  \
+        __u8  guidExtensionCode[16];                    \
+        __u8  bNumControls;                             \
+        __u8  bNrInPins;                                \
+        __u8  baSourceID[p];                            \
+        __u8  bControlSize;                             \
+        __u8  bmControls[n];                            \
+        __u8  iExtension;                               \
+} __attribute__ ((packed))
+/* 3.8.2.2. Video Control Interrupt Endpoint Descriptor */
+struct uvc_control_endpoint_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u16 wMaxTransferSize;
+} __attribute__((__packed__));
+#define UVC_DT_CONTROL_ENDPOINT_SIZE                    5
+/* 3.9.2.1. Input Header Descriptor */
+struct uvc_input_header_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bNumFormats;
+        __u16 wTotalLength;
+        __u8  bEndpointAddress;
+        __u8  bmInfo;
+        __u8  bTerminalLink;
+        __u8  bStillCaptureMethod;
+        __u8  bTriggerSupport;
+        __u8  bTriggerUsage;
+        __u8  bControlSize;
+        __u8  bmaControls[];
+} __attribute__((__packed__));
+#define UVC_DT_INPUT_HEADER_SIZE(n, p)                  (13+(n*p))
+#define UVC_INPUT_HEADER_DESCRIPTOR(n, p) \
+        uvc_input_header_descriptor_##n_##p
+#define DECLARE_UVC_INPUT_HEADER_DESCRIPTOR(n, p)       \
+struct UVC_INPUT_HEADER_DESCRIPTOR(n, p) {              \
+        __u8  bLength;                                  \
+        __u8  bDescriptorType;                          \
+        __u8  bDescriptorSubType;                       \
+        __u8  bNumFormats;                              \
+        __u16 wTotalLength;                             \
+        __u8  bEndpointAddress;                         \
+        __u8  bmInfo;                                   \
+        __u8  bTerminalLink;                            \
+        __u8  bStillCaptureMethod;                      \
+        __u8  bTriggerSupport;                          \
+        __u8  bTriggerUsage;                            \
+        __u8  bControlSize;                             \
+        __u8  bmaControls[p][n];                        \
+} __attribute__ ((packed))
+/* 3.9.2.2. Output Header Descriptor */
+struct uvc_output_header_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bNumFormats;
+        __u16 wTotalLength;
+        __u8  bEndpointAddress;
+        __u8  bTerminalLink;
+        __u8  bControlSize;
+        __u8  bmaControls[];
+} __attribute__((__packed__));
+#define UVC_DT_OUTPUT_HEADER_SIZE(n, p)                 (9+(n*p))
+#define UVC_OUTPUT_HEADER_DESCRIPTOR(n, p) \
+        uvc_output_header_descriptor_##n_##p
+#define DECLARE_UVC_OUTPUT_HEADER_DESCRIPTOR(n, p)      \
+struct UVC_OUTPUT_HEADER_DESCRIPTOR(n, p) {             \
+        __u8  bLength;                                  \
+        __u8  bDescriptorType;                          \
+        __u8  bDescriptorSubType;                       \
+        __u8  bNumFormats;                              \
+        __u16 wTotalLength;                             \
+        __u8  bEndpointAddress;                         \
+        __u8  bTerminalLink;                            \
+        __u8  bControlSize;                             \
+        __u8  bmaControls[p][n];                        \
+} __attribute__ ((packed))
+/* 3.9.2.6. Color matching descriptor */
+struct uvc_color_matching_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bColorPrimaries;
+        __u8  bTransferCharacteristics;
+        __u8  bMatrixCoefficients;
+} __attribute__((__packed__));
+#define UVC_DT_COLOR_MATCHING_SIZE                      6
+/* 4.3.1.1. Video Probe and Commit Controls */
+struct uvc_streaming_control {
+        __u16 bmHint;
+        __u8  bFormatIndex;
+        __u8  bFrameIndex;
+        __u32 dwFrameInterval;
+        __u16 wKeyFrameRate;
+        __u16 wPFrameRate;
+        __u16 wCompQuality;
+        __u16 wCompWindowSize;
+        __u16 wDelay;
+        __u32 dwMaxVideoFrameSize;
+        __u32 dwMaxPayloadTransferSize;
+        __u32 dwClockFrequency;
+        __u8  bmFramingInfo;
+        __u8  bPreferedVersion;
+        __u8  bMinVersion;
+        __u8  bMaxVersion;
+} __attribute__((__packed__));
+/* Uncompressed Payload - 3.1.1. Uncompressed Video Format Descriptor */
+struct uvc_format_uncompressed {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bFormatIndex;
+        __u8  bNumFrameDescriptors;
+        __u8  guidFormat[16];
+        __u8  bBitsPerPixel;
+        __u8  bDefaultFrameIndex;
+        __u8  bAspectRatioX;
+        __u8  bAspectRatioY;
+        __u8  bmInterfaceFlags;
+        __u8  bCopyProtect;
+} __attribute__((__packed__));
+#define UVC_DT_FORMAT_UNCOMPRESSED_SIZE                 27
+/* Uncompressed Payload - 3.1.2. Uncompressed Video Frame Descriptor */
+struct uvc_frame_uncompressed {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bFrameIndex;
+        __u8  bmCapabilities;
+        __u16 wWidth;
+        __u16 wHeight;
+        __u32 dwMinBitRate;
+        __u32 dwMaxBitRate;
+        __u32 dwMaxVideoFrameBufferSize;
+        __u32 dwDefaultFrameInterval;
+        __u8  bFrameIntervalType;
+        __u32 dwFrameInterval[];
+} __attribute__((__packed__));
+#define UVC_DT_FRAME_UNCOMPRESSED_SIZE(n)               (26+4*(n))
+#define UVC_FRAME_UNCOMPRESSED(n) \
+        uvc_frame_uncompressed_##n
+#define DECLARE_UVC_FRAME_UNCOMPRESSED(n)               \
+struct UVC_FRAME_UNCOMPRESSED(n) {                      \
+        __u8  bLength;                                  \
+        __u8  bDescriptorType;                          \
+        __u8  bDescriptorSubType;                       \
+        __u8  bFrameIndex;                              \
+        __u8  bmCapabilities;                           \
+        __u16 wWidth;                                   \
+        __u16 wHeight;                                  \
+        __u32 dwMinBitRate;                             \
+        __u32 dwMaxBitRate;                             \
+        __u32 dwMaxVideoFrameBufferSize;                \
+        __u32 dwDefaultFrameInterval;                   \
+        __u8  bFrameIntervalType;                       \
+        __u32 dwFrameInterval[n];                       \
+} __attribute__ ((packed))
+/* MJPEG Payload - 3.1.1. MJPEG Video Format Descriptor */
+struct uvc_format_mjpeg {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bFormatIndex;
+        __u8  bNumFrameDescriptors;
+        __u8  bmFlags;
+        __u8  bDefaultFrameIndex;
+        __u8  bAspectRatioX;
+        __u8  bAspectRatioY;
+        __u8  bmInterfaceFlags;
+        __u8  bCopyProtect;
+} __attribute__((__packed__));
+#define UVC_DT_FORMAT_MJPEG_SIZE                        11
+/* MJPEG Payload - 3.1.2. MJPEG Video Frame Descriptor */
+struct uvc_frame_mjpeg {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubType;
+        __u8  bFrameIndex;
+        __u8  bmCapabilities;
+        __u16 wWidth;
+        __u16 wHeight;
+        __u32 dwMinBitRate;
+        __u32 dwMaxBitRate;
+        __u32 dwMaxVideoFrameBufferSize;
+        __u32 dwDefaultFrameInterval;
+        __u8  bFrameIntervalType;
+        __u32 dwFrameInterval[];
+} __attribute__((__packed__));
+#define UVC_DT_FRAME_MJPEG_SIZE(n)                      (26+4*(n))
+#define UVC_FRAME_MJPEG(n) \
+        uvc_frame_mjpeg_##n
+#define DECLARE_UVC_FRAME_MJPEG(n)                      \
+struct UVC_FRAME_MJPEG(n) {                             \
+        __u8  bLength;                                  \
+        __u8  bDescriptorType;                          \
+        __u8  bDescriptorSubType;                       \
+        __u8  bFrameIndex;                              \
+        __u8  bmCapabilities;                           \
+        __u16 wWidth;                                   \
+        __u16 wHeight;                                  \
+        __u32 dwMinBitRate;                             \
+        __u32 dwMaxBitRate;                             \
+        __u32 dwMaxVideoFrameBufferSize;                \
+        __u32 dwDefaultFrameInterval;                   \
+        __u8  bFrameIntervalType;                       \
+        __u32 dwFrameInterval[n];                       \
+} __attribute__ ((packed))
 #endif /* __LINUX_USB_VIDEO_H */
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index cc4f45361dbb..8178156711f9 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -36,6 +36,9 @@ static inline void put_user_ns(struct user_namespace *ns)
                kref_put(&ns->kref, free_user_ns);
 }
+uid_t user_ns_map_uid(struct user_namespace *to, const struct cred *cred, uid_t uid);
+gid_t user_ns_map_gid(struct user_namespace *to, const struct cred *cred, gid_t gid);
 #else
 static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
@@ -52,6 +55,17 @@ static inline void put_user_ns(struct user_namespace *ns)
 {
 }
+static inline uid_t user_ns_map_uid(struct user_namespace *to,
+        const struct cred *cred, uid_t uid)
+{
+        return uid;
+}
+static inline gid_t user_ns_map_gid(struct user_namespace *to,
+        const struct cred *cred, gid_t gid)
+{
+        return gid;
+}
 #endif
 #endif /* _LINUX_USER_H */
diff --git a/include/linux/virtio_9p.h b/include/linux/virtio_9p.h
index 5cf11765146b..395c38a47adb 100644
--- a/include/linux/virtio_9p.h
+++ b/include/linux/virtio_9p.h
@@ -4,6 +4,7 @@
 * compatible drivers/servers. */
 #include <linux/virtio_ids.h>
 #include <linux/virtio_config.h>
+#include <linux/types.h>
 /* The feature bitmap for virtio 9P */
diff --git a/include/linux/wlp.h b/include/linux/wlp.h
index ac95ce6606ac..c76fe2392506 100644
--- a/include/linux/wlp.h
+++ b/include/linux/wlp.h
@@ -300,7 +300,7 @@ struct wlp_ie {
        __le16 cycle_param;
        __le16 acw_anchor_addr;
        u8 wssid_hash_list[];
-} __attribute__((packed));
+} __packed;
 static inline int wlp_ie_hash_length(struct wlp_ie *ie)
 {
@@ -324,7 +324,7 @@ static inline void wlp_ie_set_hash_length(struct wlp_ie *ie, int hash_length)
 */
 struct wlp_nonce {
        u8 data[16];
-} __attribute__((packed));
+} __packed;
 /**
 * WLP UUID
@@ -336,7 +336,7 @@ struct wlp_nonce {
 */
 struct wlp_uuid {
        u8 data[16];
-} __attribute__((packed));
+} __packed;
 /**
@@ -348,7 +348,7 @@ struct wlp_dev_type {
        u8 OUI[3];
        u8 OUIsubdiv;
        __le16 subID;
-} __attribute__((packed));
+} __packed;
 /**
 * WLP frame header
@@ -357,7 +357,7 @@ struct wlp_dev_type {
 struct wlp_frame_hdr {
        __le16 mux_hdr;                 /* WLP_PROTOCOL_ID */
        enum wlp_frame_type type:8;
-} __attribute__((packed));
+} __packed;
 /**
 * WLP attribute field header
@@ -368,7 +368,7 @@ struct wlp_frame_hdr {
 struct wlp_attr_hdr {
        __le16 type;
        __le16 length;
-} __attribute__((packed));
+} __packed;
 /**
 * Device information commonly used together
@@ -401,13 +401,13 @@ struct wlp_device_info {
 struct wlp_attr_##name {                                                \
        struct wlp_attr_hdr hdr;                                        \
        type name;                                                      \
-} __attribute__((packed));
+} __packed;
 #define wlp_attr_array(type, name)                                      \
 struct wlp_attr_##name {                                                \
        struct wlp_attr_hdr hdr;                                        \
        type name[];                                                    \
-} __attribute__((packed));
+} __packed;
 /**
 * WLP association attribute fields
@@ -483,7 +483,7 @@ struct wlp_wss_info {
        struct wlp_attr_accept_enrl accept;
        struct wlp_attr_wss_sec_status sec_stat;
        struct wlp_attr_wss_bcast bcast;
-} __attribute__((packed));
+} __packed;
 /* WLP WSS Information */
 wlp_attr_array(struct wlp_wss_info, wss_info)
@@ -520,7 +520,7 @@ wlp_attr(u8, wlp_assc_err)
 struct wlp_frame_std_abbrv_hdr {
        struct wlp_frame_hdr hdr;
        u8 tag;
-} __attribute__((packed));
+} __packed;
 /**
 * WLP association frames
@@ -533,7 +533,7 @@ struct wlp_frame_assoc {
        struct wlp_attr_version version;
        struct wlp_attr_msg_type msg_type;
        u8 attr[];
-} __attribute__((packed));
+} __packed;
 /* Ethernet to dev address mapping */
 struct wlp_eda {
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index 0cfa1e9c4cc1..f1e5bde4b35a 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -33,6 +33,20 @@
 #define XATTR_USER_PREFIX "user."
 #define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1)
+/* Security namespace */
+#define XATTR_SELINUX_SUFFIX "selinux"
+#define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
+#define XATTR_SMACK_SUFFIX "SMACK64"
+#define XATTR_SMACK_IPIN "SMACK64IPIN"
+#define XATTR_SMACK_IPOUT "SMACK64IPOUT"
+#define XATTR_NAME_SMACK XATTR_SECURITY_PREFIX XATTR_SMACK_SUFFIX
+#define XATTR_NAME_SMACKIPIN    XATTR_SECURITY_PREFIX XATTR_SMACK_IPIN
+#define XATTR_NAME_SMACKIPOUT   XATTR_SECURITY_PREFIX XATTR_SMACK_IPOUT
+#define XATTR_CAPS_SUFFIX "capability"
+#define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX
 struct inode;
 struct dentry;
diff --git a/include/media/ir-core.h b/include/media/ir-core.h
index ad1303f20e00..513e60dd1010 100644
--- a/include/media/ir-core.h
+++ b/include/media/ir-core.h
@@ -47,15 +47,21 @@ enum rc_driver_type {
 *      is opened.
 * @close: callback to allow drivers to disable polling/irq when IR input device
 *      is opened.
+ * @s_tx_mask: set transmitter mask (for devices with multiple tx outputs)
+ * @s_tx_carrier: set transmit carrier frequency
+ * @tx_ir: transmit IR
 */
 struct ir_dev_props {
        enum rc_driver_type     driver_type;
        unsigned long           allowed_protos;
        u32                     scanmask;
-        void                    *priv;
+        void                    *priv;
        int                     (*change_protocol)(void *priv, u64 ir_type);
        int                     (*open)(void *priv);
        void                    (*close)(void *priv);
+        int                     (*s_tx_mask)(void *priv, u32 mask);
+        int                     (*s_tx_carrier)(void *priv, u32 carrier);
+        int                     (*tx_ir)(void *priv, int *txbuf, u32 n);
 };
 struct ir_input_dev {
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 0506e45c9a4f..5e96d7a430be 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -11,7 +11,7 @@ struct IR_i2c {
        struct i2c_client      *c;
        struct input_dev       *input;
        struct ir_input_state  ir;
+        u64                    ir_type;
        /* Used to avoid fast repeating */
        unsigned char          old;
diff --git a/include/media/lirc.h b/include/media/lirc.h
new file mode 100644
index 000000000000..42c467c50519
--- /dev/null
+++ b/include/media/lirc.h
@@ -0,0 +1,165 @@
+/*
+ * lirc.h - linux infrared remote control header file
+ * last modified 2010/07/13 by Jarod Wilson
+ */
+#ifndef _LINUX_LIRC_H
+#define _LINUX_LIRC_H
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#define PULSE_BIT       0x01000000
+#define PULSE_MASK      0x00FFFFFF
+#define LIRC_MODE2_SPACE     0x00000000
+#define LIRC_MODE2_PULSE     0x01000000
+#define LIRC_MODE2_FREQUENCY 0x02000000
+#define LIRC_MODE2_TIMEOUT   0x03000000
+#define LIRC_VALUE_MASK      0x00FFFFFF
+#define LIRC_MODE2_MASK      0xFF000000
+#define LIRC_SPACE(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_SPACE)
+#define LIRC_PULSE(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_PULSE)
+#define LIRC_FREQUENCY(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_FREQUENCY)
+#define LIRC_TIMEOUT(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_TIMEOUT)
+#define LIRC_VALUE(val) ((val)&LIRC_VALUE_MASK)
+#define LIRC_MODE2(val) ((val)&LIRC_MODE2_MASK)
+#define LIRC_IS_SPACE(val) (LIRC_MODE2(val) == LIRC_MODE2_SPACE)
+#define LIRC_IS_PULSE(val) (LIRC_MODE2(val) == LIRC_MODE2_PULSE)
+#define LIRC_IS_FREQUENCY(val) (LIRC_MODE2(val) == LIRC_MODE2_FREQUENCY)
+#define LIRC_IS_TIMEOUT(val) (LIRC_MODE2(val) == LIRC_MODE2_TIMEOUT)
+/* used heavily by lirc userspace */
+#define lirc_t int
+/*** lirc compatible hardware features ***/
+#define LIRC_MODE2SEND(x) (x)
+#define LIRC_SEND2MODE(x) (x)
+#define LIRC_MODE2REC(x) ((x) << 16)
+#define LIRC_REC2MODE(x) ((x) >> 16)
+#define LIRC_MODE_RAW                  0x00000001
+#define LIRC_MODE_PULSE                0x00000002
+#define LIRC_MODE_MODE2                0x00000004
+#define LIRC_MODE_LIRCCODE             0x00000010
+#define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)
+#define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)
+#define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)
+#define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
+#define LIRC_CAN_SEND_MASK             0x0000003f
+#define LIRC_CAN_SET_SEND_CARRIER      0x00000100
+#define LIRC_CAN_SET_SEND_DUTY_CYCLE   0x00000200
+#define LIRC_CAN_SET_TRANSMITTER_MASK  0x00000400
+#define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
+#define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
+#define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
+#define LIRC_CAN_REC_LIRCCODE          LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
+#define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
+#define LIRC_CAN_SET_REC_CARRIER       (LIRC_CAN_SET_SEND_CARRIER << 16)
+#define LIRC_CAN_SET_REC_DUTY_CYCLE    (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16)
+#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
+#define LIRC_CAN_SET_REC_CARRIER_RANGE    0x80000000
+#define LIRC_CAN_GET_REC_RESOLUTION       0x20000000
+#define LIRC_CAN_SET_REC_TIMEOUT          0x10000000
+#define LIRC_CAN_SET_REC_FILTER           0x08000000
+#define LIRC_CAN_MEASURE_CARRIER          0x02000000
+#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
+#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
+#define LIRC_CAN_NOTIFY_DECODE            0x01000000
+/*** IOCTL commands for lirc driver ***/
+#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, __u32)
+#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, __u32)
+#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, __u32)
+#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, __u32)
+#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, __u32)
+#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, __u32)
+#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, __u32)
+#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, __u32)
+#define LIRC_GET_MIN_TIMEOUT           _IOR('i', 0x00000008, __u32)
+#define LIRC_GET_MAX_TIMEOUT           _IOR('i', 0x00000009, __u32)
+#define LIRC_GET_MIN_FILTER_PULSE      _IOR('i', 0x0000000a, __u32)
+#define LIRC_GET_MAX_FILTER_PULSE      _IOR('i', 0x0000000b, __u32)
+#define LIRC_GET_MIN_FILTER_SPACE      _IOR('i', 0x0000000c, __u32)
+#define LIRC_GET_MAX_FILTER_SPACE      _IOR('i', 0x0000000d, __u32)
+/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
+#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, __u32)
+#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, __u32)
+#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, __u32)
+/* Note: these can reset the according pulse_width */
+#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, __u32)
+#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, __u32)
+#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, __u32)
+#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, __u32)
+#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, __u32)
+/*
+ * when a timeout != 0 is set the driver will send a
+ * LIRC_MODE2_TIMEOUT data packet, otherwise LIRC_MODE2_TIMEOUT is
+ * never sent, timeout is disabled by default
+ */
+#define LIRC_SET_REC_TIMEOUT           _IOW('i', 0x00000018, __u32)
+/* 1 enables, 0 disables timeout reports in MODE2 */
+#define LIRC_SET_REC_TIMEOUT_REPORTS   _IOW('i', 0x00000019, __u32)
+/*
+ * pulses shorter than this are filtered out by hardware (software
+ * emulation in lirc_dev?)
+ */
+#define LIRC_SET_REC_FILTER_PULSE      _IOW('i', 0x0000001a, __u32)
+/*
+ * spaces shorter than this are filtered out by hardware (software
+ * emulation in lirc_dev?)
+ */
+#define LIRC_SET_REC_FILTER_SPACE      _IOW('i', 0x0000001b, __u32)
+/*
+ * if filter cannot be set independantly for pulse/space, this should
+ * be used
+ */
+#define LIRC_SET_REC_FILTER            _IOW('i', 0x0000001c, __u32)
+/*
+ * if enabled from the next key press on the driver will send
+ * LIRC_MODE2_FREQUENCY packets
+ */
+#define LIRC_SET_MEASURE_CARRIER_MODE  _IOW('i', 0x0000001d, __u32)
+/*
+ * to set a range use
+ * LIRC_SET_REC_DUTY_CYCLE_RANGE/LIRC_SET_REC_CARRIER_RANGE with the
+ * lower bound first and later
+ * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
+ */
+#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, __u32)
+#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, __u32)
+#define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
+#define LIRC_SETUP_START               _IO('i', 0x00000021)
+#define LIRC_SETUP_END                 _IO('i', 0x00000022)
+#endif
diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h
new file mode 100644
index 000000000000..b1f60663cb39
--- /dev/null
+++ b/include/media/lirc_dev.h
@@ -0,0 +1,225 @@
+/*
+ * LIRC base driver
+ *
+ * by Artur Lipowski <alipowski@interia.pl>
+ *        This code is licensed under GNU GPL
+ *
+ */
+#ifndef _LINUX_LIRC_DEV_H
+#define _LINUX_LIRC_DEV_H
+#define MAX_IRCTL_DEVICES 4
+#define BUFLEN            16
+#define mod(n, div) ((n) % (div))
+#include <linux/slab.h>
+#include <linux/fs.h>
+#include <linux/ioctl.h>
+#include <linux/poll.h>
+#include <linux/kfifo.h>
+#include <media/lirc.h>
+struct lirc_buffer {
+        wait_queue_head_t wait_poll;
+        spinlock_t fifo_lock;
+        unsigned int chunk_size;
+        unsigned int size; /* in chunks */
+        /* Using chunks instead of bytes pretends to simplify boundary checking
+         * And should allow for some performance fine tunning later */
+        struct kfifo fifo;
+        u8 fifo_initialized;
+};
+static inline void lirc_buffer_clear(struct lirc_buffer *buf)
+{
+        unsigned long flags;
+        if (buf->fifo_initialized) {
+                spin_lock_irqsave(&buf->fifo_lock, flags);
+                kfifo_reset(&buf->fifo);
+                spin_unlock_irqrestore(&buf->fifo_lock, flags);
+        } else
+                WARN(1, "calling %s on an uninitialized lirc_buffer\n",
+                     __func__);
+}
+static inline int lirc_buffer_init(struct lirc_buffer *buf,
+                                    unsigned int chunk_size,
+                                    unsigned int size)
+{
+        int ret;
+        init_waitqueue_head(&buf->wait_poll);
+        spin_lock_init(&buf->fifo_lock);
+        buf->chunk_size = chunk_size;
+        buf->size = size;
+        ret = kfifo_alloc(&buf->fifo, size * chunk_size, GFP_KERNEL);
+        if (ret == 0)
+                buf->fifo_initialized = 1;
+        return ret;
+}
+static inline void lirc_buffer_free(struct lirc_buffer *buf)
+{
+        if (buf->fifo_initialized) {
+                kfifo_free(&buf->fifo);
+                buf->fifo_initialized = 0;
+        } else
+                WARN(1, "calling %s on an uninitialized lirc_buffer\n",
+                     __func__);
+}
+static inline int lirc_buffer_len(struct lirc_buffer *buf)
+{
+        int len;
+        unsigned long flags;
+        spin_lock_irqsave(&buf->fifo_lock, flags);
+        len = kfifo_len(&buf->fifo);
+        spin_unlock_irqrestore(&buf->fifo_lock, flags);
+        return len;
+}
+static inline int lirc_buffer_full(struct lirc_buffer *buf)
+{
+        return lirc_buffer_len(buf) == buf->size * buf->chunk_size;
+}
+static inline int lirc_buffer_empty(struct lirc_buffer *buf)
+{
+        return !lirc_buffer_len(buf);
+}
+static inline int lirc_buffer_available(struct lirc_buffer *buf)
+{
+        return buf->size - (lirc_buffer_len(buf) / buf->chunk_size);
+}
+static inline unsigned int lirc_buffer_read(struct lirc_buffer *buf,
+                                            unsigned char *dest)
+{
+        unsigned int ret = 0;
+        if (lirc_buffer_len(buf) >= buf->chunk_size)
+                ret = kfifo_out_locked(&buf->fifo, dest, buf->chunk_size,
+                                       &buf->fifo_lock);
+        return ret;
+}
+static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf,
+                                             unsigned char *orig)
+{
+        unsigned int ret;
+        ret = kfifo_in_locked(&buf->fifo, orig, buf->chunk_size,
+                              &buf->fifo_lock);
+        return ret;
+}
+struct lirc_driver {
+        char name[40];
+        int minor;
+        unsigned long code_length;
+        unsigned int buffer_size; /* in chunks holding one code each */
+        int sample_rate;
+        unsigned long features;
+        unsigned int chunk_size;
+        void *data;
+        int min_timeout;
+        int max_timeout;
+        int (*add_to_buf) (void *data, struct lirc_buffer *buf);
+        struct lirc_buffer *rbuf;
+        int (*set_use_inc) (void *data);
+        void (*set_use_dec) (void *data);
+        struct file_operations *fops;
+        struct device *dev;
+        struct module *owner;
+};
+/* name:
+ * this string will be used for logs
+ *
+ * minor:
+ * indicates minor device (/dev/lirc) number for registered driver
+ * if caller fills it with negative value, then the first free minor
+ * number will be used (if available)
+ *
+ * code_length:
+ * length of the remote control key code expressed in bits
+ *
+ * sample_rate:
+ *
+ * data:
+ * it may point to any driver data and this pointer will be passed to
+ * all callback functions
+ *
+ * add_to_buf:
+ * add_to_buf will be called after specified period of the time or
+ * triggered by the external event, this behavior depends on value of
+ * the sample_rate this function will be called in user context. This
+ * routine should return 0 if data was added to the buffer and
+ * -ENODATA if none was available. This should add some number of bits
+ * evenly divisible by code_length to the buffer
+ *
+ * rbuf:
+ * if not NULL, it will be used as a read buffer, you will have to
+ * write to the buffer by other means, like irq's (see also
+ * lirc_serial.c).
+ *
+ * set_use_inc:
+ * set_use_inc will be called after device is opened
+ *
+ * set_use_dec:
+ * set_use_dec will be called after device is closed
+ *
+ * fops:
+ * file_operations for drivers which don't fit the current driver model.
+ *
+ * Some ioctl's can be directly handled by lirc_dev if the driver's
+ * ioctl function is NULL or if it returns -ENOIOCTLCMD (see also
+ * lirc_serial.c).
+ *
+ * owner:
+ * the module owning this struct
+ *
+ */
+/* following functions can be called ONLY from user context
+ *
+ * returns negative value on error or minor number
+ * of the registered device if success
+ * contents of the structure pointed by p is copied
+ */
+extern int lirc_register_driver(struct lirc_driver *d);
+/* returns negative value on error or 0 if success
+*/
+extern int lirc_unregister_driver(int minor);
+/* Returns the private data stored in the lirc_driver
+ * associated with the given device file pointer.
+ */
+void *lirc_get_pdata(struct file *file);
+/* default file operations
+ * used by drivers if they override only some operations
+ */
+int lirc_dev_fop_open(struct inode *inode, struct file *file);
+int lirc_dev_fop_close(struct inode *inode, struct file *file);
+unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait);
+long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
+ssize_t lirc_dev_fop_read(struct file *file, char *buffer, size_t length,
+                          loff_t *ppos);
+ssize_t lirc_dev_fop_write(struct file *file, const char *buffer, size_t length,
+                           loff_t *ppos);
+#endif
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index c78e99a435b6..9569d0863f8b 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -17,8 +17,13 @@
 #define IR_TYPE_RC6     (1  << 2)       /* Philips RC6 protocol */
 #define IR_TYPE_JVC     (1  << 3)       /* JVC protocol */
 #define IR_TYPE_SONY    (1  << 4)       /* Sony12/15/20 protocol */
+#define IR_TYPE_LIRC    (1  << 30)      /* Pass raw IR to lirc userspace */
 #define IR_TYPE_OTHER   (1u << 31)
+#define IR_TYPE_ALL (IR_TYPE_RC5 | IR_TYPE_NEC  | IR_TYPE_RC6  | \
+                     IR_TYPE_JVC | IR_TYPE_SONY | IR_TYPE_LIRC | \
+                     IR_TYPE_OTHER)
 struct ir_scancode {
        u32     scancode;
        u32     keycode;
@@ -64,6 +69,8 @@ void rc_map_init(void);
 #define RC_MAP_BUDGET_CI_OLD             "rc-budget-ci-old"
 #define RC_MAP_CINERGY_1400              "rc-cinergy-1400"
 #define RC_MAP_CINERGY                   "rc-cinergy"
+#define RC_MAP_DIB0700_NEC_TABLE         "rc-dib0700-nec"
+#define RC_MAP_DIB0700_RC5_TABLE         "rc-dib0700-rc5"
 #define RC_MAP_DM1105_NEC                "rc-dm1105-nec"
 #define RC_MAP_DNTV_LIVE_DVBT_PRO        "rc-dntv-live-dvbt-pro"
 #define RC_MAP_DNTV_LIVE_DVB_T           "rc-dntv-live-dvb-t"
@@ -87,6 +94,7 @@ void rc_map_init(void);
 #define RC_MAP_KAIOMY                    "rc-kaiomy"
 #define RC_MAP_KWORLD_315U               "rc-kworld-315u"
 #define RC_MAP_KWORLD_PLUS_TV_ANALOG     "rc-kworld-plus-tv-analog"
+#define RC_MAP_LIRC                      "rc-lirc"
 #define RC_MAP_MANLI                     "rc-manli"
 #define RC_MAP_MSI_TVANYWHERE_PLUS       "rc-msi-tvanywhere-plus"
 #define RC_MAP_MSI_TVANYWHERE            "rc-msi-tvanywhere"
@@ -107,6 +115,7 @@ void rc_map_init(void);
 #define RC_MAP_PV951                     "rc-pv951"
 #define RC_MAP_RC5_HAUPPAUGE_NEW         "rc-rc5-hauppauge-new"
 #define RC_MAP_RC5_TV                    "rc-rc5-tv"
+#define RC_MAP_RC6_MCE                   "rc-rc6-mce"
 #define RC_MAP_REAL_AUDIO_220_32_KEYS    "rc-real-audio-220-32-keys"
 #define RC_MAP_TBS_NEC                   "rc-tbs-nec"
 #define RC_MAP_TERRATEC_CINERGY_XS       "rc-terratec-cinergy-xs"
@@ -116,6 +125,7 @@ void rc_map_init(void);
 #define RC_MAP_VIDEOMATE_TV_PVR          "rc-videomate-tv-pvr"
 #define RC_MAP_WINFAST                   "rc-winfast"
 #define RC_MAP_WINFAST_USBII_DELUXE      "rc-winfast-usbii-deluxe"
 /*
 * Please, do not just append newer Remote Controller names at the end.
 * The names should be ordered in alphabetical order
diff --git a/include/media/sh_mobile_ceu.h b/include/media/sh_mobile_ceu.h
index b67747836878..80346a6d28a9 100644
--- a/include/media/sh_mobile_ceu.h
+++ b/include/media/sh_mobile_ceu.h
@@ -6,8 +6,11 @@
 #define SH_CEU_FLAG_HSYNC_LOW           (1 << 2) /* default High if possible */
 #define SH_CEU_FLAG_VSYNC_LOW           (1 << 3) /* default High if possible */
+struct device;
 struct sh_mobile_ceu_info {
        unsigned long flags;
+        struct device *csi2_dev;
 };
 #endif /* __ASM_SH_MOBILE_CEU_H__ */
diff --git a/include/media/sh_mobile_csi2.h b/include/media/sh_mobile_csi2.h
new file mode 100644
index 000000000000..4d2615174461
--- /dev/null
+++ b/include/media/sh_mobile_csi2.h
@@ -0,0 +1,46 @@
+/*
+ * Driver header for the SH-Mobile MIPI CSI-2 unit
+ *
+ * Copyright (C) 2010, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef SH_MIPI_CSI
+#define SH_MIPI_CSI
+enum sh_csi2_phy {
+        SH_CSI2_PHY_MAIN,
+        SH_CSI2_PHY_SUB,
+};
+enum sh_csi2_type {
+        SH_CSI2C,
+        SH_CSI2I,
+};
+#define SH_CSI2_CRC     (1 << 0)
+#define SH_CSI2_ECC     (1 << 1)
+struct platform_device;
+struct sh_csi2_client_config {
+        enum sh_csi2_phy phy;
+        unsigned char lanes;            /* bitmask[3:0] */
+        unsigned char channel;          /* 0..3 */
+        struct platform_device *pdev;   /* client platform device */
+};
+struct sh_csi2_pdata {
+        enum sh_csi2_type type;
+        unsigned int flags;
+        struct sh_csi2_client_config *clients;
+        int num_clients;
+};
+struct device;
+struct v4l2_device;
+#endif
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index b8289c2f609b..2ce957301f77 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -12,12 +12,15 @@
 #ifndef SOC_CAMERA_H
 #define SOC_CAMERA_H
+#include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
 #include <media/v4l2-device.h>
+extern struct bus_type soc_camera_bus_type;
 struct soc_camera_device {
        struct list_head list;
        struct device dev;
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 865cda7cd611..f0cf2e7def06 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -24,10 +24,10 @@
 */
 enum v4l2_mbus_pixelcode {
        V4L2_MBUS_FMT_FIXED = 1,
-        V4L2_MBUS_FMT_YUYV8_2X8_LE,
+        V4L2_MBUS_FMT_YUYV8_2X8,
-        V4L2_MBUS_FMT_YVYU8_2X8_LE,
+        V4L2_MBUS_FMT_YVYU8_2X8,
-        V4L2_MBUS_FMT_YUYV8_2X8_BE,
+        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_YVYU8_2X8_BE,
+        V4L2_MBUS_FMT_VYUY8_2X8,
        V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
        V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
        V4L2_MBUS_FMT_RGB565_2X8_LE,
@@ -41,6 +41,11 @@ enum v4l2_mbus_pixelcode {
        V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE,
        V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE,
        V4L2_MBUS_FMT_SGRBG8_1X8,
+        V4L2_MBUS_FMT_SBGGR12_1X12,
+        V4L2_MBUS_FMT_YUYV8_1_5X8,
+        V4L2_MBUS_FMT_YVYU8_1_5X8,
+        V4L2_MBUS_FMT_UYVY8_1_5X8,
+        V4L2_MBUS_FMT_VYUY8_1_5X8,
 };
 /**
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index f91a736c133d..f2c41cebf453 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -54,8 +54,6 @@ struct videobuf_queue;
 struct videobuf_mapping {
        unsigned int count;
-        unsigned long start;
-        unsigned long end;
        struct videobuf_queue *q;
 };
@@ -127,7 +125,7 @@ struct videobuf_queue_ops {
 struct videobuf_qtype_ops {
        u32                     magic;
-        struct videobuf_buffer *(*alloc)(size_t size);
+        struct videobuf_buffer *(*alloc_vb)(size_t size);
        void *(*vaddr)          (struct videobuf_buffer *buf);
        int (*iolock)           (struct videobuf_queue *q,
                                 struct videobuf_buffer *vb,
@@ -173,7 +171,7 @@ int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr);
 int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
                struct v4l2_framebuffer *fbuf);
-struct videobuf_buffer *videobuf_alloc(struct videobuf_queue *q);
+struct videobuf_buffer *videobuf_alloc_vb(struct videobuf_queue *q);
 /* Used on videobuf-dvb */
 void *videobuf_queue_to_vaddr(struct videobuf_queue *q,
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index a195f3b9c00a..97e07f46a0fa 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -25,23 +25,6 @@
 /* --------------------------------------------------------------------- */
 /*
- * Return a scatterlist for some page-aligned vmalloc()'ed memory
- * block (NULL on errors).  Memory for the scatterlist is allocated
- * using kmalloc.  The caller must free the memory.
- */
-struct scatterlist *videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages);
-/*
- * Return a scatterlist for a an array of userpages (NULL on errors).
- * Memory for the scatterlist is allocated using kmalloc.  The caller
- * must free the memory.
- */
-struct scatterlist *videobuf_pages_to_sg(struct page **pages, int nr_pages,
-                                         int offset);
-/* --------------------------------------------------------------------- */
-/*
 * A small set of helper functions to manage buffers (both userland
 * and kernel) for DMA.
 *
@@ -68,7 +51,7 @@ struct videobuf_dmabuf {
        struct page         **pages;
        /* for kernel buffers */
-        void                *vmalloc;
+        void                *vaddr;
        /* for overlay buffers (pci-pci dma) */
        dma_addr_t          bus_addr;
@@ -87,6 +70,16 @@ struct videobuf_dma_sg_memory {
        struct videobuf_dmabuf  dma;
 };
+/*
+ * Scatter-gather DMA buffer API.
+ *
+ * These functions provide a simple way to create a page list and a
+ * scatter-gather list from a kernel, userspace of physical address and map the
+ * memory for DMA operation.
+ *
+ * Despite the name, this is totally unrelated to videobuf, except that
+ * videobuf-dma-sg uses the same API internally.
+ */
 void videobuf_dma_init(struct videobuf_dmabuf *dma);
 int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
                           unsigned long data, unsigned long size);
@@ -96,8 +89,8 @@ int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction,
                              dma_addr_t addr, int nr_pages);
 int videobuf_dma_free(struct videobuf_dmabuf *dma);
-int videobuf_dma_map(struct videobuf_queue *q, struct videobuf_dmabuf *dma);
+int videobuf_dma_map(struct device *dev, struct videobuf_dmabuf *dma);
-int videobuf_dma_unmap(struct videobuf_queue *q, struct videobuf_dmabuf *dma);
+int videobuf_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma);
 struct videobuf_dmabuf *videobuf_to_dma(struct videobuf_buffer *buf);
 void *videobuf_sg_alloc(size_t size);
@@ -111,11 +104,5 @@ void videobuf_queue_sg_init(struct videobuf_queue *q,
                         unsigned int msize,
                         void *priv);
-/*FIXME: these variants are used only on *-alsa code, where videobuf is
- * used without queue
- */
-int videobuf_sg_dma_map(struct device *dev, struct videobuf_dmabuf *dma);
-int videobuf_sg_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma);
 #endif /* _VIDEOBUF_DMA_SG_H */
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index 851eb1a2ff2a..e19403c18dae 100644
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -22,7 +22,7 @@
 struct videobuf_vmalloc_memory {
        u32                 magic;
-        void                *vmalloc;
+        void                *vaddr;
        /* remap_vmalloc_range seems to need to run
         * after mmap() on some cases */
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index 156c26bb8bd7..a8de812ccbc8 100644
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -88,8 +88,16 @@ do { \
 * enum p9_msg_t - 9P message types
 * @P9_TSTATFS: file system status request
 * @P9_RSTATFS: file system status response
+ * @P9_TSYMLINK: make symlink request
+ * @P9_RSYMLINK: make symlink response
+ * @P9_TMKNOD: create a special file object request
+ * @P9_RMKNOD: create a special file object response
+ * @P9_TLCREATE: prepare a handle for I/O on an new file for 9P2000.L
+ * @P9_RLCREATE: response with file access information for 9P2000.L
 * @P9_TRENAME: rename request
 * @P9_RRENAME: rename response
+ * @P9_TMKDIR: create a directory request
+ * @P9_RMKDIR: create a directory response
 * @P9_TVERSION: version handshake request
 * @P9_RVERSION: version handshake response
 * @P9_TAUTH: request to establish authentication channel
@@ -131,8 +139,30 @@ do { \
 enum p9_msg_t {
        P9_TSTATFS = 8,
        P9_RSTATFS,
+        P9_TLOPEN = 12,
+        P9_RLOPEN,
+        P9_TLCREATE = 14,
+        P9_RLCREATE,
+        P9_TSYMLINK = 16,
+        P9_RSYMLINK,
+        P9_TMKNOD = 18,
+        P9_RMKNOD,
        P9_TRENAME = 20,
        P9_RRENAME,
+        P9_TGETATTR = 24,
+        P9_RGETATTR,
+        P9_TSETATTR = 26,
+        P9_RSETATTR,
+        P9_TXATTRWALK = 30,
+        P9_RXATTRWALK,
+        P9_TXATTRCREATE = 32,
+        P9_RXATTRCREATE,
+        P9_TREADDIR = 40,
+        P9_RREADDIR,
+        P9_TLINK = 70,
+        P9_RLINK,
+        P9_TMKDIR = 72,
+        P9_RMKDIR,
        P9_TVERSION = 100,
        P9_RVERSION,
        P9_TAUTH = 102,
@@ -275,6 +305,9 @@ enum p9_qid_t {
 /* ample room for Twrite/Rread header */
 #define P9_IOHDRSZ      24
+/* Room for readdir header */
+#define P9_READDIRHDRSZ 24
 /**
 * struct p9_str - length prefixed string type
 * @len: length of the string
@@ -357,6 +390,74 @@ struct p9_wstat {
        u32 n_muid;             /* 9p2000.u extensions */
 };
+struct p9_stat_dotl {
+        u64 st_result_mask;
+        struct p9_qid qid;
+        u32 st_mode;
+        u32 st_uid;
+        u32 st_gid;
+        u64 st_nlink;
+        u64 st_rdev;
+        u64 st_size;
+        u64 st_blksize;
+        u64 st_blocks;
+        u64 st_atime_sec;
+        u64 st_atime_nsec;
+        u64 st_mtime_sec;
+        u64 st_mtime_nsec;
+        u64 st_ctime_sec;
+        u64 st_ctime_nsec;
+        u64 st_btime_sec;
+        u64 st_btime_nsec;
+        u64 st_gen;
+        u64 st_data_version;
+};
+#define P9_STATS_MODE           0x00000001ULL
+#define P9_STATS_NLINK          0x00000002ULL
+#define P9_STATS_UID            0x00000004ULL
+#define P9_STATS_GID            0x00000008ULL
+#define P9_STATS_RDEV           0x00000010ULL
+#define P9_STATS_ATIME          0x00000020ULL
+#define P9_STATS_MTIME          0x00000040ULL
+#define P9_STATS_CTIME          0x00000080ULL
+#define P9_STATS_INO            0x00000100ULL
+#define P9_STATS_SIZE           0x00000200ULL
+#define P9_STATS_BLOCKS         0x00000400ULL
+#define P9_STATS_BTIME          0x00000800ULL
+#define P9_STATS_GEN            0x00001000ULL
+#define P9_STATS_DATA_VERSION   0x00002000ULL
+#define P9_STATS_BASIC          0x000007ffULL /* Mask for fields up to BLOCKS */
+#define P9_STATS_ALL            0x00003fffULL /* Mask for All fields above */
+/**
+ * struct p9_iattr_dotl - P9 inode attribute for setattr
+ * @valid: bitfield specifying which fields are valid
+ *         same as in struct iattr
+ * @mode: File permission bits
+ * @uid: user id of owner
+ * @gid: group id
+ * @size: File size
+ * @atime_sec: Last access time, seconds
+ * @atime_nsec: Last access time, nanoseconds
+ * @mtime_sec: Last modification time, seconds
+ * @mtime_nsec: Last modification time, nanoseconds
+ */
+struct p9_iattr_dotl {
+        u32 valid;
+        u32 mode;
+        u32 uid;
+        u32 gid;
+        u64 size;
+        u64 atime_sec;
+        u64 atime_nsec;
+        u64 mtime_sec;
+        u64 mtime_nsec;
+};
 /* Structures for Protocol Operations */
 struct p9_tstatfs {
        u32 fid;
@@ -485,6 +586,18 @@ struct p9_rwrite {
        u32 count;
 };
+struct p9_treaddir {
+        u32 fid;
+        u64 offset;
+        u32 count;
+};
+struct p9_rreaddir {
+        u32 count;
+        u8 *data;
+};
 struct p9_tclunk {
        u32 fid;
 };
diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index 7dd3ed85c782..d1aa2cfb30f0 100644
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -195,6 +195,21 @@ struct p9_fid {
        struct list_head dlist; /* list of all fids attached to a dentry */
 };
+/**
+ * struct p9_dirent - directory entry structure
+ * @qid: The p9 server qid for this dirent
+ * @d_off: offset to the next dirent
+ * @d_type: type of file
+ * @d_name: file name
+ */
+struct p9_dirent {
+        struct p9_qid qid;
+        u64 d_off;
+        unsigned char d_type;
+        char d_name[256];
+};
 int p9_client_statfs(struct p9_fid *fid, struct p9_rstatfs *sb);
 int p9_client_rename(struct p9_fid *fid, struct p9_fid *newdirfid, char *name);
 int p9_client_version(struct p9_client *);
@@ -211,15 +226,31 @@ struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames,
 int p9_client_open(struct p9_fid *fid, int mode);
 int p9_client_fcreate(struct p9_fid *fid, char *name, u32 perm, int mode,
                                                        char *extension);
+int p9_client_link(struct p9_fid *fid, struct p9_fid *oldfid, char *newname);
+int p9_client_symlink(struct p9_fid *fid, char *name, char *symname, gid_t gid,
+                                                        struct p9_qid *qid);
+int p9_client_create_dotl(struct p9_fid *ofid, char *name, u32 flags, u32 mode,
+                gid_t gid, struct p9_qid *qid);
 int p9_client_clunk(struct p9_fid *fid);
 int p9_client_remove(struct p9_fid *fid);
 int p9_client_read(struct p9_fid *fid, char *data, char __user *udata,
                                                        u64 offset, u32 count);
 int p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
                                                        u64 offset, u32 count);
+int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset);
+int p9dirent_read(char *buf, int len, struct p9_dirent *dirent,
+                                                        int proto_version);
 struct p9_wstat *p9_client_stat(struct p9_fid *fid);
 int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst);
+int p9_client_setattr(struct p9_fid *fid, struct p9_iattr_dotl *attr);
+struct p9_stat_dotl *p9_client_getattr_dotl(struct p9_fid *fid,
+                                                        u64 request_mask);
+int p9_client_mknod_dotl(struct p9_fid *oldfid, char *name, int mode,
+                        dev_t rdev, gid_t gid, struct p9_qid *);
+int p9_client_mkdir_dotl(struct p9_fid *fid, char *name, int mode,
+                                gid_t gid, struct p9_qid *);
 struct p9_req_t *p9_tag_lookup(struct p9_client *, u16);
 void p9_client_cb(struct p9_client *c, struct p9_req_t *req);
@@ -229,5 +260,7 @@ void p9stat_free(struct p9_wstat *);
 int p9_is_proto_dotu(struct p9_client *clnt);
 int p9_is_proto_dotl(struct p9_client *clnt);
+struct p9_fid *p9_client_xattrwalk(struct p9_fid *, const char *, u64 *);
+int p9_client_xattrcreate(struct p9_fid *, const char *, u64, int);
 #endif /* NET_9P_CLIENT_H */
diff --git a/include/net/act_api.h b/include/net/act_api.h
index c05fd717c588..bab385f13ac3 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -20,6 +20,7 @@ struct tcf_common {
        struct gnet_stats_queue         tcfc_qstats;
        struct gnet_stats_rate_est      tcfc_rate_est;
        spinlock_t                      tcfc_lock;
+        struct rcu_head                 tcfc_rcu;
 };
 #define tcf_next        common.tcfc_next
 #define tcf_index       common.tcfc_index
@@ -32,6 +33,7 @@ struct tcf_common {
 #define tcf_qstats      common.tcfc_qstats
 #define tcf_rate_est    common.tcfc_rate_est
 #define tcf_lock        common.tcfc_lock
+#define tcf_rcu         common.tcfc_rcu
 struct tcf_police {
        struct tcf_common       common;
diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 20725e213aee..90c9e2872f27 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -23,7 +23,8 @@ struct unix_address {
 };
 struct unix_skb_parms {
-        struct ucred            creds;          /* Skb credentials      */
+        struct pid              *pid;           /* Skb credentials      */
+        const struct cred       *cred;
        struct scm_fp_list      *fp;            /* Passed files         */
 #ifdef CONFIG_SECURITY_NETWORK
        u32                     secid;          /* Security ID          */
@@ -31,7 +32,6 @@ struct unix_skb_parms {
 };
 #define UNIXCB(skb)     (*(struct unix_skb_parms *)&((skb)->cb))
-#define UNIXCREDS(skb)  (&UNIXCB((skb)).creds)
 #define UNIXSID(skb)    (&UNIXCB((skb)).secid)
 #define unix_state_lock(s)      spin_lock(&unix_sk(s)->lock)
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index ff77e8f882f1..27a902d9b3a9 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -84,7 +84,7 @@ enum {
 /* BD Address */
 typedef struct {
        __u8 b[6];
-} __attribute__((packed)) bdaddr_t;
+} __packed bdaddr_t;
 #define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})
 #define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})
@@ -138,6 +138,7 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock);
 struct bt_skb_cb {
        __u8 pkt_type;
        __u8 incoming;
+        __u16 expect;
        __u8 tx_seq;
        __u8 retries;
        __u8 sar;
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index fc0c502d9fd1..bcbdd6d4e6dd 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -100,6 +100,9 @@ enum {
 #define HCISETACLMTU    _IOW('H', 227, int)
 #define HCISETSCOMTU    _IOW('H', 228, int)
+#define HCIBLOCKADDR    _IOW('H', 230, int)
+#define HCIUNBLOCKADDR  _IOW('H', 231, int)
 #define HCIINQUIRY      _IOR('H', 240, int)
 /* HCI timeouts */
@@ -227,7 +230,7 @@ struct hci_cp_inquiry {
        __u8     lap[3];
        __u8     length;
        __u8     num_rsp;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_INQUIRY_CANCEL           0x0402
@@ -241,81 +244,81 @@ struct hci_cp_create_conn {
        __u8     pscan_mode;
        __le16   clock_offset;
        __u8     role_switch;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_DISCONNECT               0x0406
 struct hci_cp_disconnect {
        __le16   handle;
        __u8     reason;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_ADD_SCO                  0x0407
 struct hci_cp_add_sco {
        __le16   handle;
        __le16   pkt_type;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_CREATE_CONN_CANCEL       0x0408
 struct hci_cp_create_conn_cancel {
        bdaddr_t bdaddr;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_ACCEPT_CONN_REQ          0x0409
 struct hci_cp_accept_conn_req {
        bdaddr_t bdaddr;
        __u8     role;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_REJECT_CONN_REQ          0x040a
 struct hci_cp_reject_conn_req {
        bdaddr_t bdaddr;
        __u8     reason;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_LINK_KEY_REPLY           0x040b
 struct hci_cp_link_key_reply {
        bdaddr_t bdaddr;
        __u8     link_key[16];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_LINK_KEY_NEG_REPLY       0x040c
 struct hci_cp_link_key_neg_reply {
        bdaddr_t bdaddr;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_PIN_CODE_REPLY           0x040d
 struct hci_cp_pin_code_reply {
        bdaddr_t bdaddr;
        __u8     pin_len;
        __u8     pin_code[16];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_PIN_CODE_NEG_REPLY       0x040e
 struct hci_cp_pin_code_neg_reply {
        bdaddr_t bdaddr;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_CHANGE_CONN_PTYPE        0x040f
 struct hci_cp_change_conn_ptype {
        __le16   handle;
        __le16   pkt_type;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_AUTH_REQUESTED           0x0411
 struct hci_cp_auth_requested {
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_SET_CONN_ENCRYPT         0x0413
 struct hci_cp_set_conn_encrypt {
        __le16   handle;
        __u8     encrypt;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_CHANGE_CONN_LINK_KEY     0x0415
 struct hci_cp_change_conn_link_key {
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_REMOTE_NAME_REQ          0x0419
 struct hci_cp_remote_name_req {
@@ -323,28 +326,28 @@ struct hci_cp_remote_name_req {
        __u8     pscan_rep_mode;
        __u8     pscan_mode;
        __le16   clock_offset;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_REMOTE_NAME_REQ_CANCEL   0x041a
 struct hci_cp_remote_name_req_cancel {
        bdaddr_t bdaddr;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_REMOTE_FEATURES     0x041b
 struct hci_cp_read_remote_features {
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_REMOTE_EXT_FEATURES 0x041c
 struct hci_cp_read_remote_ext_features {
        __le16   handle;
        __u8     page;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_REMOTE_VERSION      0x041d
 struct hci_cp_read_remote_version {
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_SETUP_SYNC_CONN          0x0428
 struct hci_cp_setup_sync_conn {
@@ -355,7 +358,7 @@ struct hci_cp_setup_sync_conn {
        __le16   voice_setting;
        __u8     retrans_effort;
        __le16   pkt_type;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_ACCEPT_SYNC_CONN_REQ     0x0429
 struct hci_cp_accept_sync_conn_req {
@@ -366,13 +369,13 @@ struct hci_cp_accept_sync_conn_req {
        __le16   content_format;
        __u8     retrans_effort;
        __le16   pkt_type;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_REJECT_SYNC_CONN_REQ     0x042a
 struct hci_cp_reject_sync_conn_req {
        bdaddr_t bdaddr;
        __u8     reason;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_SNIFF_MODE               0x0803
 struct hci_cp_sniff_mode {
@@ -381,59 +384,59 @@ struct hci_cp_sniff_mode {
        __le16   min_interval;
        __le16   attempt;
        __le16   timeout;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_EXIT_SNIFF_MODE          0x0804
 struct hci_cp_exit_sniff_mode {
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_ROLE_DISCOVERY           0x0809
 struct hci_cp_role_discovery {
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 struct hci_rp_role_discovery {
        __u8     status;
        __le16   handle;
        __u8     role;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_SWITCH_ROLE              0x080b
 struct hci_cp_switch_role {
        bdaddr_t bdaddr;
        __u8     role;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_LINK_POLICY         0x080c
 struct hci_cp_read_link_policy {
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 struct hci_rp_read_link_policy {
        __u8     status;
        __le16   handle;
        __le16   policy;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_WRITE_LINK_POLICY        0x080d
 struct hci_cp_write_link_policy {
        __le16   handle;
        __le16   policy;
-} __attribute__ ((packed));
+} __packed;
 struct hci_rp_write_link_policy {
        __u8     status;
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_DEF_LINK_POLICY     0x080e
 struct hci_rp_read_def_link_policy {
        __u8     status;
        __le16   policy;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_WRITE_DEF_LINK_POLICY    0x080f
 struct hci_cp_write_def_link_policy {
        __le16   policy;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_SNIFF_SUBRATE            0x0811
 struct hci_cp_sniff_subrate {
@@ -441,12 +444,12 @@ struct hci_cp_sniff_subrate {
        __le16   max_latency;
        __le16   min_remote_timeout;
        __le16   min_local_timeout;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_SET_EVENT_MASK           0x0c01
 struct hci_cp_set_event_mask {
        __u8     mask[8];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_RESET                    0x0c03
@@ -455,7 +458,7 @@ struct hci_cp_set_event_flt {
        __u8     flt_type;
        __u8     cond_type;
        __u8     condition[0];
-} __attribute__ ((packed));
+} __packed;
 /* Filter types */
 #define HCI_FLT_CLEAR_ALL       0x00
@@ -474,13 +477,13 @@ struct hci_cp_set_event_flt {
 #define HCI_OP_WRITE_LOCAL_NAME         0x0c13
 struct hci_cp_write_local_name {
        __u8     name[248];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_LOCAL_NAME          0x0c14
 struct hci_rp_read_local_name {
        __u8     status;
        __u8     name[248];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_WRITE_CA_TIMEOUT         0x0c16
@@ -508,23 +511,23 @@ struct hci_rp_read_local_name {
 struct hci_rp_read_class_of_dev {
        __u8     status;
        __u8     dev_class[3];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_WRITE_CLASS_OF_DEV       0x0c24
 struct hci_cp_write_class_of_dev {
        __u8     dev_class[3];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_VOICE_SETTING       0x0c25
 struct hci_rp_read_voice_setting {
        __u8     status;
        __le16   voice_setting;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_WRITE_VOICE_SETTING      0x0c26
 struct hci_cp_write_voice_setting {
        __le16   voice_setting;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_HOST_BUFFER_SIZE         0x0c33
 struct hci_cp_host_buffer_size {
@@ -532,18 +535,18 @@ struct hci_cp_host_buffer_size {
        __u8     sco_mtu;
        __le16   acl_max_pkt;
        __le16   sco_max_pkt;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_SSP_MODE            0x0c55
 struct hci_rp_read_ssp_mode {
        __u8     status;
        __u8     mode;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_WRITE_SSP_MODE           0x0c56
 struct hci_cp_write_ssp_mode {
        __u8     mode;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_LOCAL_VERSION       0x1001
 struct hci_rp_read_local_version {
@@ -553,19 +556,19 @@ struct hci_rp_read_local_version {
        __u8     lmp_ver;
        __le16   manufacturer;
        __le16   lmp_subver;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_LOCAL_COMMANDS      0x1002
 struct hci_rp_read_local_commands {
        __u8     status;
        __u8     commands[64];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_LOCAL_FEATURES      0x1003
 struct hci_rp_read_local_features {
        __u8     status;
        __u8     features[8];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_LOCAL_EXT_FEATURES  0x1004
 struct hci_rp_read_local_ext_features {
@@ -573,7 +576,7 @@ struct hci_rp_read_local_ext_features {
        __u8     page;
        __u8     max_page;
        __u8     features[8];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_BUFFER_SIZE         0x1005
 struct hci_rp_read_buffer_size {
@@ -582,13 +585,13 @@ struct hci_rp_read_buffer_size {
        __u8     sco_mtu;
        __le16   acl_max_pkt;
        __le16   sco_max_pkt;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_OP_READ_BD_ADDR             0x1009
 struct hci_rp_read_bd_addr {
        __u8     status;
        bdaddr_t bdaddr;
-} __attribute__ ((packed));
+} __packed;
 /* ---- HCI Events ---- */
 #define HCI_EV_INQUIRY_COMPLETE         0x01
@@ -601,7 +604,7 @@ struct inquiry_info {
        __u8     pscan_mode;
        __u8     dev_class[3];
        __le16   clock_offset;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_CONN_COMPLETE            0x03
 struct hci_ev_conn_complete {
@@ -610,54 +613,54 @@ struct hci_ev_conn_complete {
        bdaddr_t bdaddr;
        __u8     link_type;
        __u8     encr_mode;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_CONN_REQUEST             0x04
 struct hci_ev_conn_request {
        bdaddr_t bdaddr;
        __u8     dev_class[3];
        __u8     link_type;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_DISCONN_COMPLETE         0x05
 struct hci_ev_disconn_complete {
        __u8     status;
        __le16   handle;
        __u8     reason;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_AUTH_COMPLETE            0x06
 struct hci_ev_auth_complete {
        __u8     status;
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_REMOTE_NAME              0x07
 struct hci_ev_remote_name {
        __u8     status;
        bdaddr_t bdaddr;
        __u8     name[248];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_ENCRYPT_CHANGE           0x08
 struct hci_ev_encrypt_change {
        __u8     status;
        __le16   handle;
        __u8     encrypt;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_CHANGE_LINK_KEY_COMPLETE 0x09
 struct hci_ev_change_link_key_complete {
        __u8     status;
        __le16   handle;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_REMOTE_FEATURES          0x0b
 struct hci_ev_remote_features {
        __u8     status;
        __le16   handle;
        __u8     features[8];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_REMOTE_VERSION           0x0c
 struct hci_ev_remote_version {
@@ -666,7 +669,7 @@ struct hci_ev_remote_version {
        __u8     lmp_ver;
        __le16   manufacturer;
        __le16   lmp_subver;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_QOS_SETUP_COMPLETE       0x0d
 struct hci_qos {
@@ -675,38 +678,38 @@ struct hci_qos {
        __u32    peak_bandwidth;
        __u32    latency;
        __u32    delay_variation;
-} __attribute__ ((packed));
+} __packed;
 struct hci_ev_qos_setup_complete {
        __u8     status;
        __le16   handle;
        struct   hci_qos qos;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_CMD_COMPLETE             0x0e
 struct hci_ev_cmd_complete {
        __u8     ncmd;
        __le16   opcode;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_CMD_STATUS               0x0f
 struct hci_ev_cmd_status {
        __u8     status;
        __u8     ncmd;
        __le16   opcode;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_ROLE_CHANGE              0x12
 struct hci_ev_role_change {
        __u8     status;
        bdaddr_t bdaddr;
        __u8     role;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_NUM_COMP_PKTS            0x13
 struct hci_ev_num_comp_pkts {
        __u8     num_hndl;
        /* variable length part */
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_MODE_CHANGE              0x14
 struct hci_ev_mode_change {
@@ -714,44 +717,44 @@ struct hci_ev_mode_change {
        __le16   handle;
        __u8     mode;
        __le16   interval;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_PIN_CODE_REQ             0x16
 struct hci_ev_pin_code_req {
        bdaddr_t bdaddr;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_LINK_KEY_REQ             0x17
 struct hci_ev_link_key_req {
        bdaddr_t bdaddr;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_LINK_KEY_NOTIFY          0x18
 struct hci_ev_link_key_notify {
        bdaddr_t bdaddr;
        __u8     link_key[16];
        __u8     key_type;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_CLOCK_OFFSET             0x1c
 struct hci_ev_clock_offset {
        __u8     status;
        __le16   handle;
        __le16   clock_offset;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_PKT_TYPE_CHANGE          0x1d
 struct hci_ev_pkt_type_change {
        __u8     status;
        __le16   handle;
        __le16   pkt_type;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_PSCAN_REP_MODE           0x20
 struct hci_ev_pscan_rep_mode {
        bdaddr_t bdaddr;
        __u8     pscan_rep_mode;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_INQUIRY_RESULT_WITH_RSSI 0x22
 struct inquiry_info_with_rssi {
@@ -761,7 +764,7 @@ struct inquiry_info_with_rssi {
        __u8     dev_class[3];
        __le16   clock_offset;
        __s8     rssi;
-} __attribute__ ((packed));
+} __packed;
 struct inquiry_info_with_rssi_and_pscan_mode {
        bdaddr_t bdaddr;
        __u8     pscan_rep_mode;
@@ -770,7 +773,7 @@ struct inquiry_info_with_rssi_and_pscan_mode {
        __u8     dev_class[3];
        __le16   clock_offset;
        __s8     rssi;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_REMOTE_EXT_FEATURES      0x23
 struct hci_ev_remote_ext_features {
@@ -779,7 +782,7 @@ struct hci_ev_remote_ext_features {
        __u8     page;
        __u8     max_page;
        __u8     features[8];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_SYNC_CONN_COMPLETE       0x2c
 struct hci_ev_sync_conn_complete {
@@ -792,7 +795,7 @@ struct hci_ev_sync_conn_complete {
        __le16   rx_pkt_len;
        __le16   tx_pkt_len;
        __u8     air_mode;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_SYNC_CONN_CHANGED        0x2d
 struct hci_ev_sync_conn_changed {
@@ -802,7 +805,7 @@ struct hci_ev_sync_conn_changed {
        __u8     retrans_window;
        __le16   rx_pkt_len;
        __le16   tx_pkt_len;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_SNIFF_SUBRATE            0x2e
 struct hci_ev_sniff_subrate {
@@ -812,7 +815,7 @@ struct hci_ev_sniff_subrate {
        __le16   max_rx_latency;
        __le16   max_remote_timeout;
        __le16   max_local_timeout;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_EXTENDED_INQUIRY_RESULT  0x2f
 struct extended_inquiry_info {
@@ -823,37 +826,37 @@ struct extended_inquiry_info {
        __le16   clock_offset;
        __s8     rssi;
        __u8     data[240];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_IO_CAPA_REQUEST          0x31
 struct hci_ev_io_capa_request {
        bdaddr_t bdaddr;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_SIMPLE_PAIR_COMPLETE     0x36
 struct hci_ev_simple_pair_complete {
        __u8     status;
        bdaddr_t bdaddr;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_REMOTE_HOST_FEATURES     0x3d
 struct hci_ev_remote_host_features {
        bdaddr_t bdaddr;
        __u8     features[8];
-} __attribute__ ((packed));
+} __packed;
 /* Internal events generated by Bluetooth stack */
 #define HCI_EV_STACK_INTERNAL   0xfd
 struct hci_ev_stack_internal {
        __u16    type;
        __u8     data[0];
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_SI_DEVICE        0x01
 struct hci_ev_si_device {
        __u16    event;
        __u16    dev_id;
-} __attribute__ ((packed));
+} __packed;
 #define HCI_EV_SI_SECURITY      0x02
 struct hci_ev_si_security {
@@ -861,7 +864,7 @@ struct hci_ev_si_security {
        __u16    proto;
        __u16    subproto;
        __u8     incoming;
-} __attribute__ ((packed));
+} __packed;
 /* ---- HCI Packet structures ---- */
 #define HCI_COMMAND_HDR_SIZE 3
@@ -872,22 +875,22 @@ struct hci_ev_si_security {
 struct hci_command_hdr {
        __le16  opcode;         /* OCF & OGF */
        __u8    plen;
-} __attribute__ ((packed));
+} __packed;
 struct hci_event_hdr {
        __u8    evt;
        __u8    plen;
-} __attribute__ ((packed));
+} __packed;
 struct hci_acl_hdr {
        __le16  handle;         /* Handle & Flags(PB, BC) */
        __le16  dlen;
-} __attribute__ ((packed));
+} __packed;
 struct hci_sco_hdr {
        __le16  handle;
        __u8    dlen;
-} __attribute__ ((packed));
+} __packed;
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index e42f6ed5421c..8b28962e737e 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1,6 +1,6 @@
-/* 
+/*
   BlueZ - Bluetooth protocol stack for Linux
-   Copyright (C) 2000-2001 Qualcomm Incorporated
+   Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved.
   Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
@@ -12,13 +12,13 @@
   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
+   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
+   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
   SOFTWARE IS DISCLAIMED.
 */
@@ -62,6 +62,11 @@ struct hci_conn_hash {
        unsigned int     sco_num;
 };
+struct bdaddr_list {
+        struct list_head list;
+        bdaddr_t bdaddr;
+};
+#define NUM_REASSEMBLY 4
 struct hci_dev {
        struct list_head list;
        spinlock_t      lock;
@@ -118,7 +123,7 @@ struct hci_dev {
        struct sk_buff_head     cmd_q;
        struct sk_buff          *sent_cmd;
-        struct sk_buff          *reassembly[3];
+        struct sk_buff          *reassembly[NUM_REASSEMBLY];
        struct mutex            req_lock;
        wait_queue_head_t       req_wait_q;
@@ -127,6 +132,7 @@ struct hci_dev {
        struct inquiry_cache    inq_cache;
        struct hci_conn_hash    conn_hash;
+        struct bdaddr_list      blacklist;
        struct hci_dev_stats    stat;
@@ -250,6 +256,7 @@ enum {
        HCI_CONN_ENCRYPT_PEND,
        HCI_CONN_RSWITCH_PEND,
        HCI_CONN_MODE_CHANGE_PEND,
+        HCI_CONN_SCO_SETUP_PEND,
 };
 static inline void hci_conn_hash_init(struct hci_dev *hdev)
@@ -330,6 +337,7 @@ void hci_acl_connect(struct hci_conn *conn);
 void hci_acl_disconn(struct hci_conn *conn, __u8 reason);
 void hci_add_sco(struct hci_conn *conn, __u16 handle);
 void hci_setup_sync(struct hci_conn *conn, __u16 handle);
+void hci_sco_setup(struct hci_conn *conn, __u8 status);
 struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst);
 int hci_conn_del(struct hci_conn *conn);
@@ -380,7 +388,7 @@ static inline void __hci_dev_put(struct hci_dev *d)
 }
 static inline void hci_dev_put(struct hci_dev *d)
-{ 
+{
        __hci_dev_put(d);
        module_put(d->owner);
 }
@@ -424,10 +432,14 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg);
 int hci_get_auth_info(struct hci_dev *hdev, void __user *arg);
 int hci_inquiry(void __user *arg);
+struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr);
+int hci_blacklist_clear(struct hci_dev *hdev);
 void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
 int hci_recv_frame(struct sk_buff *skb);
 int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count);
+int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count);
 int hci_register_sysfs(struct hci_dev *hdev);
 void hci_unregister_sysfs(struct hci_dev *hdev);
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 7c695bfd853c..636724b203ee 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -1,6 +1,8 @@
 /* 
   BlueZ - Bluetooth protocol stack for Linux
   Copyright (C) 2000-2001 Qualcomm Incorporated
+   Copyright (C) 2009-2010 Gustavo F. Padovan <gustavo@padovan.org>
+   Copyright (C) 2010 Google Inc.
   Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
@@ -129,31 +131,31 @@ struct l2cap_conninfo {
 struct l2cap_hdr {
        __le16     len;
        __le16     cid;
-} __attribute__ ((packed));
+} __packed;
 #define L2CAP_HDR_SIZE          4
 struct l2cap_cmd_hdr {
        __u8       code;
        __u8       ident;
        __le16     len;
-} __attribute__ ((packed));
+} __packed;
 #define L2CAP_CMD_HDR_SIZE      4
 struct l2cap_cmd_rej {
        __le16     reason;
-} __attribute__ ((packed));
+} __packed;
 struct l2cap_conn_req {
        __le16     psm;
        __le16     scid;
-} __attribute__ ((packed));
+} __packed;
 struct l2cap_conn_rsp {
        __le16     dcid;
        __le16     scid;
        __le16     result;
        __le16     status;
-} __attribute__ ((packed));
+} __packed;
 /* channel indentifier */
 #define L2CAP_CID_SIGNALING     0x0001
@@ -177,14 +179,14 @@ struct l2cap_conf_req {
        __le16     dcid;
        __le16     flags;
        __u8       data[0];
-} __attribute__ ((packed));
+} __packed;
 struct l2cap_conf_rsp {
        __le16     scid;
        __le16     flags;
        __le16     result;
        __u8       data[0];
-} __attribute__ ((packed));
+} __packed;
 #define L2CAP_CONF_SUCCESS      0x0000
 #define L2CAP_CONF_UNACCEPT     0x0001
@@ -195,7 +197,7 @@ struct l2cap_conf_opt {
        __u8       type;
        __u8       len;
        __u8       val[0];
-} __attribute__ ((packed));
+} __packed;
 #define L2CAP_CONF_OPT_SIZE     2
 #define L2CAP_CONF_HINT         0x80
@@ -216,7 +218,7 @@ struct l2cap_conf_rfc {
        __le16     retrans_timeout;
        __le16     monitor_timeout;
        __le16     max_pdu_size;
-} __attribute__ ((packed));
+} __packed;
 #define L2CAP_MODE_BASIC        0x00
 #define L2CAP_MODE_RETRANS      0x01
@@ -227,22 +229,22 @@ struct l2cap_conf_rfc {
 struct l2cap_disconn_req {
        __le16     dcid;
        __le16     scid;
-} __attribute__ ((packed));
+} __packed;
 struct l2cap_disconn_rsp {
        __le16     dcid;
        __le16     scid;
-} __attribute__ ((packed));
+} __packed;
 struct l2cap_info_req {
        __le16      type;
-} __attribute__ ((packed));
+} __packed;
 struct l2cap_info_rsp {
        __le16      type;
        __le16      result;
        __u8        data[0];
-} __attribute__ ((packed));
+} __packed;
 /* info type */
 #define L2CAP_IT_CL_MTU     0x0001
@@ -287,6 +289,11 @@ struct l2cap_conn {
        struct l2cap_chan_list chan_list;
 };
+struct sock_del_list {
+        struct sock *sk;
+        struct list_head list;
+};
 #define L2CAP_INFO_CL_MTU_REQ_SENT      0x01
 #define L2CAP_INFO_FEAT_MASK_REQ_SENT   0x04
 #define L2CAP_INFO_FEAT_MASK_REQ_DONE   0x08
@@ -353,7 +360,6 @@ struct l2cap_pinfo {
        __le16          sport;
-        spinlock_t              send_lock;
        struct timer_list       retrans_timer;
        struct timer_list       monitor_timer;
        struct timer_list       ack_timer;
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index 921d7b3c7f8d..a140847d622c 100644
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -106,19 +106,19 @@ struct rfcomm_hdr {
        u8 addr;
        u8 ctrl;
        u8 len;    // Actual size can be 2 bytes
-} __attribute__ ((packed));
+} __packed;
 struct rfcomm_cmd {
        u8 addr;
        u8 ctrl;
        u8 len;
        u8 fcs;
-} __attribute__ ((packed));
+} __packed;
 struct rfcomm_mcc {
        u8 type;
        u8 len;
-} __attribute__ ((packed));
+} __packed;
 struct rfcomm_pn {
        u8  dlci;
@@ -128,7 +128,7 @@ struct rfcomm_pn {
        __le16 mtu;
        u8  max_retrans;
        u8  credits;
-} __attribute__ ((packed));
+} __packed;
 struct rfcomm_rpn {
        u8  dlci;
@@ -138,17 +138,17 @@ struct rfcomm_rpn {
        u8  xon_char;
        u8  xoff_char;
        __le16 param_mask;
-} __attribute__ ((packed));
+} __packed;
 struct rfcomm_rls {
        u8  dlci;
        u8  status;
-} __attribute__ ((packed));
+} __packed;
 struct rfcomm_msc {
        u8  dlci;
        u8  v24_sig;
-} __attribute__ ((packed));
+} __packed;
 /* ---- Core structures, flags etc ---- */
diff --git a/include/net/caif/caif_dev.h b/include/net/caif/caif_dev.h
index 318ab9478a44..6da573c75d54 100644
--- a/include/net/caif/caif_dev.h
+++ b/include/net/caif/caif_dev.h
@@ -50,6 +50,9 @@ struct caif_connect_request {
 * @client_layer:       User implementation of client layer. This layer
 *                      MUST have receive and control callback functions
 *                      implemented.
+ * @ifindex:            Link layer interface index used for this connection.
+ * @headroom:           Head room needed by CAIF protocol.
+ * @tailroom:           Tail room needed by CAIF protocol.
 *
 * This function connects a CAIF channel. The Client must implement
 * the struct cflayer. This layer represents the Client layer and holds
@@ -59,8 +62,9 @@ struct caif_connect_request {
 * E.g. CAIF Socket will call this function for each socket it connects
 * and have one client_layer instance for each socket.
 */
-int caif_connect_client(struct caif_connect_request *config,
+int caif_connect_client(struct caif_connect_request *conn_req,
-                           struct cflayer *client_layer);
+                        struct cflayer *client_layer, int *ifindex,
+                        int *headroom, int *tailroom);
 /**
 * caif_disconnect_client - Disconnects a client from the CAIF stack.
diff --git a/include/net/caif/caif_layer.h b/include/net/caif/caif_layer.h
index 25c472f0e5b8..c8b07a904e78 100644
--- a/include/net/caif/caif_layer.h
+++ b/include/net/caif/caif_layer.h
@@ -15,14 +15,8 @@ struct cfpktq;
 struct caif_payload_info;
 struct caif_packet_funcs;
-#define CAIF_MAX_FRAMESIZE 4096
-#define CAIF_MAX_PAYLOAD_SIZE (4096 - 64)
-#define CAIF_NEEDED_HEADROOM (10)
-#define CAIF_NEEDED_TAILROOM (2)
 #define CAIF_LAYER_NAME_SZ 16
-#define CAIF_SUCCESS    1
-#define CAIF_FAILURE    0
 /**
 * caif_assert() - Assert function for CAIF.
diff --git a/include/net/caif/caif_spi.h b/include/net/caif/caif_spi.h
new file mode 100644
index 000000000000..ce4570dff020
--- /dev/null
+++ b/include/net/caif/caif_spi.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) ST-Ericsson AB 2010
+ * Author:      Daniel Martensson / Daniel.Martensson@stericsson.com
+ * License terms: GNU General Public License (GPL) version 2
+ */
+#ifndef CAIF_SPI_H_
+#define CAIF_SPI_H_
+#include <net/caif/caif_device.h>
+#define SPI_CMD_WR                      0x00
+#define SPI_CMD_RD                      0x01
+#define SPI_CMD_EOT                     0x02
+#define SPI_CMD_IND                     0x04
+#define SPI_DMA_BUF_LEN                 8192
+#define WL_SZ                           2       /* 16 bits. */
+#define SPI_CMD_SZ                      4       /* 32 bits. */
+#define SPI_IND_SZ                      4       /* 32 bits. */
+#define SPI_XFER                        0
+#define SPI_SS_ON                       1
+#define SPI_SS_OFF                      2
+#define SPI_TERMINATE                   3
+/* Minimum time between different levels is 50 microseconds. */
+#define MIN_TRANSITION_TIME_USEC        50
+/* Defines for calculating duration of SPI transfers for a particular
+ * number of bytes.
+ */
+#define SPI_MASTER_CLK_MHZ              13
+#define SPI_XFER_TIME_USEC(bytes, clk) (((bytes) * 8) / clk)
+/* Normally this should be aligned on the modem in order to benefit from full
+ * duplex transfers. However a size of 8188 provokes errors when running with
+ * the modem. These errors occur when packet sizes approaches 4 kB of data.
+ */
+#define CAIF_MAX_SPI_FRAME 4092
+/* Maximum number of uplink CAIF frames that can reside in the same SPI frame.
+ * This number should correspond with the modem setting. The application side
+ * CAIF accepts any number of embedded downlink CAIF frames.
+ */
+#define CAIF_MAX_SPI_PKTS 9
+/* Decides if SPI buffers should be prefilled with 0xFF pattern for easier
+ * debugging. Both TX and RX buffers will be filled before the transfer.
+ */
+#define CFSPI_DBG_PREFILL               0
+/* Structure describing a SPI transfer. */
+struct cfspi_xfer {
+        u16 tx_dma_len;
+        u16 rx_dma_len;
+        void *va_tx;
+        dma_addr_t pa_tx;
+        void *va_rx;
+        dma_addr_t pa_rx;
+};
+/* Structure implemented by the SPI interface. */
+struct cfspi_ifc {
+        void (*ss_cb) (bool assert, struct cfspi_ifc *ifc);
+        void (*xfer_done_cb) (struct cfspi_ifc *ifc);
+        void *priv;
+};
+/* Structure implemented by SPI clients. */
+struct cfspi_dev {
+        int (*init_xfer) (struct cfspi_xfer *xfer, struct cfspi_dev *dev);
+        void (*sig_xfer) (bool xfer, struct cfspi_dev *dev);
+        struct cfspi_ifc *ifc;
+        char *name;
+        u32 clk_mhz;
+        void *priv;
+};
+/* Enumeration describing the CAIF SPI state. */
+enum cfspi_state {
+        CFSPI_STATE_WAITING = 0,
+        CFSPI_STATE_AWAKE,
+        CFSPI_STATE_FETCH_PKT,
+        CFSPI_STATE_GET_NEXT,
+        CFSPI_STATE_INIT_XFER,
+        CFSPI_STATE_WAIT_ACTIVE,
+        CFSPI_STATE_SIG_ACTIVE,
+        CFSPI_STATE_WAIT_XFER_DONE,
+        CFSPI_STATE_XFER_DONE,
+        CFSPI_STATE_WAIT_INACTIVE,
+        CFSPI_STATE_SIG_INACTIVE,
+        CFSPI_STATE_DELIVER_PKT,
+        CFSPI_STATE_MAX,
+};
+/* Structure implemented by SPI physical interfaces. */
+struct cfspi {
+        struct caif_dev_common cfdev;
+        struct net_device *ndev;
+        struct platform_device *pdev;
+        struct sk_buff_head qhead;
+        struct sk_buff_head chead;
+        u16 cmd;
+        u16 tx_cpck_len;
+        u16 tx_npck_len;
+        u16 rx_cpck_len;
+        u16 rx_npck_len;
+        struct cfspi_ifc ifc;
+        struct cfspi_xfer xfer;
+        struct cfspi_dev *dev;
+        unsigned long state;
+        struct work_struct work;
+        struct workqueue_struct *wq;
+        struct list_head list;
+        int    flow_off_sent;
+        u32 qd_low_mark;
+        u32 qd_high_mark;
+        struct completion comp;
+        wait_queue_head_t wait;
+        spinlock_t lock;
+        bool flow_stop;
+#ifdef CONFIG_DEBUG_FS
+        enum cfspi_state dbg_state;
+        u16 pcmd;
+        u16 tx_ppck_len;
+        u16 rx_ppck_len;
+        struct dentry *dbgfs_dir;
+        struct dentry *dbgfs_state;
+        struct dentry *dbgfs_frame;
+#endif                          /* CONFIG_DEBUG_FS */
+};
+extern int spi_frm_align;
+extern int spi_up_head_align;
+extern int spi_up_tail_align;
+extern int spi_down_head_align;
+extern int spi_down_tail_align;
+extern struct platform_driver cfspi_spi_driver;
+void cfspi_dbg_state(struct cfspi *cfspi, int state);
+int cfspi_xmitfrm(struct cfspi *cfspi, u8 *buf, size_t len);
+int cfspi_xmitlen(struct cfspi *cfspi);
+int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len);
+int cfspi_spi_remove(struct platform_device *pdev);
+int cfspi_spi_probe(struct platform_device *pdev);
+int cfspi_xmitfrm(struct cfspi *cfspi, u8 *buf, size_t len);
+int cfspi_xmitlen(struct cfspi *cfspi);
+int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len);
+void cfspi_xfer(struct work_struct *work);
+#endif                          /* CAIF_SPI_H_ */
diff --git a/include/net/caif/cfcnfg.h b/include/net/caif/cfcnfg.h
index 9fc2fc20b884..bd646faffa47 100644
--- a/include/net/caif/cfcnfg.h
+++ b/include/net/caif/cfcnfg.h
@@ -7,6 +7,7 @@
 #ifndef CFCNFG_H_
 #define CFCNFG_H_
 #include <linux/spinlock.h>
+#include <linux/netdevice.h>
 #include <net/caif/caif_layer.h>
 #include <net/caif/cfctrl.h>
@@ -73,8 +74,8 @@ void cfcnfg_remove(struct cfcnfg *cfg);
 void
 cfcnfg_add_phy_layer(struct cfcnfg *cnfg, enum cfcnfg_phy_type phy_type,
-                     void *dev, struct cflayer *phy_layer, u16 *phyid,
+                     struct net_device *dev, struct cflayer *phy_layer,
-                     enum cfcnfg_phy_preference pref,
+                     u16 *phyid, enum cfcnfg_phy_preference pref,
                     bool fcs, bool stx);
 /**
@@ -114,11 +115,18 @@ void cfcnfg_release_adap_layer(struct cflayer *adap_layer);
 * @param:              Link setup parameters.
 * @adap_layer:         Specify the adaptation layer; the receive and
 *                      flow-control functions MUST be set in the structure.
- *
+ * @ifindex:            Link layer interface index used for this connection.
+ * @proto_head:         Protocol head-space needed by CAIF protocol,
+ *                      excluding link layer.
+ * @proto_tail:         Protocol tail-space needed by CAIF protocol,
+ *                      excluding link layer.
 */
 int cfcnfg_add_adaptation_layer(struct cfcnfg *cnfg,
                            struct cfctrl_link_param *param,
-                            struct cflayer *adap_layer);
+                            struct cflayer *adap_layer,
+                            int *ifindex,
+                            int *proto_head,
+                            int *proto_tail);
 /**
 * cfcnfg_get_phyid() - Get physical ID, given type.
diff --git a/include/net/caif/cfsrvl.h b/include/net/caif/cfsrvl.h
index 2dc9eb193ecf..b1fa87ee0992 100644
--- a/include/net/caif/cfsrvl.h
+++ b/include/net/caif/cfsrvl.h
@@ -16,6 +16,8 @@ struct cfsrvl {
        bool open;
        bool phy_flow_on;
        bool modem_flow_on;
+        bool supports_flowctrl;
+        void (*release)(struct kref *);
        struct dev_info dev_info;
        struct kref ref;
 };
@@ -25,13 +27,15 @@ struct cflayer *cfvei_create(u8 linkid, struct dev_info *dev_info);
 struct cflayer *cfdgml_create(u8 linkid, struct dev_info *dev_info);
 struct cflayer *cfutill_create(u8 linkid, struct dev_info *dev_info);
 struct cflayer *cfvidl_create(u8 linkid, struct dev_info *dev_info);
-struct cflayer *cfrfml_create(u8 linkid, struct dev_info *dev_info);
+struct cflayer *cfrfml_create(u8 linkid, struct dev_info *dev_info,
+                                int mtu_size);
 struct cflayer *cfdbgl_create(u8 linkid, struct dev_info *dev_info);
 bool cfsrvl_phyid_match(struct cflayer *layer, int phyid);
 void cfservl_destroy(struct cflayer *layer);
 void cfsrvl_init(struct cfsrvl *service,
-                 u8 channel_id,
+                        u8 channel_id,
-                 struct dev_info *dev_info);
+                        struct dev_info *dev_info,
+                        bool supports_flowctrl);
 bool cfsrvl_ready(struct cfsrvl *service, int *err);
 u8 cfsrvl_getphyid(struct cflayer *layer);
@@ -50,7 +54,10 @@ static inline void cfsrvl_put(struct cflayer *layr)
        if (layr == NULL)
                return;
        s = container_of(layr, struct cfsrvl, layer);
-        kref_put(&s->ref, cfsrvl_release);
+        WARN_ON(!s->release);
+        if (s->release)
+                kref_put(&s->ref, s->release);
 }
 #endif                          /* CFSRVL_H_ */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index b44a2e5321a3..2fd06c60ffbb 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -37,6 +37,7 @@
 *
 * @IEEE80211_BAND_2GHZ: 2.4GHz ISM band
 * @IEEE80211_BAND_5GHZ: around 5GHz band (4.9-5.7)
+ * @IEEE80211_NUM_BANDS: number of defined bands
 */
 enum ieee80211_band {
        IEEE80211_BAND_2GHZ = NL80211_BAND_2GHZ,
@@ -89,7 +90,7 @@ enum ieee80211_channel_flags {
 * @max_power: maximum transmission power (in dBm)
 * @beacon_found: helper to regulatory code to indicate when a beacon
 *      has been found on this channel. Use regulatory_hint_found_beacon()
- *      to enable this, this is is useful only on 5 GHz band.
+ *      to enable this, this is useful only on 5 GHz band.
 * @orig_mag: internal use
 * @orig_mpwr: internal use
 */
@@ -188,6 +189,7 @@ struct ieee80211_sta_ht_cap {
 *      in this band. Must be sorted to give a valid "supported
 *      rates" IE, i.e. CCK rates first, then OFDM.
 * @n_bitrates: Number of bitrates in @bitrates
+ * @ht_cap: HT capabilities in this band
 */
 struct ieee80211_supported_band {
        struct ieee80211_channel *channels;
@@ -225,6 +227,7 @@ struct vif_params {
 * @seq: sequence counter (IV/PN) for TKIP and CCMP keys, only used
 *      with the get_key() callback, must be in little endian,
 *      length given by @seq_len.
+ * @seq_len: length of @seq.
 */
 struct key_params {
        u8 *key;
@@ -237,6 +240,8 @@ struct key_params {
 /**
 * enum survey_info_flags - survey information flags
 *
+ * @SURVEY_INFO_NOISE_DBM: noise (in dBm) was filled in
+ *
 * Used by the driver to indicate which info in &struct survey_info
 * it has filled in during the get_survey().
 */
@@ -247,13 +252,13 @@ enum survey_info_flags {
 /**
 * struct survey_info - channel survey response
 *
- * Used by dump_survey() to report back per-channel survey information.
- *
 * @channel: the channel this survey record reports, mandatory
 * @filled: bitflag of flags from &enum survey_info_flags
 * @noise: channel noise in dBm. This and all following fields are
 *     optional
 *
+ * Used by dump_survey() to report back per-channel survey information.
+ *
 * This structure can later be expanded with things like
 * channel duty cycle etc.
 */
@@ -288,7 +293,7 @@ struct beacon_parameters {
 *
 * @PLINK_ACTION_INVALID: action 0 is reserved
 * @PLINK_ACTION_OPEN: start mesh peer link establishment
- * @PLINK_ACTION_BLOCL: block traffic from this mesh peer
+ * @PLINK_ACTION_BLOCK: block traffic from this mesh peer
 */
 enum plink_actions {
        PLINK_ACTION_INVALID,
@@ -311,6 +316,8 @@ enum plink_actions {
 *      (bitmask of BIT(NL80211_STA_FLAG_...))
 * @listen_interval: listen interval or -1 for no change
 * @aid: AID or zero for no change
+ * @plink_action: plink action to take
+ * @ht_capa: HT capabilities of station
 */
 struct station_parameters {
        u8 *supported_rates;
@@ -448,13 +455,13 @@ enum monitor_flags {
 * Used by the driver to indicate which info in &struct mpath_info it has filled
 * in during get_station() or dump_station().
 *
- * MPATH_INFO_FRAME_QLEN: @frame_qlen filled
+ * @MPATH_INFO_FRAME_QLEN: @frame_qlen filled
- * MPATH_INFO_SN: @sn filled
+ * @MPATH_INFO_SN: @sn filled
- * MPATH_INFO_METRIC: @metric filled
+ * @MPATH_INFO_METRIC: @metric filled
- * MPATH_INFO_EXPTIME: @exptime filled
+ * @MPATH_INFO_EXPTIME: @exptime filled
- * MPATH_INFO_DISCOVERY_TIMEOUT: @discovery_timeout filled
+ * @MPATH_INFO_DISCOVERY_TIMEOUT: @discovery_timeout filled
- * MPATH_INFO_DISCOVERY_RETRIES: @discovery_retries filled
+ * @MPATH_INFO_DISCOVERY_RETRIES: @discovery_retries filled
- * MPATH_INFO_FLAGS: @flags filled
+ * @MPATH_INFO_FLAGS: @flags filled
 */
 enum mpath_info_flags {
        MPATH_INFO_FRAME_QLEN           = BIT(0),
@@ -587,6 +594,7 @@ struct cfg80211_ssid {
 * @ie_len: length of ie in octets
 * @wiphy: the wiphy this was for
 * @dev: the interface
+ * @aborted: (internal) scan request was notified as aborted
 */
 struct cfg80211_scan_request {
        struct cfg80211_ssid *ssids;
@@ -623,6 +631,7 @@ enum cfg80211_signal_type {
 * This structure describes a BSS (which may also be a mesh network)
 * for use in scan results and similar.
 *
+ * @channel: channel this BSS is on
 * @bssid: BSSID of the BSS
 * @tsf: timestamp of last received update
 * @beacon_interval: the beacon interval as from the frame
@@ -801,6 +810,7 @@ struct cfg80211_disassoc_request {
 * @beacon_interval: beacon interval to use
 * @privacy: this is a protected network, keys will be configured
 *      after joining
+ * @basic_rates: bitmap of basic rates to use when creating the IBSS
 */
 struct cfg80211_ibss_params {
        u8 *ssid;
@@ -809,6 +819,7 @@ struct cfg80211_ibss_params {
        u8 *ie;
        u8 ssid_len, ie_len;
        u16 beacon_interval;
+        u32 basic_rates;
        bool channel_fixed;
        bool privacy;
 };
@@ -826,8 +837,8 @@ struct cfg80211_ibss_params {
 * @ssid: SSID
 * @ssid_len: Length of ssid in octets
 * @auth_type: Authentication type (algorithm)
- * @assoc_ie: IEs for association request
+ * @ie: IEs for association request
- * @assoc_ie_len: Length of assoc_ie in octets
+ * @ie_len: Length of assoc_ie in octets
 * @privacy: indicates whether privacy-enabled APs should be used
 * @crypto: crypto settings
 * @key_len: length of WEP key for shared key authentication
@@ -850,10 +861,11 @@ struct cfg80211_connect_params {
 /**
 * enum wiphy_params_flags - set_wiphy_params bitfield values
- * WIPHY_PARAM_RETRY_SHORT: wiphy->retry_short has changed
+ * @WIPHY_PARAM_RETRY_SHORT: wiphy->retry_short has changed
- * WIPHY_PARAM_RETRY_LONG: wiphy->retry_long has changed
+ * @WIPHY_PARAM_RETRY_LONG: wiphy->retry_long has changed
- * WIPHY_PARAM_FRAG_THRESHOLD: wiphy->frag_threshold has changed
+ * @WIPHY_PARAM_FRAG_THRESHOLD: wiphy->frag_threshold has changed
- * WIPHY_PARAM_RTS_THRESHOLD: wiphy->rts_threshold has changed
+ * @WIPHY_PARAM_RTS_THRESHOLD: wiphy->rts_threshold has changed
+ * @WIPHY_PARAM_COVERAGE_CLASS: coverage class changed
 */
 enum wiphy_params_flags {
        WIPHY_PARAM_RETRY_SHORT         = 1 << 0,
@@ -863,19 +875,6 @@ enum wiphy_params_flags {
        WIPHY_PARAM_COVERAGE_CLASS      = 1 << 4,
 };
-/**
- * enum tx_power_setting - TX power adjustment
- *
- * @TX_POWER_AUTOMATIC: the dbm parameter is ignored
- * @TX_POWER_LIMITED: limit TX power by the dbm parameter
- * @TX_POWER_FIXED: fix TX power to the dbm parameter
- */
-enum tx_power_setting {
-        TX_POWER_AUTOMATIC,
-        TX_POWER_LIMITED,
-        TX_POWER_FIXED,
-};
 /*
 * cfg80211_bitrate_mask - masks for bitrate control
 */
@@ -949,10 +948,16 @@ struct cfg80211_pmksa {
 * @del_beacon: Remove beacon configuration and stop sending the beacon.
 *
 * @add_station: Add a new station.
- *
 * @del_station: Remove a station; @mac may be NULL to remove all stations.
- *
 * @change_station: Modify a given station.
+ * @get_station: get station information for the station identified by @mac
+ * @dump_station: dump station callback -- resume dump at index @idx
+ *
+ * @add_mpath: add a fixed mesh path
+ * @del_mpath: delete a given mesh path
+ * @change_mpath: change a given mesh path
+ * @get_mpath: get a mesh path for the given parameters
+ * @dump_mpath: dump mesh path callback -- resume dump at index @idx
 *
 * @get_mesh_params: Put the current mesh parameters into *params
 *
@@ -960,8 +965,6 @@ struct cfg80211_pmksa {
 *      The mask is a bitfield which tells us which parameters to
 *      set, and which to leave alone.
 *
- * @set_mesh_cfg: set mesh parameters (by now, just mesh id)
- *
 * @change_bss: Modify parameters for a given BSS.
 *
 * @set_txq_params: Set TX queue parameters
@@ -1002,6 +1005,8 @@ struct cfg80211_pmksa {
 * @get_tx_power: store the current TX power into the dbm variable;
 *      return 0 if successful
 *
+ * @set_wds_peer: set the WDS peer for a WDS interface
+ *
 * @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting
 *      functions to adjust rfkill hw state
 *
@@ -1019,6 +1024,8 @@ struct cfg80211_pmksa {
 *
 * @testmode_cmd: run a test mode command
 *
+ * @set_bitrate_mask: set the bitrate mask configuration
+ *
 * @set_pmksa: Cache a PMKID for a BSSID. This is mostly useful for fullmac
 *      devices running firmwares capable of generating the (re) association
 *      RSN IE. It allows for faster roaming between WPA2 BSSIDs.
@@ -1129,7 +1136,7 @@ struct cfg80211_ops {
        int     (*set_wiphy_params)(struct wiphy *wiphy, u32 changed);
        int     (*set_tx_power)(struct wiphy *wiphy,
-                                enum tx_power_setting type, int dbm);
+                                enum nl80211_tx_power_setting type, int mbm);
        int     (*get_tx_power)(struct wiphy *wiphy, int *dbm);
        int     (*set_wds_peer)(struct wiphy *wiphy, struct net_device *dev,
@@ -1168,6 +1175,7 @@ struct cfg80211_ops {
        int     (*action)(struct wiphy *wiphy, struct net_device *dev,
                          struct ieee80211_channel *chan,
                          enum nl80211_channel_type channel_type,
+                          bool channel_type_valid,
                          const u8 *buf, size_t len, u64 *cookie);
        int     (*set_power_mgmt)(struct wiphy *wiphy, struct net_device *dev,
@@ -1230,8 +1238,6 @@ struct mac_address {
 /**
 * struct wiphy - wireless hardware description
- * @idx: the wiphy index assigned to this item
- * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
 * @reg_notifier: the driver's regulatory notification callback
 * @regd: the driver's regulatory domain, if one was requested via
 *      the regulatory_hint() API. This can be used by the driver
@@ -1245,7 +1251,7 @@ struct mac_address {
 * @frag_threshold: Fragmentation threshold (dot11FragmentationThreshold);
 *      -1 = fragmentation disabled, only odd values >= 256 used
 * @rts_threshold: RTS threshold (dot11RTSThreshold); -1 = RTS/CTS disabled
- * @net: the network namespace this wiphy currently lives in
+ * @_net: the network namespace this wiphy currently lives in
 * @perm_addr: permanent MAC address of this device
 * @addr_mask: If the device supports multiple MAC addresses by masking,
 *      set this to a mask with variable bits set to 1, e.g. if the last
@@ -1258,6 +1264,28 @@ struct mac_address {
 *      by default for perm_addr. In this case, the mask should be set to
 *      all-zeroes. In this case it is assumed that the device can handle
 *      the same number of arbitrary MAC addresses.
+ * @debugfsdir: debugfs directory used for this wiphy, will be renamed
+ *      automatically on wiphy renames
+ * @dev: (virtual) struct device for this wiphy
+ * @wext: wireless extension handlers
+ * @priv: driver private data (sized according to wiphy_new() parameter)
+ * @interface_modes: bitmask of interfaces types valid for this wiphy,
+ *      must be set by driver
+ * @flags: wiphy flags, see &enum wiphy_flags
+ * @bss_priv_size: each BSS struct has private data allocated with it,
+ *      this variable determines its size
+ * @max_scan_ssids: maximum number of SSIDs the device can scan for in
+ *      any given scan
+ * @max_scan_ie_len: maximum length of user-controlled IEs device can
+ *      add to probe request frames transmitted during a scan, must not
+ *      include fixed IEs like supported rates
+ * @coverage_class: current coverage class
+ * @fw_version: firmware version for ethtool reporting
+ * @hw_version: hardware version for ethtool reporting
+ * @max_num_pmkids: maximum number of PMKIDs supported by device
+ * @privid: a pointer that drivers can use to identify if an arbitrary
+ *      wiphy is theirs, e.g. in global notifiers
+ * @bands: information about bands/channels supported by this device
 */
 struct wiphy {
        /* assign these fields before you register the wiphy */
@@ -1330,27 +1358,16 @@ struct wiphy {
        char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
 };
-#ifdef CONFIG_NET_NS
 static inline struct net *wiphy_net(struct wiphy *wiphy)
 {
-        return wiphy->_net;
+        return read_pnet(&wiphy->_net);
 }
 static inline void wiphy_net_set(struct wiphy *wiphy, struct net *net)
 {
-        wiphy->_net = net;
+        write_pnet(&wiphy->_net, net);
-}
-#else
-static inline struct net *wiphy_net(struct wiphy *wiphy)
-{
-        return &init_net;
 }
-static inline void wiphy_net_set(struct wiphy *wiphy, struct net *net)
-{
-}
-#endif
 /**
 * wiphy_priv - return priv from wiphy
 *
@@ -1399,7 +1416,7 @@ static inline struct device *wiphy_dev(struct wiphy *wiphy)
 *
 * @wiphy: The wiphy whose name to return
 */
-static inline const char *wiphy_name(struct wiphy *wiphy)
+static inline const char *wiphy_name(const struct wiphy *wiphy)
 {
        return dev_name(&wiphy->dev);
 }
@@ -1471,13 +1488,14 @@ struct cfg80211_cached_keys;
 * @ssid: (private) Used by the internal configuration code
 * @ssid_len: (private) Used by the internal configuration code
 * @wext: (private) Used by the internal wireless extensions compat code
- * @wext_bssid: (private) Used by the internal wireless extensions compat code
 * @use_4addr: indicates 4addr mode is used on this interface, must be
 *      set by driver (if supported) on add_interface BEFORE registering the
 *      netdev and may otherwise be used by driver read-only, will be update
 *      by cfg80211 on change_interface
 * @action_registrations: list of registrations for action frames
 * @action_registrations_lock: lock for the list
+ * @mtx: mutex used to lock data in this struct
+ * @cleanup_work: work struct used for cleanup that can't be done directly
 */
 struct wireless_dev {
        struct wiphy *wiphy;
@@ -1551,11 +1569,13 @@ static inline void *wdev_priv(struct wireless_dev *wdev)
 /**
 * ieee80211_channel_to_frequency - convert channel number to frequency
+ * @chan: channel number
 */
 extern int ieee80211_channel_to_frequency(int chan);
 /**
 * ieee80211_frequency_to_channel - convert frequency to channel number
+ * @freq: center frequency
 */
 extern int ieee80211_frequency_to_channel(int freq);
@@ -1570,6 +1590,8 @@ extern struct ieee80211_channel *__ieee80211_get_channel(struct wiphy *wiphy,
                                                         int freq);
 /**
 * ieee80211_get_channel - get channel struct from wiphy for specified frequency
+ * @wiphy: the struct wiphy to get the channel for
+ * @freq: the center frequency of the channel
 */
 static inline struct ieee80211_channel *
 ieee80211_get_channel(struct wiphy *wiphy, int freq)
@@ -1630,9 +1652,6 @@ struct ieee80211_radiotap_vendor_namespaces {
 * @is_radiotap_ns: indicates whether the current namespace is the default
 *      radiotap namespace or not
 *
- * @overrides: override standard radiotap fields
- * @n_overrides: number of overrides
- *
 * @_rtheader: pointer to the radiotap header we are walking through
 * @_max_length: length of radiotap header in cpu byte ordering
 * @_arg_index: next argument index
@@ -1933,6 +1952,10 @@ int cfg80211_wext_giwap(struct net_device *dev,
                        struct iw_request_info *info,
                        struct sockaddr *ap_addr, char *extra);
+int cfg80211_wext_siwpmksa(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_point *data, char *extra);
 /*
 * callbacks for asynchronous cfg80211 methods, notification
 * functions and BSS handling helpers
@@ -1948,10 +1971,12 @@ int cfg80211_wext_giwap(struct net_device *dev,
 void cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted);
 /**
- * cfg80211_inform_bss - inform cfg80211 of a new BSS
+ * cfg80211_inform_bss_frame - inform cfg80211 of a received BSS frame
 *
 * @wiphy: the wiphy reporting the BSS
- * @bss: the found BSS
+ * @channel: The channel the frame was received on
+ * @mgmt: the management frame (probe response or beacon)
+ * @len: length of the management frame
 * @signal: the signal strength, type depends on the wiphy's signal_type
 * @gfp: context flags
 *
@@ -1964,6 +1989,23 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
                          struct ieee80211_mgmt *mgmt, size_t len,
                          s32 signal, gfp_t gfp);
+/**
+ * cfg80211_inform_bss - inform cfg80211 of a new BSS
+ *
+ * @wiphy: the wiphy reporting the BSS
+ * @channel: The channel the frame was received on
+ * @bssid: the BSSID of the BSS
+ * @timestamp: the TSF timestamp sent by the peer
+ * @capability: the capability field sent by the peer
+ * @beacon_interval: the beacon interval announced by the peer
+ * @ie: additional IEs sent by the peer
+ * @ielen: length of the additional IEs
+ * @signal: the signal strength, type depends on the wiphy's signal_type
+ * @gfp: context flags
+ *
+ * This informs cfg80211 that BSS information was found and
+ * the BSS should be updated/added.
+ */
 struct cfg80211_bss*
 cfg80211_inform_bss(struct wiphy *wiphy,
                    struct ieee80211_channel *channel,
@@ -2378,4 +2420,67 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev,
                              enum nl80211_cqm_rssi_threshold_event rssi_event,
                              gfp_t gfp);
+#ifdef __KERNEL__
+/* Logging, debugging and troubleshooting/diagnostic helpers. */
+/* wiphy_printk helpers, similar to dev_printk */
+#define wiphy_printk(level, wiphy, format, args...)             \
+        printk(level "%s: " format, wiphy_name(wiphy), ##args)
+#define wiphy_emerg(wiphy, format, args...)                     \
+        wiphy_printk(KERN_EMERG, wiphy, format, ##args)
+#define wiphy_alert(wiphy, format, args...)                     \
+        wiphy_printk(KERN_ALERT, wiphy, format, ##args)
+#define wiphy_crit(wiphy, format, args...)                      \
+        wiphy_printk(KERN_CRIT, wiphy, format, ##args)
+#define wiphy_err(wiphy, format, args...)                       \
+        wiphy_printk(KERN_ERR, wiphy, format, ##args)
+#define wiphy_warn(wiphy, format, args...)                      \
+        wiphy_printk(KERN_WARNING, wiphy, format, ##args)
+#define wiphy_notice(wiphy, format, args...)                    \
+        wiphy_printk(KERN_NOTICE, wiphy, format, ##args)
+#define wiphy_info(wiphy, format, args...)                      \
+        wiphy_printk(KERN_INFO, wiphy, format, ##args)
+int wiphy_debug(const struct wiphy *wiphy, const char *format, ...)
+        __attribute__ ((format (printf, 2, 3)));
+#if defined(DEBUG)
+#define wiphy_dbg(wiphy, format, args...)                       \
+        wiphy_printk(KERN_DEBUG, wiphy, format, ##args)
+#elif defined(CONFIG_DYNAMIC_DEBUG)
+#define wiphy_dbg(wiphy, format, args...)                       \
+        dynamic_pr_debug("%s: " format, wiphy_name(wiphy), ##args)
+#else
+#define wiphy_dbg(wiphy, format, args...)                               \
+({                                                                      \
+        if (0)                                                          \
+                wiphy_printk(KERN_DEBUG, wiphy, format, ##args);        \
+        0;                                                              \
+})
+#endif
+#if defined(VERBOSE_DEBUG)
+#define wiphy_vdbg      wiphy_dbg
+#else
+#define wiphy_vdbg(wiphy, format, args...)                              \
+({                                                                      \
+        if (0)                                                          \
+                wiphy_printk(KERN_DEBUG, wiphy, format, ##args);        \
+                0;                                                      \
+})
+#endif
+/*
+ * wiphy_WARN() acts like wiphy_printk(), but with the key difference
+ * of using a WARN/WARN_ON to get the message out, including the
+ * file/line information and a backtrace.
+ */
+#define wiphy_WARN(wiphy, format, args...)                      \
+        WARN(1, "wiphy: %s\n" format, wiphy_name(wiphy), ##args);
+#endif
 #endif /* __NET_CFG80211_H */
diff --git a/include/net/dn_dev.h b/include/net/dn_dev.h
index 511a459ec10f..0916bbf3bdff 100644
--- a/include/net/dn_dev.h
+++ b/include/net/dn_dev.h
@@ -101,7 +101,7 @@ struct dn_short_packet {
        __le16 dstnode;
        __le16 srcnode;
        __u8   forward;
-} __attribute__((packed));
+} __packed;
 struct dn_long_packet {
        __u8   msgflg;
@@ -115,7 +115,7 @@ struct dn_long_packet {
        __u8   visit_ct;
        __u8   s_class;
        __u8   pt;
-} __attribute__((packed));
+} __packed;
 /*------------------------- DRP - Routing messages ---------------------*/
@@ -132,7 +132,7 @@ struct endnode_hello_message {
        __u8   mpd;
        __u8   datalen;
        __u8   data[2];
-} __attribute__((packed));
+} __packed;
 struct rtnode_hello_message {
        __u8   msgflg;
@@ -144,7 +144,7 @@ struct rtnode_hello_message {
        __u8   area;
        __le16  timer;
        __u8   mpd;
-} __attribute__((packed));
+} __packed;
 extern void dn_dev_init(void);
diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h
index 17d43d2db5ec..e43a2893f132 100644
--- a/include/net/dn_nsp.h
+++ b/include/net/dn_nsp.h
@@ -74,18 +74,18 @@ struct nsp_data_seg_msg {
        __u8   msgflg;
        __le16 dstaddr;
        __le16 srcaddr;
-} __attribute__((packed));
+} __packed;
 struct nsp_data_opt_msg {
        __le16 acknum;
        __le16 segnum;
        __le16 lsflgs;
-} __attribute__((packed));
+} __packed;
 struct nsp_data_opt_msg1 {
        __le16 acknum;
        __le16 segnum;
-} __attribute__((packed));
+} __packed;
 /* Acknowledgment Message (data/other data)                             */
@@ -94,13 +94,13 @@ struct nsp_data_ack_msg {
        __le16 dstaddr;
        __le16 srcaddr;
        __le16 acknum;
-} __attribute__((packed));
+} __packed;
 /* Connect Acknowledgment Message */
 struct  nsp_conn_ack_msg {
        __u8 msgflg;
        __le16 dstaddr;
-} __attribute__((packed));
+} __packed;
 /* Connect Initiate/Retransmit Initiate/Connect Confirm */
@@ -117,7 +117,7 @@ struct  nsp_conn_init_msg {
 #define NSP_FC_MASK   0x0c            /* FC type mask         */
        __u8   info;
        __le16 segsize;
-} __attribute__((packed));
+} __packed;
 /* Disconnect Initiate/Disconnect Confirm */
 struct  nsp_disconn_init_msg {
@@ -125,7 +125,7 @@ struct  nsp_disconn_init_msg {
        __le16 dstaddr;
        __le16 srcaddr;
        __le16 reason;
-} __attribute__((packed));
+} __packed;
@@ -135,7 +135,7 @@ struct  srcobj_fmt {
        __le16 grpcode;
        __le16 usrcode;
        __u8   dlen;
-} __attribute__((packed));
+} __packed;
 /*
 * A collection of functions for manipulating the sequence
diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index 60c9f22d8694..ccadab3aa3f6 100644
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -65,9 +65,7 @@ extern void dn_rt_cache_flush(int delay);
 * packets to the originating host.
 */
 struct dn_route {
-        union {
+        struct dst_entry dst;
-                struct dst_entry dst;
-        } u;
        struct flowi fl;
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index eb551baafc04..f7dcd2c70412 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -68,26 +68,15 @@ struct genl_info {
 #endif
 };
-#ifdef CONFIG_NET_NS
 static inline struct net *genl_info_net(struct genl_info *info)
 {
-        return info->_net;
+        return read_pnet(&info->_net);
 }
 static inline void genl_info_net_set(struct genl_info *info, struct net *net)
 {
-        info->_net = net;
+        write_pnet(&info->_net, net);
 }
-#else
-static inline struct net *genl_info_net(struct genl_info *info)
-{
-        return &init_net;
-}
-static inline void genl_info_net_set(struct genl_info *info, struct net *net)
-{
-}
-#endif
 /**
 * struct genl_ops - generic netlink operations
diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index 18c773286b91..22fac9892b16 100644
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
@@ -1,8 +1,8 @@
 #ifndef _INET_COMMON_H
 #define _INET_COMMON_H
-extern const struct proto_ops           inet_stream_ops;
+extern const struct proto_ops inet_stream_ops;
-extern const struct proto_ops           inet_dgram_ops;
+extern const struct proto_ops inet_dgram_ops;
 /*
 *      INET4 prototypes used by INET6
@@ -13,37 +13,28 @@ struct sock;
 struct sockaddr;
 struct socket;
-extern int                      inet_release(struct socket *sock);
+extern int inet_release(struct socket *sock);
-extern int                      inet_stream_connect(struct socket *sock,
+extern int inet_stream_connect(struct socket *sock, struct sockaddr * uaddr,
-                                                    struct sockaddr * uaddr,
+                               int addr_len, int flags);
-                                                    int addr_len, int flags);
+extern int inet_dgram_connect(struct socket *sock, struct sockaddr * uaddr,
-extern int                      inet_dgram_connect(struct socket *sock, 
+                              int addr_len, int flags);
-                                                   struct sockaddr * uaddr,
+extern int inet_accept(struct socket *sock, struct socket *newsock, int flags);
-                                                   int addr_len, int flags);
+extern int inet_sendmsg(struct kiocb *iocb, struct socket *sock,
-extern int                      inet_accept(struct socket *sock, 
+                        struct msghdr *msg, size_t size);
-                                            struct socket *newsock, int flags);
+extern ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,
-extern int                      inet_sendmsg(struct kiocb *iocb,
+                             size_t size, int flags);
-                                             struct socket *sock, 
+extern int inet_recvmsg(struct kiocb *iocb, struct socket *sock,
-                                             struct msghdr *msg, 
+                        struct msghdr *msg, size_t size, int flags);
-                                             size_t size);
+extern int inet_shutdown(struct socket *sock, int how);
-extern int                      inet_shutdown(struct socket *sock, int how);
+extern int inet_listen(struct socket *sock, int backlog);
-extern int                      inet_listen(struct socket *sock, int backlog);
+extern void inet_sock_destruct(struct sock *sk);
+extern int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len);
-extern void                     inet_sock_destruct(struct sock *sk);
+extern int inet_getname(struct socket *sock, struct sockaddr *uaddr,
+                        int *uaddr_len, int peer);
-extern int                      inet_bind(struct socket *sock, 
+extern int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
-                                          struct sockaddr *uaddr, int addr_len);
+extern int inet_ctl_sock_create(struct sock **sk, unsigned short family,
-extern int                      inet_getname(struct socket *sock, 
+                                unsigned short type, unsigned char protocol,
-                                             struct sockaddr *uaddr, 
+                                struct net *net);
-                                             int *uaddr_len, int peer);
-extern int                      inet_ioctl(struct socket *sock, 
-                                           unsigned int cmd, unsigned long arg);
-extern int                      inet_ctl_sock_create(struct sock **sk,
-                                                     unsigned short family,
-                                                     unsigned short type,
-                                                     unsigned char protocol,
-                                                     struct net *net);
 static inline void inet_ctl_sock_destroy(struct sock *sk)
 {
@@ -51,5 +42,3 @@ static inline void inet_ctl_sock_destroy(struct sock *sk)
 }
 #endif
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 39f2dc943908..16ff29a7bb30 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -20,6 +20,7 @@ struct inet_frag_queue {
        atomic_t                refcnt;
        struct timer_list       timer;      /* when will this queue expire? */
        struct sk_buff          *fragments; /* list of received fragments */
+        struct sk_buff          *fragments_tail;
        ktime_t                 stamp;
        int                     len;        /* total length of orig datagram */
        int                     meat;
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 1653de515cee..1989cfd7405f 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -137,7 +137,8 @@ struct inet_sock {
                                hdrincl:1,
                                mc_loop:1,
                                transparent:1,
-                                mc_all:1;
+                                mc_all:1,
+                                nodefrag:1;
        int                     mc_index;
        __be32                  mc_addr;
        struct ip_mc_socklist   *mc_list;
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 87b1df0d4d8c..417d0c894f29 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -22,10 +22,21 @@ struct inet_peer {
        __u32                   dtime;          /* the time of last use of not
                                                 * referenced entries */
        atomic_t                refcnt;
-        atomic_t                rid;            /* Frag reception counter */
+        /*
-        atomic_t                ip_id_count;    /* IP ID for the next packet */
+         * Once inet_peer is queued for deletion (refcnt == -1), following fields
-        __u32                   tcp_ts;
+         * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp
-        __u32                   tcp_ts_stamp;
+         * We can share memory with rcu_head to keep inet_peer small
+         * (less then 64 bytes)
+         */
+        union {
+                struct {
+                        atomic_t        rid;            /* Frag reception counter */
+                        atomic_t        ip_id_count;    /* IP ID for the next packet */
+                        __u32           tcp_ts;
+                        __u32           tcp_ts_stamp;
+                };
+                struct rcu_head         rcu;
+        };
 };
 void                    inet_initpeers(void) __init;
@@ -36,10 +47,21 @@ struct inet_peer	*inet_getpeer(__be32 daddr, int create);
 /* can be called from BH context or outside */
 extern void inet_putpeer(struct inet_peer *p);
+/*
+ * temporary check to make sure we dont access rid, ip_id_count, tcp_ts,
+ * tcp_ts_stamp if no refcount is taken on inet_peer
+ */
+static inline void inet_peer_refcheck(const struct inet_peer *p)
+{
+        WARN_ON_ONCE(atomic_read(&p->refcnt) <= 0);
+}
 /* can be called with or without local BH being disabled */
 static inline __u16     inet_getid(struct inet_peer *p, int more)
 {
        more++;
+        inet_peer_refcheck(p);
        return atomic_add_return(more, &p->ip_id_count) - more;
 }
diff --git a/include/net/ip.h b/include/net/ip.h
index 452f229c380a..890f9725d681 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -61,11 +61,14 @@ struct ipcm_cookie {
 struct ip_ra_chain {
        struct ip_ra_chain      *next;
        struct sock             *sk;
-        void                    (*destructor)(struct sock *);
+        union {
+                void                    (*destructor)(struct sock *);
+                struct sock             *saved_sk;
+        };
+        struct rcu_head         rcu;
 };
 extern struct ip_ra_chain *ip_ra_chain;
-extern rwlock_t ip_ra_lock;
 /* IP flags. */
 #define IP_CE           0x8000          /* Flag: "Congestion"           */
@@ -162,12 +165,12 @@ struct ipv4_config {
 };
 extern struct ipv4_config ipv4_config;
-#define IP_INC_STATS(net, field)        SNMP_INC_STATS((net)->mib.ip_statistics, field)
+#define IP_INC_STATS(net, field)        SNMP_INC_STATS64((net)->mib.ip_statistics, field)
-#define IP_INC_STATS_BH(net, field)     SNMP_INC_STATS_BH((net)->mib.ip_statistics, field)
+#define IP_INC_STATS_BH(net, field)     SNMP_INC_STATS64_BH((net)->mib.ip_statistics, field)
-#define IP_ADD_STATS(net, field, val)   SNMP_ADD_STATS((net)->mib.ip_statistics, field, val)
+#define IP_ADD_STATS(net, field, val)   SNMP_ADD_STATS64((net)->mib.ip_statistics, field, val)
-#define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS_BH((net)->mib.ip_statistics, field, val)
+#define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS64_BH((net)->mib.ip_statistics, field, val)
-#define IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS((net)->mib.ip_statistics, field, val)
+#define IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS64((net)->mib.ip_statistics, field, val)
-#define IP_UPD_PO_STATS_BH(net, field, val) SNMP_UPD_PO_STATS_BH((net)->mib.ip_statistics, field, val)
+#define IP_UPD_PO_STATS_BH(net, field, val) SNMP_UPD_PO_STATS64_BH((net)->mib.ip_statistics, field, val)
 #define NET_INC_STATS(net, field)       SNMP_INC_STATS((net)->mib.net_statistics, field)
 #define NET_INC_STATS_BH(net, field)    SNMP_INC_STATS_BH((net)->mib.net_statistics, field)
 #define NET_INC_STATS_USER(net, field)  SNMP_INC_STATS_USER((net)->mib.net_statistics, field)
@@ -175,7 +178,15 @@ extern struct ipv4_config ipv4_config;
 #define NET_ADD_STATS_USER(net, field, adnd) SNMP_ADD_STATS_USER((net)->mib.net_statistics, field, adnd)
 extern unsigned long snmp_fold_field(void __percpu *mib[], int offt);
-extern int snmp_mib_init(void __percpu *ptr[2], size_t mibsize);
+#if BITS_PER_LONG==32
+extern u64 snmp_fold_field64(void __percpu *mib[], int offt, size_t sync_off);
+#else
+static inline u64 snmp_fold_field64(void __percpu *mib[], int offt, size_t syncp_off)
+{
+        return snmp_fold_field(mib, offt);
+}
+#endif
+extern int snmp_mib_init(void __percpu *ptr[2], size_t mibsize, size_t align);
 extern void snmp_mib_free(void __percpu *ptr[2]);
 extern struct local_ports {
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 4b1dc1161c37..062a823d311c 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -84,13 +84,11 @@ struct rt6key {
 struct fib6_table;
 struct rt6_info {
-        union {
+        struct dst_entry                dst;
-                struct dst_entry        dst;
-        } u;
-#define rt6i_dev                        u.dst.dev
+#define rt6i_dev                        dst.dev
-#define rt6i_nexthop                    u.dst.neighbour
+#define rt6i_nexthop                    dst.neighbour
-#define rt6i_expires                    u.dst.expires
+#define rt6i_expires                    dst.expires
        /*
         * Tail elements of dst_entry (__refcnt etc.)
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index fbf9d1cda27b..fc94ec568a50 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -27,6 +27,6 @@ struct ipv6_tlv_tnl_enc_lim {
        __u8 type;              /* type-code for option         */
        __u8 length;            /* option length                */
        __u8 encap_limit;       /* tunnel encapsulation limit   */
-} __attribute__ ((packed));
+} __packed;
 #endif
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index fe82b1e10a29..a4747a0f7303 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -632,10 +632,22 @@ extern struct ip_vs_conn *ip_vs_ct_in_get
 (int af, int protocol, const union nf_inet_addr *s_addr, __be16 s_port,
 const union nf_inet_addr *d_addr, __be16 d_port);
+struct ip_vs_conn * ip_vs_conn_in_get_proto(int af, const struct sk_buff *skb,
+                                            struct ip_vs_protocol *pp,
+                                            const struct ip_vs_iphdr *iph,
+                                            unsigned int proto_off,
+                                            int inverse);
 extern struct ip_vs_conn *ip_vs_conn_out_get
 (int af, int protocol, const union nf_inet_addr *s_addr, __be16 s_port,
 const union nf_inet_addr *d_addr, __be16 d_port);
+struct ip_vs_conn * ip_vs_conn_out_get_proto(int af, const struct sk_buff *skb,
+                                             struct ip_vs_protocol *pp,
+                                             const struct ip_vs_iphdr *iph,
+                                             unsigned int proto_off,
+                                             int inverse);
 /* put back the conn without restarting its timer */
 static inline void __ip_vs_conn_put(struct ip_vs_conn *cp)
 {
@@ -736,8 +748,6 @@ extern void ip_vs_app_inc_put(struct ip_vs_app *inc);
 extern int ip_vs_app_pkt_out(struct ip_vs_conn *, struct sk_buff *skb);
 extern int ip_vs_app_pkt_in(struct ip_vs_conn *, struct sk_buff *skb);
-extern int ip_vs_skb_replace(struct sk_buff *skb, gfp_t pri,
-                             char *o_buf, int o_len, char *n_buf, int n_len);
 extern int ip_vs_app_init(void);
 extern void ip_vs_app_cleanup(void);
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 11e8513d2d07..65caea8b414f 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -50,7 +50,7 @@ struct ip_tunnel_prl_entry {
        int pkt_len = skb->len - skb_transport_offset(skb);             \
                                                                        \
        skb->ip_summed = CHECKSUM_NONE;                                 \
-        ip_select_ident(iph, &rt->u.dst, NULL);                         \
+        ip_select_ident(iph, &rt->dst, NULL);                           \
                                                                        \
        err = ip_local_out(skb);                                        \
        if (likely(net_xmit_eval(err) == 0)) {                          \
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 2600b69757b8..1f8412410998 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -136,17 +136,17 @@ extern struct ctl_path net_ipv6_ctl_path[];
 /* MIBs */
 #define IP6_INC_STATS(net, idev,field)          \
-                _DEVINC(net, ipv6, , idev, field)
+                _DEVINC(net, ipv6, 64, idev, field)
 #define IP6_INC_STATS_BH(net, idev,field)       \
-                _DEVINC(net, ipv6, _BH, idev, field)
+                _DEVINC(net, ipv6, 64_BH, idev, field)
 #define IP6_ADD_STATS(net, idev,field,val)      \
-                _DEVADD(net, ipv6, , idev, field, val)
+                _DEVADD(net, ipv6, 64, idev, field, val)
 #define IP6_ADD_STATS_BH(net, idev,field,val)   \
-                _DEVADD(net, ipv6, _BH, idev, field, val)
+                _DEVADD(net, ipv6, 64_BH, idev, field, val)
 #define IP6_UPD_PO_STATS(net, idev,field,val)   \
-                _DEVUPD(net, ipv6, , idev, field, val)
+                _DEVUPD(net, ipv6, 64, idev, field, val)
 #define IP6_UPD_PO_STATS_BH(net, idev,field,val)   \
-                _DEVUPD(net, ipv6, _BH, idev, field, val)
+                _DEVUPD(net, ipv6, 64_BH, idev, field, val)
 #define ICMP6_INC_STATS(net, idev, field)       \
                _DEVINC(net, icmpv6, , idev, field)
 #define ICMP6_INC_STATS_BH(net, idev, field)    \
@@ -551,6 +551,10 @@ extern int 			ipv6_ext_hdr(u8 nexthdr);
 extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type);
+extern struct in6_addr *fl6_update_dst(struct flowi *fl,
+                                       const struct ipv6_txoptions *opt,
+                                       struct in6_addr *orig);
 /*
 *      socket options (ipv6_sockglue.c)
 */
diff --git a/include/net/ipx.h b/include/net/ipx.h
index ef51a668ba19..05d7e4a88b49 100644
--- a/include/net/ipx.h
+++ b/include/net/ipx.h
@@ -27,9 +27,9 @@ struct ipx_address {
 #define IPX_MAX_PPROP_HOPS 8
 struct ipxhdr {
-        __be16                  ipx_checksum __attribute__ ((packed));
+        __be16                  ipx_checksum __packed;
 #define IPX_NO_CHECKSUM cpu_to_be16(0xFFFF)
-        __be16                  ipx_pktsize __attribute__ ((packed));
+        __be16                  ipx_pktsize __packed;
        __u8                    ipx_tctrl;
        __u8                    ipx_type;
 #define IPX_TYPE_UNKNOWN        0x00
@@ -38,8 +38,8 @@ struct ipxhdr {
 #define IPX_TYPE_SPX            0x05    /* SPX protocol */
 #define IPX_TYPE_NCP            0x11    /* $lots for docs on this (SPIT) */
 #define IPX_TYPE_PPROP          0x14    /* complicated flood fill brdcast */
-        struct ipx_address      ipx_dest __attribute__ ((packed));
+        struct ipx_address      ipx_dest __packed;
-        struct ipx_address      ipx_source __attribute__ ((packed));
+        struct ipx_address      ipx_source __packed;
 };
 static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb)
diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h
index 7e582061b230..3bed61d379a8 100644
--- a/include/net/irda/irda.h
+++ b/include/net/irda/irda.h
@@ -53,10 +53,6 @@ typedef __u32 magic_t;
 #ifndef IRDA_ALIGN
 #  define IRDA_ALIGN __attribute__((aligned))
 #endif
-#ifndef IRDA_PACK
-#  define IRDA_PACK __attribute__((packed))
-#endif
 #ifdef CONFIG_IRDA_DEBUG
diff --git a/include/net/irda/irlap_frame.h b/include/net/irda/irlap_frame.h
index 641f88e848bd..6b1dc4f8eca5 100644
--- a/include/net/irda/irlap_frame.h
+++ b/include/net/irda/irlap_frame.h
@@ -85,7 +85,7 @@ struct discovery_t;
 struct disc_frame {
        __u8 caddr;          /* Connection address */
        __u8 control;
-} IRDA_PACK;
+} __packed;
 struct xid_frame {
        __u8  caddr; /* Connection address */
@@ -96,41 +96,41 @@ struct xid_frame {
        __u8  flags; /* Discovery flags */
        __u8  slotnr;
        __u8  version;
-} IRDA_PACK;
+} __packed;
 struct test_frame {
        __u8 caddr;          /* Connection address */
        __u8 control;
        __le32 saddr;         /* Source device address */
        __le32 daddr;         /* Destination device address */
-} IRDA_PACK;
+} __packed;
 struct ua_frame {
        __u8 caddr;
        __u8 control;
        __le32 saddr; /* Source device address */
        __le32 daddr; /* Dest device address */
-} IRDA_PACK;
+} __packed;
 struct dm_frame {
        __u8 caddr;          /* Connection address */
        __u8 control;
-} IRDA_PACK;
+} __packed;
 struct rd_frame {
        __u8 caddr;          /* Connection address */
        __u8 control;
-} IRDA_PACK;
+} __packed;
 struct rr_frame {
        __u8 caddr;          /* Connection address */
        __u8 control;
-} IRDA_PACK;
+} __packed;
 struct i_frame {
        __u8 caddr;
        __u8 control;
-} IRDA_PACK;
+} __packed;
 struct snrm_frame {
        __u8  caddr;
@@ -138,7 +138,7 @@ struct snrm_frame {
        __le32 saddr;
        __le32 daddr;
        __u8  ncaddr;
-} IRDA_PACK;
+} __packed;
 void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb);
 void irlap_send_discovery_xid_frame(struct irlap_cb *, int S, __u8 s, 
diff --git a/include/net/lib80211.h b/include/net/lib80211.h
index fb4e2784857d..848cce1bb7a5 100644
--- a/include/net/lib80211.h
+++ b/include/net/lib80211.h
@@ -54,9 +54,6 @@ struct lib80211_crypto_ops {
        /* deinitialize crypto context and free allocated private data */
        void (*deinit) (void *priv);
-        int (*build_iv) (struct sk_buff * skb, int hdr_len,
-                         u8 *key, int keylen, void *priv);
        /* encrypt/decrypt return < 0 on error or >= 0 on success. The return
         * value from decrypt_mpdu is passed as the keyidx value for
         * decrypt_msdu. skb must have enough head and tail room for the
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index de22cbfef232..b0787a1dea90 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -146,6 +146,9 @@ struct ieee80211_low_level_stats {
 *      enabled/disabled (beaconing modes)
 * @BSS_CHANGED_CQM: Connection quality monitor config changed
 * @BSS_CHANGED_IBSS: IBSS join status changed
+ * @BSS_CHANGED_ARP_FILTER: Hardware ARP filter address list or state changed.
+ * @BSS_CHANGED_QOS: QoS for this association was enabled/disabled. Note
+ *      that it is only ever disabled for station mode.
 */
 enum ieee80211_bss_change {
        BSS_CHANGED_ASSOC               = 1<<0,
@@ -160,10 +163,19 @@ enum ieee80211_bss_change {
        BSS_CHANGED_BEACON_ENABLED      = 1<<9,
        BSS_CHANGED_CQM                 = 1<<10,
        BSS_CHANGED_IBSS                = 1<<11,
+        BSS_CHANGED_ARP_FILTER          = 1<<12,
+        BSS_CHANGED_QOS                 = 1<<13,
        /* when adding here, make sure to change ieee80211_reconfig */
 };
+/*
+ * The maximum number of IPv4 addresses listed for ARP filtering. If the number
+ * of addresses for an interface increase beyond this value, hardware ARP
+ * filtering will be disabled.
+ */
+#define IEEE80211_BSS_ARP_ADDR_LIST_LEN 4
 /**
 * struct ieee80211_bss_conf - holds the BSS's changing parameters
 *
@@ -182,7 +194,9 @@ enum ieee80211_bss_change {
 *      if the hardware cannot handle this it must set the
 *      IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE hardware flag
 * @dtim_period: num of beacons before the next DTIM, for beaconing,
- *      not valid in station mode (cf. hw conf ps_dtim_period)
+ *      valid in station mode only while @assoc is true and if also
+ *      requested by %IEEE80211_HW_NEED_DTIM_PERIOD (cf. also hw conf
+ *      @ps_dtim_period)
 * @timestamp: beacon timestamp
 * @beacon_int: beacon interval
 * @assoc_capability: capabilities taken from assoc resp
@@ -199,6 +213,16 @@ enum ieee80211_bss_change {
 * @cqm_rssi_thold: Connection quality monitor RSSI threshold, a zero value
 *      implies disabled
 * @cqm_rssi_hyst: Connection quality monitor RSSI hysteresis
+ * @arp_addr_list: List of IPv4 addresses for hardware ARP filtering. The
+ *      may filter ARP queries targeted for other addresses than listed here.
+ *      The driver must allow ARP queries targeted for all address listed here
+ *      to pass through. An empty list implies no ARP queries need to pass.
+ * @arp_addr_cnt: Number of addresses currently on the list.
+ * @arp_filter_enabled: Enable ARP filtering - if enabled, the hardware may
+ *      filter ARP queries based on the @arp_addr_list, if disabled, the
+ *      hardware must not perform any ARP filtering. Note, that the filter will
+ *      be enabled also in promiscuous mode.
+ * @qos: This is a QoS-enabled BSS.
 */
 struct ieee80211_bss_conf {
        const u8 *bssid;
@@ -219,6 +243,10 @@ struct ieee80211_bss_conf {
        s32 cqm_rssi_thold;
        u32 cqm_rssi_hyst;
        enum nl80211_channel_type channel_type;
+        __be32 arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN];
+        u8 arp_addr_cnt;
+        bool arp_filter_enabled;
+        bool qos;
 };
 /**
@@ -312,9 +340,10 @@ enum mac80211_tx_control_flags {
        IEEE80211_TX_INTFL_NL80211_FRAME_TX     = BIT(21),
        IEEE80211_TX_CTL_LDPC                   = BIT(22),
        IEEE80211_TX_CTL_STBC                   = BIT(23) | BIT(24),
-#define IEEE80211_TX_CTL_STBC_SHIFT             23
 };
+#define IEEE80211_TX_CTL_STBC_SHIFT             23
 /**
 * enum mac80211_rate_control_flags - per-rate flags set by the
 *      Rate Control algorithm.
@@ -390,7 +419,7 @@ struct ieee80211_tx_rate {
        s8 idx;
        u8 count;
        u8 flags;
-} __attribute__((packed));
+} __packed;
 /**
 * struct ieee80211_tx_info - skb transmit information
@@ -412,8 +441,6 @@ struct ieee80211_tx_rate {
 * @driver_data: array of driver_data pointers
 * @ampdu_ack_len: number of acked aggregated frames.
 *      relevant only if IEEE80211_TX_STAT_AMPDU was set.
- * @ampdu_ack_map: block ack bit map for the aggregation.
- *      relevant only if IEEE80211_TX_STAT_AMPDU was set.
 * @ampdu_len: number of aggregated frames.
 *      relevant only if IEEE80211_TX_STAT_AMPDU was set.
 * @ack_signal: signal strength of the ACK frame
@@ -448,10 +475,9 @@ struct ieee80211_tx_info {
                struct {
                        struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES];
                        u8 ampdu_ack_len;
-                        u64 ampdu_ack_map;
                        int ack_signal;
                        u8 ampdu_len;
-                        /* 7 bytes free */
+                        /* 15 bytes free */
                } status;
                struct {
                        struct ieee80211_tx_rate driver_rates[
@@ -601,15 +627,14 @@ struct ieee80211_rx_status {
 *      may turn the device off as much as possible. Typically, this flag will
 *      be set when an interface is set UP but not associated or scanning, but
 *      it can also be unset in that case when monitor interfaces are active.
- * @IEEE80211_CONF_QOS: Enable 802.11e QoS also know as WMM (Wireless
+ * @IEEE80211_CONF_OFFCHANNEL: The device is currently not on its main
- *      Multimedia). On some drivers (iwlwifi is one of know) we have
+ *      operating channel.
- *      to enable/disable QoS explicitly.
 */
 enum ieee80211_conf_flags {
        IEEE80211_CONF_MONITOR          = (1<<0),
        IEEE80211_CONF_PS               = (1<<1),
        IEEE80211_CONF_IDLE             = (1<<2),
-        IEEE80211_CONF_QOS              = (1<<3),
+        IEEE80211_CONF_OFFCHANNEL       = (1<<3),
 };
@@ -624,7 +649,6 @@ enum ieee80211_conf_flags {
 * @IEEE80211_CONF_CHANGE_RETRY_LIMITS: retry limits changed
 * @IEEE80211_CONF_CHANGE_IDLE: Idle flag changed
 * @IEEE80211_CONF_CHANGE_SMPS: Spatial multiplexing powersave mode changed
- * @IEEE80211_CONF_CHANGE_QOS: Quality of service was enabled or disabled
 */
 enum ieee80211_conf_changed {
        IEEE80211_CONF_CHANGE_SMPS              = BIT(1),
@@ -635,7 +659,6 @@ enum ieee80211_conf_changed {
        IEEE80211_CONF_CHANGE_CHANNEL           = BIT(6),
        IEEE80211_CONF_CHANGE_RETRY_LIMITS      = BIT(7),
        IEEE80211_CONF_CHANGE_IDLE              = BIT(8),
-        IEEE80211_CONF_CHANGE_QOS               = BIT(9),
 };
 /**
@@ -676,9 +699,6 @@ enum ieee80211_smps_mode {
 * @dynamic_ps_timeout: The dynamic powersave timeout (in ms), see the
 *      powersave documentation below. This variable is valid only when
 *      the CONF_PS flag is set.
- * @dynamic_ps_forced_timeout: The dynamic powersave timeout (in ms) configured
- *      by cfg80211 (essentially, wext) If set, this value overrules the value
- *      chosen by mac80211 based on ps qos network latency.
 *
 * @power_level: requested transmit power (in dBm)
 *
@@ -698,7 +718,7 @@ enum ieee80211_smps_mode {
 */
 struct ieee80211_conf {
        u32 flags;
-        int power_level, dynamic_ps_timeout, dynamic_ps_forced_timeout;
+        int power_level, dynamic_ps_timeout;
        int max_sleep_period;
        u16 listen_interval;
@@ -815,7 +835,6 @@ enum ieee80211_key_flags {
 *      encrypted in hardware.
 * @alg: The key algorithm.
 * @flags: key flags, see &enum ieee80211_key_flags.
- * @ap_addr: AP's MAC address
 * @keyidx: the key index (0-3)
 * @keylen: key material length
 * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte)
@@ -881,16 +900,12 @@ struct ieee80211_sta {
 * enum sta_notify_cmd - sta notify command
 *
 * Used with the sta_notify() callback in &struct ieee80211_ops, this
- * indicates addition and removal of a station to station table,
+ * indicates if an associated station made a power state transition.
- * or if a associated station made a power state transition.
 *
- * @STA_NOTIFY_ADD: (DEPRECATED) a station was added to the station table
- * @STA_NOTIFY_REMOVE: (DEPRECATED) a station being removed from the station table
 * @STA_NOTIFY_SLEEP: a station is now sleeping
 * @STA_NOTIFY_AWAKE: a sleeping station woke up
 */
 enum sta_notify_cmd {
-        STA_NOTIFY_ADD, STA_NOTIFY_REMOVE,
        STA_NOTIFY_SLEEP, STA_NOTIFY_AWAKE,
 };
@@ -1014,6 +1029,9 @@ enum ieee80211_tkip_key_type {
 *      connection quality related parameters, such as the RSSI level and
 *      provide notifications if configured trigger levels are reached.
 *
+ * @IEEE80211_HW_NEED_DTIM_PERIOD:
+ *      This device needs to know the DTIM period for the BSS before
+ *      associating.
 */
 enum ieee80211_hw_flags {
        IEEE80211_HW_HAS_RATE_CONTROL                   = 1<<0,
@@ -1023,7 +1041,7 @@ enum ieee80211_hw_flags {
        IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE      = 1<<4,
        IEEE80211_HW_SIGNAL_UNSPEC                      = 1<<5,
        IEEE80211_HW_SIGNAL_DBM                         = 1<<6,
-        /* use this hole */
+        IEEE80211_HW_NEED_DTIM_PERIOD                   = 1<<7,
        IEEE80211_HW_SPECTRUM_MGMT                      = 1<<8,
        IEEE80211_HW_AMPDU_AGGREGATION                  = 1<<9,
        IEEE80211_HW_SUPPORTS_PS                        = 1<<10,
@@ -1260,6 +1278,15 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
 * dynamic PS feature in stack and will just keep %IEEE80211_CONF_PS
 * enabled whenever user has enabled powersave.
 *
+ * Some hardware need to toggle a single shared antenna between WLAN and
+ * Bluetooth to facilitate co-existence. These types of hardware set
+ * limitations on the use of host controlled dynamic powersave whenever there
+ * is simultaneous WLAN and Bluetooth traffic. For these types of hardware, the
+ * driver may request temporarily going into full power save, in order to
+ * enable toggling the antenna between BT and WLAN. If the driver requests
+ * disabling dynamic powersave, the @dynamic_ps_timeout value will be
+ * temporarily set to zero until the driver re-enables dynamic powersave.
+ *
 * Driver informs U-APSD client support by enabling
 * %IEEE80211_HW_SUPPORTS_UAPSD flag. The mode is configured through the
 * uapsd paramater in conf_tx() operation. Hardware needs to send the QoS
@@ -1451,7 +1478,7 @@ enum ieee80211_filter_flags {
 *
 * Note that drivers MUST be able to deal with a TX aggregation
 * session being stopped even before they OK'ed starting it by
- * calling ieee80211_start_tx_ba_cb(_irqsafe), because the peer
+ * calling ieee80211_start_tx_ba_cb_irqsafe, because the peer
 * might receive the addBA frame and send a delBA right away!
 *
 * @IEEE80211_AMPDU_RX_START: start Rx aggregation
@@ -1636,7 +1663,7 @@ enum ieee80211_ampdu_mlme_action {
 *      is the first frame we expect to perform the action on. Notice
 *      that TX/RX_STOP can pass NULL for this parameter.
 *      Returns a negative error code on failure.
- *      The callback must be atomic.
+ *      The callback can sleep.
 *
 * @get_survey: Return per-channel survey information
 *
@@ -2307,25 +2334,14 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw,
 int ieee80211_start_tx_ba_session(struct ieee80211_sta *sta, u16 tid);
 /**
- * ieee80211_start_tx_ba_cb - low level driver ready to aggregate.
- * @vif: &struct ieee80211_vif pointer from the add_interface callback
- * @ra: receiver address of the BA session recipient.
- * @tid: the TID to BA on.
- *
- * This function must be called by low level driver once it has
- * finished with preparations for the BA session.
- */
-void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid);
-/**
 * ieee80211_start_tx_ba_cb_irqsafe - low level driver ready to aggregate.
 * @vif: &struct ieee80211_vif pointer from the add_interface callback
 * @ra: receiver address of the BA session recipient.
 * @tid: the TID to BA on.
 *
 * This function must be called by low level driver once it has
- * finished with preparations for the BA session.
+ * finished with preparations for the BA session. It can be called
- * This version of the function is IRQ-safe.
+ * from any context.
 */
 void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
                                      u16 tid);
@@ -2334,27 +2350,14 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
 * ieee80211_stop_tx_ba_session - Stop a Block Ack session.
 * @sta: the station whose BA session to stop
 * @tid: the TID to stop BA.
- * @initiator: if indicates initiator DELBA frame will be sent.
 *
- * Return: error if no sta with matching da found, success otherwise
+ * Return: negative error if the TID is invalid, or no aggregation active
 *
 * Although mac80211/low level driver/user space application can estimate
 * the need to stop aggregation on a certain RA/TID, the session level
 * will be managed by the mac80211.
 */
-int ieee80211_stop_tx_ba_session(struct ieee80211_sta *sta, u16 tid,
+int ieee80211_stop_tx_ba_session(struct ieee80211_sta *sta, u16 tid);
-                                 enum ieee80211_back_parties initiator);
-/**
- * ieee80211_stop_tx_ba_cb - low level driver ready to stop aggregate.
- * @vif: &struct ieee80211_vif pointer from the add_interface callback
- * @ra: receiver address of the BA session recipient.
- * @tid: the desired TID to BA on.
- *
- * This function must be called by low level driver once it has
- * finished with preparations for the BA session tear down.
- */
-void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid);
 /**
 * ieee80211_stop_tx_ba_cb_irqsafe - low level driver ready to stop aggregate.
@@ -2363,8 +2366,8 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid);
 * @tid: the desired TID to BA on.
 *
 * This function must be called by low level driver once it has
- * finished with preparations for the BA session tear down.
+ * finished with preparations for the BA session tear down. It
- * This version of the function is IRQ-safe.
+ * can be called from any context.
 */
 void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
                                     u16 tid);
@@ -2460,6 +2463,36 @@ void ieee80211_beacon_loss(struct ieee80211_vif *vif);
 void ieee80211_connection_loss(struct ieee80211_vif *vif);
 /**
+ * ieee80211_disable_dyn_ps - force mac80211 to temporarily disable dynamic psm
+ *
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
+ *
+ * Some hardware require full power save to manage simultaneous BT traffic
+ * on the WLAN frequency. Full PSM is required periodically, whenever there are
+ * burst of BT traffic. The hardware gets information of BT traffic via
+ * hardware co-existence lines, and consequentially requests mac80211 to
+ * (temporarily) enter full psm.
+ * This function will only temporarily disable dynamic PS, not enable PSM if
+ * it was not already enabled.
+ * The driver must make sure to re-enable dynamic PS using
+ * ieee80211_enable_dyn_ps() if the driver has disabled it.
+ *
+ */
+void ieee80211_disable_dyn_ps(struct ieee80211_vif *vif);
+/**
+ * ieee80211_enable_dyn_ps - restore dynamic psm after being disabled
+ *
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
+ *
+ * This function restores dynamic PS after being temporarily disabled via
+ * ieee80211_disable_dyn_ps(). Each ieee80211_disable_dyn_ps() call must
+ * be coupled with an eventual call to this function.
+ *
+ */
+void ieee80211_enable_dyn_ps(struct ieee80211_vif *vif);
+/**
 * ieee80211_cqm_rssi_notify - inform a configured connection quality monitoring
 *      rssi threshold triggered
 *
diff --git a/include/net/mip6.h b/include/net/mip6.h
index a83ad1982a90..26ba99b5a4b1 100644
--- a/include/net/mip6.h
+++ b/include/net/mip6.h
@@ -39,7 +39,7 @@ struct ip6_mh {
        __u16   ip6mh_cksum;
        /* Followed by type specific messages */
        __u8    data[0];
-} __attribute__ ((__packed__));
+} __packed;
 #define IP6_MH_TYPE_BRR         0   /* Binding Refresh Request */
 #define IP6_MH_TYPE_HOTI        1   /* HOTI Message   */
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index f76f22d05721..895997bc2ead 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -82,7 +82,7 @@ struct ra_msg {
 struct nd_opt_hdr {
        __u8            nd_opt_type;
        __u8            nd_opt_len;
-} __attribute__((__packed__));
+} __packed;
 extern int                      ndisc_init(void);
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index eb21340a573b..242879b6c4df 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -151,7 +151,7 @@ struct neigh_table {
        void                    (*proxy_redo)(struct sk_buff *skb);
        char                    *id;
        struct neigh_parms      parms;
-        /* HACK. gc_* shoul follow parms without a gap! */
+        /* HACK. gc_* should follow parms without a gap! */
        int                     gc_interval;
        int                     gc_thresh1;
        int                     gc_thresh2;
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index bde095f7e845..e624dae54fa4 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -152,11 +152,7 @@ extern struct net init_net;
 static inline struct net *nf_ct_net(const struct nf_conn *ct)
 {
-#ifdef CONFIG_NET_NS
+        return read_pnet(&ct->ct_net);
-        return ct->ct_net;
-#else
-        return &init_net;
-#endif
 }
 /* Alter reply tuple (maybe alter helper). */
@@ -261,7 +257,12 @@ extern s16 (*nf_ct_nat_offset)(const struct nf_conn *ct,
                               u32 seq);
 /* Fake conntrack entry for untracked connections */
-extern struct nf_conn nf_conntrack_untracked;
+DECLARE_PER_CPU(struct nf_conn, nf_conntrack_untracked);
+static inline struct nf_conn *nf_ct_untracked_get(void)
+{
+        return &__raw_get_cpu_var(nf_conntrack_untracked);
+}
+extern void nf_ct_untracked_status_or(unsigned long bits);
 /* Iterate over all conntracks: if iter returns true, it's deleted. */
 extern void
@@ -289,9 +290,9 @@ static inline int nf_ct_is_dying(struct nf_conn *ct)
        return test_bit(IPS_DYING_BIT, &ct->status);
 }
-static inline int nf_ct_is_untracked(const struct sk_buff *skb)
+static inline int nf_ct_is_untracked(const struct nf_conn *ct)
 {
-        return (skb->nfct == &nf_conntrack_untracked.ct_general);
+        return test_bit(IPS_UNTRACKED_BIT, &ct->status);
 }
 extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp);
diff --git a/include/net/netfilter/nf_conntrack_acct.h b/include/net/netfilter/nf_conntrack_acct.h
index 03e218f0be43..4e9c63a20db2 100644
--- a/include/net/netfilter/nf_conntrack_acct.h
+++ b/include/net/netfilter/nf_conntrack_acct.h
@@ -45,6 +45,18 @@ struct nf_conn_counter *nf_ct_acct_ext_add(struct nf_conn *ct, gfp_t gfp)
 extern unsigned int
 seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir);
+/* Check if connection tracking accounting is enabled */
+static inline bool nf_ct_acct_enabled(struct net *net)
+{
+        return net->ct.sysctl_acct != 0;
+}
+/* Enable/disable connection tracking accounting */
+static inline void nf_ct_set_acct(struct net *net, bool enable)
+{
+        net->ct.sysctl_acct = enable;
+}
 extern int nf_conntrack_acct_init(struct net *net);
 extern void nf_conntrack_acct_fini(struct net *net);
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h
index 3d7524fba194..aced085132e7 100644
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
@@ -60,7 +60,7 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb)
        struct nf_conn *ct = (struct nf_conn *)skb->nfct;
        int ret = NF_ACCEPT;
-        if (ct && ct != &nf_conntrack_untracked) {
+        if (ct && !nf_ct_is_untracked(ct)) {
                if (!nf_ct_is_confirmed(ct))
                        ret = __nf_conntrack_confirm(skb);
                if (likely(ret == NF_ACCEPT))
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
index 32d15bd6efa3..0772d296dfdb 100644
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -28,9 +28,14 @@ struct nf_ct_ext {
        char data[0];
 };
-static inline int nf_ct_ext_exist(const struct nf_conn *ct, u8 id)
+static inline bool __nf_ct_ext_exist(const struct nf_ct_ext *ext, u8 id)
 {
-        return (ct->ext && ct->ext->offset[id]);
+        return !!ext->offset[id];
+}
+static inline bool nf_ct_ext_exist(const struct nf_conn *ct, u8 id)
+{
+        return (ct->ext && __nf_ct_ext_exist(ct->ext, id));
 }
 static inline void *__nf_ct_ext_find(const struct nf_conn *ct, u8 id)
diff --git a/include/net/netfilter/nf_nat_protocol.h b/include/net/netfilter/nf_nat_protocol.h
index c398017ccfa3..df17bac46bf5 100644
--- a/include/net/netfilter/nf_nat_protocol.h
+++ b/include/net/netfilter/nf_nat_protocol.h
@@ -27,9 +27,9 @@ struct nf_nat_protocol {
        /* Alter the per-proto part of the tuple (depending on
           maniptype), to give a unique tuple in the given range if
-           possible; return false if not.  Per-protocol part of tuple
+           possible.  Per-protocol part of tuple is initialized to the
-           is initialized to the incoming packet. */
+           incoming packet. */
-        bool (*unique_tuple)(struct nf_conntrack_tuple *tuple,
+        void (*unique_tuple)(struct nf_conntrack_tuple *tuple,
                             const struct nf_nat_range *range,
                             enum nf_nat_manip_type maniptype,
                             const struct nf_conn *ct);
@@ -63,7 +63,7 @@ extern bool nf_nat_proto_in_range(const struct nf_conntrack_tuple *tuple,
                                  const union nf_conntrack_man_proto *min,
                                  const union nf_conntrack_man_proto *max);
-extern bool nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple,
+extern void nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple,
                                      const struct nf_nat_range *range,
                                      enum nf_nat_manip_type maniptype,
                                      const struct nf_conn *ct,
diff --git a/include/net/netfilter/nf_nat_rule.h b/include/net/netfilter/nf_nat_rule.h
index e4a18ae361c6..2890bdc4cd92 100644
--- a/include/net/netfilter/nf_nat_rule.h
+++ b/include/net/netfilter/nf_nat_rule.h
@@ -12,6 +12,4 @@ extern int nf_nat_rule_find(struct sk_buff *skb,
                            const struct net_device *out,
                            struct nf_conn *ct);
-extern unsigned int
-alloc_null_binding(struct nf_conn *ct, unsigned int hooknum);
 #endif /* _NF_NAT_RULE_H */
diff --git a/include/net/netfilter/nfnetlink_log.h b/include/net/netfilter/nfnetlink_log.h
index b0569ff0775e..e2dec42c2db2 100644
--- a/include/net/netfilter/nfnetlink_log.h
+++ b/include/net/netfilter/nfnetlink_log.h
@@ -10,5 +10,7 @@ nfulnl_log_packet(u_int8_t pf,
                  const struct nf_loginfo *li_user,
                  const char *prefix);
+#define NFULNL_COPY_DISABLED    0xff
 #endif /* _KER_NFNETLINK_LOG_H */
diff --git a/include/net/netfilter/xt_rateest.h b/include/net/netfilter/xt_rateest.h
index ddbf37e19616..5a2978d1cb22 100644
--- a/include/net/netfilter/xt_rateest.h
+++ b/include/net/netfilter/xt_rateest.h
@@ -2,13 +2,18 @@
 #define _XT_RATEEST_H
 struct xt_rateest {
+        /* keep lock and bstats on same cache line to speedup xt_rateest_tg() */
+        struct gnet_stats_basic_packed  bstats;
+        spinlock_t                      lock;
+        /* keep rstats and lock on same cache line to speedup xt_rateest_mt() */
+        struct gnet_stats_rate_est      rstats;
+        /* following fields not accessed in hot path */
        struct hlist_node               list;
        char                            name[IFNAMSIZ];
        unsigned int                    refcnt;
-        spinlock_t                      lock;
        struct gnet_estimator           params;
-        struct gnet_stats_rate_est      rstats;
+        struct rcu_head                 rcu;
-        struct gnet_stats_basic_packed  bstats;
 };
 extern struct xt_rateest *xt_rateest_lookup(const char *name);
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 4fc05b58503e..f3b201d335b3 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -35,7 +35,7 @@
 *   nlmsg_new()                        create a new netlink message
 *   nlmsg_put()                        add a netlink message to an skb
 *   nlmsg_put_answer()                 callback based nlmsg_put()
- *   nlmsg_end()                        finanlize netlink message
+ *   nlmsg_end()                        finalize netlink message
 *   nlmsg_get_pos()                    return current position in message
 *   nlmsg_trim()                       trim part of message
 *   nlmsg_cancel()                     cancel message construction
diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h
index d7b989ca3d63..2d16783d5e20 100644
--- a/include/net/phonet/pn_dev.h
+++ b/include/net/phonet/pn_dev.h
@@ -34,6 +34,7 @@ struct phonet_device {
        struct list_head list;
        struct net_device *netdev;
        DECLARE_BITMAP(addrs, 64);
+        struct rcu_head rcu;
 };
 int phonet_device_init(void);
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 9d4d87cc970e..d9549af6929a 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -95,7 +95,7 @@ extern void __qdisc_run(struct Qdisc *q);
 static inline void qdisc_run(struct Qdisc *q)
 {
-        if (!test_and_set_bit(__QDISC_STATE_RUNNING, &q->state))
+        if (qdisc_run_begin(q))
                __qdisc_run(q);
 }
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index f873ee37f7e4..9e103a4e91ee 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -54,7 +54,6 @@ struct regulatory_request {
        enum nl80211_reg_initiator initiator;
        char alpha2[2];
        bool intersect;
-        u32 country_ie_checksum;
        enum environment_cap country_ie_env;
        struct list_head list;
 };
diff --git a/include/net/route.h b/include/net/route.h
index af6cf4b4c9dc..bd732d62e1c3 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -50,9 +50,7 @@
 struct fib_nh;
 struct inet_peer;
 struct rtable {
-        union {
+        struct dst_entry        dst;
-                struct dst_entry        dst;
-        } u;
        /* Cache lookup keys */
        struct flowi            fl;
@@ -144,7 +142,7 @@ extern void fib_add_ifaddr(struct in_ifaddr *);
 static inline void ip_rt_put(struct rtable * rt)
 {
        if (rt)
-                dst_release(&rt->u.dst);
+                dst_release(&rt->dst);
 }
 #define IPTOS_RT_MASK   (IPTOS_TOS_MASK & ~3)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 433604bb3fe8..3c8728aaab4e 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -23,11 +23,17 @@ struct qdisc_rate_table {
 };
 enum qdisc_state_t {
-        __QDISC_STATE_RUNNING,
        __QDISC_STATE_SCHED,
        __QDISC_STATE_DEACTIVATED,
 };
+/*
+ * following bits are only changed while qdisc lock is held
+ */
+enum qdisc___state_t {
+        __QDISC___STATE_RUNNING,
+};
 struct qdisc_size_table {
        struct list_head        list;
        struct tc_sizespec      szopts;
@@ -72,10 +78,27 @@ struct Qdisc {
        unsigned long           state;
        struct sk_buff_head     q;
        struct gnet_stats_basic_packed bstats;
+        unsigned long           __state;
        struct gnet_stats_queue qstats;
-        struct rcu_head     rcu_head;
+        struct rcu_head         rcu_head;
+        spinlock_t              busylock;
 };
+static inline bool qdisc_is_running(struct Qdisc *qdisc)
+{
+        return test_bit(__QDISC___STATE_RUNNING, &qdisc->__state);
+}
+static inline bool qdisc_run_begin(struct Qdisc *qdisc)
+{
+        return !__test_and_set_bit(__QDISC___STATE_RUNNING, &qdisc->__state);
+}
+static inline void qdisc_run_end(struct Qdisc *qdisc)
+{
+        __clear_bit(__QDISC___STATE_RUNNING, &qdisc->__state);
+}
 struct Qdisc_class_ops {
        /* Child qdisc manipulation */
        struct netdev_queue *   (*select_queue)(struct Qdisc *, struct tcmsg *);
@@ -583,9 +606,16 @@ static inline u32 qdisc_l2t(struct qdisc_rate_table* rtab, unsigned int pktlen)
 }
 #ifdef CONFIG_NET_CLS_ACT
-static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask)
+static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask,
+                                            int action)
 {
-        struct sk_buff *n = skb_clone(skb, gfp_mask);
+        struct sk_buff *n;
+        if ((action == TC_ACT_STOLEN || action == TC_ACT_QUEUED) &&
+            !skb_shared(skb))
+                n = skb_get(skb);
+        else
+                n = skb_clone(skb, gfp_mask);
        if (n) {
                n->tc_verd = SET_TC_VERD(n->tc_verd, 0);
diff --git a/include/net/scm.h b/include/net/scm.h
index 8360e47aa7e3..31656506d967 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -19,8 +19,10 @@ struct scm_fp_list {
 };
 struct scm_cookie {
-        struct ucred            creds;          /* Skb credentials      */
+        struct pid              *pid;           /* Skb credentials */
+        const struct cred       *cred;
        struct scm_fp_list      *fp;            /* Passed files         */
+        struct ucred            creds;          /* Skb credentials      */
 #ifdef CONFIG_SECURITY_NETWORK
        u32                     secid;          /* Passed security ID   */
 #endif
@@ -42,8 +44,27 @@ static __inline__ void unix_get_peersec_dgram(struct socket *sock, struct scm_co
 { }
 #endif /* CONFIG_SECURITY_NETWORK */
+static __inline__ void scm_set_cred(struct scm_cookie *scm,
+                                    struct pid *pid, const struct cred *cred)
+{
+        scm->pid  = get_pid(pid);
+        scm->cred = get_cred(cred);
+        cred_to_ucred(pid, cred, &scm->creds);
+}
+static __inline__ void scm_destroy_cred(struct scm_cookie *scm)
+{
+        put_pid(scm->pid);
+        scm->pid  = NULL;
+        if (scm->cred)
+                put_cred(scm->cred);
+        scm->cred = NULL;
+}
 static __inline__ void scm_destroy(struct scm_cookie *scm)
 {
+        scm_destroy_cred(scm);
        if (scm && scm->fp)
                __scm_destroy(scm);
 }
@@ -51,10 +72,7 @@ static __inline__ void scm_destroy(struct scm_cookie *scm)
 static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
                               struct scm_cookie *scm)
 {
-        struct task_struct *p = current;
+        scm_set_cred(scm, task_tgid(current), current_cred());
-        scm->creds.uid = current_uid();
-        scm->creds.gid = current_gid();
-        scm->creds.pid = task_tgid_vnr(p);
        scm->fp = NULL;
        unix_get_peersec_dgram(sock, scm);
        if (msg->msg_controllen <= 0)
@@ -96,6 +114,8 @@ static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
        if (test_bit(SOCK_PASSCRED, &sock->flags))
                put_cmsg(msg, SOL_SOCKET, SCM_CREDENTIALS, sizeof(scm->creds), &scm->creds);
+        scm_destroy_cred(scm);
        scm_passec(sock, msg, scm);
        if (!scm->fp)
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 4b860116e096..f9e7473613bd 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -443,7 +443,7 @@ struct sctp_signed_cookie {
        __u8 signature[SCTP_SECRET_SIZE];
        __u32 __pad;            /* force sctp_cookie alignment to 64 bits */
        struct sctp_cookie c;
-} __attribute__((packed));
+} __packed;
 /* This is another convenience type to allocate memory for address
 * params for the maximum size and pass such structures around
@@ -488,7 +488,7 @@ typedef struct sctp_sender_hb_info {
        union sctp_addr daddr;
        unsigned long sent_at;
        __u64 hb_nonce;
-} __attribute__((packed)) sctp_sender_hb_info_t;
+} __packed sctp_sender_hb_info_t;
 /*
 *  RFC 2960 1.3.2 Sequenced Delivery within Streams
diff --git a/include/net/snmp.h b/include/net/snmp.h
index 899003d18db9..a0e61806d480 100644
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -47,15 +47,16 @@ struct snmp_mib {
 }
 /*
- * We use all unsigned longs. Linux will soon be so reliable that even 
+ * We use unsigned longs for most mibs but u64 for ipstats.
- * these will rapidly get too small 8-). Seriously consider the IpInReceives 
- * count on the 20Gb/s + networks people expect in a few years time!
 */
+#include <linux/u64_stats_sync.h>
 /* IPstats */
 #define IPSTATS_MIB_MAX __IPSTATS_MIB_MAX
 struct ipstats_mib {
-        unsigned long   mibs[IPSTATS_MIB_MAX];
+        /* mibs[] must be first field of struct ipstats_mib */
+        u64             mibs[IPSTATS_MIB_MAX];
+        struct u64_stats_sync syncp;
 };
 /* ICMP */
@@ -155,4 +156,70 @@ struct linux_xfrm_mib {
                ptr->mibs[basefield##PKTS]++; \
                ptr->mibs[basefield##OCTETS] += addend;\
        } while (0)
+#if BITS_PER_LONG==32
+#define SNMP_ADD_STATS64_BH(mib, field, addend)                         \
+        do {                                                            \
+                __typeof__(*mib[0]) *ptr = __this_cpu_ptr((mib)[0]);    \
+                u64_stats_update_begin(&ptr->syncp);                    \
+                ptr->mibs[field] += addend;                             \
+                u64_stats_update_end(&ptr->syncp);                      \
+        } while (0)
+#define SNMP_ADD_STATS64_USER(mib, field, addend)                       \
+        do {                                                            \
+                __typeof__(*mib[0]) *ptr;                               \
+                preempt_disable();                                      \
+                ptr = __this_cpu_ptr((mib)[1]);                         \
+                u64_stats_update_begin(&ptr->syncp);                    \
+                ptr->mibs[field] += addend;                             \
+                u64_stats_update_end(&ptr->syncp);                      \
+                preempt_enable();                                       \
+        } while (0)
+#define SNMP_ADD_STATS64(mib, field, addend)                            \
+        do {                                                            \
+                __typeof__(*mib[0]) *ptr;                               \
+                preempt_disable();                                      \
+                ptr = __this_cpu_ptr((mib)[!in_softirq()]);             \
+                u64_stats_update_begin(&ptr->syncp);                    \
+                ptr->mibs[field] += addend;                             \
+                u64_stats_update_end(&ptr->syncp);                      \
+                preempt_enable();                                       \
+        } while (0)
+#define SNMP_INC_STATS64_BH(mib, field) SNMP_ADD_STATS64_BH(mib, field, 1)
+#define SNMP_INC_STATS64_USER(mib, field) SNMP_ADD_STATS64_USER(mib, field, 1)
+#define SNMP_INC_STATS64(mib, field) SNMP_ADD_STATS64(mib, field, 1)
+#define SNMP_UPD_PO_STATS64(mib, basefield, addend)                     \
+        do {                                                            \
+                __typeof__(*mib[0]) *ptr;                               \
+                preempt_disable();                                      \
+                ptr = __this_cpu_ptr((mib)[!in_softirq()]);             \
+                u64_stats_update_begin(&ptr->syncp);                    \
+                ptr->mibs[basefield##PKTS]++;                           \
+                ptr->mibs[basefield##OCTETS] += addend;                 \
+                u64_stats_update_end(&ptr->syncp);                      \
+                preempt_enable();                                       \
+        } while (0)
+#define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend)                  \
+        do {                                                            \
+                __typeof__(*mib[0]) *ptr;                               \
+                ptr = __this_cpu_ptr((mib)[!in_softirq()]);             \
+                u64_stats_update_begin(&ptr->syncp);                    \
+                ptr->mibs[basefield##PKTS]++;                           \
+                ptr->mibs[basefield##OCTETS] += addend;                 \
+                u64_stats_update_end(&ptr->syncp);                      \
+        } while (0)
+#else
+#define SNMP_INC_STATS64_BH(mib, field)         SNMP_INC_STATS_BH(mib, field)
+#define SNMP_INC_STATS64_USER(mib, field)       SNMP_INC_STATS_USER(mib, field)
+#define SNMP_INC_STATS64(mib, field)            SNMP_INC_STATS(mib, field)
+#define SNMP_DEC_STATS64(mib, field)            SNMP_DEC_STATS(mib, field)
+#define SNMP_ADD_STATS64_BH(mib, field, addend) SNMP_ADD_STATS_BH(mib, field, addend)
+#define SNMP_ADD_STATS64_USER(mib, field, addend) SNMP_ADD_STATS_USER(mib, field, addend)
+#define SNMP_ADD_STATS64(mib, field, addend)    SNMP_ADD_STATS(mib, field, addend)
+#define SNMP_UPD_PO_STATS64(mib, basefield, addend) SNMP_UPD_PO_STATS(mib, basefield, addend)
+#define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend) SNMP_UPD_PO_STATS_BH(mib, basefield, addend)
+#endif
 #endif
diff --git a/include/net/sock.h b/include/net/sock.h
index 0a691ea7654a..a441c9cdd625 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -295,7 +295,8 @@ struct sock {
        unsigned short          sk_ack_backlog;
        unsigned short          sk_max_ack_backlog;
        __u32                   sk_priority;
-        struct ucred            sk_peercred;
+        struct pid              *sk_peer_pid;
+        const struct cred       *sk_peer_cred;
        long                    sk_rcvtimeo;
        long                    sk_sndtimeo;
        struct sk_filter        *sk_filter;
@@ -771,6 +772,7 @@ struct proto {
        int                     *sysctl_wmem;
        int                     *sysctl_rmem;
        int                     max_header;
+        bool                    no_autobind;
        struct kmem_cache       *slab;
        unsigned int            obj_size;
@@ -1706,19 +1708,13 @@ static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_e
 static inline
 struct net *sock_net(const struct sock *sk)
 {
-#ifdef CONFIG_NET_NS
+        return read_pnet(&sk->sk_net);
-        return sk->sk_net;
-#else
-        return &init_net;
-#endif
 }
 static inline
 void sock_net_set(struct sock *sk, struct net *net)
 {
-#ifdef CONFIG_NET_NS
+        write_pnet(&sk->sk_net, net);
-        sk->sk_net = net;
-#endif
 }
 /*
diff --git a/include/net/tcp.h b/include/net/tcp.h
index a1449144848a..df6a2eb20193 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -296,45 +296,30 @@ extern struct proto tcp_prot;
 #define TCP_ADD_STATS_USER(net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val)
 #define TCP_ADD_STATS(net, field, val)  SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val)
-extern void                     tcp_v4_err(struct sk_buff *skb, u32);
+extern void tcp_v4_err(struct sk_buff *skb, u32);
-extern void                     tcp_shutdown (struct sock *sk, int how);
+extern void tcp_shutdown (struct sock *sk, int how);
-extern int                      tcp_v4_rcv(struct sk_buff *skb);
+extern int tcp_v4_rcv(struct sk_buff *skb);
-extern int                      tcp_v4_remember_stamp(struct sock *sk);
+extern int tcp_v4_remember_stamp(struct sock *sk);
+extern int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);
-extern int                      tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);
+extern int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+                       size_t size);
-extern int                      tcp_sendmsg(struct kiocb *iocb, struct socket *sock,
+extern int tcp_sendpage(struct sock *sk, struct page *page, int offset,
-                                            struct msghdr *msg, size_t size);
+                        size_t size, int flags);
-extern ssize_t                  tcp_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags);
+extern int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg);
+extern int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
-extern int                      tcp_ioctl(struct sock *sk, 
+                                 struct tcphdr *th, unsigned len);
-                                          int cmd, 
+extern int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
-                                          unsigned long arg);
+                               struct tcphdr *th, unsigned len);
+extern void tcp_rcv_space_adjust(struct sock *sk);
-extern int                      tcp_rcv_state_process(struct sock *sk, 
+extern void tcp_cleanup_rbuf(struct sock *sk, int copied);
-                                                      struct sk_buff *skb,
+extern int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);
-                                                      struct tcphdr *th,
+extern void tcp_twsk_destructor(struct sock *sk);
-                                                      unsigned len);
+extern ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos,
+                               struct pipe_inode_info *pipe, size_t len,
-extern int                      tcp_rcv_established(struct sock *sk, 
+                               unsigned int flags);
-                                                    struct sk_buff *skb,
-                                                    struct tcphdr *th, 
-                                                    unsigned len);
-extern void                     tcp_rcv_space_adjust(struct sock *sk);
-extern void                     tcp_cleanup_rbuf(struct sock *sk, int copied);
-extern int                      tcp_twsk_unique(struct sock *sk,
-                                                struct sock *sktw, void *twp);
-extern void                     tcp_twsk_destructor(struct sock *sk);
-extern ssize_t                  tcp_splice_read(struct socket *sk, loff_t *ppos,
-                                                struct pipe_inode_info *pipe, size_t len, unsigned int flags);
 static inline void tcp_dec_quickack_mode(struct sock *sk,
                                         const unsigned int pkts)
@@ -372,88 +357,59 @@ enum tcp_tw_status {
 };
-extern enum tcp_tw_status       tcp_timewait_state_process(struct inet_timewait_sock *tw,
+extern enum tcp_tw_status tcp_timewait_state_process(struct inet_timewait_sock *tw,
-                                                           struct sk_buff *skb,
+                                                     struct sk_buff *skb,
-                                                           const struct tcphdr *th);
+                                                     const struct tcphdr *th);
+extern struct sock * tcp_check_req(struct sock *sk,struct sk_buff *skb,
-extern struct sock *            tcp_check_req(struct sock *sk,struct sk_buff *skb,
+                                   struct request_sock *req,
-                                              struct request_sock *req,
+                                   struct request_sock **prev);
-                                              struct request_sock **prev);
+extern int tcp_child_process(struct sock *parent, struct sock *child,
-extern int                      tcp_child_process(struct sock *parent,
+                             struct sk_buff *skb);
-                                                  struct sock *child,
+extern int tcp_use_frto(struct sock *sk);
-                                                  struct sk_buff *skb);
+extern void tcp_enter_frto(struct sock *sk);
-extern int                      tcp_use_frto(struct sock *sk);
+extern void tcp_enter_loss(struct sock *sk, int how);
-extern void                     tcp_enter_frto(struct sock *sk);
+extern void tcp_clear_retrans(struct tcp_sock *tp);
-extern void                     tcp_enter_loss(struct sock *sk, int how);
+extern void tcp_update_metrics(struct sock *sk);
-extern void                     tcp_clear_retrans(struct tcp_sock *tp);
+extern void tcp_close(struct sock *sk, long timeout);
-extern void                     tcp_update_metrics(struct sock *sk);
+extern unsigned int tcp_poll(struct file * file, struct socket *sock,
+                             struct poll_table_struct *wait);
-extern void                     tcp_close(struct sock *sk, 
+extern int tcp_getsockopt(struct sock *sk, int level, int optname,
-                                          long timeout);
+                          char __user *optval, int __user *optlen);
-extern unsigned int             tcp_poll(struct file * file, struct socket *sock, struct poll_table_struct *wait);
+extern int tcp_setsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, unsigned int optlen);
-extern int                      tcp_getsockopt(struct sock *sk, int level, 
+extern int compat_tcp_getsockopt(struct sock *sk, int level, int optname,
-                                               int optname,
+                                 char __user *optval, int __user *optlen);
-                                               char __user *optval, 
+extern int compat_tcp_setsockopt(struct sock *sk, int level, int optname,
-                                               int __user *optlen);
+                                 char __user *optval, unsigned int optlen);
-extern int                      tcp_setsockopt(struct sock *sk, int level, 
+extern void tcp_set_keepalive(struct sock *sk, int val);
-                                               int optname, char __user *optval, 
+extern void tcp_syn_ack_timeout(struct sock *sk, struct request_sock *req);
-                                               unsigned int optlen);
+extern int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-extern int                      compat_tcp_getsockopt(struct sock *sk,
+                       size_t len, int nonblock, int flags, int *addr_len);
-                                        int level, int optname,
+extern void tcp_parse_options(struct sk_buff *skb,
-                                        char __user *optval, int __user *optlen);
+                              struct tcp_options_received *opt_rx, u8 **hvpp,
-extern int                      compat_tcp_setsockopt(struct sock *sk,
+                              int estab);
-                                        int level, int optname,
+extern u8 *tcp_parse_md5sig_option(struct tcphdr *th);
-                                        char __user *optval, unsigned int optlen);
-extern void                     tcp_set_keepalive(struct sock *sk, int val);
-extern void                     tcp_syn_ack_timeout(struct sock *sk,
-                                                    struct request_sock *req);
-extern int                      tcp_recvmsg(struct kiocb *iocb, struct sock *sk,
-                                            struct msghdr *msg,
-                                            size_t len, int nonblock, 
-                                            int flags, int *addr_len);
-extern void                     tcp_parse_options(struct sk_buff *skb,
-                                                  struct tcp_options_received *opt_rx,
-                                                  u8 **hvpp,
-                                                  int estab);
-extern u8                       *tcp_parse_md5sig_option(struct tcphdr *th);
 /*
 *      TCP v4 functions exported for the inet6 API
 */
-extern void                     tcp_v4_send_check(struct sock *sk,
+extern void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb);
-                                                  struct sk_buff *skb);
+extern int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb);
+extern struct sock * tcp_create_openreq_child(struct sock *sk,
-extern int                      tcp_v4_conn_request(struct sock *sk,
+                                              struct request_sock *req,
-                                                    struct sk_buff *skb);
-extern struct sock *            tcp_create_openreq_child(struct sock *sk,
-                                                         struct request_sock *req,
-                                                         struct sk_buff *skb);
-extern struct sock *            tcp_v4_syn_recv_sock(struct sock *sk,
-                                                     struct sk_buff *skb,
-                                                     struct request_sock *req,
-                                                        struct dst_entry *dst);
-extern int                      tcp_v4_do_rcv(struct sock *sk,
                                              struct sk_buff *skb);
+extern struct sock * tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
-extern int                      tcp_v4_connect(struct sock *sk,
+                                          struct request_sock *req,
-                                               struct sockaddr *uaddr,
+                                          struct dst_entry *dst);
-                                               int addr_len);
+extern int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb);
+extern int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr,
-extern int                      tcp_connect(struct sock *sk);
+                          int addr_len);
+extern int tcp_connect(struct sock *sk);
-extern struct sk_buff *         tcp_make_synack(struct sock *sk,
+extern struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst,
-                                                struct dst_entry *dst,
+                                        struct request_sock *req,
-                                                struct request_sock *req,
+                                        struct request_values *rvp);
-                                                struct request_values *rvp);
+extern int tcp_disconnect(struct sock *sk, int flags);
-extern int                      tcp_disconnect(struct sock *sk, int flags);
 /* From syncookies.c */
@@ -464,7 +420,7 @@ extern __u32 cookie_v4_init_sequence(struct sock *sk, struct sk_buff *skb,
                                     __u16 *mss);
 extern __u32 cookie_init_timestamp(struct request_sock *req);
-extern void cookie_check_timestamp(struct tcp_options_received *tcp_opt);
+extern bool cookie_check_timestamp(struct tcp_options_received *opt, bool *);
 /* From net/ipv6/syncookies.c */
 extern struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb);
@@ -485,10 +441,10 @@ extern int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
 extern void tcp_send_probe0(struct sock *);
 extern void tcp_send_partial(struct sock *);
-extern int  tcp_write_wakeup(struct sock *);
+extern int tcp_write_wakeup(struct sock *);
 extern void tcp_send_fin(struct sock *sk);
 extern void tcp_send_active_reset(struct sock *sk, gfp_t priority);
-extern int  tcp_send_synack(struct sock *);
+extern int tcp_send_synack(struct sock *);
 extern void tcp_push_one(struct sock *, unsigned int mss_now);
 extern void tcp_send_ack(struct sock *sk);
 extern void tcp_send_delayed_ack(struct sock *sk);
@@ -592,7 +548,7 @@ static inline u32 tcp_receive_window(const struct tcp_sock *tp)
 * scaling applied to the result.  The caller does these things
 * if necessary.  This is a "raw" window selection.
 */
-extern u32      __tcp_select_window(struct sock *sk);
+extern u32 __tcp_select_window(struct sock *sk);
 /* TCP timestamps are only 32-bits, this causes a slight
 * complication on 64-bit systems since we store a snapshot
@@ -602,12 +558,22 @@ extern u32	__tcp_select_window(struct sock *sk);
 */
 #define tcp_time_stamp          ((__u32)(jiffies))
+#define tcp_flag_byte(th) (((u_int8_t *)th)[13])
+#define TCPHDR_FIN 0x01
+#define TCPHDR_SYN 0x02
+#define TCPHDR_RST 0x04
+#define TCPHDR_PSH 0x08
+#define TCPHDR_ACK 0x10
+#define TCPHDR_URG 0x20
+#define TCPHDR_ECE 0x40
+#define TCPHDR_CWR 0x80
 /* This is what the send packet queuing engine uses to pass
- * TCP per-packet control information to the transmission
+ * TCP per-packet control information to the transmission code.
- * code.  We also store the host-order sequence numbers in
+ * We also store the host-order sequence numbers in here too.
- * here too.  This is 36 bytes on 32-bit architectures,
+ * This is 44 bytes if IPV6 is enabled.
- * 40 bytes on 64-bit machines, if this grows please adjust
+ * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
- * skbuff.h:skbuff->cb[xxx] size appropriately.
 */
 struct tcp_skb_cb {
        union {
@@ -620,19 +586,6 @@ struct tcp_skb_cb {
        __u32           end_seq;        /* SEQ + FIN + SYN + datalen    */
        __u32           when;           /* used to compute rtt's        */
        __u8            flags;          /* TCP header flags.            */
-        /* NOTE: These must match up to the flags byte in a
-         *       real TCP header.
-         */
-#define TCPCB_FLAG_FIN          0x01
-#define TCPCB_FLAG_SYN          0x02
-#define TCPCB_FLAG_RST          0x04
-#define TCPCB_FLAG_PSH          0x08
-#define TCPCB_FLAG_ACK          0x10
-#define TCPCB_FLAG_URG          0x20
-#define TCPCB_FLAG_ECE          0x40
-#define TCPCB_FLAG_CWR          0x80
        __u8            sacked;         /* State flags for SACK/FACK.   */
 #define TCPCB_SACKED_ACKED      0x01    /* SKB ACK'd by a SACK block    */
 #define TCPCB_SACKED_RETRANS    0x02    /* SKB retransmitted            */
@@ -1176,22 +1129,14 @@ struct tcp_md5sig_pool {
 #define TCP_MD5SIG_MAXKEYS      (~(u32)0)       /* really?! */
 /* - functions */
-extern int                      tcp_v4_md5_hash_skb(char *md5_hash,
+extern int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,
-                                                    struct tcp_md5sig_key *key,
+                               struct sock *sk, struct request_sock *req,
-                                                    struct sock *sk,
+                               struct sk_buff *skb);
-                                                    struct request_sock *req,
+extern struct tcp_md5sig_key * tcp_v4_md5_lookup(struct sock *sk,
-                                                    struct sk_buff *skb);
+                                                 struct sock *addr_sk);
+extern int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, u8 *newkey,
-extern struct tcp_md5sig_key    *tcp_v4_md5_lookup(struct sock *sk,
+                             u8 newkeylen);
-                                                   struct sock *addr_sk);
+extern int tcp_v4_md5_do_del(struct sock *sk, __be32 addr);
-extern int                      tcp_v4_md5_do_add(struct sock *sk,
-                                                  __be32 addr,
-                                                  u8 *newkey,
-                                                  u8 newkeylen);
-extern int                      tcp_v4_md5_do_del(struct sock *sk,
-                                                  __be32 addr);
 #ifdef CONFIG_TCP_MD5SIG
 #define tcp_twsk_md5_key(twsk)  ((twsk)->tw_md5_keylen ?                 \
@@ -1204,10 +1149,10 @@ extern int			tcp_v4_md5_do_del(struct sock *sk,
 #endif
 extern struct tcp_md5sig_pool * __percpu *tcp_alloc_md5sig_pool(struct sock *);
-extern void                     tcp_free_md5sig_pool(void);
+extern void tcp_free_md5sig_pool(void);
 extern struct tcp_md5sig_pool   *tcp_get_md5sig_pool(void);
-extern void                     tcp_put_md5sig_pool(void);
+extern void tcp_put_md5sig_pool(void);
 extern int tcp_md5_hash_header(struct tcp_md5sig_pool *, struct tcphdr *);
 extern int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, struct sk_buff *,
@@ -1413,7 +1358,8 @@ struct tcp_iter_state {
        sa_family_t             family;
        enum tcp_seq_states     state;
        struct sock             *syn_wait_sk;
-        int                     bucket, sbucket, num, uid;
+        int                     bucket, offset, sbucket, num, uid;
+        loff_t                  last_pos;
 };
 extern int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo);
@@ -1434,7 +1380,7 @@ extern int tcp_gro_complete(struct sk_buff *skb);
 extern int tcp4_gro_complete(struct sk_buff *skb);
 #ifdef CONFIG_PROC_FS
-extern int  tcp4_proc_init(void);
+extern int tcp4_proc_init(void);
 extern void tcp4_proc_exit(void);
 #endif
diff --git a/include/net/udp.h b/include/net/udp.h
index 5348d80b25bb..7abdf305da50 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -157,30 +157,28 @@ static inline void udp_lib_close(struct sock *sk, long timeout)
        sk_common_release(sk);
 }
-extern int      udp_lib_get_port(struct sock *sk, unsigned short snum,
+extern int udp_lib_get_port(struct sock *sk, unsigned short snum,
-                int (*)(const struct sock *,const struct sock *),
+                            int (*)(const struct sock *,const struct sock *),
-                unsigned int hash2_nulladdr);
+                            unsigned int hash2_nulladdr);
 /* net/ipv4/udp.c */
-extern int      udp_get_port(struct sock *sk, unsigned short snum,
+extern int udp_get_port(struct sock *sk, unsigned short snum,
-                             int (*saddr_cmp)(const struct sock *, const struct sock *));
+                        int (*saddr_cmp)(const struct sock *,
-extern void     udp_err(struct sk_buff *, u32);
+                                         const struct sock *));
+extern void udp_err(struct sk_buff *, u32);
-extern int      udp_sendmsg(struct kiocb *iocb, struct sock *sk,
+extern int udp_sendmsg(struct kiocb *iocb, struct sock *sk,
                            struct msghdr *msg, size_t len);
-extern void     udp_flush_pending_frames(struct sock *sk);
+extern void udp_flush_pending_frames(struct sock *sk);
+extern int udp_rcv(struct sk_buff *skb);
-extern int      udp_rcv(struct sk_buff *skb);
+extern int udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
-extern int      udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
+extern int udp_disconnect(struct sock *sk, int flags);
-extern int      udp_disconnect(struct sock *sk, int flags);
 extern unsigned int udp_poll(struct file *file, struct socket *sock,
                             poll_table *wait);
-extern int      udp_lib_getsockopt(struct sock *sk, int level, int optname,
+extern int udp_lib_getsockopt(struct sock *sk, int level, int optname,
-                                   char __user *optval, int __user *optlen);
+                              char __user *optval, int __user *optlen);
-extern int      udp_lib_setsockopt(struct sock *sk, int level, int optname,
+extern int udp_lib_setsockopt(struct sock *sk, int level, int optname,
-                                   char __user *optval, unsigned int optlen,
+                              char __user *optval, unsigned int optlen,
-                                   int (*push_pending_frames)(struct sock *));
+                              int (*push_pending_frames)(struct sock *));
 extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
                                    __be32 daddr, __be16 dport,
                                    int dif);
@@ -236,7 +234,7 @@ struct udp_iter_state {
 extern int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo);
 extern void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo);
-extern int  udp4_proc_init(void);
+extern int udp4_proc_init(void);
 extern void udp4_proc_exit(void);
 #endif
diff --git a/include/rxrpc/packet.h b/include/rxrpc/packet.h
index b69e6e173ea1..9b2c30897e50 100644
--- a/include/rxrpc/packet.h
+++ b/include/rxrpc/packet.h
@@ -65,7 +65,7 @@ struct rxrpc_header {
        };
        __be16          serviceId;      /* service ID */
-} __attribute__((packed));
+} __packed;
 #define __rxrpc_header_off(X) offsetof(struct rxrpc_header,X)
@@ -120,7 +120,7 @@ struct rxrpc_ackpacket {
 #define RXRPC_ACK_TYPE_NACK             0
 #define RXRPC_ACK_TYPE_ACK              1
-} __attribute__((packed));
+} __packed;
 /*
 * ACK packets can have a further piece of information tagged on the end
@@ -141,7 +141,7 @@ struct rxkad_challenge {
        __be32          nonce;          /* encrypted random number */
        __be32          min_level;      /* minimum security level */
        __be32          __padding;      /* padding to 8-byte boundary */
-} __attribute__((packed));
+} __packed;
 /*****************************************************************************/
 /*
@@ -164,7 +164,7 @@ struct rxkad_response {
        __be32          kvno;           /* Kerberos key version number */
        __be32          ticket_len;     /* Kerberos ticket length  */
-} __attribute__((packed));
+} __packed;
 /*****************************************************************************/
 /*
diff --git a/include/scsi/fc/fc_els.h b/include/scsi/fc/fc_els.h
index f94328132a26..481abbd48e39 100644
--- a/include/scsi/fc/fc_els.h
+++ b/include/scsi/fc/fc_els.h
@@ -191,6 +191,7 @@ enum fc_els_rjt_reason {
        ELS_RJT_UNAB =          0x09,   /* unable to perform command request */
        ELS_RJT_UNSUP =         0x0b,   /* command not supported */
        ELS_RJT_INPROG =        0x0e,   /* command already in progress */
+        ELS_RJT_FIP =           0x20,   /* FIP error */
        ELS_RJT_VENDOR =        0xff,   /* vendor specific error */
 };
@@ -212,6 +213,7 @@ enum fc_els_rjt_explan {
        ELS_EXPL_UNAB_DATA =    0x2a,   /* unable to supply requested data */
        ELS_EXPL_UNSUPR =       0x2c,   /* Request not supported */
        ELS_EXPL_INV_LEN =      0x2d,   /* Invalid payload length */
+        ELS_EXPL_NOT_NEIGHBOR = 0x62,   /* VN2VN_Port not in neighbor set */
        /* TBD - above definitions incomplete */
 };
@@ -405,6 +407,15 @@ struct fc_els_prli {
 };
 /*
+ * ELS_PRLO - Process logout request and response.
+ */
+struct fc_els_prlo {
+        __u8            prlo_cmd;       /* command */
+        __u8            prlo_obs;       /* obsolete, but shall be set to 10h */
+        __be16          prlo_len;       /* payload length */
+};
+/*
 * ELS_ADISC payload
 */
 struct fc_els_adisc {
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
index e6ad3d2ae475..d5dcd6062815 100644
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -22,23 +22,18 @@
 /*
 * FCoE - Fibre Channel over Ethernet.
+ * See T11 FC-BB-5 Rev 2.00 (09-056v5.pdf)
 */
 /*
- * FC_FCOE_OUI hasn't been standardized yet.   XXX TBD.
+ * Default FC_FCOE_OUI / FC-MAP value.
 */
-#ifndef FC_FCOE_OUI
+#define FC_FCOE_OUI     0x0efc00        /* upper 24 bits of FCOE MAC */
-#define FC_FCOE_OUI     0x0efc00        /* upper 24 bits of FCOE dest MAC TBD */
-#endif
 /*
- * The destination MAC address for the fabric login may get a different OUI.
+ * Fabric Login (FLOGI) MAC for non-FIP use.  Non-FIP use is deprecated.
- * This isn't standardized yet.
 */
-#ifndef FC_FCOE_FLOGI_MAC
-/* gateway MAC - TBD */
 #define FC_FCOE_FLOGI_MAC { 0x0e, 0xfc, 0x00, 0xff, 0xff, 0xfe }
-#endif
 #define FC_FCOE_VER     0                       /* version */
@@ -51,8 +46,6 @@
 /*
 * FCoE frame header - 14 bytes
- *
- * This is the August 2007 version of the FCoE header as defined by T11.
 * This follows the VLAN header, which includes the ethertype.
 */
 struct fcoe_hdr {
diff --git a/include/scsi/fc/fc_fip.h b/include/scsi/fc/fc_fip.h
index 17baa19380f0..ae25d4ab2548 100644
--- a/include/scsi/fc/fc_fip.h
+++ b/include/scsi/fc/fc_fip.h
@@ -17,9 +17,12 @@
 #ifndef _FC_FIP_H_
 #define _FC_FIP_H_
+#include <scsi/fc/fc_ns.h>
 /*
 * This version is based on:
 * http://www.t11.org/ftp/t11/pub/fc/bb-5/08-543v1.pdf
+ * and T11 FC-BB-6 10-019v4.pdf (June 2010 VN2VN proposal)
 */
 #define FIP_DEF_PRI     128     /* default selection priority */
@@ -29,11 +32,24 @@
 #define FIP_FCF_FUZZ    100     /* random time added by FCF (mS) */
 /*
+ * VN2VN proposed-standard values.
+ */
+#define FIP_VN_FC_MAP   0x0efd00 /* MAC OUI for VN2VN use */
+#define FIP_VN_PROBE_WAIT 100   /* interval between VN2VN probes (ms) */
+#define FIP_VN_ANN_WAIT 400     /* interval between VN2VN announcements (ms) */
+#define FIP_VN_RLIM_INT 10000   /* interval between probes when rate limited */
+#define FIP_VN_RLIM_COUNT 10    /* number of probes before rate limiting */
+#define FIP_VN_BEACON_INT 8000  /* interval between VN2VN beacons */
+#define FIP_VN_BEACON_FUZZ 100  /* random time to add to beacon period (ms) */
+/*
 * Multicast MAC addresses.  T11-adopted.
 */
-#define FIP_ALL_FCOE_MACS       ((u8[6]) { 1, 0x10, 0x18, 1, 0, 0 })
+#define FIP_ALL_FCOE_MACS       ((__u8[6]) { 1, 0x10, 0x18, 1, 0, 0 })
-#define FIP_ALL_ENODE_MACS      ((u8[6]) { 1, 0x10, 0x18, 1, 0, 1 })
+#define FIP_ALL_ENODE_MACS      ((__u8[6]) { 1, 0x10, 0x18, 1, 0, 1 })
-#define FIP_ALL_FCF_MACS        ((u8[6]) { 1, 0x10, 0x18, 1, 0, 2 })
+#define FIP_ALL_FCF_MACS        ((__u8[6]) { 1, 0x10, 0x18, 1, 0, 2 })
+#define FIP_ALL_VN2VN_MACS      ((__u8[6]) { 1, 0x10, 0x18, 1, 0, 4 })
+#define FIP_ALL_P2P_MACS        ((__u8[6]) { 1, 0x10, 0x18, 1, 0, 5 })
 #define FIP_VER         1               /* version for fip_header */
@@ -60,6 +76,7 @@ enum fip_opcode {
        FIP_OP_LS =     2,              /* Link Service request or reply */
        FIP_OP_CTRL =   3,              /* Keep Alive / Link Reset */
        FIP_OP_VLAN =   4,              /* VLAN discovery */
+        FIP_OP_VN2VN =  5,              /* VN2VN operation */
        FIP_OP_VENDOR_MIN = 0xfff8,     /* min vendor-specific opcode */
        FIP_OP_VENDOR_MAX = 0xfffe,     /* max vendor-specific opcode */
 };
@@ -97,11 +114,23 @@ enum fip_vlan_subcode {
 };
 /*
+ * Subcodes for FIP_OP_VN2VN.
+ */
+enum fip_vn2vn_subcode {
+        FIP_SC_VN_PROBE_REQ = 1,        /* probe request */
+        FIP_SC_VN_PROBE_REP = 2,        /* probe reply */
+        FIP_SC_VN_CLAIM_NOTIFY = 3,     /* claim notification */
+        FIP_SC_VN_CLAIM_REP = 4,        /* claim response */
+        FIP_SC_VN_BEACON = 5,           /* beacon */
+};
+/*
 * flags in header fip_flags.
 */
 enum fip_flag {
        FIP_FL_FPMA =   0x8000,         /* supports FPMA fabric-provided MACs */
        FIP_FL_SPMA =   0x4000,         /* supports SPMA server-provided MACs */
+        FIP_FL_REC_OR_P2P = 0x0008,     /* configured addr or point-to-point */
        FIP_FL_AVAIL =  0x0004,         /* available for FLOGI/ELP */
        FIP_FL_SOL =    0x0002,         /* this is a solicited message */
        FIP_FL_FPORT =  0x0001,         /* sent from an F port */
@@ -130,6 +159,7 @@ enum fip_desc_type {
        FIP_DT_FKA =    12,             /* advertisement keep-alive period */
        FIP_DT_VENDOR = 13,             /* vendor ID */
        FIP_DT_VLAN =   14,             /* vlan number */
+        FIP_DT_FC4F =   15,             /* FC-4 features */
        FIP_DT_LIMIT,                   /* max defined desc_type + 1 */
        FIP_DT_VENDOR_BASE = 128,       /* first vendor-specific desc_type */
 };
@@ -229,6 +259,16 @@ enum fip_fka_flags {
 /* FIP_DT_FKA flags */
 /*
+ * FIP_DT_FC4F - FC-4 features.
+ */
+struct fip_fc4_feat {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        struct fc_ns_fts fd_fts;
+        struct fc_ns_ff fd_ff;
+} __attribute__((packed));
+/*
 * FIP_DT_VENDOR descriptor.
 */
 struct fip_vendor_desc {
diff --git a/include/scsi/fc/fc_ns.h b/include/scsi/fc/fc_ns.h
index e7d3ac497d7d..185015dd1166 100644
--- a/include/scsi/fc/fc_ns.h
+++ b/include/scsi/fc/fc_ns.h
@@ -100,6 +100,13 @@ struct fc_ns_fts {
 };
 /*
+ * FC4-features object.
+ */
+struct fc_ns_ff {
+        __be32  fd_feat[FC_NS_TYPES * 4 / FC_NS_BPW]; /* 4-bits per FC-type */
+};
+/*
 * GID_PT request.
 */
 struct fc_ns_gid_pt {
diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
index 9b4867c9c2d2..6d293c846a46 100644
--- a/include/scsi/fc_encode.h
+++ b/include/scsi/fc_encode.h
@@ -21,6 +21,13 @@
 #define _FC_ENCODE_H_
 #include <asm/unaligned.h>
+/*
+ * F_CTL values for simple requests and responses.
+ */
+#define FC_FCTL_REQ     (FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT)
+#define FC_FCTL_RESP    (FC_FC_EX_CTX | FC_FC_LAST_SEQ | \
+                        FC_FC_END_SEQ | FC_FC_SEQ_INIT)
 struct fc_ns_rft {
        struct fc_ns_fid fid;   /* port ID object */
        struct fc_ns_fts fts;   /* FC4-types object */
diff --git a/include/scsi/fc_frame.h b/include/scsi/fc_frame.h
index 4d3e9c7b7c57..4ad02041b667 100644
--- a/include/scsi/fc_frame.h
+++ b/include/scsi/fc_frame.h
@@ -30,6 +30,23 @@
 #include <linux/if_ether.h>
+/* some helpful macros */
+#define ntohll(x) be64_to_cpu(x)
+#define htonll(x) cpu_to_be64(x)
+static inline u32 ntoh24(const u8 *p)
+{
+        return (p[0] << 16) | (p[1] << 8) | p[2];
+}
+static inline void hton24(u8 *p, u32 v)
+{
+        p[0] = (v >> 16) & 0xff;
+        p[1] = (v >> 8) & 0xff;
+        p[2] = v & 0xff;
+}
 /*
 * The fc_frame interface is used to pass frame data between functions.
 * The frame includes the data buffer, length, and SOF / EOF delimiter types.
@@ -51,6 +68,7 @@
 #define fr_sof(fp)      (fr_cb(fp)->fr_sof)
 #define fr_eof(fp)      (fr_cb(fp)->fr_eof)
 #define fr_flags(fp)    (fr_cb(fp)->fr_flags)
+#define fr_encaps(fp)   (fr_cb(fp)->fr_encaps)
 #define fr_max_payload(fp)      (fr_cb(fp)->fr_max_payload)
 #define fr_fsp(fp)      (fr_cb(fp)->fr_fsp)
 #define fr_crc(fp)      (fr_cb(fp)->fr_crc)
@@ -66,9 +84,10 @@ struct fcoe_rcv_info {
        struct fc_fcp_pkt *fr_fsp;      /* for the corresponding fcp I/O */
        u32             fr_crc;
        u16             fr_max_payload; /* max FC payload */
-        enum fc_sof     fr_sof;         /* start of frame delimiter */
+        u8              fr_sof;         /* start of frame delimiter */
-        enum fc_eof     fr_eof;         /* end of frame delimiter */
+        u8              fr_eof;         /* end of frame delimiter */
        u8              fr_flags;       /* flags - see below */
+        u8              fr_encaps;      /* LLD encapsulation info (e.g. FIP) */
        u8              granted_mac[ETH_ALEN]; /* FCoE MAC address */
 };
@@ -97,6 +116,7 @@ static inline void fc_frame_init(struct fc_frame *fp)
        fr_dev(fp) = NULL;
        fr_seq(fp) = NULL;
        fr_flags(fp) = 0;
+        fr_encaps(fp) = 0;
 }
 struct fc_frame *fc_frame_alloc_fill(struct fc_lport *, size_t payload_len);
@@ -136,13 +156,39 @@ static inline int fc_frame_is_linear(struct fc_frame *fp)
 /*
 * Get frame header from message in fc_frame structure.
+ * This version doesn't do a length check.
+ */
+static inline
+struct fc_frame_header *__fc_frame_header_get(const struct fc_frame *fp)
+{
+        return (struct fc_frame_header *)fr_hdr(fp);
+}
+/*
+ * Get frame header from message in fc_frame structure.
 * This hides a cast and provides a place to add some checking.
 */
 static inline
 struct fc_frame_header *fc_frame_header_get(const struct fc_frame *fp)
 {
        WARN_ON(fr_len(fp) < sizeof(struct fc_frame_header));
-        return (struct fc_frame_header *) fr_hdr(fp);
+        return __fc_frame_header_get(fp);
+}
+/*
+ * Get source FC_ID (S_ID) from frame header in message.
+ */
+static inline u32 fc_frame_sid(const struct fc_frame *fp)
+{
+        return ntoh24(__fc_frame_header_get(fp)->fh_s_id);
+}
+/*
+ * Get destination FC_ID (D_ID) from frame header in message.
+ */
+static inline u32 fc_frame_did(const struct fc_frame *fp)
+{
+        return ntoh24(__fc_frame_header_get(fp)->fh_d_id);
 }
 /*
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 66d377b9c72b..a8631acd37c3 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -313,6 +313,7 @@ enum iscsi_param {
        ISCSI_PARAM_INITIATOR_NAME,
        ISCSI_PARAM_TGT_RESET_TMO,
+        ISCSI_PARAM_TARGET_ALIAS,
        /* must always be last */
        ISCSI_PARAM_MAX,
 };
@@ -353,6 +354,7 @@ enum iscsi_param {
 #define ISCSI_ISID                      (1ULL << ISCSI_PARAM_ISID)
 #define ISCSI_INITIATOR_NAME            (1ULL << ISCSI_PARAM_INITIATOR_NAME)
 #define ISCSI_TGT_RESET_TMO             (1ULL << ISCSI_PARAM_TGT_RESET_TMO)
+#define ISCSI_TARGET_ALIAS              (1ULL << ISCSI_PARAM_TARGET_ALIAS)
 /* iSCSI HBA params */
 enum iscsi_host_param {
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 7495c0ba67ee..14be49b44e84 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -42,24 +42,6 @@
 #define FC_EX_TIMEOUT   1       /* Exchange timeout */
 #define FC_EX_CLOSED    2       /* Exchange closed */
-/* some helpful macros */
-#define ntohll(x) be64_to_cpu(x)
-#define htonll(x) cpu_to_be64(x)
-static inline u32 ntoh24(const u8 *p)
-{
-        return (p[0] << 16) | (p[1] << 8) | p[2];
-}
-static inline void hton24(u8 *p, u32 v)
-{
-        p[0] = (v >> 16) & 0xff;
-        p[1] = (v >> 8) & 0xff;
-        p[2] = v & 0xff;
-}
 /**
 * enum fc_lport_state - Local port states
 * @LPORT_ST_DISABLED: Disabled
@@ -97,25 +79,25 @@ enum fc_disc_event {
 /**
 * enum fc_rport_state - Remote port states
 * @RPORT_ST_INIT:    Initialized
+ * @RPORT_ST_FLOGI:   Waiting for FLOGI completion for point-to-multipoint
+ * @RPORT_ST_PLOGI_WAIT:   Waiting for peer to login for point-to-multipoint
 * @RPORT_ST_PLOGI:   Waiting for PLOGI completion
 * @RPORT_ST_PRLI:    Waiting for PRLI completion
 * @RPORT_ST_RTV:     Waiting for RTV completion
 * @RPORT_ST_READY:   Ready for use
- * @RPORT_ST_LOGO:    Remote port logout (LOGO) sent
 * @RPORT_ST_ADISC:   Discover Address sent
 * @RPORT_ST_DELETE:  Remote port being deleted
- * @RPORT_ST_RESTART: Remote port being deleted and will restart
 */
 enum fc_rport_state {
        RPORT_ST_INIT,
+        RPORT_ST_FLOGI,
+        RPORT_ST_PLOGI_WAIT,
        RPORT_ST_PLOGI,
        RPORT_ST_PRLI,
        RPORT_ST_RTV,
        RPORT_ST_READY,
-        RPORT_ST_LOGO,
        RPORT_ST_ADISC,
        RPORT_ST_DELETE,
-        RPORT_ST_RESTART,
 };
 /**
@@ -173,6 +155,7 @@ struct fc_rport_libfc_priv {
        u16                        flags;
        #define FC_RP_FLAGS_REC_SUPPORTED       (1 << 0)
        #define FC_RP_FLAGS_RETRY               (1 << 1)
+        #define FC_RP_STARTED                   (1 << 2)
        unsigned int               e_d_tov;
        unsigned int               r_a_tov;
 };
@@ -185,16 +168,18 @@ struct fc_rport_libfc_priv {
 * @rp_state:       Enumeration that tracks progress of PLOGI, PRLI,
 *                  and RTV exchanges
 * @ids:            The remote port identifiers and roles
- * @flags:          REC and RETRY supported flags
+ * @flags:          STARTED, REC and RETRY_SUPPORTED flags
 * @max_seq:        Maximum number of concurrent sequences
 * @disc_id:        The discovery identifier
 * @maxframe_size:  The maximum frame size
 * @retries:        The retry count for the current state
+ * @major_retries:  The retry count for the entire PLOGI/PRLI state machine
 * @e_d_tov:        Error detect timeout value (in msec)
 * @r_a_tov:        Resource allocation timeout value (in msec)
 * @rp_mutex:       The mutex that protects the remote port
 * @retry_work:     Handle for retries
 * @event_callback: Callback when READY, FAILED or LOGO states complete
+ * @rcu:            Structure used for freeing in an RCU-safe manner
 */
 struct fc_rport_priv {
        struct fc_lport             *local_port;
@@ -207,6 +192,7 @@ struct fc_rport_priv {
        u16                         disc_id;
        u16                         maxframe_size;
        unsigned int                retries;
+        unsigned int                major_retries;
        unsigned int                e_d_tov;
        unsigned int                r_a_tov;
        struct mutex                rp_mutex;
@@ -216,6 +202,7 @@ struct fc_rport_priv {
        struct list_head            peers;
        struct work_struct          event_work;
        u32                         supported_classes;
+        struct rcu_head             rcu;
 };
 /**
@@ -262,14 +249,12 @@ struct fcoe_dev_stats {
 /**
 * struct fc_seq_els_data - ELS data used for passing ELS specific responses
- * @fp:     The ELS frame
 * @reason: The reason for rejection
 * @explan: The explaination of the rejection
 *
 * Mainly used by the exchange manager layer.
 */
 struct fc_seq_els_data {
-        struct fc_frame *fp;
        enum fc_els_rjt_reason reason;
        enum fc_els_rjt_explan explan;
 };
@@ -405,6 +390,7 @@ struct fc_seq {
 * @esb_stat:     ESB exchange status
 * @r_a_tov:      Resouce allocation time out value (in msecs)
 * @seq_id:       The next sequence ID to use
+ * @encaps:       encapsulation information for lower-level driver
 * @f_ctl:        F_CTL flags for the sequence
 * @fh_type:      The frame type
 * @class:        The class of service
@@ -436,6 +422,7 @@ struct fc_exch {
        u32                 esb_stat;
        u32                 r_a_tov;
        u8                  seq_id;
+        u8                  encaps;
        u32                 f_ctl;
        u8                  fh_type;
        enum fc_class       class;
@@ -530,12 +517,11 @@ struct libfc_function_template {
                        struct fc_frame *);
        /*
-         * Send an ELS response using infomation from a previous
+         * Send an ELS response using infomation from the received frame.
-         * exchange and sequence.
         *
         * STATUS: OPTIONAL
         */
-        void (*seq_els_rsp_send)(struct fc_seq *, enum fc_els_cmd,
+        void (*seq_els_rsp_send)(struct fc_frame *, enum fc_els_cmd,
                                 struct fc_seq_els_data *);
        /*
@@ -567,6 +553,13 @@ struct libfc_function_template {
        struct fc_seq *(*seq_start_next)(struct fc_seq *);
        /*
+         * Assign a sequence for an incoming request frame.
+         *
+         * STATUS: OPTIONAL
+         */
+        struct fc_seq *(*seq_assign)(struct fc_lport *, struct fc_frame *);
+        /*
         * Reset an exchange manager, completing all sequences and exchanges.
         * If s_id is non-zero, reset only exchanges originating from that FID.
         * If d_id is non-zero, reset only exchanges sending to that FID.
@@ -587,8 +580,7 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        void (*lport_recv)(struct fc_lport *, struct fc_seq *,
+        void (*lport_recv)(struct fc_lport *, struct fc_frame *);
-                           struct fc_frame *);
        /*
         * Reset the local port.
@@ -650,8 +642,7 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        void (*rport_recv_req)(struct fc_seq *, struct fc_frame *,
+        void (*rport_recv_req)(struct fc_lport *, struct fc_frame *);
-                               struct fc_lport *);
        /*
         * lookup an rport by it's port ID.
@@ -697,8 +688,7 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        void (*disc_recv_req)(struct fc_seq *, struct fc_frame *,
+        void (*disc_recv_req)(struct fc_lport *, struct fc_frame *);
-                              struct fc_lport *);
        /*
         * Start discovery for a local port.
@@ -736,7 +726,7 @@ struct libfc_function_template {
 * @buf_len:       Length of the discovery buffer
 * @disc_id:       Discovery ID
 * @rports:        List of discovered remote ports
- * @lport:         The local port that discovery is for
+ * @priv:          Private pointer for use by discovery code
 * @disc_mutex:    Mutex that protects the discovery context
 * @partial_buf:   Partial name buffer (if names are returned
 *                 in multiple frames)
@@ -752,7 +742,7 @@ struct fc_disc {
        u16                   disc_id;
        struct list_head      rports;
-        struct fc_lport       *lport;
+        void                  *priv;
        struct mutex          disc_mutex;
        struct fc_gpn_ft_resp partial_buf;
        struct delayed_work   disc_work;
@@ -796,6 +786,7 @@ struct fc_disc {
 * @mfs:                   The maximum Fibre Channel payload size
 * @max_retry_count:       The maximum retry attempts
 * @max_rport_retry_count: The maximum remote port retry attempts
+ * @rport_priv_size:       Size needed by driver after struct fc_rport_priv
 * @lro_xid:               The maximum XID for LRO
 * @lso_max:               The maximum large offload send size
 * @fcts:                  FC-4 type mask
@@ -842,9 +833,11 @@ struct fc_lport {
        u32                            lro_enabled:1;
        u32                            does_npiv:1;
        u32                            npiv_enabled:1;
+        u32                            point_to_multipoint:1;
        u32                            mfs;
        u8                             max_retry_count;
        u8                             max_rport_retry_count;
+        u16                            rport_priv_size;
        u16                            link_speed;
        u16                            link_supported_speeds;
        u16                            lro_xid;
@@ -986,6 +979,7 @@ int fc_set_mfs(struct fc_lport *, u32 mfs);
 struct fc_lport *libfc_vport_create(struct fc_vport *, int privsize);
 struct fc_lport *fc_vport_id_lookup(struct fc_lport *, u32 port_id);
 int fc_lport_bsg_request(struct fc_bsg_job *);
+void fc_lport_set_local_id(struct fc_lport *, u32 port_id);
 /*
 * REMOTE PORT LAYER
@@ -998,6 +992,11 @@ void fc_rport_terminate_io(struct fc_rport *);
 *****************************/
 int fc_disc_init(struct fc_lport *);
+static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc)
+{
+        return container_of(disc, struct fc_lport, disc);
+}
 /*
 * FCP LAYER
 *****************************/
@@ -1029,6 +1028,10 @@ struct fc_seq *fc_elsct_send(struct fc_lport *, u32 did,
                                    void *arg, u32 timer_msec);
 void fc_lport_flogi_resp(struct fc_seq *, struct fc_frame *, void *);
 void fc_lport_logo_resp(struct fc_seq *, struct fc_frame *, void *);
+void fc_fill_reply_hdr(struct fc_frame *, const struct fc_frame *,
+                       enum fc_rctl, u32 parm_offset);
+void fc_fill_hdr(struct fc_frame *, const struct fc_frame *,
+                 enum fc_rctl, u32 f_ctl, u16 seq_cnt, u32 parm_offset);
 /*
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index ec13f51531f8..06f1b5a8ed19 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -26,6 +26,7 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/workqueue.h>
+#include <linux/random.h>
 #include <scsi/fc/fc_fcoe.h>
 #include <scsi/libfc.h>
@@ -37,6 +38,7 @@
 #define FCOE_CTLR_START_DELAY   2000    /* mS after first adv. to choose FCF */
 #define FCOE_CTRL_SOL_TOV       2000    /* min. solicitation interval (mS) */
 #define FCOE_CTLR_FCF_LIMIT     20      /* max. number of FCF entries */
+#define FCOE_CTLR_VN2VN_LOGIN_LIMIT 3   /* max. VN2VN rport login retries */
 /**
 * enum fip_state - internal state of FCoE controller.
@@ -45,6 +47,11 @@
 * @FIP_ST_AUTO:        determining whether to use FIP or non-FIP mode.
 * @FIP_ST_NON_FIP:     non-FIP mode selected.
 * @FIP_ST_ENABLED:     FIP mode selected.
+ * @FIP_ST_VNMP_START:  VN2VN multipath mode start, wait
+ * @FIP_ST_VNMP_PROBE1: VN2VN sent first probe, listening
+ * @FIP_ST_VNMP_PROBE2: VN2VN sent second probe, listening
+ * @FIP_ST_VNMP_CLAIM:  VN2VN sent claim, waiting for responses
+ * @FIP_ST_VNMP_UP:     VN2VN multipath mode operation
 */
 enum fip_state {
        FIP_ST_DISABLED,
@@ -52,8 +59,23 @@ enum fip_state {
        FIP_ST_AUTO,
        FIP_ST_NON_FIP,
        FIP_ST_ENABLED,
+        FIP_ST_VNMP_START,
+        FIP_ST_VNMP_PROBE1,
+        FIP_ST_VNMP_PROBE2,
+        FIP_ST_VNMP_CLAIM,
+        FIP_ST_VNMP_UP,
 };
+/*
+ * Modes:
+ * The mode is the state that is to be entered after link up.
+ * It must not change after fcoe_ctlr_init() sets it.
+ */
+#define FIP_MODE_AUTO           FIP_ST_AUTO
+#define FIP_MODE_NON_FIP        FIP_ST_NON_FIP
+#define FIP_MODE_FABRIC         FIP_ST_ENABLED
+#define FIP_MODE_VN2VN          FIP_ST_VNMP_START
 /**
 * struct fcoe_ctlr - FCoE Controller and FIP state
 * @state:         internal FIP state for network link and FIP or non-FIP mode.
@@ -70,19 +92,20 @@ enum fip_state {
 * @timer_work:    &work_struct for doing keep-alives and resets.
 * @recv_work:     &work_struct for receiving FIP frames.
 * @fip_recv_list: list of received FIP frames.
+ * @rnd_state:     state for pseudo-random number generator.
+ * @port_id:       proposed or selected local-port ID.
 * @user_mfs:      configured maximum FC frame size, including FC header.
 * @flogi_oxid:    exchange ID of most recent fabric login.
 * @flogi_count:   number of FLOGI attempts in AUTO mode.
 * @map_dest:      use the FC_MAP mode for destination MAC addresses.
 * @spma:          supports SPMA server-provided MACs mode
- * @send_ctlr_ka:  need to send controller keep alive
+ * @probe_tries:   number of FC_IDs probed
- * @send_port_ka:  need to send port keep alives
 * @dest_addr:     MAC address of the selected FC forwarder.
 * @ctl_src_addr:  the native MAC address of our local port.
 * @send:          LLD-supplied function to handle sending FIP Ethernet frames
 * @update_mac:    LLD-supplied function to handle changes to MAC addresses.
 * @get_src_addr:  LLD-supplied function to supply a source MAC address.
- * @lock:          lock protecting this structure.
+ * @ctlr_mutex:    lock protecting this structure.
 *
 * This structure is used by all FCoE drivers.  It contains information
 * needed by all FCoE low-level drivers (LLDs) as well as internal state
@@ -103,21 +126,23 @@ struct fcoe_ctlr {
        struct work_struct timer_work;
        struct work_struct recv_work;
        struct sk_buff_head fip_recv_list;
+        struct rnd_state rnd_state;
+        u32 port_id;
        u16 user_mfs;
        u16 flogi_oxid;
        u8 flogi_count;
-        u8 reset_req;
        u8 map_dest;
        u8 spma;
-        u8 send_ctlr_ka;
+        u8 probe_tries;
-        u8 send_port_ka;
        u8 dest_addr[ETH_ALEN];
        u8 ctl_src_addr[ETH_ALEN];
        void (*send)(struct fcoe_ctlr *, struct sk_buff *);
        void (*update_mac)(struct fc_lport *, u8 *addr);
        u8 * (*get_src_addr)(struct fc_lport *);
-        spinlock_t lock;
+        struct mutex ctlr_mutex;
 };
 /**
@@ -156,8 +181,26 @@ struct fcoe_fcf {
        u8 fd_flags:1;
 };
+/**
+ * struct fcoe_rport - VN2VN remote port
+ * @time:       time of create or last beacon packet received from node
+ * @fcoe_len:   max FCoE frame size, not including VLAN or Ethernet headers
+ * @flags:      flags from probe or claim
+ * @login_count: number of unsuccessful rport logins to this port
+ * @enode_mac:  E_Node control MAC address
+ * @vn_mac:     VN_Node assigned MAC address for data
+ */
+struct fcoe_rport {
+        unsigned long time;
+        u16 fcoe_len;
+        u16 flags;
+        u8 login_count;
+        u8 enode_mac[ETH_ALEN];
+        u8 vn_mac[ETH_ALEN];
+};
 /* FIP API functions */
-void fcoe_ctlr_init(struct fcoe_ctlr *);
+void fcoe_ctlr_init(struct fcoe_ctlr *, enum fip_state);
 void fcoe_ctlr_destroy(struct fcoe_ctlr *);
 void fcoe_ctlr_link_up(struct fcoe_ctlr *);
 int fcoe_ctlr_link_down(struct fcoe_ctlr *);
@@ -168,6 +211,17 @@ int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_lport *,
 /* libfcoe funcs */
 u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
-int fcoe_libfc_config(struct fc_lport *, struct libfc_function_template *);
+int fcoe_libfc_config(struct fc_lport *, struct fcoe_ctlr *,
+                      const struct libfc_function_template *, int init_fcp);
+/**
+ * is_fip_mode() - returns true if FIP mode selected.
+ * @fip:        FCoE controller.
+ */
+static inline bool is_fip_mode(struct fcoe_ctlr *fip)
+{
+        return fip->state == FIP_ST_ENABLED;
+}
 #endif /* _LIBFCOE_H */
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 3b586859669c..d06e13be717b 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -422,16 +422,7 @@ enum service_response {
 };
 enum exec_status {
-        SAM_GOOD         = 0,
+        /* The SAM_STAT_.. codes fit in the lower 6 bits */
-        SAM_CHECK_COND   = 2,
-        SAM_COND_MET     = 4,
-        SAM_BUSY         = 8,
-        SAM_INTERMEDIATE = 0x10,
-        SAM_IM_COND_MET  = 0x12,
-        SAM_RESV_CONFLICT= 0x14,
-        SAM_TASK_SET_FULL= 0x28,
-        SAM_ACA_ACTIVE   = 0x30,
-        SAM_TASK_ABORTED = 0x40,
        SAS_DEV_NO_RESPONSE = 0x80,
        SAS_DATA_UNDERRUN,
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index d80b6dbed1ca..50cb34ffef11 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -381,6 +381,14 @@ extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
                            struct scsi_sense_hdr *, int timeout, int retries,
                            int *resid);
+#ifdef CONFIG_PM_RUNTIME
+extern int scsi_autopm_get_device(struct scsi_device *);
+extern void scsi_autopm_put_device(struct scsi_device *);
+#else
+static inline int scsi_autopm_get_device(struct scsi_device *d) { return 0; }
+static inline void scsi_autopm_put_device(struct scsi_device *d) {}
+#endif /* CONFIG_PM_RUNTIME */
 static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev)
 {
        return device_reprobe(&sdev->sdev_gendev);
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 349c7f30720d..7fff94b3b2a8 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -32,6 +32,7 @@ struct scsi_transport_template;
 struct iscsi_transport;
 struct iscsi_endpoint;
 struct Scsi_Host;
+struct scsi_cmnd;
 struct iscsi_cls_conn;
 struct iscsi_conn;
 struct iscsi_task;
@@ -255,5 +256,6 @@ extern int iscsi_scan_finished(struct Scsi_Host *shost, unsigned long time);
 extern struct iscsi_endpoint *iscsi_create_endpoint(int dd_size);
 extern void iscsi_destroy_endpoint(struct iscsi_endpoint *ep);
 extern struct iscsi_endpoint *iscsi_lookup_endpoint(u64 handle);
+extern int iscsi_block_scsi_eh(struct scsi_cmnd *cmd);
 #endif
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index dd76cdede64d..6e3a29732dc4 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -366,7 +366,7 @@ struct snd_pcm_substream {
        int number;
        char name[32];                  /* substream name */
        int stream;                     /* stream (direction) */
-        struct pm_qos_request_list *latency_pm_qos_req; /* pm_qos request */
+        struct pm_qos_request_list latency_pm_qos_req; /* pm_qos request */
        size_t buffer_bytes_max;        /* limit ring buffer size */
        struct snd_dma_buffer dma_buffer;
        unsigned int dma_buf_id;
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index c4efe9b8280d..35a2a6e7bf1e 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -18,52 +18,55 @@ enum {
 DECLARE_EVENT_CLASS(power,
-        TP_PROTO(unsigned int type, unsigned int state),
+        TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
-        TP_ARGS(type, state),
+        TP_ARGS(type, state, cpu_id),
        TP_STRUCT__entry(
                __field(        u64,            type            )
                __field(        u64,            state           )
+                __field(        u64,            cpu_id          )
        ),
        TP_fast_assign(
                __entry->type = type;
                __entry->state = state;
+                __entry->cpu_id = cpu_id;
        ),
-        TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long)__entry->state)
+        TP_printk("type=%lu state=%lu cpu_id=%lu", (unsigned long)__entry->type,
+                (unsigned long)__entry->state, (unsigned long)__entry->cpu_id)
 );
 DEFINE_EVENT(power, power_start,
-        TP_PROTO(unsigned int type, unsigned int state),
+        TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
-        TP_ARGS(type, state)
+        TP_ARGS(type, state, cpu_id)
 );
 DEFINE_EVENT(power, power_frequency,
-        TP_PROTO(unsigned int type, unsigned int state),
+        TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
-        TP_ARGS(type, state)
+        TP_ARGS(type, state, cpu_id)
 );
 TRACE_EVENT(power_end,
-        TP_PROTO(int dummy),
+        TP_PROTO(unsigned int cpu_id),
-        TP_ARGS(dummy),
+        TP_ARGS(cpu_id),
        TP_STRUCT__entry(
-                __field(        u64,            dummy           )
+                __field(        u64,            cpu_id          )
        ),
        TP_fast_assign(
-                __entry->dummy = 0xffff;
+                __entry->cpu_id = cpu_id;
        ),
-        TP_printk("dummy=%lu", (unsigned long)__entry->dummy)
+        TP_printk("cpu_id=%lu", (unsigned long)__entry->cpu_id)
 );
diff --git a/include/xen/events.h b/include/xen/events.h
index e68d59a90ca8..a15d93262e30 100644
--- a/include/xen/events.h
+++ b/include/xen/events.h
@@ -56,4 +56,11 @@ void xen_poll_irq(int irq);
 /* Determine the IRQ which is bound to an event channel */
 unsigned irq_from_evtchn(unsigned int evtchn);
+/* Xen HVM evtchn vector callback */
+extern void xen_hvm_callback_vector(void);
+extern int xen_have_vector_callback;
+int xen_set_callback_via(uint64_t via);
+void xen_evtchn_do_upcall(struct pt_regs *regs);
+void xen_hvm_evtchn_do_upcall(void);
 #endif  /* _XEN_EVENTS_H */
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index a40f1cd91be1..9a731706a016 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -51,6 +51,7 @@ struct gnttab_free_callback {
        u16 count;
 };
+int gnttab_init(void);
 int gnttab_suspend(void);
 int gnttab_resume(void);
@@ -112,6 +113,9 @@ int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
 void arch_gnttab_unmap_shared(struct grant_entry *shared,
                              unsigned long nr_gframes);
+extern unsigned long xen_hvm_resume_frames;
+unsigned int gnttab_max_grant_frames(void);
 #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
 #endif /* __ASM_GNTTAB_H__ */
diff --git a/include/xen/hvm.h b/include/xen/hvm.h
new file mode 100644
index 000000000000..b193fa2f9fdd
--- /dev/null
+++ b/include/xen/hvm.h
@@ -0,0 +1,30 @@
+/* Simple wrappers around HVM functions */
+#ifndef XEN_HVM_H__
+#define XEN_HVM_H__
+#include <xen/interface/hvm/params.h>
+#include <asm/xen/hypercall.h>
+static inline int hvm_get_parameter(int idx, uint64_t *value)
+{
+        struct xen_hvm_param xhv;
+        int r;
+        xhv.domid = DOMID_SELF;
+        xhv.index = idx;
+        r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv);
+        if (r < 0) {
+                printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n",
+                        idx, r);
+                return r;
+        }
+        *value = xhv.value;
+        return r;
+}
+#define HVM_CALLBACK_VIA_TYPE_VECTOR 0x2
+#define HVM_CALLBACK_VIA_TYPE_SHIFT 56
+#define HVM_CALLBACK_VECTOR(x) (((uint64_t)HVM_CALLBACK_VIA_TYPE_VECTOR)<<\
+                HVM_CALLBACK_VIA_TYPE_SHIFT | (x))
+#endif /* XEN_HVM_H__ */
diff --git a/include/xen/interface/features.h b/include/xen/interface/features.h
index f51b6413b054..70d2563ab166 100644
--- a/include/xen/interface/features.h
+++ b/include/xen/interface/features.h
@@ -41,6 +41,12 @@
 /* x86: Does this Xen host support the MMU_PT_UPDATE_PRESERVE_AD hypercall? */
 #define XENFEAT_mmu_pt_update_preserve_ad  5
+/* x86: Does this Xen host support the HVM callback vector type? */
+#define XENFEAT_hvm_callback_vector        8
+/* x86: pvclock algorithm is safe to use on HVM */
+#define XENFEAT_hvm_safe_pvclock           9
 #define XENFEAT_NR_SUBMAPS 1
 #endif /* __XEN_PUBLIC_FEATURES_H__ */
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
index 39da93c21de0..39e571796e32 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -28,6 +28,7 @@
 #ifndef __XEN_PUBLIC_GRANT_TABLE_H__
 #define __XEN_PUBLIC_GRANT_TABLE_H__
+#include <xen/interface/xen.h>
 /***********************************
 * GRANT TABLE REPRESENTATION
diff --git a/include/xen/interface/hvm/hvm_op.h b/include/xen/interface/hvm/hvm_op.h
new file mode 100644
index 000000000000..a4827f46ee97
--- /dev/null
+++ b/include/xen/interface/hvm/hvm_op.h
@@ -0,0 +1,46 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#ifndef __XEN_PUBLIC_HVM_HVM_OP_H__
+#define __XEN_PUBLIC_HVM_HVM_OP_H__
+/* Get/set subcommands: the second argument of the hypercall is a
+ * pointer to a xen_hvm_param struct. */
+#define HVMOP_set_param           0
+#define HVMOP_get_param           1
+struct xen_hvm_param {
+    domid_t  domid;    /* IN */
+    uint32_t index;    /* IN */
+    uint64_t value;    /* IN/OUT */
+};
+DEFINE_GUEST_HANDLE_STRUCT(xen_hvm_param);
+/* Hint from PV drivers for pagetable destruction. */
+#define HVMOP_pagetable_dying       9
+struct xen_hvm_pagetable_dying {
+    /* Domain with a pagetable about to be destroyed. */
+    domid_t  domid;
+    /* guest physical address of the toplevel pagetable dying */
+    aligned_u64 gpa;
+};
+typedef struct xen_hvm_pagetable_dying xen_hvm_pagetable_dying_t;
+DEFINE_GUEST_HANDLE_STRUCT(xen_hvm_pagetable_dying_t);
+ 
+#endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */
diff --git a/include/xen/interface/hvm/params.h b/include/xen/interface/hvm/params.h
new file mode 100644
index 000000000000..1888d8c157e6
--- /dev/null
+++ b/include/xen/interface/hvm/params.h
@@ -0,0 +1,95 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#ifndef __XEN_PUBLIC_HVM_PARAMS_H__
+#define __XEN_PUBLIC_HVM_PARAMS_H__
+#include "hvm_op.h"
+/*
+ * Parameter space for HVMOP_{set,get}_param.
+ */
+/*
+ * How should CPU0 event-channel notifications be delivered?
+ * val[63:56] == 0: val[55:0] is a delivery GSI (Global System Interrupt).
+ * val[63:56] == 1: val[55:0] is a delivery PCI INTx line, as follows:
+ *                  Domain = val[47:32], Bus  = val[31:16],
+ *                  DevFn  = val[15: 8], IntX = val[ 1: 0]
+ * val[63:56] == 2: val[7:0] is a vector number.
+ * If val == 0 then CPU0 event-channel notifications are not delivered.
+ */
+#define HVM_PARAM_CALLBACK_IRQ 0
+#define HVM_PARAM_STORE_PFN    1
+#define HVM_PARAM_STORE_EVTCHN 2
+#define HVM_PARAM_PAE_ENABLED  4
+#define HVM_PARAM_IOREQ_PFN    5
+#define HVM_PARAM_BUFIOREQ_PFN 6
+/*
+ * Set mode for virtual timers (currently x86 only):
+ *  delay_for_missed_ticks (default):
+ *   Do not advance a vcpu's time beyond the correct delivery time for
+ *   interrupts that have been missed due to preemption. Deliver missed
+ *   interrupts when the vcpu is rescheduled and advance the vcpu's virtual
+ *   time stepwise for each one.
+ *  no_delay_for_missed_ticks:
+ *   As above, missed interrupts are delivered, but guest time always tracks
+ *   wallclock (i.e., real) time while doing so.
+ *  no_missed_ticks_pending:
+ *   No missed interrupts are held pending. Instead, to ensure ticks are
+ *   delivered at some non-zero rate, if we detect missed ticks then the
+ *   internal tick alarm is not disabled if the VCPU is preempted during the
+ *   next tick period.
+ *  one_missed_tick_pending:
+ *   Missed interrupts are collapsed together and delivered as one 'late tick'.
+ *   Guest time always tracks wallclock (i.e., real) time.
+ */
+#define HVM_PARAM_TIMER_MODE   10
+#define HVMPTM_delay_for_missed_ticks    0
+#define HVMPTM_no_delay_for_missed_ticks 1
+#define HVMPTM_no_missed_ticks_pending   2
+#define HVMPTM_one_missed_tick_pending   3
+/* Boolean: Enable virtual HPET (high-precision event timer)? (x86-only) */
+#define HVM_PARAM_HPET_ENABLED 11
+/* Identity-map page directory used by Intel EPT when CR0.PG=0. */
+#define HVM_PARAM_IDENT_PT     12
+/* Device Model domain, defaults to 0. */
+#define HVM_PARAM_DM_DOMAIN    13
+/* ACPI S state: currently support S0 and S3 on x86. */
+#define HVM_PARAM_ACPI_S_STATE 14
+/* TSS used on Intel when CR0.PE=0. */
+#define HVM_PARAM_VM86_TSS     15
+/* Boolean: Enable aligning all periodic vpts to reduce interrupts */
+#define HVM_PARAM_VPT_ALIGN    16
+#define HVM_NR_PARAMS          17
+#endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */
diff --git a/include/xen/platform_pci.h b/include/xen/platform_pci.h
new file mode 100644
index 000000000000..ce9d671c636c
--- /dev/null
+++ b/include/xen/platform_pci.h
@@ -0,0 +1,49 @@
+#ifndef _XEN_PLATFORM_PCI_H
+#define _XEN_PLATFORM_PCI_H
+#define XEN_IOPORT_MAGIC_VAL 0x49d2
+#define XEN_IOPORT_LINUX_PRODNUM 0x0003
+#define XEN_IOPORT_LINUX_DRVVER  0x0001
+#define XEN_IOPORT_BASE 0x10
+#define XEN_IOPORT_PLATFLAGS    (XEN_IOPORT_BASE + 0) /* 1 byte access (R/W) */
+#define XEN_IOPORT_MAGIC        (XEN_IOPORT_BASE + 0) /* 2 byte access (R) */
+#define XEN_IOPORT_UNPLUG       (XEN_IOPORT_BASE + 0) /* 2 byte access (W) */
+#define XEN_IOPORT_DRVVER       (XEN_IOPORT_BASE + 0) /* 4 byte access (W) */
+#define XEN_IOPORT_SYSLOG       (XEN_IOPORT_BASE + 2) /* 1 byte access (W) */
+#define XEN_IOPORT_PROTOVER     (XEN_IOPORT_BASE + 2) /* 1 byte access (R) */
+#define XEN_IOPORT_PRODNUM      (XEN_IOPORT_BASE + 2) /* 2 byte access (W) */
+#define XEN_UNPLUG_ALL_IDE_DISKS 1
+#define XEN_UNPLUG_ALL_NICS 2
+#define XEN_UNPLUG_AUX_IDE_DISKS 4
+#define XEN_UNPLUG_ALL 7
+#define XEN_UNPLUG_IGNORE 8
+static inline int xen_must_unplug_nics(void) {
+#if (defined(CONFIG_XEN_NETDEV_FRONTEND) || \
+                defined(CONFIG_XEN_NETDEV_FRONTEND_MODULE)) && \
+                (defined(CONFIG_XEN_PLATFORM_PCI) || \
+                 defined(CONFIG_XEN_PLATFORM_PCI_MODULE))
+        return 1;
+#else
+        return 0;
+#endif
+}
+static inline int xen_must_unplug_disks(void) {
+#if (defined(CONFIG_XEN_BLKDEV_FRONTEND) || \
+                defined(CONFIG_XEN_BLKDEV_FRONTEND_MODULE)) && \
+                (defined(CONFIG_XEN_PLATFORM_PCI) || \
+                 defined(CONFIG_XEN_PLATFORM_PCI_MODULE))
+        return 1;
+#else
+        return 0;
+#endif
+}
+extern int xen_platform_pci_unplug;
+#endif /* _XEN_PLATFORM_PCI_H */
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 883a21bba24b..46bc81ef74c6 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -7,6 +7,7 @@ DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu);
 void xen_pre_suspend(void);
 void xen_post_suspend(int suspend_cancelled);
+void xen_hvm_post_suspend(int suspend_cancelled);
 void xen_mm_pin_all(void);
 void xen_mm_unpin_all(void);
@@ -14,4 +15,6 @@ void xen_mm_unpin_all(void);
 void xen_timer_resume(void);
 void xen_arch_resume(void);
+int xen_setup_shutdown_event(void);
 #endif /* INCLUDE_XEN_OPS_H */